From a52036eda6958f4671c9ecb04373bf7bc2e4bd36 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 13 Nov 2025 10:20:34 -0800 Subject: Update to use .NET 10 SDK for builds --- README.md | 12 ++++++------ src/api/wix/WixToolset.Data/WixToolset.Data.csproj | 6 ++++-- src/build_all.cmd | 2 +- src/internal/SetBuildNumber/global.json.pp | 3 ++- src/test/burn/WixTestTools/WixTestTools.csproj | 2 -- .../WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj | 2 -- .../msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj | 3 --- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 93768e41..d95c62da 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto ### Prerequisites -Before building the WiX Toolset, ensure you have Visual Studio 2022 (17.8.2 or higher) with the following installed: +Before building the WiX Toolset, ensure you have Visual Studio 2026 (17.8.2 or higher) with the following installed: | Workloads | | :-------- | @@ -36,13 +36,13 @@ Before building the WiX Toolset, ensure you have Visual Studio 2022 (17.8.2 or h | Individual components | | :-------------------- | -| .NET 8.0 Runtime (Long Term Support) | +| .NET 10.0 Runtime (Long Term Support) | | .NET Framework 4.7.2 SDK | | .NET Framework 4.7.2 targeting pack | | .NET Framework 4.6.2 targeting pack | -| ATL v143 - VS 2022 C++ x64/x86 build tools (Latest) | -| MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) | -| MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) | +| ATL v143 - VS 2026 C++ x64/x86 build tools (Latest) | +| MSVC v143 - VS 2026 C++ ARM64/ARM64EC build tools (Latest) | +| MSVC v143 - VS 2026 C++ x64/x86 build tools (Latest) | | Git for Windows | Also, download the latest [nuget.exe command-line tool](https://www.nuget.org/downloads) and place it in a directory on your path. @@ -56,7 +56,7 @@ Also, download the latest [nuget.exe command-line tool](https://www.nuget.org/do #### To build the WiX toolset: - * Start a VS2022 'Developer Command Prompt' + * Start a VS2026 'Developer Command Prompt' * Change directory to the root of the cloned repository * Issue the command `devbuild` (or `devbuild release` if you want to create a release version) diff --git a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj index 257b9415..294127a0 100644 --- a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj +++ b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj @@ -19,7 +19,9 @@ - - + + + + diff --git a/src/build_all.cmd b/src/build_all.cmd index 5f3ba14e..14e77bee 100644 --- a/src/build_all.cmd +++ b/src/build_all.cmd @@ -84,7 +84,7 @@ if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" exit /b 2 ) -for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version [17.0^,18.0^) -property installationPath`) do ( +for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version [18^,19^) -property installationPath`) do ( if exist "%%i\Common7\Tools\vsdevcmd.bat" ( call "%%i\Common7\Tools\vsdevcmd.bat" -no_logo exit /b diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp index 97f7e471..b99149d2 100644 --- a/src/internal/SetBuildNumber/global.json.pp +++ b/src/internal/SetBuildNumber/global.json.pp @@ -6,6 +6,7 @@ "WixToolset.Sdk": "{packageversion}" }, "sdk": { - "allowPrerelease": false + "version": "10.0.100", + "rollForward": "latestFeature" } } diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj index 587ff9ea..619ec974 100644 --- a/src/test/burn/WixTestTools/WixTestTools.csproj +++ b/src/test/burn/WixTestTools/WixTestTools.csproj @@ -20,11 +20,9 @@ - - diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj index 23a65cdc..1d9615bb 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj +++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj @@ -18,8 +18,6 @@ - - diff --git a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj index 21b00b7d..f0bf8a5d 100644 --- a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj +++ b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj @@ -28,9 +28,6 @@ - - - -- cgit v1.2.3-55-g6feb