diff --git a/.gitignore b/.gitignore
index 1c9a181a..af66b9a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,14 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
-
 # User-specific files
 *.suo
 *.user
 *.userosscache
 *.sln.docstates
-
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
-
 # Build results
+/Harmony/build
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
@@ -21,29 +19,23 @@
 bld/
 [Bb]in/
 [Oo]bj/
-
 # Visual Studio 2015 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
-
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
-
 # NUNIT
 *.VisualState.xml
 TestResult.xml
-
 # Build Results of an ATL Project
 [Dd]ebugPS/
 [Rr]eleasePS/
 dlldata.c
-
 # DNX
 project.lock.json
 artifacts/
-
 *_i.c
 *_p.c
 *_i.h
@@ -68,10 +60,8 @@ artifacts/
 *.pidb
 *.svclog
 *.scc
-
 # Chutzpah Test files
 _Chutzpah*
-
 # Visual C++ cache files
 ipch/
 *.aps
@@ -81,48 +71,36 @@ ipch/
 *.sdf
 *.cachefile
 *.VC.db
-
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
 *.sap
-
 # TFS 2012 Local Workspace
 $tf/
-
 # Guidance Automation Toolkit
 *.gpState
-
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
-
 # JustCode is a .NET coding add-in
 .JustCode
-
 # TeamCity is a build add-in
 _TeamCity*
-
 # DotCover is a Code Coverage Tool
 *.dotCover
-
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
 nCrunchTemp_*
-
 # MightyMoose
 *.mm.*
 AutoTest.Net/
-
 # Web workbench (sass)
 .sass-cache/
-
 # Installshield output folder
 [Ee]xpress/
-
 # DocProject is a documentation generator add-in
 DocProject/buildhelp/
 DocProject/Help/*.HxT
@@ -132,20 +110,16 @@ DocProject/Help/*.hhk
 DocProject/Help/*.hhp
 DocProject/Help/Html2
 DocProject/Help/html
-
 # Click-Once directory
 publish/
-
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-
 # TODO: Un-comment the next line if you do not want to checkin
 # your web deploy settings because they may include unencrypted
 # passwords
 #*.pubxml
 *.publishproj
-
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
@@ -157,25 +131,20 @@ publish/
 # NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets
-
 # Microsoft Azure Build Output
 csx/
 *.build.csdef
-
 # Microsoft Azure Emulator
 ecf/
 rcf/
-
 # Windows Store app package directory
 AppPackages/
 BundleArtifacts/
-
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
 !*.[Cc]ache/
-
 # Others
 ClientBin/
 [Ss]tyle[Cc]op.*
@@ -187,10 +156,8 @@ ClientBin/
 *.publishsettings
 node_modules/
 orleans.codegen.cs
-
 # RIA/Silverlight projects
 Generated_Code/
-
 # Backup & report files from converting an old project file
 # to a newer Visual Studio version. Backup files are not needed,
 # because we have git ;-)
@@ -198,31 +165,23 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
-
 # SQL Server files
 *.mdf
 *.ldf
-
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
-
 # Microsoft Fakes
 FakesAssemblies/
-
 # GhostDoc plugin setting file
 *.GhostDoc.xml
-
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
-
 # Visual Studio 6 build log
 *.plg
-
 # Visual Studio 6 workspace options file
 *.opt
-
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -230,13 +189,10 @@ FakesAssemblies/
 **/*.Server/GeneratedArtifacts
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
-
 # LightSwitch generated files
 GeneratedArtifacts/
 ModelManifest.xml
-
 # Paket dependency manager
 .paket/paket.exe
-
 # FAKE - F# Make
 .fake/
