Skip to content
/ wix Public

Commit 677e8a8

Browse files
committed
Update to use .NET 10 SDK for builds
1 parent 2ce9b1c commit 677e8a8

File tree

7 files changed

+4
-14
lines changed

7 files changed

+4
-14
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Before building the WiX Toolset, ensure you have Visual Studio 2022 (17.8.2 or h
3636

3737
| Individual components |
3838
| :-------------------- |
39-
| .NET 8.0 Runtime (Long Term Support) |
39+
| .NET 10.0 Runtime (Long Term Support) |
4040
| .NET Framework 4.7.2 SDK |
4141
| .NET Framework 4.7.2 targeting pack |
4242
| .NET Framework 4.6.2 targeting pack |

src/api/wix/WixToolset.Data/WixToolset.Data.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,4 @@
1818
<ItemGroup>
1919
<None Include="README.md" Pack="true" PackagePath="\" />
2020
</ItemGroup>
21-
22-
<ItemGroup>
23-
<PackageReference Include="System.IO.Compression" />
24-
</ItemGroup>
2521
</Project>

src/build_all.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ if not exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
8484
exit /b 2
8585
)
8686

87-
for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version [17.0^,18.0^) -property installationPath`) do (
87+
for /f "usebackq delims=" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version [18^,19^) -property installationPath`) do (
8888
if exist "%%i\Common7\Tools\vsdevcmd.bat" (
8989
call "%%i\Common7\Tools\vsdevcmd.bat" -no_logo
9090
exit /b

src/internal/SetBuildNumber/global.json.pp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"WixToolset.Sdk": "{packageversion}"
77
},
88
"sdk": {
9-
"allowPrerelease": false
9+
"version": "10.0.100",
10+
"rollForward": "latestFeature"
1011
}
1112
}

src/test/burn/WixTestTools/WixTestTools.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Microsoft.Win32.Registry" />
2423
<PackageReference Include="System.DirectoryServices" />
2524
<PackageReference Include="System.DirectoryServices.AccountManagement" />
2625
<PackageReference Include="System.Management" />
27-
<PackageReference Include="System.Security.Principal.Windows" />
2826
<PackageReference Include="WixInternal.TestSupport" />
2927
<PackageReference Include="WixToolset.Data" />
3028
<PackageReference Include="WixToolset.BootstrapperApplicationApi" />

src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Microsoft.AspNetCore.Owin" />
21-
<PackageReference Include="Microsoft.Win32.Registry" />
22-
<PackageReference Include="System.Security.Principal.Windows" />
2321
<PackageReference Include="WixInternal.TestSupport" />
2422
<PackageReference Include="WixToolset.Data" />
2523
<PackageReference Include="WixToolset.BootstrapperApplicationApi" />

src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Win32.Registry" />
32-
<PackageReference Include="System.Net.NetworkInformation" />
33-
<PackageReference Include="System.Security.Principal.Windows" />
3431
<PackageReference Include="WixInternal.TestSupport" />
3532
<PackageReference Include="WixToolset.Data" />
3633
</ItemGroup>

0 commit comments

Comments
 (0)