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. --- .../WixToolsetTest.BootstrapperApplications.csproj | 2 +- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- .../Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- .../WixToolset.Bal.wixext.csproj | 2 +- .../test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs | 5 ++++- .../WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj | 2 +- .../DependencyExtensionFixture.cs | 5 ++++- .../WixToolsetTest.Dependency.csproj | 2 +- .../test/WixToolsetTest.DirectX/DirectXExtensionFixture.cs | 5 ++++- .../WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj | 2 +- .../WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj | 2 +- .../test/WixToolsetTest.Http/WixToolsetTest.Http.csproj | 2 +- src/ext/Iis/test/WixToolsetTest.Iis/IisExtensionFixture.cs | 4 ++++ .../Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj | 2 +- .../Msmq/test/WixToolsetTest.Msmq/MsmqExtensionFixture.cs | 5 ++++- .../test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj | 2 +- src/ext/NetFx/netcoresearch/netcoresearch.vcxproj | 4 ++-- src/ext/NetFx/netcoresearch/packages.config | 14 +++++++------- .../test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj | 2 +- .../PowerShellExtensionFixture.cs | 5 ++++- .../WixToolsetTest.Powershell.csproj | 2 +- src/ext/Sql/test/WixToolsetTest.Sql/SqlExtensionFixture.cs | 5 ++++- .../Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj | 2 +- src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj | 2 +- .../Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 2 +- .../test/WixToolsetTest.Util/WixToolsetTest.Util.csproj | 2 +- .../VisualStudioExtensionFixture.cs | 5 ++++- .../WixToolsetTest.VisualStudio.csproj | 2 +- 29 files changed, 60 insertions(+), 35 deletions(-) (limited to 'src/ext') 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 -- cgit v1.2.3-55-g6feb