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.HeatTasks/HeatTask.cs                 | 5 +++++
 src/tools/WixToolset.HeatTasks/WixToolset.HeatTasks.csproj | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/tools/WixToolset.HeatTasks')

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>
-- 
cgit v1.2.3-55-g6feb