aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj7
-rw-r--r--src/heat/heat.csproj7
-rw-r--r--src/wix/wix.csproj7
3 files changed, 15 insertions, 6 deletions
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 2d7e7ca7..c006b5a4 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -3,8 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp2.1</TargetFrameworks> 6 <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461</TargetFrameworks>
8 <Description></Description> 7 <Description></Description>
9 <Title>WiX Toolset MSBuild Tasks</Title> 8 <Title>WiX Toolset MSBuild Tasks</Title>
10 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
@@ -28,6 +27,10 @@
28 <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> 27 <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
29 </ItemGroup> 28 </ItemGroup>
30 29
30 <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'">
31 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
32 </ItemGroup>
33
31 <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1' "> 34 <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1' ">
32 <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" /> 35 <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.7.179" />
33 </ItemGroup> 36 </ItemGroup>
diff --git a/src/heat/heat.csproj b/src/heat/heat.csproj
index 780a9496..51c9b297 100644
--- a/src/heat/heat.csproj
+++ b/src/heat/heat.csproj
@@ -3,8 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp2.1</TargetFrameworks> 6 <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461</TargetFrameworks>
8 <OutputType>Exe</OutputType> 7 <OutputType>Exe</OutputType>
9 <Description>Harvester</Description> 8 <Description>Harvester</Description>
10 <Title>WiX Harvester</Title> 9 <Title>WiX Harvester</Title>
@@ -25,6 +24,10 @@
25 <Compile Include="..\wix\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" /> 24 <Compile Include="..\wix\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
26 </ItemGroup> 25 </ItemGroup>
27 26
27 <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'">
28 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
29 </ItemGroup>
30
28 <ItemGroup> 31 <ItemGroup>
29 <PackageReference Include="WixToolset.Core" Version="4.0.*" /> 32 <PackageReference Include="WixToolset.Core" Version="4.0.*" />
30 <PackageReference Include="WixToolset.Harvesters" Version="4.0.*" /> 33 <PackageReference Include="WixToolset.Harvesters" Version="4.0.*" />
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index 3125a7e7..d03d076e 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -3,8 +3,7 @@
3 3
4<Project Sdk="Microsoft.NET.Sdk"> 4<Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp2.1</TargetFrameworks> 6 <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
7 <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net461</TargetFrameworks>
8 <OutputType>Exe</OutputType> 7 <OutputType>Exe</OutputType>
9 <Description>Compiler</Description> 8 <Description>Compiler</Description>
10 <Title>WiX Toolset Compiler</Title> 9 <Title>WiX Toolset Compiler</Title>
@@ -21,6 +20,10 @@
21 <NoWarn>NU1701</NoWarn> 20 <NoWarn>NU1701</NoWarn>
22 </PropertyGroup> 21 </PropertyGroup>
23 22
23 <ItemGroup Condition="'$(TargetFramework)'=='net461' and '$(OS)' != 'Windows_NT'">
24 <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
25 </ItemGroup>
26
24 <ItemGroup> 27 <ItemGroup>
25 <PackageReference Include="WixToolset.Converters" Version="4.0.*" /> 28 <PackageReference Include="WixToolset.Converters" Version="4.0.*" />
26 <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> 29 <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />