Merge pull request #28 from yuzd/dev

Dev
yuzd · Sep 27, 2022 · ebf09d5 · ebf09d5
2 parents 9939e7f + 96cc1c5
commit ebf09d5
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 243 deletions.
diff --git a/AntDeploy2022/AntDeployV2/AntDeployApp.exe b/AntDeploy2022/AntDeployV2/AntDeployApp.exe
diff --git a/AntDeploy2022/AntDeployV2/AntDeployApp.exe.config b/AntDeploy2022/AntDeployV2/AntDeployApp.exe.config
@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-  </startup>
-  <system.net>
-    <settings>
-      <httpWebRequest useUnsafeHeaderParsing="true" />
-    </settings>
-    <defaultProxy enabled="false" useDefaultCredentials="false">
-      <proxy />
-      <bypasslist />
-      <module />
-    </defaultProxy>
-  </system.net>
-  <runtime>
-    <AppContextSwitchOverrides value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+	</startup>
+	<system.net>
+		<settings>
+   <httpWebRequest useUnsafeHeaderParsing="true" />
+  </settings>
+		<defaultProxy enabled="false" useDefaultCredentials="false">
+			<proxy/>
+			<bypasslist/>
+			<module/>
+		</defaultProxy>
+	</system.net>
+	<runtime>
+		<AppContextSwitchOverrides value="Switch.System.Windows.Forms.DoNotLoadLatestRichEditControl=true" />
+	</runtime>
+</configuration>
diff --git a/AntDeploy2022/AntDeployV2/AntDeployV2.csproj b/AntDeploy2022/AntDeployV2/AntDeployV2.csproj
@@ -60,9 +60,6 @@
       <ResourceName>Menus.ctmenu</ResourceName>
     </VSCTCompile>
     <None Include="Key.snk" />
-    <Content Include="nlog.config">
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>

diff --git a/AntDeploy2022/AntDeployV2/AntDeployWinform.dll b/AntDeploy2022/AntDeployV2/AntDeployWinform.dll
diff --git a/AntDeploy2022/AntDeployV2/NLog.Windows.Forms.dll b/AntDeploy2022/AntDeployV2/NLog.Windows.Forms.dll
diff --git a/AntDeploy2022/AntDeployV2/NLog.dll b/AntDeploy2022/AntDeployV2/NLog.dll
diff --git a/AntDeploy2022/AntDeployV2/nlog.config b/AntDeploy2022/AntDeployV2/nlog.config
diff --git a/AntDeploy2022/AntDeployV2/source.extension.vsixmanifest b/AntDeploy2022/AntDeployV2/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="AntDeployV2.7c9b7525-17b5-4862-91fd-75e80893e476" Version="2.4" Language="en-US" Publisher="yuzd" />
+        <Identity Id="AntDeployV2.7c9b7525-17b5-4862-91fd-75e80893e476" Version="2.5" Language="en-US" Publisher="yuzd" />
         <DisplayName>AntDeployV2</DisplayName>
         <Description xml:space="preserve">Tools to deploy applications to remote server(iis,windowsService,docker) support netframwork and dotnetcore,support rollback and increment deploy</Description>
         <MoreInfo>https://github.com/yuzd</MoreInfo>

diff --git a/AntDeployAgentService/Program.cs b/AntDeployAgentService/Program.cs
@@ -58,6 +58,7 @@ private static void Main(string[] args)
 
             if (isService)
             {
+                Console.WriteLine("Current Version：" + AntDeployAgent.Version.VERSION);
                 builder.UseWindowsService().Build().Run();
             }
             else

diff --git a/AntDeployWinform/AntDeployWinform.csproj b/AntDeployWinform/AntDeployWinform.csproj
@@ -52,6 +52,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\AntDeploy\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\DLL\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\DLL\NLog.Windows.Forms.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
@@ -253,9 +261,6 @@
     <EmbeddedResource Include="Winform\SelectProject.zh-Hans.resx">
       <DependentUpon>SelectProject.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="nlog.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -283,12 +288,6 @@
     <PackageReference Include="LibGit2Sharp">
       <Version>0.26.2</Version>
     </PackageReference>
-    <PackageReference Include="NLog">
-      <Version>5.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="NLog.Windows.Forms">
-      <Version>4.6.0</Version>
-    </PackageReference>
     <PackageReference Include="SSH.NET">
       <Version>2020.0.2</Version>
     </PackageReference>

diff --git a/AntDeployWinform/Vsix.cs b/AntDeployWinform/Vsix.cs
@@ -3,7 +3,7 @@
     public static class Vsix
     {
         public const string FORM_NAME = "AntDeploy("+VERSION+")";
-        public const string VERSION = "7.44";
+        public const string VERSION = "7.45";
         public const string AGENTVERSION = "7.1";
         public const string PRODUCT = "yuzd";
         public const string PACKAGE = "AntDeploy";

diff --git a/AntDeployWinform/Winform/Deploy.cs b/AntDeployWinform/Winform/Deploy.cs
@@ -513,9 +513,9 @@ private void Init(string projectPath, ProjectParam project = null, bool isFirst
         private void NlogConfig()
         {
 
-            #region Nlog
+            #region Nlog 修改过的dll 不能升级，否则会导致在某些windows系统上出现中文乱码的问题
 
-            /*
+
             var config = new LoggingConfiguration();
             var richTarget = new RichTextBoxTarget
             {
@@ -629,8 +629,7 @@ private void NlogConfig()
             config.LoggingRules.Add(rule5);
 
             LogManager.Configuration = config;
-            */
-            LogManager.Setup().SetupExtensions(ext => ext.RegisterAssembly(typeof(RichTextBoxTarget).Assembly));
+
             nlog_iis = NLog.LogManager.GetLogger("rich_iis_log");
             nlog_windowservice = NLog.LogManager.GetLogger("rich_windowservice_log");
             nlog_linux = NLog.LogManager.GetLogger("rich_linuxservice_log");

diff --git a/AntDeployWinform/nlog.config b/AntDeployWinform/nlog.config