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/NetFx | |
| 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/NetFx')
| -rw-r--r-- | src/ext/NetFx/netcoresearch/netcoresearch.vcxproj | 4 | ||||
| -rw-r--r-- | src/ext/NetFx/netcoresearch/packages.config | 14 | ||||
| -rw-r--r-- | src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj | 2 |
3 files changed, 10 insertions, 10 deletions
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 | ||