diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj
index 4b8c3d796..70d6bddea 100644
--- a/ArchiSteamFarm/ArchiSteamFarm.csproj
+++ b/ArchiSteamFarm/ArchiSteamFarm.csproj
@@ -286,15 +286,13 @@
     <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\Fody.1.30.0-beta01\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets'))" />
     <Error Condition="!Exists('..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets'))" />
   </Target>
-  <Import Project="..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets')" />
-  <Import Project="..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets')" />
   <Import Project="..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets')" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Import Project="..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets" Condition="Exists('..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/ArchiSteamFarm/FodyWeavers.xml b/ArchiSteamFarm/FodyWeavers.xml
index c4626742c..23a4aff5c 100644
--- a/ArchiSteamFarm/FodyWeavers.xml
+++ b/ArchiSteamFarm/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Weavers>
   <Costura IncludeDebugSymbols='false' />
diff --git a/ArchiSteamFarm/packages.config b/ArchiSteamFarm/packages.config
index 991805b77..7935e1b2d 100644
--- a/ArchiSteamFarm/packages.config
+++ b/ArchiSteamFarm/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="2.0.0-beta0018" targetFramework="net461" developmentDependency="true" />
-  <package id="Fody" version="1.30.0-beta01" targetFramework="net461" developmentDependency="true" />
+  <package id="Costura.Fody" version="1.4.1" targetFramework="net461" developmentDependency="true" />
+  <package id="Fody" version="2.0.7" targetFramework="net461" developmentDependency="true" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net461" />
   <package id="Humanizer" version="2.2.0" targetFramework="net461" />
   <package id="Humanizer.Core" version="2.2.0" targetFramework="net461" />
diff --git a/ConfigGenerator/ConfigGenerator.csproj b/ConfigGenerator/ConfigGenerator.csproj
index b56de89bb..2ffbc0b84 100644
--- a/ConfigGenerator/ConfigGenerator.csproj
+++ b/ConfigGenerator/ConfigGenerator.csproj
@@ -200,13 +200,11 @@
     <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\Fody.1.30.0-beta01\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets'))" />
     <Error Condition="!Exists('..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets'))" />
   </Target>
-  <Import Project="..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets')" />
-  <Import Project="..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets')" />
   <Import Project="..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets')" />
+  <Import Project="..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets" Condition="Exists('..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/ConfigGenerator/FodyWeavers.xml b/ConfigGenerator/FodyWeavers.xml
index c4626742c..23a4aff5c 100644
--- a/ConfigGenerator/FodyWeavers.xml
+++ b/ConfigGenerator/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Weavers>
   <Costura IncludeDebugSymbols='false' />
diff --git a/ConfigGenerator/packages.config b/ConfigGenerator/packages.config
index fe00248c4..5a4b23bfb 100644
--- a/ConfigGenerator/packages.config
+++ b/ConfigGenerator/packages.config
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-  <package id="Costura.Fody" version="2.0.0-beta0018" targetFramework="net461" developmentDependency="true" />
-  <package id="Fody" version="1.30.0-beta01" targetFramework="net461" developmentDependency="true" />
+  <package id="Costura.Fody" version="1.4.1" targetFramework="net461" developmentDependency="true" />
+  <package id="Fody" version="2.0.7" targetFramework="net461" developmentDependency="true" />
   <package id="GenDictEdit" version="1.1.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
   <package id="Resource.Embedder" version="1.2.2" targetFramework="net461" developmentDependency="true" />
diff --git a/GUI/FodyWeavers.xml b/GUI/FodyWeavers.xml
index c4626742c..23a4aff5c 100644
--- a/GUI/FodyWeavers.xml
+++ b/GUI/FodyWeavers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Weavers>
   <Costura IncludeDebugSymbols='false' />
diff --git a/GUI/GUI.csproj b/GUI/GUI.csproj
index cdd1cbde4..fe817c7e0 100644
--- a/GUI/GUI.csproj
+++ b/GUI/GUI.csproj
@@ -396,15 +396,13 @@
     <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\Fody.1.30.0-beta01\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets'))" />
     <Error Condition="!Exists('..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets'))" />
   </Target>
