From 82dc53d9a8c07d552dd0d5ba46ddf241299b5901 Mon Sep 17 00:00:00 2001
From: icedream <icedream2k9@die-optimisten.net>
Date: Mon, 12 Jan 2015 01:25:34 +0100
Subject: [PATCH] Update Fody and Fody.Costura-Mono.

---
 packages/{Fody.1.26.1 => Fody.1.26.4}/build/Fody.targets | 2 +-
 src/updater/CitizenMP Server Updater.csproj              | 7 ++++---
 src/updater/FodyWeavers.xml                              | 2 +-
 src/updater/packages.config                              | 4 ++--
 src/wrapper/CitizenMP Server Updater Wrapper.csproj      | 6 +++---
 src/wrapper/FodyWeavers.xml                              | 2 +-
 src/wrapper/packages.config                              | 4 ++--
 7 files changed, 14 insertions(+), 13 deletions(-)
 rename packages/{Fody.1.26.1 => Fody.1.26.4}/build/Fody.targets (97%)

diff --git a/packages/Fody.1.26.1/build/Fody.targets b/packages/Fody.1.26.4/build/Fody.targets
similarity index 97%
rename from packages/Fody.1.26.1/build/Fody.targets
rename to packages/Fody.1.26.4/build/Fody.targets
index a8b23c6..c1a08e2 100644
--- a/packages/Fody.1.26.1/build/Fody.targets
+++ b/packages/Fody.1.26.4/build/Fody.targets
@@ -61,7 +61,7 @@
   </Target>
 
   <!--Support for ncrunch-->
-  <ItemGroup>
+  <ItemGroup  Condition="'$(NCrunch)' == '1'">
     <None Include="$(FodyPath)\*.*" />
   </ItemGroup>
 
diff --git a/src/updater/CitizenMP Server Updater.csproj b/src/updater/CitizenMP Server Updater.csproj
index 98760fc..d972aa7 100644
--- a/src/updater/CitizenMP Server Updater.csproj	
+++ b/src/updater/CitizenMP Server Updater.csproj	
@@ -11,7 +11,7 @@
     <AssemblyName>citizenmp_server_updater</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>8d59ce5d</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>fe2835f3</NuGetPackageImportStamp>
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -85,8 +85,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)\packages\Fody.1.26.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Fody.1.26.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir).nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir).nuget\NuGet.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Fody.1.26.4\build\Fody.targets'))" />
   </Target>
   <ItemGroup>
     <EmbeddedResource Include="costura32\git2-91fa31f.dll" />
@@ -199,6 +199,7 @@ fi
 </PreBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)packages\Fody.1.26.1\build\Fody.targets" Condition="Exists('$(SolutionDir)packages\Fody.1.26.1\build\Fody.targets')" />
+  <Import Project="$(SolutionDir)packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.26.4\build\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/src/updater/FodyWeavers.xml b/src/updater/FodyWeavers.xml
index 1c28646..e0a35bd 100644
--- a/src/updater/FodyWeavers.xml
+++ b/src/updater/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers>
-  <Costura CreateTemporaryAssemblies="true"/>
+	<Costura/>
 </Weavers>
\ No newline at end of file
diff --git a/src/updater/packages.config b/src/updater/packages.config
index 407b4c4..c069e43 100644
--- a/src/updater/packages.config
+++ b/src/updater/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommandLineParser" version="1.9.71" targetFramework="net40" />
-  <package id="Costura.Fody-Mono" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
-  <package id="Fody" version="1.26.1" targetFramework="net40" developmentDependency="true" />
+  <package id="Costura.Fody-Mono" version="1.3.3.1" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.26.4" targetFramework="net40" developmentDependency="true" />
   <package id="Mono.Posix" version="4.0.0.0" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/wrapper/CitizenMP Server Updater Wrapper.csproj b/src/wrapper/CitizenMP Server Updater Wrapper.csproj
index a9b02c4..02c9b88 100644
--- a/src/wrapper/CitizenMP Server Updater Wrapper.csproj	
+++ b/src/wrapper/CitizenMP Server Updater Wrapper.csproj	
@@ -14,7 +14,7 @@
     <TargetFrameworkProfile />
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <NuGetPackageImportStamp>92e775de</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>ddada5b4</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -79,9 +79,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Fody.1.26.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.26.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.26.4\build\Fody.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Fody.1.26.1\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.26.1\build\Fody.targets')" />
+  <Import Project="..\..\packages\Fody.1.26.4\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.26.4\build\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/src/wrapper/FodyWeavers.xml b/src/wrapper/FodyWeavers.xml
index 1c28646..e0a35bd 100644
--- a/src/wrapper/FodyWeavers.xml
+++ b/src/wrapper/FodyWeavers.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers>
-  <Costura CreateTemporaryAssemblies="true"/>
+	<Costura/>
 </Weavers>
\ No newline at end of file
diff --git a/src/wrapper/packages.config b/src/wrapper/packages.config
index 84fd4a6..3ee4d8b 100644
--- a/src/wrapper/packages.config
+++ b/src/wrapper/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody-Mono" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
-  <package id="Fody" version="1.26.1" targetFramework="net40" developmentDependency="true" />
+  <package id="Costura.Fody-Mono" version="1.3.3.1" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.26.4" targetFramework="net40" developmentDependency="true" />
 </packages>
\ No newline at end of file