From a13003de8b8601ac693d7af960fab67d285dbd0e Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Thu, 9 Feb 2017 22:38:10 -0500
Subject: remove Mono.Cecil.Rocks (#231)

It's not needed since we're not injecting new instructions, and causes the field rewriters to fail unexpectedly.
---
 README.md                                               | 2 --
 src/StardewModdingAPI.Installer/InteractiveInstaller.cs | 6 +++---
 src/StardewModdingAPI/Framework/AssemblyLoader.cs       | 3 ---
 src/StardewModdingAPI/StardewModdingAPI.csproj          | 4 ----
 src/prepare-install-package.targets                     | 2 --
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index b1062077..63adcf78 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,6 @@ folder containing `src`).
             Mono/
                Mods/*
                Mono.Cecil.dll
-               Mono.Cecil.Rocks.dll
                Newtonsoft.Json.dll
                StardewModdingAPI
                StardewModdingAPI.AssemblyRewriters.dll
@@ -95,7 +94,6 @@ folder containing `src`).
             Windows/
                Mods/*
                Mono.Cecil.dll
-               Mono.Cecil.Rocks.dll
                Newtonsoft.Json.dll
                StardewModdingAPI.AssemblyRewriters.dll
                StardewModdingAPI.config.json
diff --git a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
index d6d395b6..868889fa 100644
--- a/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
+++ b/src/StardewModdingAPI.Installer/InteractiveInstaller.cs
@@ -59,6 +59,8 @@ namespace StardewModdingApi.Installer
             Func<string, string> installPath = path => Path.Combine(installDir.FullName, path);
 
             // common
+            yield return installPath("Mono.Cecil.dll");
+            yield return installPath("Newtonsoft.Json.dll");
             yield return installPath("StardewModdingAPI.exe");
             yield return installPath("StardewModdingAPI.config.json");
             yield return installPath("StardewModdingAPI.data.json");
@@ -66,9 +68,6 @@ namespace StardewModdingApi.Installer
             yield return installPath("steam_appid.txt");
 
             // Linux/Mac only
-            yield return installPath("Mono.Cecil.dll");
-            yield return installPath("Mono.Cecil.Rocks.dll");
-            yield return installPath("Newtonsoft.Json.dll");
             yield return installPath("StardewModdingAPI");
             yield return installPath("StardewModdingAPI.exe.mdb");
             yield return installPath("System.Numerics.dll");
@@ -79,6 +78,7 @@ namespace StardewModdingApi.Installer
 
             // obsolete
             yield return installPath("Mods/.cache"); // 1.3-1.4
+            yield return installPath("Mono.Cecil.Rocks.dll"); // 1.3–1.8
             yield return installPath("StardewModdingAPI-settings.json"); // 1.0-1.4
             if (modsDir.Exists)
             {
diff --git a/src/StardewModdingAPI/Framework/AssemblyLoader.cs b/src/StardewModdingAPI/Framework/AssemblyLoader.cs
index d5e8f5ee..0cf6e569 100644
--- a/src/StardewModdingAPI/Framework/AssemblyLoader.cs
+++ b/src/StardewModdingAPI/Framework/AssemblyLoader.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Reflection;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
-using Mono.Cecil.Rocks;
 using StardewModdingAPI.AssemblyRewriters;
 
 namespace StardewModdingAPI.Framework
@@ -195,7 +194,6 @@ namespace StardewModdingAPI.Framework
                     continue;
 
                 // prepare method
-                method.Body.SimplifyMacros();
                 ILProcessor cil = method.Body.GetILProcessor();
 
                 // rewrite instructions
@@ -206,7 +204,6 @@ namespace StardewModdingAPI.Framework
                 }
 
                 // finalise method
-                method.Body.OptimizeMacros();
                 anyRewritten = true;
             }
 
diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj
index d148e0c8..eca2713f 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.csproj
+++ b/src/StardewModdingAPI/StardewModdingAPI.csproj
@@ -90,10 +90,6 @@
       <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
diff --git a/src/prepare-install-package.targets b/src/prepare-install-package.targets
index f411b909..bd9287f1 100644
--- a/src/prepare-install-package.targets
+++ b/src/prepare-install-package.targets
@@ -23,7 +23,6 @@
     
     <!-- copy SMAPI files for Mono -->
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\Mono.Cecil.dll" DestinationFolder="$(PackageInternalPath)\Mono" />
-    <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\Mono.Cecil.Rocks.dll" DestinationFolder="$(PackageInternalPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\Newtonsoft.Json.dll" DestinationFolder="$(PackageInternalPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.exe" DestinationFolder="$(PackageInternalPath)\Mono" />
     <Copy Condition="$(OS) != 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.exe.mdb" DestinationFolder="$(PackageInternalPath)\Mono" />
@@ -38,7 +37,6 @@
     
     <!-- copy SMAPI files for Windows -->
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\Mono.Cecil.dll" DestinationFolder="$(PackageInternalPath)\Windows" />
-    <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\Mono.Cecil.Rocks.dll" DestinationFolder="$(PackageInternalPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\Newtonsoft.Json.dll" DestinationFolder="$(PackageInternalPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.exe" DestinationFolder="$(PackageInternalPath)\Windows" />
     <Copy Condition="$(OS) == 'Windows_NT'" SourceFiles="$(CompiledSmapiPath)\StardewModdingAPI.pdb" DestinationFolder="$(PackageInternalPath)\Windows" />
-- 
cgit