diff --git a/Harmony.sln b/Harmony.sln
index b59b89d5..3c5f36dc 100644
--- a/Harmony.sln
+++ b/Harmony.sln
@@ -9,18 +9,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarmonyTests", "HarmonyTest
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug-3.5|Any CPU = Debug-3.5|Any CPU
+		Debug-4.7.1|Any CPU = Debug-4.7.1|Any CPU
+		Release-3.5|Any CPU = Release-3.5|Any CPU
+		Release-4.7.1|Any CPU = Release-4.7.1|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Debug-3.5|Any CPU.ActiveCfg = Debug-3.5|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Debug-3.5|Any CPU.Build.0 = Debug-3.5|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Debug-4.7.1|Any CPU.ActiveCfg = Debug-4.7.1|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Debug-4.7.1|Any CPU.Build.0 = Debug-4.7.1|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Release-3.5|Any CPU.ActiveCfg = Release-3.5|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Release-3.5|Any CPU.Build.0 = Release-3.5|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Release-4.7.1|Any CPU.ActiveCfg = Release-4.7.1|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.Release-4.7.1|Any CPU.Build.0 = Release-4.7.1|Any CPU
+		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.Debug-3.5|Any CPU.ActiveCfg = Debug-3.5|Any CPU
+		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.Debug-4.7.1|Any CPU.ActiveCfg = Debug-4.7.1|Any CPU
+		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.Release-3.5|Any CPU.ActiveCfg = Release-3.5|Any CPU
+		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.Release-4.7.1|Any CPU.ActiveCfg = Release-4.7.1|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Harmony/Attributes.cs b/Harmony/Attributes.cs
index 9164c577..165a058d 100644
--- a/Harmony/Attributes.cs
+++ b/Harmony/Attributes.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 
 namespace Harmony
 {
diff --git a/Harmony/CodeInstruction.cs b/Harmony/CodeInstruction.cs
index 091a6aa7..93fa0f64 100644
--- a/Harmony/CodeInstruction.cs
+++ b/Harmony/CodeInstruction.cs
@@ -25,6 +25,26 @@ public CodeInstruction(CodeInstruction instruction)
 			labels = instruction.labels.ToArray().ToList();
 		}
 
