Update nuget

CyberPolaris · Feb 11, 2019 · fcef17a · fcef17a
1 parent 7194f5a
commit fcef17a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/shadowsocks-csharp/FodyWeavers.xml b/shadowsocks-csharp/FodyWeavers.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
   <Caseless StringComparison="Ordinal" />
+  <Costura />
 </Weavers>
diff --git a/shadowsocks-csharp/packages.config b/shadowsocks-csharp/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Caseless.Fody" version="1.8.3" targetFramework="net462" developmentDependency="true" />
   <package id="Costura.Fody" version="3.3.2" targetFramework="net462" developmentDependency="true" />
-  <package id="Fody" version="3.3.5" targetFramework="net462" developmentDependency="true" />
+  <package id="Fody" version="4.0.0" targetFramework="net462" developmentDependency="true" />
   <package id="GlobalHotKey" version="1.1.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net462" />
   <package id="StringEx.CS" version="0.3.1" targetFramework="net462" developmentDependency="true" />

diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj
@@ -353,15 +353,15 @@ foreach (var item in filesToCleanup)
   <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget">
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
-  <Import Project="3rd\Fody.3.3.5\build\Fody.targets" Condition="Exists('3rd\Fody.3.3.5\build\Fody.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('3rd\Fody.3.3.5\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '3rd\Fody.3.3.5\build\Fody.targets'))" />
     <Error Condition="!Exists('3rd\Costura.Fody.3.3.2\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '3rd\Costura.Fody.3.3.2\build\Costura.Fody.props'))" />
     <Error Condition="!Exists('3rd\Caseless.Fody.1.8.3\build\Caseless.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '3rd\Caseless.Fody.1.8.3\build\Caseless.Fody.props'))" />
+    <Error Condition="!Exists('3rd\Fody.4.0.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '3rd\Fody.4.0.0\build\Fody.targets'))" />
   </Target>
+  <Import Project="3rd\Fody.4.0.0\build\Fody.targets" Condition="Exists('3rd\Fody.4.0.0\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">