From 90157a3799acc06ba094b9c445e50f459f3fd194 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 15 Oct 2025 23:06:59 -0700 Subject: Update to .NET 8 to fix build .NET 6 was deprecated so move to .NET 8 and possibly .NET 10 after it releases. --- src/Directory.csproj.targets | 1 - src/api/api.cmd | 4 +- ...ixToolsetTest.BootstrapperApplicationApi.csproj | 2 +- .../WixToolsetTest.Data/WixToolsetTest.Data.csproj | 2 +- .../WixToolsetTest.BootstrapperApplications.csproj | 2 +- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- .../WixToolset.Bal.wixext.csproj | 2 +- .../ComPlusExtensionFixture.cs | 5 +- .../WixToolsetTest.ComPlus.csproj | 2 +- .../DependencyExtensionFixture.cs | 5 +- .../WixToolsetTest.Dependency.csproj | 2 +- .../DirectXExtensionFixture.cs | 5 +- .../WixToolsetTest.DirectX.csproj | 2 +- .../WixToolsetTest.Firewall.csproj | 2 +- .../WixToolsetTest.Http/WixToolsetTest.Http.csproj | 2 +- .../test/WixToolsetTest.Iis/IisExtensionFixture.cs | 4 ++ .../WixToolsetTest.Iis/WixToolsetTest.Iis.csproj | 2 +- .../WixToolsetTest.Msmq/MsmqExtensionFixture.cs | 5 +- .../WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj | 2 +- src/ext/NetFx/netcoresearch/netcoresearch.vcxproj | 4 +- src/ext/NetFx/netcoresearch/packages.config | 14 +++--- .../WixToolsetTest.Netfx.csproj | 2 +- .../PowerShellExtensionFixture.cs | 5 +- .../WixToolsetTest.Powershell.csproj | 2 +- .../test/WixToolsetTest.Sql/SqlExtensionFixture.cs | 5 +- .../WixToolsetTest.Sql/WixToolsetTest.Sql.csproj | 2 +- .../WixToolsetTest.UI/WixToolsetTest.UI.csproj | 2 +- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- .../WixToolsetTest.Util/WixToolsetTest.Util.csproj | 2 +- .../VisualStudioExtensionFixture.cs | 5 +- .../WixToolsetTest.VisualStudio.csproj | 2 +- .../SetBuildNumber/Directory.Packages.props.pp | 54 ++++++++++------------ src/internal/SetBuildNumber/global.json.pp | 4 +- .../MsbuildRunnerResult.cs | 2 +- .../WixInternal.MSTestSupport/WixAssert.cs | 2 +- .../WixInternal.MSTestSupport.csproj | 2 +- .../build/WixInternal.TestSupport.Native.props | 4 +- .../build/WixInternal.TestSupport.Native.targets | 18 ++++---- .../WixInternal.TestSupport.Native/packages.config | 12 ++--- src/libs/libs.cmd | 5 +- .../WixToolsetTest.Versioning.csproj | 2 +- src/test/burn/Directory.wixproj.props | 2 +- src/test/burn/README.md | 10 ++-- src/test/burn/TestBA/TestBA.csproj | 2 +- src/test/burn/TestBA/TestBA_x64.csproj | 2 +- .../TestData/CacheTests/BundleC/BundleC.wixproj | 2 +- .../burn/TestData/Manual/BundleB/BundleB.wixproj | 4 +- .../TestData/PrereqBaTests/BundleA/BundleA.wixproj | 2 +- .../TestData/PrereqBaTests/BundleC/BundleC.wixproj | 2 +- .../TestData/PrereqBaTests/BundleE/BundleE.wixproj | 2 +- .../TestBA/TestBAWixlib/testbawixlib.wixproj | 2 +- .../TestBAWixlib_x64/testbawixlib_x64.wixproj | 2 +- src/test/burn/TestExe/TestExe.csproj | 2 +- src/test/burn/WixTestTools/WixTestTools.csproj | 2 +- .../burn/WixToolset.WixBA/WixToolset.WixBA.csproj | 2 +- .../WixToolset.WixBA/WixToolset.WixBA_x64.csproj | 2 +- .../WixToolsetTest.BurnE2E.csproj | 2 +- src/test/burn/test_burn.cmd | 4 +- src/test/msi/Directory.wixproj.props | 2 +- src/test/msi/README.md | 6 +-- .../WixToolsetTest.MsiE2E.csproj | 2 +- .../CsprojClassLibraryMultiFramework.csproj | 2 +- .../CsprojClassLibraryMultiTarget.csproj | 2 +- .../CsprojConsoleMultiFramework.csproj | 2 +- .../CsprojConsoleNetCore.csproj | 2 +- .../CsprojWebApplicationNetCore.csproj | 2 +- .../WixprojLibraryMultiFramework/Library.wxs | 10 ++-- .../WixprojLibraryMultiFramework.wixproj | 4 +- ...xprojPackageCsprojWebApplicationNetCore.wixproj | 4 +- ...xprojPackageCsprojWebApplicationNetCore.wixproj | 4 +- .../WixInternal.Core.MSTestPackage.csproj | 2 +- .../WixRunnerResult.cs | 6 +-- .../WixInternal.Core.TestPackage.csproj | 2 +- .../WixToolset.BuildTasks.csproj | 2 +- src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj | 2 +- src/wix/WixToolset.Sdk/tools/wix.targets | 2 +- src/wix/pack-wix/pack-wix.csproj | 2 +- src/wix/pack-wix/pack-wix.nuspec | 4 +- src/wix/publish_t.proj | 10 ++-- .../CompileCoreTestExtensionWixlib.csproj | 2 +- .../Example.Extension/Example.Extension.csproj | 2 +- .../ConverterIntegrationFixture.cs | 2 +- .../UIExtensionFixture.cs | 2 +- .../WixToolsetTest.Converters.csproj | 2 +- .../WixToolsetTest.Core.Native.csproj | 2 +- .../WixToolsetTest.Core/WixToolsetTest.Core.csproj | 2 +- .../BundleExtractionFixture.cs | 2 +- .../BundleFixture.cs | 2 +- .../WixToolsetTest.CoreIntegration.csproj | 2 +- .../WixlibFixture.cs | 6 +-- src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs | 14 +++--- .../PackageReleaseAndDebug/Package.wxs | 16 +++---- .../PackageReleaseAndDebug.wixproj | 2 +- .../PackageUsingExplicitTfmAndRids/Package.wxs | 8 ++-- .../PackageUsingExplicitTfmAndRids.wixproj | 2 +- .../PackageUsingRids/Package.wxs | 8 ++-- .../PackageUsingRids/PackageUsingRids.wixproj | 2 +- .../MultiTargetingWixlib/TestExe/TestExe.csproj | 2 +- .../WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj | 4 +- src/wix/wix.cmd | 8 ++-- src/wix/wix/wix.csproj | 4 +- 103 files changed, 222 insertions(+), 203 deletions(-) (limited to 'src') diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets index d5bfb960..dbf9d604 100644 --- a/src/Directory.csproj.targets +++ b/src/Directory.csproj.targets @@ -26,7 +26,6 @@ - diff --git a/src/api/api.cmd b/src/api/api.cmd index cae0cf5a..42ca8567 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 1a8014a4..4b2d273b 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 ea26bea8..688e23f5 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/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/WixToolsetTest.BootstrapperApplications.csproj index 6a9b5856..b2672472 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 93ceb7d4..73428ece 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 96587d26..a6302ad5 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 37639021..d5a721ec 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 91253621..4585efbf 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/ComPlusExtensionFixture.cs b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs index 7b38ef54..ef3c8b00 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs @@ -1,9 +1,12 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] + namespace WixToolsetTest.ComPlus { using System.Linq; - using Microsoft.VisualStudio.TestTools.UnitTesting; using WixInternal.MSTestSupport; using WixInternal.Core.MSTestPackage; using WixToolset.ComPlus; diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj index d0a7081b..2bd2e48f 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/DependencyExtensionFixture.cs b/src/ext/Dependency/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs index ade2a12e..4104395f 100644 --- a/src/ext/Dependency/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs +++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs @@ -1,10 +1,13 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] + namespace WixToolsetTest.Dependency { using System.Linq; using System.Text.RegularExpressions; - using Microsoft.VisualStudio.TestTools.UnitTesting; using WixInternal.MSTestSupport; using WixInternal.Core.MSTestPackage; using WixToolset.Dependency; diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj index 1fd46c63..7f531a22 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/DirectXExtensionFixture.cs b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs index dceaaec5..d4c3d9a5 100644 --- a/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs @@ -1,9 +1,12 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] + namespace WixToolsetTest.DirectX { using System.Linq; - using Microsoft.VisualStudio.TestTools.UnitTesting; using WixInternal.MSTestSupport; using WixInternal.Core.MSTestPackage; using WixToolset.DirectX; diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj index c13f3300..abbe7541 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 5de88c8b..be2ddd36 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 d5e6c929..759787bf 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/IisExtensionFixture.cs b/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs index 01a89dc0..7e4912e2 100644 --- a/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs +++ b/src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs @@ -1,5 +1,9 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] + namespace WixToolsetTest.Iis { using System.Linq; diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj index a0a6e043..7b9afedf 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/MsmqExtensionFixture.cs b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs index 60335b8a..95ec7874 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs @@ -1,12 +1,15 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] + namespace WixToolsetTest.Msmq { using System.Data; using System.IO; using System.Linq; using System.Xml.Linq; - using Microsoft.VisualStudio.TestTools.UnitTesting; using WixInternal.MSTestSupport; using WixInternal.Core.MSTestPackage; using WixToolset.Msmq; diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj index a8991c2e..f41cc2e9 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 a73192d0..b6e193dc 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.21\runtimes\win-$(NetHostPlatform)\native\ + ..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.8.0.21\runtimes\win-$(NetHostPlatform)\native\ $(NetHostPath) diff --git a/src/ext/NetFx/netcoresearch/packages.config b/src/ext/NetFx/netcoresearch/packages.config index ad26db1c..235e6e08 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/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index bdca49e6..c7f01717 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/PowerShellExtensionFixture.cs b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs index a1dc3282..31090bf6 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs @@ -1,8 +1,11 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] + namespace WixToolsetTest.PowerShell { - using Microsoft.VisualStudio.TestTools.UnitTesting; using WixInternal.MSTestSupport; using WixInternal.Core.MSTestPackage; using WixToolset.PowerShell; diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj index cff13cb7..9f46f94e 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/SqlExtensionFixture.cs b/src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs index 14ca14c3..0133d082 100644 --- a/src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs +++ b/src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs @@ -1,9 +1,12 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] + namespace WixToolsetTest.Sql { using System.Linq; - using Microsoft.VisualStudio.TestTools.UnitTesting; using WixInternal.MSTestSupport; using WixInternal.Core.MSTestPackage; using WixToolset.Sql; diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj index 62345258..f417f489 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/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj index 132920c5..fd2a4e69 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/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs index bb00717f..b29607c7 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -377,7 +377,7 @@ namespace WixToolsetTest.Util extractResult.AssertSuccess(); var bootstrapperExtensionDatas = extractResult.SelectBootstrapperExtensionDataNodes("/be:BootstrapperExtensionData/be:BootstrapperExtension[@Id='Wix4UtilBootstrapperExtension_X86']"); - Assert.AreEqual(1, bootstrapperExtensionDatas.Count); + Assert.HasCount(1, bootstrapperExtensionDatas); Assert.AreEqual("" + "" + "", bootstrapperExtensionDatas[0].GetTestXml()); diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 4036c3ab..b5ea9d2e 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/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs index 992ac953..361f5274 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs @@ -1,8 +1,11 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. +using Microsoft.VisualStudio.TestTools.UnitTesting; + +[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] + namespace WixToolsetTest.VisualStudio { - using Microsoft.VisualStudio.TestTools.UnitTesting; using WixInternal.MSTestSupport; using WixInternal.Core.MSTestPackage; using WixToolset.VisualStudio; diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj index 9cfb6867..8b8f6ad9 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 4632272f..6c01a4da 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -52,58 +52,52 @@ - - - - - + + + + + - + - - - + + + - - + + - - - + + + - - - - - - + + - - - - + + + + - + - - - + + + diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp index 48f4ecb3..97f7e471 100644 --- a/src/internal/SetBuildNumber/global.json.pp +++ b/src/internal/SetBuildNumber/global.json.pp @@ -1,8 +1,8 @@ { "msbuild-sdks": { - "MSTest.Sdk": "3.8.3", + "MSTest.Sdk": "4.0.1", "Microsoft.Build.Traversal": "4.1.82", - "Microsoft.Build.NoTargets": "3.5.6", + "Microsoft.Build.NoTargets": "3.7.134", "WixToolset.Sdk": "{packageversion}" }, "sdk": { diff --git a/src/internal/WixInternal.MSTestSupport/MsbuildRunnerResult.cs b/src/internal/WixInternal.MSTestSupport/MsbuildRunnerResult.cs index 02e25ebb..4dda6b23 100644 --- a/src/internal/WixInternal.MSTestSupport/MsbuildRunnerResult.cs +++ b/src/internal/WixInternal.MSTestSupport/MsbuildRunnerResult.cs @@ -13,7 +13,7 @@ namespace WixInternal.MSTestSupport public void AssertSuccess() { - Assert.IsTrue(0 == this.ExitCode, $"MSBuild failed unexpectedly. Output:{Environment.NewLine}{String.Join(Environment.NewLine, this.Output)}"); + Assert.AreEqual(0, this.ExitCode, $"MSBuild failed unexpectedly. Output:{Environment.NewLine}{String.Join(Environment.NewLine, this.Output)}"); } } } diff --git a/src/internal/WixInternal.MSTestSupport/WixAssert.cs b/src/internal/WixInternal.MSTestSupport/WixAssert.cs index 9110309d..3da4f9e6 100644 --- a/src/internal/WixInternal.MSTestSupport/WixAssert.cs +++ b/src/internal/WixInternal.MSTestSupport/WixAssert.cs @@ -99,7 +99,7 @@ namespace WixInternal.MSTestSupport public static void NotEmpty(IEnumerable collection) { - Assert.IsTrue(collection.Count() > 0); + Assert.IsGreaterThan(0, collection.Count()); } public static void Empty(IEnumerable collection) diff --git a/src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj b/src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj index b48aacd4..6edc92c3 100644 --- a/src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj +++ b/src/internal/WixInternal.MSTestSupport/WixInternal.MSTestSupport.csproj @@ -4,7 +4,7 @@ - net6.0;net472 + net8.0 true embedded true 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 2362a8de..f0d37a71 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 a882ad8d..36875a6e 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.3\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.3\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.3\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 21567bf3..ea16d09d 100644 --- a/src/internal/WixInternal.TestSupport.Native/packages.config +++ b/src/internal/WixInternal.TestSupport.Native/packages.config @@ -7,10 +7,10 @@ when any of these versions are updated. --> - - - - - - + + + + + + diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd index acf5ff55..97d2490b 100644 --- a/src/libs/libs.cmd +++ b/src/libs/libs.cmd @@ -21,9 +21,10 @@ msbuild -Restore libs_t.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\libs_build.binlog || exit /b +@rem Optional blame switches for tracking down hangs: --blame-hang-timeout 1min --blame-hang-dump-type mini dotnet test ^ - --results-directory %_L%\TestResults --blame-hang-timeout 1min --blame-hang-dump-type mini -l:"console;verbosity=detailed" ^ - %_B%\net6.0\WixToolsetTest.Versioning.dll ^ + --results-directory %_L%\TestResults -l:"console;verbosity=detailed" ^ + %_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 79d4ef35..52fbf0de 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 49a6ba62..9bda487e 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 30623b7e..28284737 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 ec60adc8..e926833b 100644 --- a/src/test/burn/TestBA/TestBA.csproj +++ b/src/test/burn/TestBA/TestBA.csproj @@ -3,7 +3,7 @@ - net6.0-windows;net462 + net8.0-windows;net462 WinExe TestBA WixToolset.Test.BA diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj index 1e2ed69d..d552f09e 100644 --- a/src/test/burn/TestBA/TestBA_x64.csproj +++ b/src/test/burn/TestBA/TestBA_x64.csproj @@ -3,7 +3,7 @@ - net6.0-windows;net462 + net8.0-windows;net462 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 a5a8c6e3..2c414118 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 d0b05bc1..5060077d 100644 --- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj @@ -17,8 +17,8 @@ - - + + diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj index 06916058..ce39322b 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 27b9c196..118d8378 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 6e3bbfa5..ac1559ba 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 f80dc6cc..5dae879d 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 86edc0e1..68141044 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 9a80aa92..9b88e195 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.csproj @@ -3,7 +3,7 @@ - net6.0;net462 + net8.0;net462 TestExe TestExe Exe diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj index 7a702949..587ff9ea 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 4371d0d6..b821e32e 100644 --- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj +++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj @@ -3,7 +3,7 @@ - net6.0-windows;net472 + net8.0-windows;net472 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 597e108d..44d030a5 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 @@ - net6.0-windows;net472 + net8.0-windows;net472 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 751b7748..23a65cdc 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 178ac7e2..a956c838 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 de825e30..9325dcb6 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 f4c42029..bb7d9ee4 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. @@ -26,4 +26,4 @@ The VM must have: 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/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj index 7d4695d3..21b00b7d 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 bc30bf4b..3fc6a7c8 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 9e55d157..aa5782dd 100644 --- a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj +++ b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj @@ -1,7 +1,7 @@ - net6.0;net472 + net8.0;net472 diff --git a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj index bb8a8b3e..095a48bd 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 b58706ec..8dd47979 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 2cd83a64..cae0d3a6 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 cf3d2d35..93049fd3 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 66812ea2..ec224510 100644 --- a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj +++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj @@ -1,5 +1,5 @@ - + Library true @@ -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 048f81ec..bbe0f49b 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 2dfa1073..686092b6 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/wix/WixInternal.Core.MSTestPackage/WixInternal.Core.MSTestPackage.csproj b/src/wix/WixInternal.Core.MSTestPackage/WixInternal.Core.MSTestPackage.csproj index 6b4bbefe..943e2c6d 100644 --- a/src/wix/WixInternal.Core.MSTestPackage/WixInternal.Core.MSTestPackage.csproj +++ b/src/wix/WixInternal.Core.MSTestPackage/WixInternal.Core.MSTestPackage.csproj @@ -3,7 +3,7 @@ - net6.0;net472 + net8.0 Internal WiX Toolset MSTest Package embedded true diff --git a/src/wix/WixInternal.Core.MSTestPackage/WixRunnerResult.cs b/src/wix/WixInternal.Core.MSTestPackage/WixRunnerResult.cs index 4a8c784d..61271dfd 100644 --- a/src/wix/WixInternal.Core.MSTestPackage/WixRunnerResult.cs +++ b/src/wix/WixInternal.Core.MSTestPackage/WixRunnerResult.cs @@ -23,7 +23,7 @@ namespace WixInternal.Core.MSTestPackage public Message[] Messages { get; set; } /// - /// + /// /// /// public WixRunnerResult AssertSuccess() @@ -33,13 +33,13 @@ namespace WixInternal.Core.MSTestPackage } /// - /// + /// /// /// /// public static void AssertSuccess(int exitCode, IEnumerable messages) { - Assert.IsTrue(0 == exitCode, $"\r\n\r\nWixRunner failed with exit code: {exitCode}\r\n Output: {String.Join("\r\n ", FormatMessages(messages))}\r\n"); + Assert.AreEqual(0, exitCode, $"\r\n\r\nWixRunner failed with exit code: {exitCode}\r\n Output: {String.Join("\r\n ", FormatMessages(messages))}\r\n"); } private static IEnumerable FormatMessages(IEnumerable messages) diff --git a/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj b/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj index 99ffe620..d0cbff99 100644 --- a/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj +++ b/src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj @@ -3,7 +3,7 @@ - net6.0;net472 + net8.0 Internal WiX Toolset Test Package embedded true diff --git a/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/wix/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index 2938abe2..20d248c0 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 a45d660e..bbb63646 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 f2cdd703..59b7d85f 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 0a8dc89c..608b35b4 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 e7b79466..5d0c6193 100644 --- a/src/wix/pack-wix/pack-wix.nuspec +++ b/src/wix/pack-wix/pack-wix.nuspec @@ -23,7 +23,7 @@ - - + + diff --git a/src/wix/publish_t.proj b/src/wix/publish_t.proj index 2ba70656..a507ba31 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 2938be48..ae413796 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 353bbefd..932ab816 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/ConverterIntegrationFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs index be2bd41c..2682d926 100644 --- a/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs @@ -162,7 +162,7 @@ namespace WixToolsetTest.Converters var result = RunConversion(targetFile); Assert.Equal(13, result.ExitCode); - Assert.Single(result.Messages.Where(message => message.ToString().EndsWith("(QtExecCmdTimeoutAmbiguous)"))); + Assert.Single(result.Messages, message => message.ToString().EndsWith("(QtExecCmdTimeoutAmbiguous)")); var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n"); var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n"); diff --git a/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs b/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs index a562fb59..bc53d960 100644 --- a/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs @@ -126,7 +126,7 @@ namespace WixToolsetTest.Converters var actual = UnformattedDocumentLines(document); WixAssert.CompareLineByLine(expected, actual); - Assert.Single(messaging.Messages.Where(m => m.Id == 65)); + Assert.Single(messaging.Messages, m => m.Id == 65); Assert.Equal(2, errors); } } diff --git a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj index 27bc24b6..09f311fb 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 a1cead3b..acf62788 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 3907aae0..3329238f 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 4f44ca16..063f00c6 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs @@ -38,7 +38,7 @@ namespace WixToolsetTest.CoreIntegration }); 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 9ff5e26c..174df55f 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -100,7 +100,7 @@ namespace WixToolsetTest.CoreIntegration }); 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 e0b5afd4..3b7ff268 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.CoreIntegration/WixlibFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index 0cd8a542..50f8111d 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs @@ -125,9 +125,9 @@ namespace WixToolsetTest.CoreIntegration var wixlib = Intermediate.Load(wixlibPath); var binarySymbols = wixlib.Sections.SelectMany(s => s.Symbols).OfType().ToList(); Assert.Equal(3, binarySymbols.Count); - Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll")); - Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-1")); - Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-2")); + Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll"); + Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll-1"); + Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll-2"); } } diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs index e1e2c1d7..25fd61d9 100644 --- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs @@ -16,7 +16,7 @@ namespace WixToolsetTest.Sdk [TestClass] public class MsbuildFixture { - public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).LocalPath), "..", "..", "..", "publish", "WixToolset.Sdk"); + public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(typeof(MsbuildFixture).Assembly.Location), "..", "..", "..", "publish", "WixToolset.Sdk"); public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "Sdk", "Sdk.props"); [TestMethod] @@ -707,8 +707,8 @@ namespace WixToolsetTest.Sdk { @"net472_x64\e_sqlite3.dll - 1601536", @"net472_x86\e_sqlite3.dll - 1207296", - @"net6_x64\e_sqlite3.dll - 1601536", - @"net6_x86\e_sqlite3.dll - 1207296", + @"net8_x64\e_sqlite3.dll - 1601536", + @"net8_x86\e_sqlite3.dll - 1207296", }, releaseFileSizes); } } @@ -745,12 +745,12 @@ namespace WixToolsetTest.Sdk { @"debug_net472_x64\e_sqlite3.dll - 1601536", @"debug_net472_x86\e_sqlite3.dll - 1207296", - @"debug_net6_x64\e_sqlite3.dll - 1601536", - @"debug_net6_x86\e_sqlite3.dll - 1207296", + @"debug_net8_x64\e_sqlite3.dll - 1601536", + @"debug_net8_x86\e_sqlite3.dll - 1207296", @"release_net472_x64\e_sqlite3.dll - 1601536", @"release_net472_x86\e_sqlite3.dll - 1207296", - @"release_net6_x64\e_sqlite3.dll - 1601536", - @"release_net6_x86\e_sqlite3.dll - 1207296", + @"release_net8_x64\e_sqlite3.dll - 1601536", + @"release_net8_x86\e_sqlite3.dll - 1207296", }, releaseFileSizes); } } 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 b6da91ba..c3a5bb65 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageReleaseAndDebug/Package.wxs @@ -13,11 +13,11 @@ - - + + - - + + @@ -25,11 +25,11 @@ - - + + - - + + 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 17e17d98..cb02dd92 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 838461da..d7d32268 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingExplicitTfmAndRids/Package.wxs @@ -10,11 +10,11 @@ - - + + - - + + 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 42002428..e9ad8445 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 2fe7a289..f36b754e 100644 --- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/Package.wxs +++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiTargetingWixlib/PackageUsingRids/Package.wxs @@ -13,11 +13,11 @@ - - + + - - + + 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 e7d834d6..243b1914 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 a7fe2eef..82dcd9dd 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/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj index 5a617fb1..2ffebcb7 100644 --- a/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj +++ b/src/wix/test/WixToolsetTest.Sdk/WixToolsetTest.Sdk.csproj @@ -3,7 +3,7 @@ - net472 + net8.0 TestData\**;$(DefaultItemExcludes) true true @@ -18,6 +18,6 @@ - + diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd index 68e13cd1..73e51c11 100644 --- a/src/wix/wix.cmd +++ b/src/wix/wix.cmd @@ -39,11 +39,11 @@ msbuild -t:Test test\WixToolsetTest.Sdk\WixToolsetTest.Sdk.csproj -p:Configurati :: 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 ^ --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 24131117..11099b1d 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 -- cgit v1.2.3-55-g6feb