-  <Import Project="..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Fody.1.30.0-beta01\build\dotnet\Fody.targets')" />
-  <Import Project="..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets')" />
   <Import Project="..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets" Condition="'$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' AND Exists('..\packages\Resource.Embedder.1.2.2\build\Resource.Embedder.targets')" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Import Project="..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets" Condition="Exists('..\packages\Fody.2.0.7\build\netstandard1.4\Fody.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/GUI/packages.config b/GUI/packages.config
index f270f656c..5df7c54ae 100644
--- a/GUI/packages.config
+++ b/GUI/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="2.0.0-beta0018" targetFramework="net461" developmentDependency="true" />
-  <package id="Fody" version="1.30.0-beta01" targetFramework="net461" developmentDependency="true" />
+  <package id="Costura.Fody" version="1.4.1" targetFramework="net461" developmentDependency="true" />
+  <package id="Fody" version="2.0.7" targetFramework="net461" developmentDependency="true" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net461" />
   <package id="Humanizer" version="2.2.0" targetFramework="net461" />
   <package id="Humanizer.Core" version="2.2.0" targetFramework="net461" />
diff --git a/packages/Costura.Fody.1.4.1/Costura.Fody.1.4.1.nupkg b/packages/Costura.Fody.1.4.1/Costura.Fody.1.4.1.nupkg
new file mode 100644
index 000000000..6dd09725b
Binary files /dev/null and b/packages/Costura.Fody.1.4.1/Costura.Fody.1.4.1.nupkg differ
diff --git a/packages/Costura.Fody.2.0.0-beta0018/Costura.Fody.dll b/packages/Costura.Fody.1.4.1/Costura.Fody.dll
similarity index 55%
rename from packages/Costura.Fody.2.0.0-beta0018/Costura.Fody.dll
rename to packages/Costura.Fody.1.4.1/Costura.Fody.dll
index 152c61460..3da6c5713 100644
Binary files a/packages/Costura.Fody.2.0.0-beta0018/Costura.Fody.dll and b/packages/Costura.Fody.1.4.1/Costura.Fody.dll differ
diff --git a/packages/Costura.Fody.2.0.0-beta0018/tools/install.ps1 b/packages/Costura.Fody.1.4.1/tools/install.ps1
similarity index 100%
rename from packages/Costura.Fody.2.0.0-beta0018/tools/install.ps1
rename to packages/Costura.Fody.1.4.1/tools/install.ps1
diff --git a/packages/Costura.Fody.2.0.0-beta0018/tools/uninstall.ps1 b/packages/Costura.Fody.1.4.1/tools/uninstall.ps1
similarity index 100%
rename from packages/Costura.Fody.2.0.0-beta0018/tools/uninstall.ps1
rename to packages/Costura.Fody.1.4.1/tools/uninstall.ps1
diff --git a/packages/Costura.Fody.2.0.0-beta0018/Costura.Fody.2.0.0-beta0018.nupkg b/packages/Costura.Fody.2.0.0-beta0018/Costura.Fody.2.0.0-beta0018.nupkg
deleted file mode 100644
index dccdc8536..000000000
Binary files a/packages/Costura.Fody.2.0.0-beta0018/Costura.Fody.2.0.0-beta0018.nupkg and /dev/null differ
diff --git a/packages/Costura.Fody.2.0.0-beta0018/build/Costura.Fody.targets b/packages/Costura.Fody.2.0.0-beta0018/build/Costura.Fody.targets
deleted file mode 100644
index fb13d1cc4..000000000
--- a/packages/Costura.Fody.2.0.0-beta0018/build/Costura.Fody.targets
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target
-    AfterTargets="AfterBuild"
-    Name="FodyPropertyChangedVerification">
-
-    <Error
-      Condition="$(FodyExecutedWeavers) == '*Undefined*'"
-      Text="Could not find `FodyWeaversExecuted` MSBuild property. It is possible you need to update Fody." />
-
-    <Error
-      Condition="!$(FodyExecutedWeavers.Contains('Costura;'))"
-      Text="Costura expected to be executed. You may also need to manually add '&lt;Costura /&gt;' into your FodyWeavers.xml. eg &lt;Weavers&gt;&lt;Costura/&gt;&lt;/Weavers&gt;. See https://github.com/Fody/Fody/wiki/SampleUsage" />
-
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/packages/Fody.1.30.0-beta01/Fody.1.30.0-beta01.nupkg b/packages/Fody.1.30.0-beta01/Fody.1.30.0-beta01.nupkg
deleted file mode 100644
index 9de1c5933..000000000
Binary files a/packages/Fody.1.30.0-beta01/Fody.1.30.0-beta01.nupkg and /dev/null differ
diff --git a/packages/Fody.1.30.0-beta01/Fody.dll b/packages/Fody.1.30.0-beta01/Fody.dll
deleted file mode 100644
index 2a71d51ab..000000000
Binary files a/packages/Fody.1.30.0-beta01/Fody.dll and /dev/null differ
diff --git a/packages/Fody.1.30.0-beta01/FodyCommon.dll b/packages/Fody.1.30.0-beta01/FodyCommon.dll
deleted file mode 100644
index d190a86da..000000000
Binary files a/packages/Fody.1.30.0-beta01/FodyCommon.dll and /dev/null differ
diff --git a/packages/Fody.1.30.0-beta01/FodyIsolated.dll b/packages/Fody.1.30.0-beta01/FodyIsolated.dll
deleted file mode 100644
index fdacd31c6..000000000
Binary files a/packages/Fody.1.30.0-beta01/FodyIsolated.dll and /dev/null differ
diff --git a/packages/Fody.1.30.0-beta01/Mono.Cecil.Mdb.dll b/packages/Fody.1.30.0-beta01/Mono.Cecil.Mdb.dll
deleted file mode 100644
index 1e1ea3eb5..000000000
Binary files a/packages/Fody.1.30.0-beta01/Mono.Cecil.Mdb.dll and /dev/null differ
diff --git a/packages/Fody.1.30.0-beta01/Mono.Cecil.Pdb.dll b/packages/Fody.1.30.0-beta01/Mono.Cecil.Pdb.dll
deleted file mode 100644
index d6a3c3ded..000000000
Binary files a/packages/Fody.1.30.0-beta01/Mono.Cecil.Pdb.dll and /dev/null differ
diff --git a/packages/Fody.1.30.0-beta01/Mono.Cecil.Rocks.dll b/packages/Fody.1.30.0-beta01/Mono.Cecil.Rocks.dll
deleted file mode 100644
index a93b2e1b3..000000000
Binary files a/packages/Fody.1.30.0-beta01/Mono.Cecil.Rocks.dll and /dev/null differ
diff --git a/packages/Fody.1.30.0-beta01/Mono.Cecil.dll b/packages/Fody.1.30.0-beta01/Mono.Cecil.dll
deleted file mode 100644
index 18e19f6de..000000000
Binary files a/packages/Fody.1.30.0-beta01/Mono.Cecil.dll and /dev/null differ
diff --git a/packages/Fody.1.30.0-beta01/Content/FodyWeavers.xml b/packages/Fody.2.0.7/Content/FodyWeavers.xml
similarity index 100%
rename from packages/Fody.1.30.0-beta01/Content/FodyWeavers.xml
rename to packages/Fody.2.0.7/Content/FodyWeavers.xml
diff --git a/packages/Fody.2.0.7/Fody.2.0.7.nupkg b/packages/Fody.2.0.7/Fody.2.0.7.nupkg
new file mode 100644
index 000000000..ae656e3d8
Binary files /dev/null and b/packages/Fody.2.0.7/Fody.2.0.7.nupkg differ
diff --git a/packages/Fody.2.0.7/Fody.dll b/packages/Fody.2.0.7/Fody.dll
new file mode 100644
index 000000000..011cdcdcc
Binary files /dev/null and b/packages/Fody.2.0.7/Fody.dll differ
diff --git a/packages/Fody.2.0.7/FodyCommon.dll b/packages/Fody.2.0.7/FodyCommon.dll
new file mode 100644
index 000000000..186d8f940
Binary files /dev/null and b/packages/Fody.2.0.7/FodyCommon.dll differ
diff --git a/packages/Fody.2.0.7/FodyIsolated.dll b/packages/Fody.2.0.7/FodyIsolated.dll
new file mode 100644
index 000000000..bf807b92e
Binary files /dev/null and b/packages/Fody.2.0.7/FodyIsolated.dll differ
diff --git a/packages/Fody.2.0.7/Mono.Cecil.Mdb.dll b/packages/Fody.2.0.7/Mono.Cecil.Mdb.dll
new file mode 100644
index 000000000..7997e7483
Binary files /dev/null and b/packages/Fody.2.0.7/Mono.Cecil.Mdb.dll differ
diff --git a/packages/Fody.2.0.7/Mono.Cecil.Pdb.dll b/packages/Fody.2.0.7/Mono.Cecil.Pdb.dll
new file mode 100644
index 000000000..86e29ef45
Binary files /dev/null and b/packages/Fody.2.0.7/Mono.Cecil.Pdb.dll differ
diff --git a/packages/Fody.2.0.7/Mono.Cecil.Rocks.dll b/packages/Fody.2.0.7/Mono.Cecil.Rocks.dll
new file mode 100644
index 000000000..d71e49594
Binary files /dev/null and b/packages/Fody.2.0.7/Mono.Cecil.Rocks.dll differ
diff --git a/packages/Fody.2.0.7/Mono.Cecil.dll b/packages/Fody.2.0.7/Mono.Cecil.dll
new file mode 100644
index 000000000..982df99e0
Binary files /dev/null and b/packages/Fody.2.0.7/Mono.Cecil.dll differ
diff --git a/packages/Fody.1.30.0-beta01/Tools/install.ps1 b/packages/Fody.2.0.7/Tools/install.ps1
similarity index 100%
rename from packages/Fody.1.30.0-beta01/Tools/install.ps1
rename to packages/Fody.2.0.7/Tools/install.ps1
diff --git a/packages/Fody.1.30.0-beta01/build/dotnet/Fody.targets b/packages/Fody.2.0.7/build/dotnet/Fody.targets
similarity index 87%
rename from packages/Fody.1.30.0-beta01/build/dotnet/Fody.targets
rename to packages/Fody.2.0.7/build/dotnet/Fody.targets
index 53eacd676..51b2dce70 100644
--- a/packages/Fody.1.30.0-beta01/build/dotnet/Fody.targets
+++ b/packages/Fody.2.0.7/build/dotnet/Fody.targets
@@ -36,7 +36,6 @@
   </Choose>
   <PropertyGroup>
     <ProjectWeaverXml>$(ProjectDir)FodyWeavers.xml</ProjectWeaverXml>
