aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2025-11-13 10:20:34 -0800
committerRob Mensching <rob@firegiant.com>2025-12-13 16:30:50 -0800
commitce6075b804cb43aa3474f9e5d878d0ded1a77aaf (patch)
tree63a04bd59fbed1a46c294bb8acb1886d98d08a1e
parent7760a8b0d241223e0210c52d17b950f64629d2a4 (diff)
downloadwix-ce6075b804cb43aa3474f9e5d878d0ded1a77aaf.tar.gz
wix-ce6075b804cb43aa3474f9e5d878d0ded1a77aaf.tar.bz2
wix-ce6075b804cb43aa3474f9e5d878d0ded1a77aaf.zip
Update to use .NET 10 SDK for builds
-rw-r--r--README.md12
-rw-r--r--src/api/wix/WixToolset.Data/WixToolset.Data.csproj6
-rw-r--r--src/build_all.cmd2
-rw-r--r--src/internal/SetBuildNumber/global.json.pp3
-rw-r--r--src/test/burn/WixTestTools/WixTestTools.csproj2
-rw-r--r--src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj2
-rw-r--r--src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj3
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
26 26
27### Prerequisites 27### Prerequisites
28 28
29Before building the WiX Toolset, ensure you have Visual Studio 2022 (17.8.2 or higher) with the following installed: 29Before building the WiX Toolset, ensure you have Visual Studio 2026 (17.8.2 or higher) with the following installed:
30 30
31| Workloads | 31| Workloads |
32| :-------- | 32| :-------- |
@@ -36,13 +36,13 @@ Before building the WiX Toolset, ensure you have Visual Studio 2022 (17.8.2 or h
36 36
37| Individual components | 37| Individual components |
38| :-------------------- | 38| :-------------------- |
39| .NET 8.0 Runtime (Long Term Support) | 39| .NET 10.0 Runtime (Long Term Support) |
40| .NET Framework 4.7.2 SDK | 40| .NET Framework 4.7.2 SDK |
41| .NET Framework 4.7.2 targeting pack | 41| .NET Framework 4.7.2 targeting pack |
42| .NET Framework 4.6.2 targeting pack | 42| .NET Framework 4.6.2 targeting pack |
43| ATL v143 - VS 2022 C++ x64/x86 build tools (Latest) | 43| ATL v143 - VS 2026 C++ x64/x86 build tools (Latest) |
44| MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) | 44| MSVC v143 - VS 2026 C++ ARM64/ARM64EC build tools (Latest) |
45| MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest) | 45| MSVC v143 - VS 2026 C++ x64/x86 build tools (Latest) |
46| Git for Windows | 46| Git for Windows |
47 47
48Also, download the latest [nuget.exe command-line tool](https://www.nuget.org/downloads) and place it in a directory on your path. 48Also, 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
56 56
57#### To build the WiX toolset: 57#### To build the WiX toolset:
58 58
59 * Start a VS2022 'Developer Command Prompt' 59 * Start a VS2026 'Developer Command Prompt'
60 * Change directory to the root of the cloned repository 60 * Change directory to the root of the cloned repository
61 * Issue the command `devbuild` (or `devbuild release` if you want to create a release version) 61 * Issue the command `devbuild` (or `devbuild release` if you want to create a release version)
62 62
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 @@
19 <None Include="README.md" Pack="true" PackagePath="\" /> 19 <None Include="README.md" Pack="true" PackagePath="\" />
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <!-- .NET 10 SDK no longer implicitly references these, so we need to be explicit -->
23 <PackageReference Include="System.IO.Compression" /> 23 <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
24 <Reference Include="System.IO.Compression" />
25 <Reference Include="System.IO.Compression.FileSystem" />
24 </ItemGroup> 26 </ItemGroup>
25</Project> 27</Project>
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"
84 exit /b 2 84 exit /b 2
85) 85)
86 86
87for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version [17.0^,18.0^) -property installationPath`) do ( 87for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version [18^,19^) -property installationPath`) do (
88 if exist "%%i\Common7\Tools\vsdevcmd.bat" ( 88 if exist "%%i\Common7\Tools\vsdevcmd.bat" (
89 call "%%i\Common7\Tools\vsdevcmd.bat" -no_logo 89 call "%%i\Common7\Tools\vsdevcmd.bat" -no_logo
90 exit /b 90 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 @@
6 "WixToolset.Sdk": "{packageversion}" 6 "WixToolset.Sdk": "{packageversion}"
7 }, 7 },
8 "sdk": { 8 "sdk": {
9 "allowPrerelease": false 9 "version": "10.0.100",
10 "rollForward": "latestFeature"
10 } 11 }
11} 12}
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 @@
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <PackageReference Include="Microsoft.Win32.Registry" />
24 <PackageReference Include="System.DirectoryServices" /> 23 <PackageReference Include="System.DirectoryServices" />
25 <PackageReference Include="System.DirectoryServices.AccountManagement" /> 24 <PackageReference Include="System.DirectoryServices.AccountManagement" />
26 <PackageReference Include="System.Management" /> 25 <PackageReference Include="System.Management" />
27 <PackageReference Include="System.Security.Principal.Windows" />
28 <PackageReference Include="WixInternal.TestSupport" /> 26 <PackageReference Include="WixInternal.TestSupport" />
29 <PackageReference Include="WixToolset.Data" /> 27 <PackageReference Include="WixToolset.Data" />
30 <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> 28 <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
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 @@
18 18
19 <ItemGroup> 19 <ItemGroup>
20 <PackageReference Include="Microsoft.AspNetCore.Owin" /> 20 <PackageReference Include="Microsoft.AspNetCore.Owin" />
21 <PackageReference Include="Microsoft.Win32.Registry" />
22 <PackageReference Include="System.Security.Principal.Windows" />
23 <PackageReference Include="WixInternal.TestSupport" /> 21 <PackageReference Include="WixInternal.TestSupport" />
24 <PackageReference Include="WixToolset.Data" /> 22 <PackageReference Include="WixToolset.Data" />
25 <PackageReference Include="WixToolset.BootstrapperApplicationApi" /> 23 <PackageReference Include="WixToolset.BootstrapperApplicationApi" />
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 @@
28 </ItemGroup> 28 </ItemGroup>
29 29
30 <ItemGroup> 30 <ItemGroup>
31 <PackageReference Include="Microsoft.Win32.Registry" />
32 <PackageReference Include="System.Net.NetworkInformation" />
33 <PackageReference Include="System.Security.Principal.Windows" />
34 <PackageReference Include="WixInternal.TestSupport" /> 31 <PackageReference Include="WixInternal.TestSupport" />
35 <PackageReference Include="WixToolset.Data" /> 32 <PackageReference Include="WixToolset.Data" />
36 </ItemGroup> 33 </ItemGroup>