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/publish_t.proj | |
| 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/publish_t.proj')
| -rw-r--r-- | src/tools/publish_t.proj | 8 |
1 files changed, 4 insertions, 4 deletions
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 @@ | |||
| 2 | <PropertyGroup> | 2 | <PropertyGroup> |
| 3 | <StagePublishX86>$(BaseIntermediateOutputPath)$(Configuration)\net472\x86\</StagePublishX86> | 3 | <StagePublishX86>$(BaseIntermediateOutputPath)$(Configuration)\net472\x86\</StagePublishX86> |
| 4 | <StagePublishX64>$(BaseIntermediateOutputPath)$(Configuration)\net472\x64\</StagePublishX64> | 4 | <StagePublishX64>$(BaseIntermediateOutputPath)$(Configuration)\net472\x64\</StagePublishX64> |
| 5 | <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\netcoreapp3.1\</StagePublishDnc> | 5 | <StagePublishDnc>$(BaseIntermediateOutputPath)$(Configuration)\net6.0\</StagePublishDnc> |
| 6 | 6 | ||
| 7 | <PublishBuildFolder>$(PublishRoot)WixToolset.Heat\build\</PublishBuildFolder> | 7 | <PublishBuildFolder>$(PublishRoot)WixToolset.Heat\build\</PublishBuildFolder> |
| 8 | <PublishHere>$(PublishRoot)WixToolset.Heat\tools\net472\</PublishHere> | 8 | <PublishHere>$(PublishRoot)WixToolset.Heat\tools\net472\</PublishHere> |
| 9 | <PublishX86>$(PublishRoot)WixToolset.Heat\tools\net472\x86\</PublishX86> | 9 | <PublishX86>$(PublishRoot)WixToolset.Heat\tools\net472\x86\</PublishX86> |
| 10 | <PublishX64>$(PublishRoot)WixToolset.Heat\tools\net472\x64\</PublishX64> | 10 | <PublishX64>$(PublishRoot)WixToolset.Heat\tools\net472\x64\</PublishX64> |
| 11 | <PublishDnc>$(PublishRoot)WixToolset.Heat\tools\netcoreapp3.1\</PublishDnc> | 11 | <PublishDnc>$(PublishRoot)WixToolset.Heat\tools\net6.0\</PublishDnc> |
| 12 | </PropertyGroup> | 12 | </PropertyGroup> |
| 13 | 13 | ||
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net472;PublishDir=$(StagePublishX86)WixToolset.HeatTasks" Targets="Publish" /> | 15 | <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net472;PublishDir=$(StagePublishX86)WixToolset.HeatTasks" Targets="Publish" /> |
| 16 | <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(StagePublishDnc)WixToolset.HeatTasks" Targets="Publish" /> | 16 | <ProjectReference Include="WixToolset.HeatTasks\WixToolset.HeatTasks.csproj" Properties="TargetFramework=net6.0;UseAppHost=false;PublishDir=$(StagePublishDnc)WixToolset.HeatTasks" Targets="Publish" /> |
| 17 | 17 | ||
| 18 | <!-- heat.exe doesn't need to filter any files so publish it straight into its final location --> | 18 | <!-- heat.exe doesn't need to filter any files so publish it straight into its final location --> |
| 19 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" /> | 19 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x86;PublishDir=$(PublishX86)" Targets="Publish" /> |
| 20 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" /> | 20 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net472;RuntimeIdentifier=win-x64;PublishDir=$(PublishX64)" Targets="Publish" /> |
| 21 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=netcoreapp3.1;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" /> | 21 | <ProjectReference Include="heat\heat.csproj" Properties="TargetFramework=net6.0-windows;UseAppHost=false;PublishDir=$(PublishDnc)" Targets="Publish" /> |
| 22 | </ItemGroup> | 22 | </ItemGroup> |
| 23 | 23 | ||
| 24 | <Target Name="CopyToFinalPublishFolder" AfterTargets="Build"> | 24 | <Target Name="CopyToFinalPublishFolder" AfterTargets="Build"> |