From 50061502a78a47168deeaec19ba8d3ebc7b517a2 Mon Sep 17 00:00:00 2001
From: mikhailshilkov <mshilkov@astrata.eu>
Date: Thu, 15 Jun 2017 11:00:11 +0200
Subject: [PATCH] #13 Update to Fody Version 2

---
 NuGet/With.Fody.nuspec     |  2 +-
 Tests/Tests.csproj         | 16 ++++++++--------
 Tests/WeaverTests.cs       | 19 ++++++++++---------
 Tests/packages.config      |  2 +-
 With.Fody/AssemblyInfo.cs  |  4 ++--
 With.Fody/With.Fody.csproj | 16 ++++++++--------
 With.Fody/packages.config  |  2 +-
 7 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/NuGet/With.Fody.nuspec b/NuGet/With.Fody.nuspec
index 07963a3..8dc311c 100644
--- a/NuGet/With.Fody.nuspec
+++ b/NuGet/With.Fody.nuspec
@@ -16,7 +16,7 @@
     <language>en-UK</language>
     <tags>ILWeaving, Fody, Cecil</tags>
     <dependencies>
-      <dependency id="Fody"/>
+      <dependency id="Fody" version="2.0.0"/>
     </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index b9b8403..43c5540 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -32,20 +32,20 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\FodyCecil.1.29.2\lib\net40\Mono.Cecil.dll</HintPath>
+    <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\FodyCecil.2.1.0\lib\net40\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\FodyCecil.1.29.2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\FodyCecil.2.1.0\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\FodyCecil.1.29.2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\FodyCecil.2.1.0\lib\net40\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\FodyCecil.1.29.2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\FodyCecil.2.1.0\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
diff --git a/Tests/WeaverTests.cs b/Tests/WeaverTests.cs
index c07efb1..ab888b4 100644
--- a/Tests/WeaverTests.cs
+++ b/Tests/WeaverTests.cs
@@ -31,16 +31,17 @@ public void Setup()
         var assemblyResolver = new DefaultAssemblyResolver();
         assemblyResolver.AddSearchDirectory(assemblyProcessBinPath);
 
-        var moduleDefinition = ModuleDefinition.ReadModule(newAssemblyPath);
-
-        var weavingTask = new ModuleWeaver
+        using (var moduleDefinition = ModuleDefinition.ReadModule(assemblyPath))
         {
-            ModuleDefinition = moduleDefinition,
-            AssemblyResolver = assemblyResolver,
-        };
-
-        weavingTask.Execute();
-        moduleDefinition.Write(newAssemblyPath);
+            var weavingTask = new ModuleWeaver
+             {
+                ModuleDefinition = moduleDefinition,
+                AssemblyResolver = assemblyResolver
+            };
+            
+            weavingTask.Execute();
+            moduleDefinition.Write(newAssemblyPath);
+        }
 
         assembly = Assembly.LoadFile(newAssemblyPath);
 
diff --git a/Tests/packages.config b/Tests/packages.config
index 26e7536..d521c7f 100644
--- a/Tests/packages.config
+++ b/Tests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FodyCecil" version="1.29.2" targetFramework="net40" developmentDependency="true" />
+  <package id="FodyCecil" version="2.1.0" targetFramework="net40" developmentDependency="true" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/With.Fody/AssemblyInfo.cs b/With.Fody/AssemblyInfo.cs
index ca723a8..495d6b3 100644
--- a/With.Fody/AssemblyInfo.cs
+++ b/With.Fody/AssemblyInfo.cs
@@ -2,5 +2,5 @@
 
 [assembly: AssemblyTitle("With.Fody")]
 [assembly: AssemblyProduct("With.Fody")]
-[assembly: AssemblyVersion("0.6.1")]
-[assembly: AssemblyFileVersion("0.6.1")]
+[assembly: AssemblyVersion("0.8.0")]
+[assembly: AssemblyFileVersion("0.8.0")]
diff --git a/With.Fody/With.Fody.csproj b/With.Fody/With.Fody.csproj
index 2cffedd..3642882 100644
--- a/With.Fody/With.Fody.csproj
+++ b/With.Fody/With.Fody.csproj
@@ -39,20 +39,20 @@
     <AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\FodyCecil.1.29.2\lib\net40\Mono.Cecil.dll</HintPath>
+    <Reference Include="Mono.Cecil, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\FodyCecil.2.1.0\lib\net40\Mono.Cecil.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\FodyCecil.1.29.2\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\FodyCecil.2.1.0\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <HintPath>..\packages\FodyCecil.1.29.2\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\FodyCecil.2.1.0\lib\net40\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\FodyCecil.1.29.2\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.10.0.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
+      <HintPath>..\packages\FodyCecil.2.1.0\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/With.Fody/packages.config b/With.Fody/packages.config
index c39cd04..b858d75 100644
--- a/With.Fody/packages.config
+++ b/With.Fody/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FodyCecil" version="1.29.2" targetFramework="net40" developmentDependency="true" />
+  <package id="FodyCecil" version="2.1.0" targetFramework="net40" developmentDependency="true" />
 </packages>
\ No newline at end of file