-    <IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
     <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
     <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)..\..\</FodyPath>
   </PropertyGroup>
@@ -45,7 +44,7 @@
       AssemblyFile="$(FodyPath)\Fody.dll" />
   <Target
       AfterTargets="AfterCompile"
-      Condition="Exists(@(IntermediateAssembly))"
+      Condition="Exists('@(IntermediateAssembly)')"
       Name="FodyTarget"
       DependsOnTargets="$(FodyDependsOnTargets)"
       Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
@@ -53,7 +52,7 @@
 
     <Fody.WeavingTask
           AssemblyPath="@(IntermediateAssembly)"
-          IntermediateDir="$(IntermediateDir)"
+          IntermediateDir="$(ProjectDir)$(IntermediateOutputPath)"
           KeyFilePath="$(FodyKeyFilePath)"
           NuGetPackageRoot="$(NuGetPackageRoot)"
           ProjectDirectory="$(ProjectDir)"
@@ -62,24 +61,28 @@
           SignAssembly="$(FodySignAssembly)"
           ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
           DefineConstants="$(DefineConstants)"
+          PackageDefinitions="@(PackageDefinitions->'%(ResolvedPath)')"
       >
 
       <Output 
         TaskParameter="ExecutedWeavers"
         PropertyName="FodyExecutedWeavers" />
     </Fody.WeavingTask>
