diff --git a/shadowsocks-csharp/Program.cs b/shadowsocks-csharp/Program.cs index e24ab322..3054d4b2 100755 --- a/shadowsocks-csharp/Program.cs +++ b/shadowsocks-csharp/Program.cs @@ -43,17 +43,17 @@ namespace Shadowsocks return; } - // Check .NET Framework version - if (!Utils.IsSupportedRuntimeVersion()) - { - if (DialogResult.OK == MessageBox.Show(I18N.GetString("Unsupported .NET Framework, please update to {0} or later.", "4.7.2"), - "Shadowsocks Error", MessageBoxButtons.OKCancel, MessageBoxIcon.Error)) - { - //Process.Start("https://www.microsoft.com/download/details.aspx?id=53344"); // 4.6.2 - Process.Start("https://dotnet.microsoft.com/download/dotnet-framework/net472"); - } - return; - } + //// Check .NET Framework version + //if (!Utils.IsSupportedRuntimeVersion()) + //{ + // if (DialogResult.OK == MessageBox.Show(I18N.GetString("Unsupported .NET Framework, please update to {0} or later.", "4.7.2"), + // "Shadowsocks Error", MessageBoxButtons.OKCancel, MessageBoxIcon.Error)) + // { + // //Process.Start("https://www.microsoft.com/download/details.aspx?id=53344"); // 4.6.2 + // Process.Start("https://dotnet.microsoft.com/download/dotnet-framework/net472"); + // } + // return; + //} Utils.ReleaseMemory(true); using (Mutex mutex = new Mutex(false, $"Global\\Shadowsocks_{Application.StartupPath.GetHashCode()}")) @@ -67,6 +67,7 @@ namespace Shadowsocks SystemEvents.PowerModeChanged += SystemEvents_PowerModeChanged; Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); + Application.SetHighDpiMode(HighDpiMode.SystemAware); AutoStartup.RegisterForRestart(true); if (!mutex.WaitOne(0, false)) diff --git a/shadowsocks-csharp/shadowsocks-csharp.csproj b/shadowsocks-csharp/shadowsocks-csharp.csproj index 3e6bfc28..ca9497d5 100644 --- a/shadowsocks-csharp/shadowsocks-csharp.csproj +++ b/shadowsocks-csharp/shadowsocks-csharp.csproj @@ -10,10 +10,15 @@ Shadowsocks 4.1.9.2 Shadowsocks - + shadowsocks.ico + + true + x86 + + @@ -59,16 +64,12 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.Windows.Forms.DataVisualization.dll - - - diff --git a/shadowsocks-windows.sln b/shadowsocks-windows.sln index be5541e0..85749908 100644 --- a/shadowsocks-windows.sln +++ b/shadowsocks-windows.sln @@ -26,12 +26,14 @@ Global {8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|Any CPU.Build.0 = Release|Any CPU {8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|x86.ActiveCfg = Release|Any CPU {8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|x86.Build.0 = Release|Any CPU - {45913187-0685-4903-B250-DCEF0479CD86}.Debug|Any CPU.ActiveCfg = Debug|x86 - {45913187-0685-4903-B250-DCEF0479CD86}.Debug|x86.ActiveCfg = Debug|x86 - {45913187-0685-4903-B250-DCEF0479CD86}.Debug|x86.Build.0 = Debug|x86 - {45913187-0685-4903-B250-DCEF0479CD86}.Release|Any CPU.ActiveCfg = Release|x86 - {45913187-0685-4903-B250-DCEF0479CD86}.Release|x86.ActiveCfg = Release|x86 - {45913187-0685-4903-B250-DCEF0479CD86}.Release|x86.Build.0 = Release|x86 + {45913187-0685-4903-B250-DCEF0479CD86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45913187-0685-4903-B250-DCEF0479CD86}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45913187-0685-4903-B250-DCEF0479CD86}.Debug|x86.ActiveCfg = Debug|Any CPU + {45913187-0685-4903-B250-DCEF0479CD86}.Debug|x86.Build.0 = Debug|Any CPU + {45913187-0685-4903-B250-DCEF0479CD86}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45913187-0685-4903-B250-DCEF0479CD86}.Release|Any CPU.Build.0 = Release|Any CPU + {45913187-0685-4903-B250-DCEF0479CD86}.Release|x86.ActiveCfg = Release|Any CPU + {45913187-0685-4903-B250-DCEF0479CD86}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/test/Properties/AssemblyInfo.cs b/test/Properties/AssemblyInfo.cs deleted file mode 100755 index 26e77a34..00000000 --- a/test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("test")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f74e87ac-7e3a-444b-a1d9-8b91a674c60f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/ShadowsocksTest.csproj b/test/ShadowsocksTest.csproj index c21ab66b..0a77f8ef 100644 --- a/test/ShadowsocksTest.csproj +++ b/test/ShadowsocksTest.csproj @@ -1,101 +1,28 @@ - - + + - Debug - AnyCPU - {45913187-0685-4903-B250-DCEF0479CD86} - Library - Properties - Shadowsocks.Test - Shadowsocks.Test - v4.7.2 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - + netcoreapp3.1 + + false - - bin\x86\Debug\ - x86 - TRACE;DEBUG - - - bin\x86\Release\ - x86 - true - TRACE - - - - - - - ..\packages\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - {8c02d2f7-7cdb-4d55-9f25-cd03ef4aa062} - shadowsocks-csharp - + + - + - - - - - False - - - False - - - False - - - False - - - - - - - - \ No newline at end of file + + diff --git a/test/packages.config b/test/packages.config deleted file mode 100644 index b0cd2533..00000000 --- a/test/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file