Merge branch 'dev'

yuzd · Oct 26, 2022 · 94ff7c8 · 94ff7c8
2 parents 856d8de + 9aa46a1
commit 94ff7c8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/AntDeploy2022/AntDeployV2/AntDeployWinform.dll b/AntDeploy2022/AntDeployV2/AntDeployWinform.dll
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.7" Language="en-US" Publisher="yuzd" />
+        <Identity Id="AntDeployV2.7c9b7525-17b5-4862-91fd-75e80893e476" Version="2.8" 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/AntDeployWinform/Util/CommandHelper.cs b/AntDeployWinform/Util/CommandHelper.cs
@@ -52,14 +52,14 @@ public static bool RunMsbuild(string path, string publishPath, NLog.Logger logge
                     logger.Error($"msbuild.exe path `{msBuild}` not found. please set it in Config tab page.");
                     goto CONTINUEWEB;
                 }
-
-                var vsfolder = msbuildFolder.Directory?.Parent?.Parent?.Parent;
+                var vsfolder = msbuildFolder.Directory.Name == "amd64" || msbuildFolder.Directory.Name == "arm64"?
+                    msbuildFolder.Directory?.Parent?.Parent?.Parent?.Parent : msbuildFolder.Directory?.Parent?.Parent?.Parent;
                 if (vsfolder == null)
                 {
                     logger.Warn($"can not found visual stuidio install path by `{msBuild}` . please use `msbuild` in visual studio installed path");
                     goto CONTINUEWEB;
                 }
-
+                // 这里要兼容一下amd64的情况
                 var vsfolderToolPath = Path.Combine(vsfolder.FullName, "Common7", "Tools");
                 if (!Directory.Exists(vsfolderToolPath))
                 {

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.47";
+        public const string VERSION = "7.48";
         public const string AGENTVERSION = "7.1";
         public const string PRODUCT = "yuzd";
         public const string PACKAGE = "AntDeploy";