+		public CodeInstruction Clone()
+		{
+			return new CodeInstruction(this) { labels = new List<Label>() };
+		}
+
+		public CodeInstruction Clone(OpCode opcode)
+		{
+			var instruction = new CodeInstruction(this) { labels = new List<Label>() };
+			instruction.opcode = opcode;
+			return instruction;
+		}
+
+		public CodeInstruction Clone(OpCode opcode, object operand)
+		{
+			var instruction = new CodeInstruction(this) { labels = new List<Label>() };
+			instruction.opcode = opcode;
+			instruction.operand = operand;
+			return instruction;
+		}
+
 		public override string ToString()
 		{
 			var list = new List<string>();
diff --git a/Harmony/CodeTranspiler.cs b/Harmony/CodeTranspiler.cs
index 6bfd8ec2..5bd53612 100644
--- a/Harmony/CodeTranspiler.cs
+++ b/Harmony/CodeTranspiler.cs
@@ -51,6 +51,10 @@ public static object ConvertInstruction(Type type, object op, out Dictionary<str
 			return elementTo;
 		}
 
+		// ShouldAddExceptionInfo is used to determine if CodeInstructions from an older Harmony version were duplicating
+		// exception information as well as to preserve the exception information from being dropped when piping through
+		// multiple transpilers with mixed Harmony versions.
+		//
 		public static bool ShouldAddExceptionInfo(object op, int opIndex, List<object> originalInstructions, List<object> newInstructions, Dictionary<object, Dictionary<string, object>> unassignedValues)
 		{
 			var originalIndex = originalInstructions.IndexOf(op);
diff --git a/Harmony/Harmony.csproj b/Harmony/Harmony.csproj
index c50760ee..9d9d45b8 100644
--- a/Harmony/Harmony.csproj
+++ b/Harmony/Harmony.csproj
@@ -1,36 +1,75 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net35</TargetFramework>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Product>Harmony</Product>
-        <Company>Andreas Pardeike</Company>
-        <Copyright>Copyright © 2016</Copyright>
-        <Description>A general non-destructive patch library for .NET and Mono modules</Description>
-        <PackageId>Harmony</PackageId>
-        <Authors>Andreas Pardeike</Authors>
-        <AssemblyName>0Harmony</AssemblyName>
-        <SignAssembly>false</SignAssembly>
-        <Version>1.1.0</Version>
-        <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-        <PackageTags>Harmony,Mono,Patch,Patching,Runtime,Detour,Detours,Aspect,Aspects</PackageTags>
-        <Configurations>Debug;Release</Configurations>
-    </PropertyGroup>
+	<PropertyGroup>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<Product>Harmony</Product>
+		<Company>Andreas Pardeike</Company>
+		<Copyright>Copyright © 2016</Copyright>
+		<Description>A general non-destructive patch library for .NET and Mono modules</Description>
+		<PackageId>Harmony</PackageId>
+		<Authors>Andreas Pardeike</Authors>
+		<AssemblyName>0Harmony</AssemblyName>
+		<SignAssembly>false</SignAssembly>
+		<Version>1.1.0</Version>
+		<PackageLicenseUrl>https://raw.githubusercontent.com/pardeike/Harmony/master/LICENSE</PackageLicenseUrl>
+		<PackageProjectUrl>https://github.com/pardeike/Harmony</PackageProjectUrl>
+		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+		<PackageTags>Harmony,Mono,Patch,Patching,Runtime,Detour,Detours,Aspect,Aspects</PackageTags>
+		<Configurations>Debug-3.5;Release-3.5;Debug-4.7.1;Release-4.7.1</Configurations>
+		<TargetFrameworks>net35;net471</TargetFrameworks>
+	</PropertyGroup>
 
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-      <DefineConstants>DEBUG;TRACE;NET35</DefineConstants>
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <Optimize>false</Optimize>
-      <DebugType>full</DebugType>
-      <DebugSymbols>true</DebugSymbols>
-    </PropertyGroup>
+	<ItemGroup>
+		<Reference Include="System" />
+		<Reference Include="System.Core" />
+		<Reference Include="System.Data" />
+		<Reference Include="System.Runtime.Serialization" />
+		<Reference Include="System.XML" />
+		<Reference Include="System.XML.Linq" />
+	</ItemGroup>
 
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-      <DefineConstants>NET35</DefineConstants>
-      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-      <Optimize>true</Optimize>
-      <DebugType>none</DebugType>
-      <DebugSymbols>false</DebugSymbols>
-    </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-3.5|AnyCPU'">
+		<DefineConstants>DEBUG;TRACE;NET35</DefineConstants>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Optimize>false</Optimize>
+		<DebugType>full</DebugType>
+		<DebugSymbols>true</DebugSymbols>
+		<TargetFramework>net35</TargetFramework>
+		<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+		<OutputPath>build\Debug\</OutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-4.7.1|AnyCPU'">
+		<DefineConstants>DEBUG;TRACE;NET471</DefineConstants>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Optimize>false</Optimize>
+		<DebugType>full</DebugType>
+		<DebugSymbols>true</DebugSymbols>
+		<TargetFramework>net471</TargetFramework>
+		<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+		<OutputPath>build\Debug\</OutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-3.5|AnyCPU'">
+		<DefineConstants>NET35</DefineConstants>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Optimize>true</Optimize>
+		<DebugType>none</DebugType>
+		<DebugSymbols>false</DebugSymbols>
+		<TargetFramework>net35</TargetFramework>
+		<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+		<OutputPath>build\Release\</OutputPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-4.7.1|AnyCPU'">
+		<DefineConstants>NET471</DefineConstants>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<Optimize>true</Optimize>
+		<DebugType>none</DebugType>
+		<DebugSymbols>false</DebugSymbols>
+		<TargetFramework>net471</TargetFramework>
+		<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+		<OutputPath>build\Release\</OutputPath>
+	</PropertyGroup>
 
 </Project>
diff --git a/Harmony/Harmony.nuspec b/Harmony/Harmony.nuspec
new file mode 100644
index 00000000..bc3563fc
--- /dev/null
+++ b/Harmony/Harmony.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<package>
+	<metadata>
+		<id>$id$</id>
+		<version>$version$</version>
+		<title>$title$</title>
+		<authors>$author$</authors>
+		<owners>$author$</owners>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>$description$</description>
+		<releaseNotes>First release</releaseNotes>
+		<copyright>Copyright 2017, Andreas Pardeike</copyright>
+		<tags>Tag1 Tag2</tags>
+	</metadata>
+	<files>
+		<file src="build\Release\**" target="lib/{framework name}[{version}]" />
+	</files>
+</package>
diff --git a/Harmony/ILCopying/Emitter.cs b/Harmony/ILCopying/Emitter.cs
index 0d88bb20..d57d8ede 100644
--- a/Harmony/ILCopying/Emitter.cs
+++ b/Harmony/ILCopying/Emitter.cs
@@ -16,9 +16,9 @@ public override string ToString()
 
 	public static class Emitter
 	{
-		static GetterHandler codeLenGetter = FastAccess.CreateFieldGetter(typeof(ILGenerator), "code_len", "m_length");
-		static GetterHandler localsGetter = FastAccess.CreateFieldGetter(typeof(ILGenerator), "locals");
-		static GetterHandler localCountGetter = FastAccess.CreateFieldGetter(typeof(ILGenerator), "m_localCount");
+		static readonly GetterHandler codeLenGetter = FastAccess.CreateFieldGetter(typeof(ILGenerator), "code_len", "m_length");
+		static readonly GetterHandler localsGetter = FastAccess.CreateFieldGetter(typeof(ILGenerator), "locals");
+		static readonly GetterHandler localCountGetter = FastAccess.CreateFieldGetter(typeof(ILGenerator), "m_localCount");
 
 		public static string CodePos(ILGenerator il)
 		{
diff --git a/Harmony/ILCopying/MethodCopier.cs b/Harmony/ILCopying/MethodCopier.cs
index 2fdf62d7..150693f4 100644
--- a/Harmony/ILCopying/MethodCopier.cs
+++ b/Harmony/ILCopying/MethodCopier.cs
@@ -52,12 +52,14 @@ public class MethodBodyReader
 		// NOTE: you cannot simply "copy" ILInstructions from a method. They contain references to
 		// local variables which must be CREATED on an ILGenerator or else they are invalid when you
 		// want to use the ILInstruction. If you are really clever, you can supply a dummy generator
-		// and edit out all labels during the processing but that might be more tricky than you think.
+		// and edit out all labels during the processing but that might be more trickier than you think
 		//
-		// In order to copy together a bunch of method parts within a transpiler, you either have to
-		// accep that by passing the generator that will build your new method, you will end up with
-		// the sum of all declared local variables of all methods you query with GetInstructions or
-		// you tricks around with fake generators (not recommended)
+		// In order to copy together a bunch of method parts within a transpiler, you have to pass in
+		// your current generator that builds your new method
+		//
+		// You will end up with the sum of all declared local variables of all methods you run
+		// GetInstructions on or use a dummy generator but edit out the invalid labels from the codes
+		// you copy
 		//
 		public static List<ILInstruction> GetInstructions(ILGenerator generator, MethodBase method)
 		{
diff --git a/Harmony/PatchFunctions.cs b/Harmony/PatchFunctions.cs
index 62550db9..dde8011f 100644
--- a/Harmony/PatchFunctions.cs
+++ b/Harmony/PatchFunctions.cs
@@ -62,6 +62,13 @@ public static void RemovePatch(PatchInfo patchInfo, MethodInfo patch)
 			patchInfo.RemovePatch(patch);
 		}
 
+		// pass in a generator that will create local variables for the returned instructions
+		//
+		public static List<ILInstruction> GetInstructions(ILGenerator generator, MethodBase method)
+		{
+			return MethodBodyReader.GetInstructions(generator, method);
+		}
+
 		public static List<MethodInfo> GetSortedPatchMethods(MethodBase original, Patch[] patches)
 		{
 			return patches
diff --git a/Harmony/Tools/AccessTools.cs b/Harmony/Tools/AccessTools.cs
index 82baac37..fdc4ef92 100644
--- a/Harmony/Tools/AccessTools.cs
+++ b/Harmony/Tools/AccessTools.cs
@@ -91,6 +91,17 @@ public static MethodInfo Method(Type type, string name, Type[] parameters = null
 			return result;
 		}
 
+		public static MethodInfo Method(string typeColonMethodname, Type[] parameters = null, Type[] generics = null)
+		{
+			if (typeColonMethodname == null) return null;
+			var parts = typeColonMethodname.Split(':');
+			if (parts.Length != 2)
+				throw new ArgumentException("Method must be specified as 'Namespace.Type1.Type2:MethodName", nameof(typeColonMethodname));
+
+			var type = TypeByName(parts[0]);
+			return Method(type, parts[1], parameters, generics);
+		}
+
 		public static List<string> GetMethodNames(Type type)
 		{
 			if (type == null) return new List<string>();
diff --git a/Harmony/Transpilers.cs b/Harmony/Transpilers.cs
index 9ebc08fa..a41688ed 100644
--- a/Harmony/Transpilers.cs
+++ b/Harmony/Transpilers.cs
@@ -23,5 +23,7 @@ public static IEnumerable<CodeInstruction> DebugLogger(this IEnumerable<CodeInst
 			yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(FileLog), nameof(FileLog.Log)));
 			foreach (var instruction in instructions) yield return instruction;
 		}
+
+		// more added soon
 	}
 }
\ No newline at end of file
diff --git a/HarmonyTests/HarmonyTests.csproj b/HarmonyTests/HarmonyTests.csproj
index 8fcde0e6..98878cd9 100644
--- a/HarmonyTests/HarmonyTests.csproj
+++ b/HarmonyTests/HarmonyTests.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.1.3.0-beta2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.0-beta2\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -25,6 +25,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>15.0</OldToolsVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -37,11 +38,10 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-3.5|AnyCPU' ">
     <OutputPath>bin\3.5-Debug\</OutputPath>
     <Prefer32Bit>false</Prefer32Bit>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -49,22 +49,28 @@
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-3.5|AnyCPU' ">
     <OutputPath>bin\3.5-Release\</OutputPath>
     <Prefer32Bit>false</Prefer32Bit>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Optimize>true</Optimize>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.3.0-beta2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.3.0-beta2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.7.1|AnyCPU'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug-4.7.1\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.7.1|AnyCPU'">
+    <OutputPath>bin\Release-4.7.1\</OutputPath>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Extras\Assets\MethodInvokerClasses.cs" />
     <Compile Include="Extras\TestMethodInvoker.cs" />
@@ -87,30 +93,38 @@
     <Compile Include="Traverse\TestTraverse_Properties.cs" />
     <Compile Include="Traverse\TestTraverse_Types.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.3.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.1.3.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Harmony\Harmony.csproj">
       <Project>{69aee16a-b6e7-4642-8081-3928b32455df}</Project>
       <Name>Harmony</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.0-beta2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.0-beta2\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.0-beta2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.0-beta2\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.1.3.0-beta2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.0-beta2\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.0\build\net45\MSTest.TestAdapter.targets')" />
 </Project>
\ No newline at end of file
diff --git a/HarmonyTests/Patching/Assets/PatchClasses.cs b/HarmonyTests/Patching/Assets/PatchClasses.cs
index 0dbcdf64..81bd8415 100644
--- a/HarmonyTests/Patching/Assets/PatchClasses.cs
+++ b/HarmonyTests/Patching/Assets/PatchClasses.cs
@@ -10,6 +10,10 @@ public class Class1
 		public static void Method1()
 		{
 			Class1Patch.originalExecuted = true;
+			// some useless work to prevent inlining when testing Release builds
+			for (var i = 0; i < "abcd".Length; i++)
+				if (i > 4)
+					Console.WriteLine("");
 		}
 	}
 
@@ -49,6 +53,10 @@ public class Class2
 		public void Method2()
 		{
 			Class2Patch.originalExecuted = true;
+			// some useless work to prevent inlining when testing Release builds
+			for (var i = 0; i < "abcd".Length; i++)
+				if (i > 4)
+					Console.WriteLine("");
 		}
 	}
 