+
+    <PropertyGroup>
+      <FodyWeavingTargetWasRun>True</FodyWeavingTargetWasRun>
+    </PropertyGroup>
+
   </Target>
 
 
   <UsingTask
     TaskName="Fody.VerifyTask"
     AssemblyFile="$(FodyPath)\Fody.dll" />
-  <Target Condition="'$(NCrunch)' != '1' And Exists($(TargetPath))"
+  <Target Condition="'$(NCrunch)' != '1' And ('$(FodyWeavingTargetWasRun)' == 'True')"
       AfterTargets="AfterBuild"
       Name="FodyVerifyTarget"
-      DependsOnTargets="$(FodyVerifyDependsOnTargets)"
-      Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
-      Outputs="$(TargetPath)">
+      DependsOnTargets="$(FodyVerifyDependsOnTargets)">
 
     <Fody.VerifyTask
           ProjectDirectory="$(ProjectDir)"
@@ -88,8 +91,8 @@
           DefineConstants="$(DefineConstants)"
       />
   </Target>
-  
-  
+
+
   <!--Support for ncrunch-->
   <ItemGroup  Condition="'$(NCrunch)' == '1'">
     <None Include="$(FodyPath)\*.*" />
diff --git a/packages/Fody.1.30.0-beta01/build/portable-net+sl+win+wpa+wp/Fody.targets b/packages/Fody.2.0.7/build/netstandard1.4/Fody.targets
similarity index 87%
rename from packages/Fody.1.30.0-beta01/build/portable-net+sl+win+wpa+wp/Fody.targets
rename to packages/Fody.2.0.7/build/netstandard1.4/Fody.targets
index 53eacd676..51b2dce70 100644
--- a/packages/Fody.1.30.0-beta01/build/portable-net+sl+win+wpa+wp/Fody.targets
+++ b/packages/Fody.2.0.7/build/netstandard1.4/Fody.targets
@@ -36,7 +36,6 @@
   </Choose>
   <PropertyGroup>
     <ProjectWeaverXml>$(ProjectDir)FodyWeavers.xml</ProjectWeaverXml>
