diff options
| author | Rob Mensching <rob@firegiant.com> | 2025-10-15 23:06:59 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2025-10-15 23:12:35 -0700 |
| commit | 90157a3799acc06ba094b9c445e50f459f3fd194 (patch) | |
| tree | 6967e73759f32738750bfadc35158187896edbb5 /src/ext | |
| parent | 064d58584d57ed8fa45d8f3f570a253a0490561b (diff) | |
| download | wix-90157a3799acc06ba094b9c445e50f459f3fd194.tar.gz wix-90157a3799acc06ba094b9c445e50f459f3fd194.tar.bz2 wix-90157a3799acc06ba094b9c445e50f459f3fd194.zip | |
Update to .NET 8 to fix build
.NET 6 was deprecated so move to .NET 8 and possibly .NET 10 after it
releases.
Diffstat (limited to 'src/ext')
29 files changed, 60 insertions, 35 deletions
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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
| 2 | 2 | ||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <TargetFramework>net6.0</TargetFramework> | 4 | <TargetFramework>net8.0</TargetFramework> |
| 5 | <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> | 5 | <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> |
| 6 | <OutputType>WinExe</OutputType> | 6 | <OutputType>WinExe</OutputType> |
| 7 | <DebugType>embedded</DebugType> | 7 | <DebugType>embedded</DebugType> |
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 @@ | |||
| 1 | <Project Sdk="Microsoft.NET.Sdk"> | 1 | <Project Sdk="Microsoft.NET.Sdk"> |
| 2 | 2 | ||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <TargetFramework>net6.0</TargetFramework> | 4 | <TargetFramework>net8.0</TargetFramework> |
| 5 | <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> | 5 | <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> |
| 6 | <OutputType>WinExe</OutputType> | 6 | <OutputType>WinExe</OutputType> |
| 7 | <DebugType>embedded</DebugType> | 7 | <DebugType>embedded</DebugType> |
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 @@ | |||
| 2 | 2 | ||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>WinExe</OutputType> | 4 | <OutputType>WinExe</OutputType> |
| 5 | <TargetFramework>net6.0-windows</TargetFramework> | 5 | <TargetFramework>net8.0-windows</TargetFramework> |
| 6 | <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> | 6 | <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers> |
| 7 | <Description>WPF .NET Core MBA</Description> | 7 | <Description>WPF .NET Core MBA</Description> |
| 8 | <UseWPF>true</UseWPF> | 8 | <UseWPF>true</UseWPF> |
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 @@ | |||
| 5 | <Import Project="..\..\WixExt.props" /> | 5 | <Import Project="..\..\WixExt.props" /> |
| 6 | 6 | ||
| 7 | <PropertyGroup> | 7 | <PropertyGroup> |
| 8 | <TargetFramework>net6.0</TargetFramework> | 8 | <TargetFramework>net8.0</TargetFramework> |
| 9 | <IncludeBuildOutput>false</IncludeBuildOutput> | 9 | <IncludeBuildOutput>false</IncludeBuildOutput> |
| 10 | <Title>WiX Toolset BootstrapperApplications extension</Title> | 10 | <Title>WiX Toolset BootstrapperApplications extension</Title> |
| 11 | <Description>WiX Toolset BootstrapperApplications extension</Description> | 11 | <Description>WiX Toolset BootstrapperApplications extension</Description> |
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 @@ | |||
| 1 | // 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. | 1 | // 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. |
| 2 | 2 | ||
| 3 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 4 | |||
| 5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
| 6 | |||
| 3 | namespace WixToolsetTest.ComPlus | 7 | namespace WixToolsetTest.ComPlus |
| 4 | { | 8 | { |
| 5 | using System.Linq; | 9 | using System.Linq; |
| 6 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 7 | using WixInternal.MSTestSupport; | 10 | using WixInternal.MSTestSupport; |
| 8 | using WixInternal.Core.MSTestPackage; | 11 | using WixInternal.Core.MSTestPackage; |
| 9 | using WixToolset.ComPlus; | 12 | 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 1 | // 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. | 1 | // 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. |
| 2 | 2 | ||
| 3 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 4 | |||
| 5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
| 6 | |||
| 3 | namespace WixToolsetTest.Dependency | 7 | namespace WixToolsetTest.Dependency |
| 4 | { | 8 | { |
| 5 | using System.Linq; | 9 | using System.Linq; |
| 6 | using System.Text.RegularExpressions; | 10 | using System.Text.RegularExpressions; |
| 7 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 8 | using WixInternal.MSTestSupport; | 11 | using WixInternal.MSTestSupport; |
| 9 | using WixInternal.Core.MSTestPackage; | 12 | using WixInternal.Core.MSTestPackage; |
| 10 | using WixToolset.Dependency; | 13 | 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 1 | // 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. | 1 | // 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. |
| 2 | 2 | ||
| 3 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 4 | |||
| 5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
| 6 | |||
| 3 | namespace WixToolsetTest.DirectX | 7 | namespace WixToolsetTest.DirectX |
| 4 | { | 8 | { |
| 5 | using System.Linq; | 9 | using System.Linq; |
| 6 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 7 | using WixInternal.MSTestSupport; | 10 | using WixInternal.MSTestSupport; |
| 8 | using WixInternal.Core.MSTestPackage; | 11 | using WixInternal.Core.MSTestPackage; |
| 9 | using WixToolset.DirectX; | 12 | 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 1 | // 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. | 1 | // 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. |
| 2 | 2 | ||
| 3 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 4 | |||
| 5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
| 6 | |||
| 3 | namespace WixToolsetTest.Iis | 7 | namespace WixToolsetTest.Iis |
| 4 | { | 8 | { |
| 5 | using System.Linq; | 9 | 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 1 | // 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. | 1 | // 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. |
| 2 | 2 | ||
| 3 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 4 | |||
| 5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
| 6 | |||
| 3 | namespace WixToolsetTest.Msmq | 7 | namespace WixToolsetTest.Msmq |
| 4 | { | 8 | { |
| 5 | using System.Data; | 9 | using System.Data; |
| 6 | using System.IO; | 10 | using System.IO; |
| 7 | using System.Linq; | 11 | using System.Linq; |
| 8 | using System.Xml.Linq; | 12 | using System.Xml.Linq; |
| 9 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 10 | using WixInternal.MSTestSupport; | 13 | using WixInternal.MSTestSupport; |
| 11 | using WixInternal.Core.MSTestPackage; | 14 | using WixInternal.Core.MSTestPackage; |
| 12 | using WixToolset.Msmq; | 15 | 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 42 | <PropertyGroup> | 42 | <PropertyGroup> |
| 43 | <NetHostPlatform>$(Platform)</NetHostPlatform> | 43 | <NetHostPlatform>$(Platform)</NetHostPlatform> |
| 44 | <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform> | 44 | <NetHostPlatform Condition=" '$(NetHostPlatform)'=='Win32' ">x86</NetHostPlatform> |
| 45 | <NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.6.0.4\runtimes\win-$(NetHostPlatform)\native\</NetHostPath> | 45 | <NetHostPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.8.0.21\runtimes\win-$(NetHostPlatform)\native\</NetHostPath> |
| 46 | <HostfxrPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.6.0.4\runtimes\win-$(NetHostPlatform)\native\</HostfxrPath> | 46 | <HostfxrPath>..\..\..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetHostResolver.8.0.21\runtimes\win-$(NetHostPlatform)\native\</HostfxrPath> |
| 47 | <ProjectAdditionalIncludeDirectories>$(NetHostPath)</ProjectAdditionalIncludeDirectories> | 47 | <ProjectAdditionalIncludeDirectories>$(NetHostPath)</ProjectAdditionalIncludeDirectories> |
| 48 | </PropertyGroup> | 48 | </PropertyGroup> |
| 49 | 49 | ||
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" /> | 3 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="8.0.21" targetFramework="native" /> |
| 4 | <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" /> | 4 | <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="8.0.21" targetFramework="native" /> |
| 5 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="6.0.4" targetFramework="native" /> | 5 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="8.0.21" targetFramework="native" /> |
| 6 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" /> | 6 | <package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="8.0.21" targetFramework="native" /> |
| 7 | <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" /> | 7 | <package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="8.0.21" targetFramework="native" /> |
| 8 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.4" targetFramework="native" /> | 8 | <package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="8.0.21" targetFramework="native" /> |
| 9 | </packages> \ No newline at end of file | 9 | </packages> |
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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 1 | // 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. | 1 | // 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. |
| 2 | 2 | ||
| 3 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 4 | |||
| 5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
| 6 | |||
| 3 | namespace WixToolsetTest.PowerShell | 7 | namespace WixToolsetTest.PowerShell |
| 4 | { | 8 | { |
| 5 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 6 | using WixInternal.MSTestSupport; | 9 | using WixInternal.MSTestSupport; |
| 7 | using WixInternal.Core.MSTestPackage; | 10 | using WixInternal.Core.MSTestPackage; |
| 8 | using WixToolset.PowerShell; | 11 | 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 1 | // 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. | 1 | // 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. |
| 2 | 2 | ||
| 3 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 4 | |||
| 5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
| 6 | |||
| 3 | namespace WixToolsetTest.Sql | 7 | namespace WixToolsetTest.Sql |
| 4 | { | 8 | { |
| 5 | using System.Linq; | 9 | using System.Linq; |
| 6 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 7 | using WixInternal.MSTestSupport; | 10 | using WixInternal.MSTestSupport; |
| 8 | using WixInternal.Core.MSTestPackage; | 11 | using WixInternal.Core.MSTestPackage; |
| 9 | using WixToolset.Sql; | 12 | 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 | |||
| 377 | extractResult.AssertSuccess(); | 377 | extractResult.AssertSuccess(); |
| 378 | 378 | ||
| 379 | var bootstrapperExtensionDatas = extractResult.SelectBootstrapperExtensionDataNodes("/be:BootstrapperExtensionData/be:BootstrapperExtension[@Id='Wix4UtilBootstrapperExtension_X86']"); | 379 | var bootstrapperExtensionDatas = extractResult.SelectBootstrapperExtensionDataNodes("/be:BootstrapperExtensionData/be:BootstrapperExtension[@Id='Wix4UtilBootstrapperExtension_X86']"); |
| 380 | Assert.AreEqual(1, bootstrapperExtensionDatas.Count); | 380 | Assert.HasCount(1, bootstrapperExtensionDatas); |
| 381 | Assert.AreEqual("<BootstrapperExtension Id='Wix4UtilBootstrapperExtension_X86'>" + | 381 | Assert.AreEqual("<BootstrapperExtension Id='Wix4UtilBootstrapperExtension_X86'>" + |
| 382 | "<WixWindowsFeatureSearch Id='DetectSHA2SupportId' Type='sha2CodeSigning' />" + | 382 | "<WixWindowsFeatureSearch Id='DetectSHA2SupportId' Type='sha2CodeSigning' />" + |
| 383 | "</BootstrapperExtension>", bootstrapperExtensionDatas[0].GetTestXml()); | 383 | "</BootstrapperExtension>", 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
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 @@ | |||
| 1 | // 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. | 1 | // 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. |
| 2 | 2 | ||
| 3 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 4 | |||
| 5 | [assembly: Parallelize(Scope = ExecutionScope.MethodLevel)] | ||
| 6 | |||
| 3 | namespace WixToolsetTest.VisualStudio | 7 | namespace WixToolsetTest.VisualStudio |
| 4 | { | 8 | { |
| 5 | using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| 6 | using WixInternal.MSTestSupport; | 9 | using WixInternal.MSTestSupport; |
| 7 | using WixInternal.Core.MSTestPackage; | 10 | using WixInternal.Core.MSTestPackage; |
| 8 | using WixToolset.VisualStudio; | 11 | 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 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="MSTest.Sdk"> | 4 | <Project Sdk="MSTest.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net6.0</TargetFramework> | 6 | <TargetFramework>net8.0</TargetFramework> |
| 7 | <IsWixMSTestProject>true</IsWixMSTestProject> | 7 | <IsWixMSTestProject>true</IsWixMSTestProject> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
