diff --git a/README.md b/README.md index 600d65bd2..da2f3b296 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This repository contains the WiX Toolset codebase. | Individual components | | :-------------------- | -| .NET 6.0 Runtime (Long Term Support) | +| .NET 8.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 | diff --git a/src/api/api.cmd b/src/api/api.cmd index cae0cf5a3..42ca85679 100644 --- a/src/api/api.cmd +++ b/src/api/api.cmd @@ -27,8 +27,8 @@ msbuild api_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\api_b :: Test dotnet test ^ - %_B%\net6.0\WixToolsetTest.Data.dll ^ - %_B%\net6.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^ + %_B%\net8.0\WixToolsetTest.Data.dll ^ + %_B%\net8.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^ %_B%\x86\BalUtilUnitTest.dll ^ %_B%\x86\BextUtilUnitTest.dll ^ --nologo -l "trx;LogFileName=%_L%\TestResults\api.trx" || exit /b diff --git a/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj index a3d9930dc..2bcdbbfa4 100644 --- a/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj +++ b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 win-x86 false true diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj index ea26bea85..688e23f5d 100644 --- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj +++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd index df9ceca44..84d01005f 100644 --- a/src/ext/Bal/bal.cmd +++ b/src/ext/Bal/bal.cmd @@ -31,7 +31,7 @@ msbuild bal_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\bal_b :: Test dotnet test ^ %_B%\x86\WixStdFnUnitTest.dll ^ - %_B%\net6.0\WixToolsetTest.BootstrapperApplications.dll ^ + %_B%\net8.0\WixToolsetTest.BootstrapperApplications.dll ^ --nologo -l "trx;LogFileName=%_L%\TestResults\bal.wixext.trx" || exit /b @goto :end diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj index 64fc297ce..28a6cb05e 100644 --- a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj +++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 93ceb7d43..73428ece7 100644 --- a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 win-x86;win-x64 WinExe embedded diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index 96587d26a..a6302ad5c 100644 --- a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 win-x86;win-x64 WinExe embedded diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index 376390219..d5a721ec0 100644 --- a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net8.0-windows win-x86;win-x64 WPF .NET Core MBA true diff --git a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj index 912536212..4585efbf3 100644 --- a/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj +++ b/src/ext/Bal/wixext-backward-compatible/WixToolset.Bal.wixext.csproj @@ -5,7 +5,7 @@ - net6.0 + net8.0 false WiX Toolset BootstrapperApplications extension WiX Toolset BootstrapperApplications extension diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj index a9e9dbef0..1cdf0fc42 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj index 70b56f452..e31685af1 100644 --- a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj +++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj index 31a35320c..3aa6e67f5 100644 --- a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj index e46020a62..fcddbc1f6 100644 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj +++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj index b23ef4819..fd0f47496 100644 --- a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj +++ b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj index a39e5b0b2..407b5e0fa 100644 --- a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj +++ b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj index e7b6f21e0..adadc38cd 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj index a73192d0f..ea4497b02 100644 --- a/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj +++ b/src/ext/NetFx/netcoresearch/netcoresearch.vcxproj @@ -42,8 +42,8 @@ $(Platform) x86 - ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\ - ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.6.0.4\runtimes\win-$(NetHostPlatform)\native\ + ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.8.0.7\runtimes\win-$(NetHostPlatform)\native\ + ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.8.0.7\runtimes\win-$(NetHostPlatform)\native\ $(NetHostPath) diff --git a/src/ext/NetFx/netcoresearch/packages.config b/src/ext/NetFx/netcoresearch/packages.config index ad26db1ce..5306a77d7 100644 --- a/src/ext/NetFx/netcoresearch/packages.config +++ b/src/ext/NetFx/netcoresearch/packages.config @@ -1,9 +1,9 @@ - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd index d81959cc0..01282f344 100644 --- a/src/ext/NetFx/netfx.cmd +++ b/src/ext/NetFx/netfx.cmd @@ -27,7 +27,7 @@ msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_net :: Test dotnet test ^ - %_B%\net6.0\WixToolsetTest.NetFx.dll ^ + %_B%\net8.0\WixToolsetTest.NetFx.dll ^ --nologo -l "trx;LogFileName=%_L%\TestResults\netfx.wixext.trx" || exit /b :: Pack diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index 4e509cce9..bb9485d7b 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj index 347ca1ed0..24212e520 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj index 6c848683a..285a7067d 100644 --- a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj +++ b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs index 45d58e26b..ce613d639 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs +++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs @@ -135,7 +135,7 @@ public void CanBuildUsingWixUIFeatureTree() var results = build.BuildAndQuery(BuildX64, "Binary", "Dialog", "CustomAction", "ControlEvent", "InstallUISequence"); Assert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t")); Assert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t")); - Assert.Empty(results.Where(result => result.StartsWith("Dialog:SetupTypeDlg\t"))); + Assert.DoesNotContain(results, result => result.StartsWith("Dialog:SetupTypeDlg\t")); WixAssert.CompareLineByLine(new[] { "Binary:WixUI_Bmp_Banner\t[Binary data]", @@ -358,7 +358,7 @@ public void CanBuildWithInstallDirAndRemovedDialog() "ControlEvent:InstallDirDlg\tNext\tDoAction\tWixUIValidatePath_X86\tNOT WIXUI_DONTVALIDATEPATH\t2", }, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")).OrderBy(s => s).ToArray()); - Assert.Empty(results.Where(result => result.Contains("LicenseAgreementDlg")).ToArray()); + Assert.DoesNotContain(results, result => result.Contains("LicenseAgreementDlg")); WixAssert.CompareLineByLine(new[] { diff --git a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj index 675f14f81..20f442e03 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj +++ b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 16d0e1384..dfac4692f 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd index 3c66e7d81..1e602d26c 100644 --- a/src/ext/Util/util.cmd +++ b/src/ext/Util/util.cmd @@ -24,7 +24,7 @@ msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_uti :: Test dotnet test ^ - %_B%\net6.0\WixToolsetTest.Util.dll ^ + %_B%\net8.0\WixToolsetTest.Util.dll ^ --nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b :: Pack diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj index 2b0a7c1c6..761379e6c 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index 721771d0c..64f7c303a 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -42,53 +42,47 @@ - - - - - + + + + + - + - - - - + + + + - - - + + + - - - + + + - - - - - - + + - - - - + + + + - - - + + + diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props index 2362a8deb..2a522658c 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props @@ -5,8 +5,8 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore)) - - + + v4.7.2 diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets index a882ad8de..cdf010731 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets @@ -22,28 +22,28 @@ $(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll - $(RootPackagesFolder)xunit.assert.2.8.1\lib\netstandard1.1\xunit.assert.dll + $(RootPackagesFolder)xunit.assert.2.9.0\lib\netstandard1.1\xunit.assert.dll - $(RootPackagesFolder)xunit.extensibility.core.2.8.1\lib\netstandard1.1\xunit.core.dll + $(RootPackagesFolder)xunit.extensibility.core.2.9.0\lib\netstandard1.1\xunit.core.dll - $(RootPackagesFolder)xunit.extensibility.execution.2.8.1\lib\net452\xunit.execution.desktop.dll + $(RootPackagesFolder)xunit.extensibility.execution.2.9.0\lib\net452\xunit.execution.desktop.dll - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + - - + + diff --git a/src/internal/WixInternal.TestSupport.Native/packages.config b/src/internal/WixInternal.TestSupport.Native/packages.config index 21567bf36..cccc7eb48 100644 --- a/src/internal/WixInternal.TestSupport.Native/packages.config +++ b/src/internal/WixInternal.TestSupport.Native/packages.config @@ -1,4 +1,4 @@ - + @@ -7,10 +7,10 @@ when any of these versions are updated. --> - - - - - - + + + + + + diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd index d8b81f546..d549808b7 100644 --- a/src/libs/libs.cmd +++ b/src/libs/libs.cmd @@ -22,7 +22,7 @@ msbuild -Restore libs_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b dotnet test ^ - %_B%\net6.0\WixToolsetTest.Versioning.dll ^ + %_B%\net8.0\WixToolsetTest.Versioning.dll ^ %_B%\x86\DUtilUnitTest.dll ^ %_B%\x64\DUtilUnitTest.dll ^ --nologo -l "trx;LogFileName=%_L%\TestResults\libs.trx" || exit /b diff --git a/src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj b/src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj index 79d4ef35e..52fbf0de9 100644 --- a/src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj +++ b/src/libs/test/WixToolsetTest.Versioning/WixToolsetTest.Versioning.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/test/burn/Directory.wixproj.props b/src/test/burn/Directory.wixproj.props index 49a6ba621..9bda487e0 100644 --- a/src/test/burn/Directory.wixproj.props +++ b/src/test/burn/Directory.wixproj.props @@ -3,7 +3,7 @@ $([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))))) $(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\ - $(OutputPath)net6.0-windows\TestData\$(TestGroupName)\ + $(OutputPath)net8.0-windows\TestData\$(TestGroupName)\ None -wx 1154;$(SuppressSpecificWarnings) diff --git a/src/test/burn/README.md b/src/test/burn/README.md index 30623b7ed..282847374 100644 --- a/src/test/burn/README.md +++ b/src/test/burn/README.md @@ -10,8 +10,8 @@ They modify machine state so it's strongly recommended *not* to run these tests They should be run on a VM instead, where you can easily roll back. 1. Run build.cmd to build everything (the tests will not automatically run). -1. Copy the build\IntegrationBurn\Debug\net6.0-windows folder to your VM. -1. Open an elevated command prompt and navigate to the net6.0-windows folder. +1. Copy the build\IntegrationBurn\Debug\net8.0-windows folder to your VM. +1. Open an elevated command prompt and navigate to the net8.0-windows folder. 1. Run the runtests.cmd file to run the tests. You can modify the runtests.cmd to run specific tests. @@ -20,12 +20,12 @@ For example, the following line runs only the specified test: > dotnet test --filter WixToolsetTest.BurnE2E.BasicFunctionalityTests.CanInstallAndUninstallSimpleBundle_x86_wixstdba WixToolsetTest.BurnE2E.dll The VM must have: -1. x64 .NET Core SDK of 6.0 or later (for the test runner and .NET Core TestBA) +1. x64 .NET Core SDK of 8.0 or later (for the test runner and .NET Core TestBA) 1. Any version of .NET Framework (for the .NET Framework TestBA) -1. x86 .NET Core Desktop Runtime of 6.0 or later (for the .NET Core TestBA) +1. x86 .NET Core Desktop Runtime of 8.0 or later (for the .NET Core TestBA) ## Building with local changes The current build process will poison your NuGet package cache, so you may have to run the following command to clear it: -> nuget locals all -clear \ No newline at end of file +> nuget locals all -clear diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj index 6db83b205..06fb305d5 100644 --- a/src/test/burn/TestBA/TestBA.csproj +++ b/src/test/burn/TestBA/TestBA.csproj @@ -3,7 +3,7 @@ - net462;net6.0-windows + net462;net8.0-windows WinExe TestBA WixToolset.Test.BA diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj index 9d8dc3301..08bfc8297 100644 --- a/src/test/burn/TestBA/TestBA_x64.csproj +++ b/src/test/burn/TestBA/TestBA_x64.csproj @@ -3,7 +3,7 @@ - net462;net6.0-windows + net462;net8.0-windows WinExe TestBA WixToolset.Test.BA diff --git a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj index a5a8c6e3f..2c4141188 100644 --- a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj @@ -17,7 +17,7 @@ - + diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj index b37138e01..ee23ece95 100644 --- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj @@ -31,8 +31,8 @@ - - + + diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj index 06916058d..ce39322b4 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj @@ -9,7 +9,7 @@ - + diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj index 7ed34aa54..b32f8ba47 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj @@ -9,7 +9,7 @@ - + diff --git a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj index 6e3bbfa51..ac1559ba7 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj @@ -9,7 +9,7 @@ - + diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index f80dc6ccb..5dae879d7 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj @@ -8,7 +8,7 @@ - + diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj index 86edc0e10..681410447 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj @@ -9,7 +9,7 @@ - + diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj index 9209dfd75..c72681c8a 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.csproj @@ -3,7 +3,7 @@ - net462;net6.0 + net462;net8.0 TestExe TestExe Exe diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj index 7a7029490..587ff9eaa 100644 --- a/src/test/burn/WixTestTools/WixTestTools.csproj +++ b/src/test/burn/WixTestTools/WixTestTools.csproj @@ -3,7 +3,7 @@ - net6.0-windows + net8.0-windows x64 true diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj index e87501e98..39dc9f1ed 100644 --- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj +++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj @@ -3,7 +3,7 @@ - net472;net6.0-windows + net472;net8.0-windows WinExe WixToolset.WixBA WixToolset.WixBA diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj index 3437119c2..874bd1d0a 100644 --- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj +++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj @@ -3,7 +3,7 @@ - net472;net6.0-windows + net472;net8.0-windows WinExe WixToolset.WixBA WixToolset.WixBA diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj index 751b77483..23a65cdc1 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj +++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj @@ -3,7 +3,7 @@ - net6.0-windows + net8.0-windows x64 true diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd index 178ac7e25..a956c8384 100644 --- a/src/test/burn/test_burn.cmd +++ b/src/test/burn/test_burn.cmd @@ -16,8 +16,8 @@ msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_data_build.binlog || exit /b -"%_B%\net462\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe" -mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe" +"%_B%\net462\win-x86\testexe.exe" /dm "%_B%\net8.0-windows\testhost.exe" +mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net8.0-windows\testhost.exe" @if not "%RuntimeTestsEnabled%"=="true" goto :LExit diff --git a/src/test/msi/Directory.wixproj.props b/src/test/msi/Directory.wixproj.props index de825e302..9325dcb67 100644 --- a/src/test/msi/Directory.wixproj.props +++ b/src/test/msi/Directory.wixproj.props @@ -3,7 +3,7 @@ $([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))))) $(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\ - $(OutputPath)net6.0-windows\TestData\$(TestGroupName)\ + $(OutputPath)net8.0-windows\TestData\$(TestGroupName)\ None -wx true diff --git a/src/test/msi/README.md b/src/test/msi/README.md index f4c42029e..79a8a28b2 100644 --- a/src/test/msi/README.md +++ b/src/test/msi/README.md @@ -10,8 +10,8 @@ They modify machine state so it's strongly recommended *not* to run these tests They should be run on a VM instead, where you can easily roll back. 1. Run build.cmd to build everything (the tests will not automatically run). -1. Copy the build\IntegrationMsi\Debug\net6.0-windows folder to your VM. -1. Open an elevated command prompt and navigate to the net6.0-windows folder. +1. Copy the build\IntegrationMsi\Debug\net8.0-windows folder to your VM. +1. Open an elevated command prompt and navigate to the net8.0-windows folder. 1. Run the runtests.cmd file to run the tests. You can modify the runtests.cmd to run specific tests. diff --git a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj index 7d4695d33..21b00b7d7 100644 --- a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj +++ b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj @@ -3,7 +3,7 @@ - net6.0-windows + net8.0-windows x64 true diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj index bc30bf4bf..3fc6a7c8d 100644 --- a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj @@ -1,7 +1,7 @@ - net6.0;net472 + net8.0;net472 embedded diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj index e2fa94f5d..e75669141 100644 --- a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj @@ -1,7 +1,7 @@ - net472;net6.0 + net472;net8.0 diff --git a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj index bb8a8b3ea..095a48bdd 100644 --- a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj +++ b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net472 + net8.0;net472 win-x86 diff --git a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj index b58706ec7..8dd479790 100644 --- a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj +++ b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 win-x86 diff --git a/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj b/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj index 2cd83a64e..cae0d3a6d 100644 --- a/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj +++ b/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs index cf3d2d358..d8c68c943 100644 --- a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs +++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs @@ -1,13 +1,13 @@ - + - - - + + + - + diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj index 66812ea22..35e72b2ab 100644 --- a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj +++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj @@ -7,6 +7,6 @@ + TargetFrameworks="net472;net8.0" Publish="true" /> diff --git a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj index 048f81ecb..bbe0f49b7 100644 --- a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj +++ b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj @@ -1,7 +1,7 @@ - + @@ -13,5 +13,5 @@ - + diff --git a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj index 2dfa10733..686092b6f 100644 --- a/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj +++ b/src/test/wix/TestData/WixprojPackageCsprojWpfNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj @@ -1,7 +1,7 @@ - + @@ -13,5 +13,5 @@ - + diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.csproj b/src/tools/WixToolset.Heat/WixToolset.Heat.csproj index 2166028a7..bb77a19f5 100644 --- a/src/tools/WixToolset.Heat/WixToolset.Heat.csproj +++ b/src/tools/WixToolset.Heat/WixToolset.Heat.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 WiX Toolset Heat MSBuild integration $(PublishRoot)WixToolset.Heat\ $(MSBuildThisFileName).nuspec diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.targets b/src/tools/WixToolset.Heat/WixToolset.Heat.targets index c20bd1940..db5eff1ee 100644 --- a/src/tools/WixToolset.Heat/WixToolset.Heat.targets +++ b/src/tools/WixToolset.Heat/WixToolset.Heat.targets @@ -5,7 +5,7 @@ - $(MSBuildThisFileDirectory)..\tools\net6.0\ + $(MSBuildThisFileDirectory)..\tools\net8.0\ $(MSBuildThisFileDirectory)..\tools\net472\ $(WixHeatBinDir)WixToolset.HeatTasks.dll diff --git a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj index 214608106..769c466b9 100644 --- a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj +++ b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj @@ -3,7 +3,7 @@ - net6.0;net472 + net8.0;net472 WiX Toolset Heat MSBuild Tasks embedded true diff --git a/src/tools/heat/app.config b/src/tools/heat/app.config index 65d3d6c39..062249c26 100644 --- a/src/tools/heat/app.config +++ b/src/tools/heat/app.config @@ -6,5 +6,11 @@ + + + + + + diff --git a/src/tools/heat/heat.csproj b/src/tools/heat/heat.csproj index dfcc91269..e4068f78c 100644 --- a/src/tools/heat/heat.csproj +++ b/src/tools/heat/heat.csproj @@ -3,13 +3,13 @@ - net6.0-windows;net472 + net8.0-windows;net472 Exe Harvester WiX Toolset Harvester embedded true - win-x86;win-x64 + win-x86;win-x64 app.config heat.exe.manifest LatestMajor diff --git a/src/tools/publish_t.proj b/src/tools/publish_t.proj index cbe67768b..c939165fb 100644 --- a/src/tools/publish_t.proj +++ b/src/tools/publish_t.proj @@ -2,23 +2,23 @@ $(BaseIntermediateOutputPath)$(Configuration)\net472\x86\ $(BaseIntermediateOutputPath)$(Configuration)\net472\x64\ - $(BaseIntermediateOutputPath)$(Configuration)\net6.0\ + $(BaseIntermediateOutputPath)$(Configuration)\net8.0\ $(PublishRoot)WixToolset.Heat\build\ $(PublishRoot)WixToolset.Heat\tools\net472\ $(PublishRoot)WixToolset.Heat\tools\net472\x86\ $(PublishRoot)WixToolset.Heat\tools\net472\x64\ - $(PublishRoot)WixToolset.Heat\tools\net6.0\ + $(PublishRoot)WixToolset.Heat\tools\net8.0\ - + - + diff --git a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index 2938abe2e..20d248c0d 100644 --- a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj @@ -3,7 +3,7 @@ - net6.0;net472 + net8.0;net472 WiX Toolset MSBuild Tasks embedded diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj index a45d660eb..bbb636461 100644 --- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj +++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 WiX Toolset MSBuild integration README.md $(PublishRoot)WixToolset.Sdk\ diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets index 1ba6746b4..e49f08c34 100644 --- a/src/wix/WixToolset.Sdk/tools/wix.targets +++ b/src/wix/WixToolset.Sdk/tools/wix.targets @@ -26,7 +26,7 @@ - $(MSBuildThisFileDirectory)net6.0\ + $(MSBuildThisFileDirectory)net8.0\ $(MSBuildThisFileDirectory)net472\ $(WixBinDir)WixToolset.BuildTasks.dll diff --git a/src/wix/pack-wix/pack-wix.csproj b/src/wix/pack-wix/pack-wix.csproj index 0a8dc89ca..608b35b44 100644 --- a/src/wix/pack-wix/pack-wix.csproj +++ b/src/wix/pack-wix/pack-wix.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 false The WiX Toolset command-line interface. The WiX Toolset lets developers create installers for Windows. This package contains the WiX Toolset command-line interface. diff --git a/src/wix/pack-wix/pack-wix.nuspec b/src/wix/pack-wix/pack-wix.nuspec index 8ecca0f20..43c169cfd 100644 --- a/src/wix/pack-wix/pack-wix.nuspec +++ b/src/wix/pack-wix/pack-wix.nuspec @@ -18,8 +18,8 @@ - + - + diff --git a/src/wix/publish_t.proj b/src/wix/publish_t.proj index 2ba70656d..a507ba310 100644 --- a/src/wix/publish_t.proj +++ b/src/wix/publish_t.proj @@ -2,27 +2,27 @@ $(BaseIntermediateOutputPath)$(Configuration)\net472\x86\ $(BaseIntermediateOutputPath)$(Configuration)\net472\x64\ - $(BaseIntermediateOutputPath)$(Configuration)\net6.0\ + $(BaseIntermediateOutputPath)$(Configuration)\net8.0\ $(PublishRoot)WixToolset.Sdk\build\ $(PublishRoot)WixToolset.Sdk\tools\net472\ $(PublishRoot)WixToolset.Sdk\tools\net472\x86\ $(PublishRoot)WixToolset.Sdk\tools\net472\x64\ $(PublishRoot)WixToolset.Sdk\tools\net472\arm64\ - $(PublishRoot)WixToolset.Sdk\tools\net6.0\ + $(PublishRoot)WixToolset.Sdk\tools\net8.0\ - + - + - + diff --git a/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj b/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj index 2938be48d..ae4137965 100644 --- a/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj +++ b/src/wix/test/CompileCoreTestExtensionWixlib/CompileCoreTestExtensionWixlib.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 false Exe false diff --git a/src/wix/test/Example.Extension/Example.Extension.csproj b/src/wix/test/Example.Extension/Example.Extension.csproj index 353bbefdd..932ab8167 100644 --- a/src/wix/test/Example.Extension/Example.Extension.csproj +++ b/src/wix/test/Example.Extension/Example.Extension.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 false embedded false diff --git a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj index 27bc24b62..09f311fb7 100644 --- a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj +++ b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj index a1cead3bc..acf627885 100644 --- a/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj +++ b/src/wix/test/WixToolsetTest.Core.Native/WixToolsetTest.Core.Native.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 win-x64 false true diff --git a/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj b/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj index 3907aae07..3329238f6 100644 --- a/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj +++ b/src/wix/test/WixToolsetTest.Core/WixToolsetTest.Core.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs index 4f44ca169..063f00c69 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs @@ -38,7 +38,7 @@ public void CanExtractBundleWithDetachedContainer() }); result.AssertSuccess(); - Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning)); + Assert.DoesNotContain(result.Messages, m => m.Level == MessageLevel.Warning); Assert.True(File.Exists(exePath)); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 3280c608d..0e94535ef 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -100,7 +100,7 @@ public void CanBuildSimpleBundle() }); result.AssertSuccess(); - Assert.Empty(result.Messages.Where(m => m.Level == MessageLevel.Warning)); + Assert.DoesNotContain(result.Messages, m => m.Level == MessageLevel.Warning); Assert.True(File.Exists(exePath)); Assert.True(File.Exists(pdbPath)); diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj index e0b5afd49..3b7ff2684 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true true diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/Package.wxs index b6da91bae..d07148ffa 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/Package.wxs @@ -14,10 +14,10 @@ - + - + @@ -26,10 +26,10 @@ - + - + diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/PackageReleaseAndDebug.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/PackageReleaseAndDebug.wixproj index 17e17d98f..cb02dd923 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/PackageReleaseAndDebug.wixproj +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/PackageReleaseAndDebug.wixproj @@ -3,7 +3,7 @@ - + diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/Package.wxs index 838461da7..81363d54e 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/Package.wxs @@ -11,10 +11,10 @@ - + - + diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/PackageUsingExplicitTfmAndRids.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/PackageUsingExplicitTfmAndRids.wixproj index 420024289..e9ad84453 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/PackageUsingExplicitTfmAndRids.wixproj +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/PackageUsingExplicitTfmAndRids.wixproj @@ -3,7 +3,7 @@ - + diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/Package.wxs b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/Package.wxs index 2fe7a2898..a5ba3d239 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/Package.wxs @@ -14,10 +14,10 @@ - + - + diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/PackageUsingRids.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/PackageUsingRids.wixproj index e7d834d62..243b19147 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/PackageUsingRids.wixproj +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/PackageUsingRids.wixproj @@ -3,7 +3,7 @@ - + diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj index a7fe2eefa..82dcd9dd4 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/TestExe/TestExe.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net472 + net8.0;net472 win-x86;win-x64 false diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd index e49cfd53e..259da741b 100644 --- a/src/wix/wix.cmd +++ b/src/wix/wix.cmd @@ -38,11 +38,11 @@ msbuild -t:Publish -p:Configuration=%_C% -tl -nologo -warnaserror WixToolset.Sdk :: Test dotnet test ^ - %_B%\test\WixToolsetTest.Converters\net6.0\WixToolsetTest.Converters.dll ^ + %_B%\test\WixToolsetTest.Converters\net8.0\WixToolsetTest.Converters.dll ^ %_B%\test\WixToolsetTest.Converters.Symbolizer\net472\WixToolsetTest.Converters.Symbolizer.dll ^ - %_B%\test\WixToolsetTest.Core\net6.0\WixToolsetTest.Core.dll ^ - %_B%\test\WixToolsetTest.Core.Native\net6.0\win-x64\WixToolsetTest.Core.Native.dll ^ - %_B%\test\WixToolsetTest.CoreIntegration\net6.0\WixToolsetTest.CoreIntegration.dll ^ + %_B%\test\WixToolsetTest.Core\net8.0\WixToolsetTest.Core.dll ^ + %_B%\test\WixToolsetTest.Core.Native\net8.0\win-x64\WixToolsetTest.Core.Native.dll ^ + %_B%\test\WixToolsetTest.CoreIntegration\net8.0\WixToolsetTest.CoreIntegration.dll ^ %_B%\test\WixToolsetTest.BuildTasks\net472\WixToolsetTest.BuildTasks.dll ^ %_B%\test\WixToolsetTest.Sdk\net472\WixToolsetTest.Sdk.dll ^ --nologo -l "trx;LogFileName=%_L%\TestResults\wix.trx" || exit /b diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj index 241311171..11099b1d3 100644 --- a/src/wix/wix/wix.csproj +++ b/src/wix/wix/wix.csproj @@ -3,13 +3,13 @@ - net6.0;net472 + net8.0;net472 Exe WiX Toolset creates installation packages. embedded true true - win-x86;win-x64;win-arm64 + win-x86;win-x64;win-arm64 app.config wix.exe.manifest Major