-    <IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
     <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
     <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)..\..\</FodyPath>
   </PropertyGroup>
@@ -45,7 +44,7 @@
       AssemblyFile="$(FodyPath)\Fody.dll" />
   <Target
       AfterTargets="AfterCompile"
-      Condition="Exists(@(IntermediateAssembly))"
+      Condition="Exists('@(IntermediateAssembly)')"
       Name="FodyTarget"
       DependsOnTargets="$(FodyDependsOnTargets)"
       Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
@@ -53,7 +52,7 @@
 
     <Fody.WeavingTask
           AssemblyPath="@(IntermediateAssembly)"
-          IntermediateDir="$(IntermediateDir)"
+          IntermediateDir="$(ProjectDir)$(IntermediateOutputPath)"
           KeyFilePath="$(FodyKeyFilePath)"
           NuGetPackageRoot="$(NuGetPackageRoot)"
           ProjectDirectory="$(ProjectDir)"
@@ -62,24 +61,28 @@
           SignAssembly="$(FodySignAssembly)"
           ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
           DefineConstants="$(DefineConstants)"
+          PackageDefinitions="@(PackageDefinitions->'%(ResolvedPath)')"
       >
 
       <Output 
         TaskParameter="ExecutedWeavers"
         PropertyName="FodyExecutedWeavers" />
     </Fody.WeavingTask>
+
+    <PropertyGroup>
+      <FodyWeavingTargetWasRun>True</FodyWeavingTargetWasRun>
+    </PropertyGroup>
+
   </Target>
 
 
   <UsingTask
     TaskName="Fody.VerifyTask"
     AssemblyFile="$(FodyPath)\Fody.dll" />
-  <Target Condition="'$(NCrunch)' != '1' And Exists($(TargetPath))"
+  <Target Condition="'$(NCrunch)' != '1' And ('$(FodyWeavingTargetWasRun)' == 'True')"
       AfterTargets="AfterBuild"
       Name="FodyVerifyTarget"
-      DependsOnTargets="$(FodyVerifyDependsOnTargets)"
-      Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
-      Outputs="$(TargetPath)">
+      DependsOnTargets="$(FodyVerifyDependsOnTargets)">
 
     <Fody.VerifyTask
           ProjectDirectory="$(ProjectDir)"
