Merge remote-tracking branch 'maikebing/master' into net-core-build

shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs

@@ -216,7 +216,7 @@ namespace Shadowsocks.Controller
                 }
                 catch (Exception e)
                 {
-                    logger.Debug("config changed asynchrously, just ignore this server");
+                    logger.Debug(e,"config changed asynchrously, just ignore this server");
                 }
             }
 

shadowsocks-csharp/Model/NlogConfig.cs

@@ -20,8 +20,18 @@ namespace Shadowsocks.Model
             Debug,
             Trace,
         }
-
-        const string NLOG_CONFIG_FILE_NAME = "NLog.config";
+        private static string _NLOG_CONFIG_FILE_NAME=string.Empty;
+        public static string NLOG_CONFIG_FILE_NAME
+        {
+            get
+            {
+                if (_NLOG_CONFIG_FILE_NAME.IsNullOrEmpty())
+                {
+                    _NLOG_CONFIG_FILE_NAME = Path.Combine(Environment.CurrentDirectory, "NLog.config");
+                }
+                return _NLOG_CONFIG_FILE_NAME;
+            }
+        }
         const string TARGET_MIN_LEVEL_ATTRIBUTE = "minlevel";
         const string LOGGER_FILE_NAME_ATTRIBUTE = "fileName";
 
@@ -108,6 +118,7 @@ namespace Shadowsocks.Model
         /// </summary>
         public static void TouchAndApplyNLogConfig()
         {
+      
             if (!File.Exists(NLOG_CONFIG_FILE_NAME))
             {
                 File.WriteAllText(NLOG_CONFIG_FILE_NAME, Properties.Resources.NLog_config);

shadowsocks-csharp/Properties/PublishProfiles/FolderProfile.pubxml

@@ -10,9 +10,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun>True</PublishReadyToRun>
-    <PublishTrimmed>True</PublishTrimmed>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
   </PropertyGroup>
 </Project>

shadowsocks-csharp/shadowsocks-csharp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RootNamespace>Shadowsocks</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
     <Authors>clowwindy &amp; community 2020</Authors>

shadowsocks-windows.sln

@@ -10,6 +10,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShadowsocksTest", "test\Sha
 		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062} = {8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7BD54B24-BBD7-4DD8-99EF-DAEE6684B673}"
+	ProjectSection(SolutionItems) = preProject
+		.gitignore = .gitignore
+		appveyor.yml = appveyor.yml
+		appveyor.yml.obsolete = appveyor.yml.obsolete
+		appveyor.yml.sample = appveyor.yml.sample
+		CHANGES = CHANGES
+		CONTRIBUTING.md = CONTRIBUTING.md
+		LICENSE.txt = LICENSE.txt
+		OPENSSL-GUIDE = OPENSSL-GUIDE
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU