From 35d4dc7c02b2b5f055651efdcab38ddebdf37bef Mon Sep 17 00:00:00 2001 From: lindexi Date: Wed, 11 Mar 2026 17:11:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20Visual=20Studio=202026?= =?UTF-8?q?=20=E7=9A=84=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DotNETBuild/Context/CompileConfiguration.cs | 30 +++++++++++++++++++ .../Utils/DotNetBuildTools_/MsBuild.cs | 18 +++++++++++ Tests/DotNETBuild.Tests/MSBuildToolTest.cs | 28 +++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 Tests/DotNETBuild.Tests/MSBuildToolTest.cs diff --git a/DotNETBuild/Context/CompileConfiguration.cs b/DotNETBuild/Context/CompileConfiguration.cs index 57bfe3b..fc9edb2 100644 --- a/DotNETBuild/Context/CompileConfiguration.cs +++ b/DotNETBuild/Context/CompileConfiguration.cs @@ -58,6 +58,9 @@ public string MsBuildFile return GetMSBuildPath ( msbuild, + VS2026EnterpriseMSBuild, + VS2026ProfessionalMSBuild, + VS2026CommunityMSBuild, VS2022EnterpriseMSBuild, VS2022ProfessionalMSBuild, VS2022CommunityMSBuild, @@ -180,6 +183,33 @@ public string VS2022CommunityMSBuild get => GetString(); } + /// + /// VisualStudio 2026 企业版的 MSBuild.exe 文件所在路径 + /// + public string VS2026EnterpriseMSBuild + { + set => SetFullPath(value); + get => GetString(); + } + + /// + /// VisualStudio 2026 社区版的 MSBuild.exe 文件所在路径 + /// + public string VS2026ProfessionalMSBuild + { + set => SetFullPath(value); + get => GetString(); + } + + /// + /// VisualStudio 2026 社区版的 MSBuild.exe 文件所在路径 + /// + public string VS2026CommunityMSBuild + { + set => SetFullPath(value); + get => GetString(); + } + /// /// 获取 vstest.console.exe 文件路径 /// diff --git a/DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs b/DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs index ee9a757..8b6849e 100644 --- a/DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs +++ b/DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs @@ -176,6 +176,24 @@ public static void FindInstalledMSBuildFilePath(CompileConfiguration compileConf { compileConfiguration.VS2022CommunityMSBuild = vs2022CommunityMSBuild; } + + var vs2026EnterpriseMSBuild = @"C:\Program Files\Microsoft Visual Studio\18\Professional\MSBuild\Current\Bin\amd64\MSBuild.exe"; + if (File.Exists(vs2022EnterpriseMSBuild)) + { + compileConfiguration.VS2026EnterpriseMSBuild = vs2026EnterpriseMSBuild; + } + + var vs2026ProfessionalMSBuild = @"C:\Program Files\Microsoft Visual Studio\18\Professional\Msbuild\Current\Bin\amd64\MSBuild.exe"; + if (File.Exists(vs2022ProfessionalMSBuild)) + { + compileConfiguration.VS2026ProfessionalMSBuild = vs2026ProfessionalMSBuild; + } + + var vs2026CommunityMSBuild = @"C:\Program Files\Microsoft Visual Studio\2022\Community\Msbuild\Current\Bin\amd64\MSBuild.exe"; + if (File.Exists(vs2022CommunityMSBuild)) + { + compileConfiguration.VS2026CommunityMSBuild = vs2026CommunityMSBuild; + } } } diff --git a/Tests/DotNETBuild.Tests/MSBuildToolTest.cs b/Tests/DotNETBuild.Tests/MSBuildToolTest.cs new file mode 100644 index 0000000..d24fc15 --- /dev/null +++ b/Tests/DotNETBuild.Tests/MSBuildToolTest.cs @@ -0,0 +1,28 @@ +using dotnetCampus.DotNETBuild.Utils; + +using Microsoft.VisualStudio.TestTools.UnitTesting; + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection.PortableExecutable; +using System.Text; +using System.Threading.Tasks; +using dotnetCampus.Configurations.Core; + +namespace DotNETBuild.Tests; + +[TestClass] +public class MSBuildToolTest +{ + [TestMethod] + public void TestFindMSBuild() + { + var memoryConfigurationRepo = new MemoryConfigurationRepo(); + var appConfigurator = memoryConfigurationRepo.CreateAppConfigurator(); + var msBuild = new MSBuild(appConfigurator); + var msBuildFile = msBuild.GetMSBuildFile(); + Assert.IsTrue(File.Exists(msBuildFile)); + } +} From e84049aecd450a0916b09e80890bb8f15f2ca9c2 Mon Sep 17 00:00:00 2001 From: lindexi Date: Wed, 11 Mar 2026 17:16:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=86=99=E9=94=99?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs b/DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs index 8b6849e..afc9578 100644 --- a/DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs +++ b/DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs @@ -189,7 +189,7 @@ public static void FindInstalledMSBuildFilePath(CompileConfiguration compileConf compileConfiguration.VS2026ProfessionalMSBuild = vs2026ProfessionalMSBuild; } - var vs2026CommunityMSBuild = @"C:\Program Files\Microsoft Visual Studio\2022\Community\Msbuild\Current\Bin\amd64\MSBuild.exe"; + var vs2026CommunityMSBuild = @"C:\Program Files\Microsoft Visual Studio\18\Community\Msbuild\Current\Bin\amd64\MSBuild.exe"; if (File.Exists(vs2022CommunityMSBuild)) { compileConfiguration.VS2026CommunityMSBuild = vs2026CommunityMSBuild;