diff --git a/AntDeploy2022/AntDeployV2/AntDeployApp.exe b/AntDeploy2022/AntDeployV2/AntDeployApp.exe
index 809faf1..2326568 100644
Binary files a/AntDeploy2022/AntDeployV2/AntDeployApp.exe and b/AntDeploy2022/AntDeployV2/AntDeployApp.exe differ
diff --git a/AntDeploy2022/AntDeployV2/AntDeployApp.exe.config b/AntDeploy2022/AntDeployV2/AntDeployApp.exe.config
index b881d7d..9e11f10 100644
--- a/AntDeploy2022/AntDeployV2/AntDeployApp.exe.config
+++ b/AntDeploy2022/AntDeployV2/AntDeployApp.exe.config
@@ -1,25 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AntDeploy2022/AntDeployV2/AntDeployV2.csproj b/AntDeploy2022/AntDeployV2/AntDeployV2.csproj
index bd92831..9411325 100644
--- a/AntDeploy2022/AntDeployV2/AntDeployV2.csproj
+++ b/AntDeploy2022/AntDeployV2/AntDeployV2.csproj
@@ -60,9 +60,6 @@
Menus.ctmenu
-
- true
-
Designer
diff --git a/AntDeploy2022/AntDeployV2/AntDeployWinform.dll b/AntDeploy2022/AntDeployV2/AntDeployWinform.dll
index 7a748eb..10229d6 100644
Binary files a/AntDeploy2022/AntDeployV2/AntDeployWinform.dll and b/AntDeploy2022/AntDeployV2/AntDeployWinform.dll differ
diff --git a/AntDeploy2022/AntDeployV2/NLog.Windows.Forms.dll b/AntDeploy2022/AntDeployV2/NLog.Windows.Forms.dll
index 658084f..a50a18e 100644
Binary files a/AntDeploy2022/AntDeployV2/NLog.Windows.Forms.dll and b/AntDeploy2022/AntDeployV2/NLog.Windows.Forms.dll differ
diff --git a/AntDeploy2022/AntDeployV2/NLog.dll b/AntDeploy2022/AntDeployV2/NLog.dll
index 62ecb3d..6730265 100644
Binary files a/AntDeploy2022/AntDeployV2/NLog.dll and b/AntDeploy2022/AntDeployV2/NLog.dll differ
diff --git a/AntDeploy2022/AntDeployV2/nlog.config b/AntDeploy2022/AntDeployV2/nlog.config
deleted file mode 100644
index 68522ac..0000000
--- a/AntDeploy2022/AntDeployV2/nlog.config
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/AntDeploy2022/AntDeployV2/source.extension.vsixmanifest b/AntDeploy2022/AntDeployV2/source.extension.vsixmanifest
index 2ecadea..1f07eb7 100644
--- a/AntDeploy2022/AntDeployV2/source.extension.vsixmanifest
+++ b/AntDeploy2022/AntDeployV2/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
-
+
AntDeployV2
Tools to deploy applications to remote server(iis,windowsService,docker) support netframwork and dotnetcore,support rollback and increment deploy
https://github.com/yuzd
diff --git a/AntDeployAgentService/Program.cs b/AntDeployAgentService/Program.cs
index 8c30fd8..35558f5 100644
--- 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
index 09c03aa..78a5a6c 100644
--- a/AntDeployWinform/AntDeployWinform.csproj
+++ b/AntDeployWinform/AntDeployWinform.csproj
@@ -52,6 +52,14 @@
False
..\AntDeploy\Newtonsoft.Json.dll
+
+ False
+ ..\DLL\NLog.dll
+
+
+ False
+ ..\DLL\NLog.Windows.Forms.dll
+
@@ -253,9 +261,6 @@
SelectProject.cs
-
- Always
-
SettingsSingleFileGenerator
Settings.Designer.cs
@@ -283,12 +288,6 @@
0.26.2
-
- 5.0.1
-
-
- 4.6.0
-
2020.0.2
diff --git a/AntDeployWinform/Vsix.cs b/AntDeployWinform/Vsix.cs
index f430231..ae78b02 100644
--- 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
index 6be9500..54b703e 100644
--- 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
deleted file mode 100644
index 68522ac..0000000
--- a/AntDeployWinform/nlog.config
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file