From 1ffce10b05b837dc53c998719846be61d33ce96c Mon Sep 17 00:00:00 2001
From: Student Main <scncgz@gmail.com>
Date: Thu, 5 Mar 2020 20:20:33 +0800
Subject: [PATCH] remove Fody dependency

---
 README.md                                    |  3 ---
 shadowsocks-csharp/FodyWeavers.xml           |  5 -----
 shadowsocks-csharp/packages.config           |  3 ---
 shadowsocks-csharp/shadowsocks-csharp.csproj | 33 ++++++++--------------------
 4 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 shadowsocks-csharp/FodyWeavers.xml

diff --git a/README.md b/README.md
index 6612822d..5bfb6777 100644
--- a/README.md
+++ b/README.md
@@ -125,9 +125,6 @@ especially for feature development.
 #### Open Source Components / Libraries
 
 ```
-Caseless.Fody (MIT)    https://github.com/Fody/Caseless
-Costura.Fody (MIT)     https://github.com/Fody/Costura
-Fody (MIT)             https://github.com/Fody/Fody
 GlobalHotKey (GPLv3)   https://github.com/kirmir/GlobalHotKey
 Newtonsoft.Json (MIT)  https://www.newtonsoft.com/json
 StringEx.CS ()         https://github.com/LazyMode/StringEx
diff --git a/shadowsocks-csharp/FodyWeavers.xml b/shadowsocks-csharp/FodyWeavers.xml
deleted file mode 100644
index a5ec775c..00000000
--- a/shadowsocks-csharp/FodyWeavers.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/shadowsocks-csharp/packages.config b/shadowsocks-csharp/packages.config
index f7fcb451..10b465d1 100644
--- a/shadowsocks-csharp/packages.config
+++ b/shadowsocks-csharp/packages.config
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Caseless.Fody" version="1.8.3" targetFramework="net472" />
-  <package id="Costura.Fody" version="3.3.3" targetFramework="net472" />
-  <package id="Fody" version="4.2.1" targetFramework="net472" developmentDependency="true" />
   <package id="GlobalHotKey" version="1.1.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
   <package id="StringEx.CS" version="0.3.1" targetFramework="net472" developmentDependency="true" />
diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj
index fd1ee531..37b09f27 100644
--- a/shadowsocks-csharp/shadowsocks-csharp.csproj
+++ b/shadowsocks-csharp/shadowsocks-csharp.csproj
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props')" />
-  <Import Project="..\packages\Caseless.Fody.1.8.3\build\Caseless.Fody.props" Condition="Exists('..\packages\Caseless.Fody.1.8.3\build\Caseless.Fody.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -68,12 +66,6 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Caseless, Version=1.8.3.0, Culture=neutral, PublicKeyToken=409b3227471b0f0d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Caseless.Fody.1.8.3\lib\net452\Caseless.dll</HintPath>
-    </Reference>
-    <Reference Include="Costura, Version=3.3.3.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.3.3.3\lib\net40\Costura.dll</HintPath>
-    </Reference>
     <Reference Include="GlobalHotKey, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll</HintPath>
     </Reference>
@@ -267,42 +259,39 @@
     <ContentWithTargetPath Include="Data\abp.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>abp.js</TargetPath>
-    </ContentWithTargetPath >
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Data\default-abp-rule.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>default-abp-rule.js</TargetPath>
-    </ContentWithTargetPath >
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Data\i18n.csv">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>i18n.csv</TargetPath>
-    </ContentWithTargetPath >
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Data\libsscrypto.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>libsscrypto.dll</TargetPath>
-    </ContentWithTargetPath >
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Data\privoxy.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>privoxy.exe</TargetPath>
-    </ContentWithTargetPath >
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Data\privoxy_conf.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>privoxy_conf.txt</TargetPath>
-    </ContentWithTargetPath >
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Data\sysproxy.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>sysproxy.exe</TargetPath>
-    </ContentWithTargetPath >
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Data\sysproxy64.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>sysproxy64.exe</TargetPath>
-    </ContentWithTargetPath >
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Data\user-rule.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>user-rule.txt</TargetPath>
-    </ContentWithTargetPath >
-    <None Include="FodyWeavers.xml">
-      <SubType>Designer</SubType>
-    </None>
+    </ContentWithTargetPath>
     <Content Include="Resources\ss32Fill.png" />
     <Content Include="Resources\ss32In.png" />
     <Content Include="Resources\ss32Out.png" />
@@ -337,14 +326,10 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.4.2.1\build\Fody.targets" Condition="Exists('..\packages\Fody.4.2.1\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('..\packages\Fody.4.2.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.4.2.1\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Caseless.Fody.1.8.3\build\Caseless.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Caseless.Fody.1.8.3\build\Caseless.Fody.props'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props'))" />
   </Target>
   <!-- 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.