Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions DotNETBuild/Context/CompileConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public string MsBuildFile
return GetMSBuildPath
(
msbuild,
VS2026EnterpriseMSBuild,
VS2026ProfessionalMSBuild,
VS2026CommunityMSBuild,
VS2022EnterpriseMSBuild,
VS2022ProfessionalMSBuild,
VS2022CommunityMSBuild,
Expand Down Expand Up @@ -180,6 +183,33 @@ public string VS2022CommunityMSBuild
get => GetString();
}

/// <summary>
/// VisualStudio 2026 企业版的 MSBuild.exe 文件所在路径
/// </summary>
public string VS2026EnterpriseMSBuild
{
set => SetFullPath(value);
get => GetString();
}

/// <summary>
/// VisualStudio 2026 社区版的 MSBuild.exe 文件所在路径
/// </summary>
public string VS2026ProfessionalMSBuild
{
set => SetFullPath(value);
get => GetString();
}

/// <summary>
/// VisualStudio 2026 社区版的 MSBuild.exe 文件所在路径
/// </summary>
public string VS2026CommunityMSBuild
{
set => SetFullPath(value);
get => GetString();
}

/// <summary>
/// 获取 vstest.console.exe 文件路径
/// </summary>
Expand Down
18 changes: 18 additions & 0 deletions DotNETBuild/Utils/DotNetBuildTools_/MsBuild.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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\18\Community\Msbuild\Current\Bin\amd64\MSBuild.exe";
if (File.Exists(vs2022CommunityMSBuild))
{
compileConfiguration.VS2026CommunityMSBuild = vs2026CommunityMSBuild;
}
}
}

Expand Down
28 changes: 28 additions & 0 deletions Tests/DotNETBuild.Tests/MSBuildToolTest.cs
Original file line number Diff line number Diff line change
@@ -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));
}
}
Loading