diff --git a/HarmonyTests/Patching/StaticPatches.cs b/HarmonyTests/Patching/StaticPatches.cs
index 004a5641..0fe254ef 100644
--- a/HarmonyTests/Patching/StaticPatches.cs
+++ b/HarmonyTests/Patching/StaticPatches.cs
@@ -58,9 +58,9 @@ public void TestMethod1()
 			}
 
 			Class1.Method1();
-			Assert.IsTrue(Class1Patch.prefixed);
-			Assert.IsTrue(Class1Patch.originalExecuted);
-			Assert.IsTrue(Class1Patch.postfixed);
+			Assert.IsTrue(Class1Patch.prefixed, "Prefix was not executed");
+			Assert.IsTrue(Class1Patch.originalExecuted, "Original was not executed");
+			Assert.IsTrue(Class1Patch.postfixed, "Postfix was not executed");
 		}
 
 		[TestMethod]
@@ -110,9 +110,9 @@ public void TestMethod2()
 			}
 
 			new Class2().Method2();
-			Assert.IsTrue(Class2Patch.prefixed);
-			Assert.IsTrue(Class2Patch.originalExecuted);
-			Assert.IsTrue(Class2Patch.postfixed);
+			Assert.IsTrue(Class1Patch.prefixed, "Prefix was not executed");
+			Assert.IsTrue(Class1Patch.originalExecuted, "Original was not executed");
+			Assert.IsTrue(Class1Patch.postfixed, "Postfix was not executed");
 		}
 	}
 }
