From 464575def4341d65bc3fa72298798755cdee527e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 1 Oct 2022 02:38:00 -0700
Subject: Standardize on .NET 6 as the minimum for .NET Core platform.

Closes 6942
---
 src/tools/WixToolset.Heat/WixToolset.Heat.csproj           | 2 +-
 src/tools/WixToolset.Heat/WixToolset.Heat.targets          | 2 +-
 src/tools/WixToolset.HeatTasks/HeatTask.cs                 | 5 +++++
 src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj | 2 +-
 src/tools/heat/heat.csproj                                 | 4 ++--
 src/tools/publish_t.proj                                   | 8 ++++----
 6 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.csproj b/src/tools/WixToolset.Heat/WixToolset.Heat.csproj
index a3e0eb41..2166028a 100644
--- a/src/tools/WixToolset.Heat/WixToolset.Heat.csproj
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <Description>WiX Toolset Heat MSBuild integration</Description>
     <PublishDir>$(PublishRoot)WixToolset.Heat\</PublishDir>
     <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.targets b/src/tools/WixToolset.Heat/WixToolset.Heat.targets
index ba854459..25493295 100644
--- a/src/tools/WixToolset.Heat/WixToolset.Heat.targets
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.targets
@@ -5,7 +5,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- These properties can be overridden to support non-default installations. -->
   <PropertyGroup>
-    <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\</WixHeatBinDir>
+    <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)..\tools\net6.0\</WixHeatBinDir>
     <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' ">$(MSBuildThisFileDirectory)..\tools\net472\</WixHeatBinDir>
     <WixHeatTasksPath Condition=" '$(WixHeatTasksPath)' == '' ">$(WixHeatBinDir)WixToolset.HeatTasks.dll</WixHeatTasksPath>
 
diff --git a/src/tools/WixToolset.HeatTasks/HeatTask.cs b/src/tools/WixToolset.HeatTasks/HeatTask.cs
index 8942a7e1..6b7b9399 100644
--- a/src/tools/WixToolset.HeatTasks/HeatTask.cs
+++ b/src/tools/WixToolset.HeatTasks/HeatTask.cs
@@ -14,7 +14,12 @@ namespace WixToolset.HeatTasks
     /// </summary>
     public abstract partial class HeatTask : ToolTask
     {
+#if NETFRAMEWORK
         private static readonly string ThisDllPath = new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath;
+#else
+        private static readonly string ThisDllPath = typeof(HeatTask).Assembly.Location;
+#endif
+
 
         /// <summary>
         /// Gets or sets additional options that are appended the the tool command-line.
diff --git a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
index ea52bdfa..ddc75c69 100644
--- a/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
+++ b/src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <Title>WiX Toolset Heat MSBuild Tasks</Title>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/src/tools/heat/heat.csproj b/src/tools/heat/heat.csproj
index db4a710b..dfcc9126 100644
--- a/src/tools/heat/heat.csproj
+++ b/src/tools/heat/heat.csproj
@@ -3,13 +3,13 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows;net472</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <Description>Harvester</Description>
     <Title>WiX Toolset Harvester</Title>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp3.1' ">win-x86;win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='net6.0' ">win-x86;win-x64</RuntimeIdentifiers>
     <AppConfig>app.config</AppConfig>
     <ApplicationManifest>heat.exe.manifest</ApplicationManifest>
     <RollForward>LatestMajor</RollForward>
diff --git a/src/tools/publish_t.proj b/src/tools/publish_t.proj
index b23c3d84..cbe67768 100644
--- a/src/tools/publish_t.proj
+++ b/src/tools/publish_t.proj
@@ -2,23 +2,23 @@
   <PropertyGroup>
     <StagePublishX86>$(BaseIntermediateOutputPath)$(Configuration)\net472\x86\</StagePublishX86>
     <StagePublishX64>$(BaseIntermediateOutputPath)$(Configuration)\net472\x64\</StagePublishX64>
-    <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\netcoreapp3.1\</StagePublishDnc>
+    <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\net6.0\</StagePublishDnc>
 
     <PublishBuildFolder>$(PublishRoot)WixToolset.Heat\build\</PublishBuildFolder>
     <PublishHere>$(PublishRoot)WixToolset.Heat\tools\net472\</PublishHere>
     <PublishX86>$(PublishRoot)WixToolset.Heat\tools\net472\x86\</PublishX86>
     <PublishX64>$(PublishRoot)WixToolset.Heat\tools\net472\x64\</PublishX64>
-    <PublishDnc>$(PublishRoot)WixToolset.Heat\tools\netcoreapp3.1\</PublishDnc>
+    <PublishDnc>$(PublishRoot)WixToolset.Heat\tools\net6.0\</PublishDnc>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net472;PublishDir=$(StagePublishX86)WixToolset.HeatTasks" Targets="Publish" />
-    <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(StagePublishDnc)WixToolset.HeatTasks" Targets="Publish" />
+    <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net6.0;UseAppHost=false;PublishDir=$(StagePublishDnc)WixToolset.HeatTasks" Targets="Publish" />
 
     <!-- heat.exe doesn't need to filter any files so publish it straight into its final location -->
     <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" />
     <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" />
-    <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" />
+    <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net6.0-windows;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" />
   </ItemGroup>
 
   <Target Name="CopyToFinalPublishFolder" AfterTargets="Build">
-- 
cgit v1.2.3-55-g6feb