@@ -88,8 +91,8 @@
           DefineConstants="$(DefineConstants)"
       />
   </Target>
-  
-  
+
+
   <!--Support for ncrunch-->
   <ItemGroup  Condition="'$(NCrunch)' == '1'">
     <None Include="$(FodyPath)\*.*" />
diff --git a/packages/Fody.2.0.7/build/portable-net+sl+win+wpa+wp/Fody.targets b/packages/Fody.2.0.7/build/portable-net+sl+win+wpa+wp/Fody.targets
new file mode 100644
index 000000000..51b2dce70
--- /dev/null
+++ b/packages/Fody.2.0.7/build/portable-net+sl+win+wpa+wp/Fody.targets
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Choose>
+    <When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(NCrunchOriginalSolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(SolutionDir)</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">
+      <PropertyGroup>
+        <FodySolutionDir>$(MSBuildProjectDirectory)..\..\..\</FodySolutionDir>
+      </PropertyGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(KeyOriginatorFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'">
+      <PropertyGroup>
+        <FodyKeyFilePath>$(AssemblyOriginatorKeyFile)</FodyKeyFilePath>
+      </PropertyGroup>
+    </When>
+    <Otherwise >
+      <PropertyGroup>
+        <FodyKeyFilePath></FodyKeyFilePath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <PropertyGroup>
+    <ProjectWeaverXml>$(ProjectDir)FodyWeavers.xml</ProjectWeaverXml>
+    <FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
+    <FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)..\..\</FodyPath>
+  </PropertyGroup>
+  <UsingTask
+      TaskName="Fody.WeavingTask"
+      AssemblyFile="$(FodyPath)\Fody.dll" />
+  <Target
+      AfterTargets="AfterCompile"
+      Condition="Exists('@(IntermediateAssembly)')"
+      Name="FodyTarget"
+      DependsOnTargets="$(FodyDependsOnTargets)"
+      Inputs="@(IntermediateAssembly->'%(FullPath)');$(FodyKeyFilePath);$(ProjectWeaverXml)"
+      Outputs="$(TargetPath)">
+
+    <Fody.WeavingTask
+          AssemblyPath="@(IntermediateAssembly)"
+          IntermediateDir="$(ProjectDir)$(IntermediateOutputPath)"
+          KeyFilePath="$(FodyKeyFilePath)"
+          NuGetPackageRoot="$(NuGetPackageRoot)"
+          ProjectDirectory="$(ProjectDir)"
+          SolutionDir="$(FodySolutionDir)"
+          References="@(ReferencePath)"
+          SignAssembly="$(FodySignAssembly)"
+          ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
+          DefineConstants="$(DefineConstants)"
+          PackageDefinitions="@(PackageDefinitions->'%(ResolvedPath)')"
+      >
+
+      <Output 
+        TaskParameter="ExecutedWeavers"
+        PropertyName="FodyExecutedWeavers" />
+    </Fody.WeavingTask>
+
+    <PropertyGroup>
+      <FodyWeavingTargetWasRun>True</FodyWeavingTargetWasRun>
+    </PropertyGroup>
+
+  </Target>
+
+
+  <UsingTask
+    TaskName="Fody.VerifyTask"
+    AssemblyFile="$(FodyPath)\Fody.dll" />
+  <Target Condition="'$(NCrunch)' != '1' And ('$(FodyWeavingTargetWasRun)' == 'True')"
+      AfterTargets="AfterBuild"
+      Name="FodyVerifyTarget"
+      DependsOnTargets="$(FodyVerifyDependsOnTargets)">
+
+    <Fody.VerifyTask
+          ProjectDirectory="$(ProjectDir)"
+          TargetPath="$(TargetPath)"
+          SolutionDir="$(FodySolutionDir)"
+          DefineConstants="$(DefineConstants)"
+      />
+  </Target>
+
+
+  <!--Support for ncrunch-->
+  <ItemGroup  Condition="'$(NCrunch)' == '1'">
+    <None Include="$(FodyPath)\*.*" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file