summaryrefslogtreecommitdiff
path: root/src/tools/WixToolset.Heat
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools/WixToolset.Heat')
-rw-r--r--src/tools/WixToolset.Heat/WixToolset.Heat.csproj2
-rw-r--r--src/tools/WixToolset.Heat/WixToolset.Heat.targets2
2 files changed, 2 insertions, 2 deletions
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 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp3.1</TargetFrameworks> 6 <TargetFrameworks>net6.0</TargetFrameworks>
7 <Description>WiX Toolset Heat MSBuild integration</Description> 7 <Description>WiX Toolset Heat MSBuild integration</Description>
8 <PublishDir>$(PublishRoot)WixToolset.Heat\</PublishDir> 8 <PublishDir>$(PublishRoot)WixToolset.Heat\</PublishDir>
9 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> 9 <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 @@
5<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 5<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <!-- These properties can be overridden to support non-default installations. --> 6 <!-- These properties can be overridden to support non-default installations. -->
7 <PropertyGroup> 7 <PropertyGroup>
8 <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)..\tools\netcoreapp3.1\</WixHeatBinDir> 8 <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)..\tools\net6.0\</WixHeatBinDir>
9 <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' ">$(MSBuildThisFileDirectory)..\tools\net472\</WixHeatBinDir> 9 <WixHeatBinDir Condition=" '$(WixHeatBinDir)' == '' ">$(MSBuildThisFileDirectory)..\tools\net472\</WixHeatBinDir>
10 <WixHeatTasksPath Condition=" '$(WixHeatTasksPath)' == '' ">$(WixHeatBinDir)WixToolset.HeatTasks.dll</WixHeatTasksPath> 10 <WixHeatTasksPath Condition=" '$(WixHeatTasksPath)' == '' ">$(WixHeatBinDir)WixToolset.HeatTasks.dll</WixHeatTasksPath>
11 11