\ No newline at end of file
diff --git a/HarmonyTests/Tools/TestAccessTools.cs b/HarmonyTests/Tools/TestAccessTools.cs
index 8b982527..3c44bb1f 100644
--- a/HarmonyTests/Tools/TestAccessTools.cs
+++ b/HarmonyTests/Tools/TestAccessTools.cs
@@ -47,7 +47,7 @@ public void AccessTools_Method()
 		{
 			var type = typeof(AccessToolsClass);
 
-			Assert.IsNull(AccessTools.Method(null, null));
+			Assert.IsNull(AccessTools.Method(null));
 			Assert.IsNull(AccessTools.Method(type, null));
 			Assert.IsNull(AccessTools.Method(null, "Method"));
 			Assert.IsNull(AccessTools.Method(type, "unknown"));
@@ -57,11 +57,16 @@ public void AccessTools_Method()
 			Assert.AreEqual(type, m1.DeclaringType);
 			Assert.AreEqual("Method", m1.Name);
 
-			var m2 = AccessTools.Method(type, "Method", new Type[] { });
+			var m2 = AccessTools.Method("HarmonyTests.Assets.AccessToolsClass:Method");
 			Assert.IsNotNull(m2);
+			Assert.AreEqual(type, m2.DeclaringType);
+			Assert.AreEqual("Method", m2.Name);
 
-			var m3 = AccessTools.Method(type, "SetField", new Type[] { typeof(string) });
+			var m3 = AccessTools.Method(type, "Method", new Type[] { });
 			Assert.IsNotNull(m3);
+
+			var m4 = AccessTools.Method(type, "SetField", new Type[] { typeof(string) });
+			Assert.IsNotNull(m4);
 		}
 
 		[TestMethod]
diff --git a/HarmonyTests/packages.config b/HarmonyTests/packages.config
index 57c44f04..4dce40ac 100644
--- a/HarmonyTests/packages.config
+++ b/HarmonyTests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MSTest.TestAdapter" version="1.3.0-beta2" targetFramework="net461" />
-  <package id="MSTest.TestFramework" version="1.3.0-beta2" targetFramework="net461" />
+  <package id="MSTest.TestAdapter" version="1.3.0" targetFramework="net471" />
+  <package id="MSTest.TestFramework" version="1.3.0" targetFramework="net471" />
 </packages>
\ No newline at end of file