diff options
| author | martinh2011 <1169790+martinh2011@users.noreply.github.com> | 2026-03-26 17:37:46 +0100 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2026-06-09 15:38:28 -0400 |
| commit | a5ec0724f3681bd3076a0b914e6a5f5e09ce1d40 (patch) | |
| tree | 85ecae89186685bcc3fb40f7a6eb81b642a8dc47 /src | |
| parent | a47e82d4a6437d00f2cfa89311ee97b4924055a6 (diff) | |
| download | wix-a5ec0724f3681bd3076a0b914e6a5f5e09ce1d40.tar.gz wix-a5ec0724f3681bd3076a0b914e6a5f5e09ce1d40.tar.bz2 wix-a5ec0724f3681bd3076a0b914e6a5f5e09ce1d40.zip | |
also find MSBuild v18 (VS 2026)
Diffstat (limited to 'src')
| -rw-r--r-- | src/internal/WixInternal.MSTestSupport/MsbuildRunner.cs | 2 | ||||
| -rw-r--r-- | src/internal/WixInternal.TestSupport/MsbuildRunner.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/internal/WixInternal.MSTestSupport/MsbuildRunner.cs b/src/internal/WixInternal.MSTestSupport/MsbuildRunner.cs index 69fc7292..ed2384dd 100644 --- a/src/internal/WixInternal.MSTestSupport/MsbuildRunner.cs +++ b/src/internal/WixInternal.MSTestSupport/MsbuildRunner.cs | |||
| @@ -8,7 +8,7 @@ namespace WixInternal.MSTestSupport | |||
| 8 | 8 | ||
| 9 | public class MsbuildRunner : ExternalExecutable | 9 | public class MsbuildRunner : ExternalExecutable |
| 10 | { | 10 | { |
| 11 | private static readonly string VswhereFindArguments = "-property installationPath -version [17.0,18.0)"; | 11 | private static readonly string VswhereFindArguments = "-property installationPath -version [17.0,19.0)"; |
| 12 | private static readonly string MsbuildCurrentRelativePath = @"MSBuild\Current\Bin\MSBuild.exe"; | 12 | private static readonly string MsbuildCurrentRelativePath = @"MSBuild\Current\Bin\MSBuild.exe"; |
| 13 | private static readonly string MsbuildCurrentRelativePath64 = @"MSBuild\Current\Bin\amd64\MSBuild.exe"; | 13 | private static readonly string MsbuildCurrentRelativePath64 = @"MSBuild\Current\Bin\amd64\MSBuild.exe"; |
| 14 | 14 | ||
diff --git a/src/internal/WixInternal.TestSupport/MsbuildRunner.cs b/src/internal/WixInternal.TestSupport/MsbuildRunner.cs index 2cbf5e91..965b22f5 100644 --- a/src/internal/WixInternal.TestSupport/MsbuildRunner.cs +++ b/src/internal/WixInternal.TestSupport/MsbuildRunner.cs | |||
| @@ -8,7 +8,7 @@ namespace WixInternal.TestSupport | |||
| 8 | 8 | ||
| 9 | public class MsbuildRunner : ExternalExecutable | 9 | public class MsbuildRunner : ExternalExecutable |
| 10 | { | 10 | { |
| 11 | private static readonly string VswhereFindArguments = "-property installationPath -version [17.0,18.0)"; | 11 | private static readonly string VswhereFindArguments = "-property installationPath -version [17.0,19.0)"; |
| 12 | private static readonly string MsbuildCurrentRelativePath = @"MSBuild\Current\Bin\MSBuild.exe"; | 12 | private static readonly string MsbuildCurrentRelativePath = @"MSBuild\Current\Bin\MSBuild.exe"; |
| 13 | private static readonly string MsbuildCurrentRelativePath64 = @"MSBuild\Current\Bin\amd64\MSBuild.exe"; | 13 | private static readonly string MsbuildCurrentRelativePath64 = @"MSBuild\Current\Bin\amd64\MSBuild.exe"; |
| 14 | 14 | ||