diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-10-01 02:38:00 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-10-03 12:29:27 -0700 |
| commit | 464575def4341d65bc3fa72298798755cdee527e (patch) | |
| tree | 815adc229c92756260dcd65782102511359bf50f /src/tools/WixToolset.Heat | |
| parent | ed6593322d34ff0e655be9347f340d0cc96c0784 (diff) | |
| download | wix-464575def4341d65bc3fa72298798755cdee527e.tar.gz wix-464575def4341d65bc3fa72298798755cdee527e.tar.bz2 wix-464575def4341d65bc3fa72298798755cdee527e.zip | |
Standardize on .NET 6 as the minimum for .NET Core platform.
Closes 6942
Diffstat (limited to 'src/tools/WixToolset.Heat')
| -rw-r--r-- | src/tools/WixToolset.Heat/WixToolset.Heat.csproj | 2 | ||||
| -rw-r--r-- | src/tools/WixToolset.Heat/WixToolset.Heat.targets | 2 |
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 | ||