diff --git a/shadowsocks-csharp/FodyWeavers.xml b/shadowsocks-csharp/FodyWeavers.xml index 625f36e3..576cb339 100644 --- a/shadowsocks-csharp/FodyWeavers.xml +++ b/shadowsocks-csharp/FodyWeavers.xml @@ -1,5 +1,4 @@  - + - \ No newline at end of file diff --git a/shadowsocks-csharp/FodyWeavers.xsd b/shadowsocks-csharp/FodyWeavers.xsd new file mode 100644 index 00000000..e9cd8f0e --- /dev/null +++ b/shadowsocks-csharp/FodyWeavers.xsd @@ -0,0 +1,112 @@ + + + + + + + + + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with line breaks. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with line breaks. + + + + + The order of preloaded assemblies, delimited with line breaks. + + + + + + This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. + + + + + Controls if .pdbs for reference assemblies are also embedded. + + + + + Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. + + + + + As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. + + + + + Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. + + + + + Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + + + A list of unmanaged 32 bit assembly names to include, delimited with |. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with |. + + + + + The order of preloaded assemblies, delimited with |. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/shadowsocks-csharp/packages.config b/shadowsocks-csharp/packages.config index 9f605d30..7056bb05 100644 --- a/shadowsocks-csharp/packages.config +++ b/shadowsocks-csharp/packages.config @@ -1,10 +1,10 @@  - - - + + + - + - + \ No newline at end of file diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 17f162f0..ac8f35b9 100644 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -1,5 +1,7 @@  + + Debug AnyCPU @@ -66,12 +68,11 @@ app.manifest - - 3rd\Caseless.Fody.1.7.3\lib\net452\Caseless.dll + + 3rd\Caseless.Fody.1.8.3\lib\net452\Caseless.dll - - 3rd\Costura.Fody.1.6.2\lib\dotnet\Costura.dll - False + + 3rd\Costura.Fody.3.3.2\lib\net40\Costura.dll 3rd\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll @@ -79,8 +80,8 @@ - - 3rd\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + 3rd\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll @@ -92,11 +93,11 @@ - - 3rd\ZXing.Net.0.16.2\lib\net461\zxing.dll + + 3rd\ZXing.Net.0.16.4\lib\net461\zxing.dll - - 3rd\ZXing.Net.0.16.2\lib\net461\zxing.presentation.dll + + 3rd\ZXing.Net.0.16.4\lib\net461\zxing.presentation.dll @@ -352,15 +353,15 @@ foreach (var item in filesToCleanup) - + 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}. - - + + + -