Better support all .NETs and remove unnecessary NuGet workarounds
Rob Mensching committed
Oct 20, 2019 at 00:36 UTC
d9645d0faf28c2adbad249b4db047df47942160e
4 files changed
+6
-23
src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netstandard2.0</TargetFramework>
6
+ <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
7
<Description>Core Burn</Description>
8
<Title>WiX Toolset Core Burn</Title>
9
<DebugType>embedded</DebugType>
src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj
+1
-18
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netstandard2.0</TargetFramework>
6
+ <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
7
<Description>Internal WiX Toolset Test Package</Description>
8
<DebugType>embedded</DebugType>
9
<PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -15,22 +15,6 @@
15
<ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" IncludeAssets="true" />
16
</ItemGroup>
17
18
- <!-- This is a workaround until https://github.com/NuGet/Home/issues/3891 is resolved -->
19
- <ItemGroup>
20
- <_PackageFiles Include="$(OutputPath)\WixToolset.Core.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" />
21
- <_PackageFiles Include="$(OutputPath)\WixToolset.Core.Burn.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" />
22
- <_PackageFiles Include="$(OutputPath)\WixToolset.Core.WindowsInstaller.dll" BuildAction="None" PackagePath="lib\$(TargetFramework)\" />
23
- </ItemGroup>
24
-
25
- <!--
26
- These package references duplicate the dependencies in WixToolset.Core.csproj to ensure
27
- WixToolset.Core.dll's dependencies are referenced by this test .nupkg.
28
- -->
29
- <ItemGroup>
30
- <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" />
31
- <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
32
- </ItemGroup>
33
-
18
<ItemGroup>
19
<PackageReference Include="WixToolset.Data" Version="4.0.*" />
20
<PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
@@ -45,5 +29,4 @@
29
<ItemGroup>
30
<PackageReference Include="xunit.assert" Version="2.4.0" />
31
</ItemGroup>
48
-
32
</Project>
src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
+1
-1
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netstandard2.0</TargetFramework>
6
+ <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
7
<Description>Core Windows Installer</Description>
8
<Title>WiX Toolset Core Windows Installer</Title>
9
<DebugType>embedded</DebugType>
src/WixToolset.Core/WixToolset.Core.csproj
+3
-3
@@ -3,7 +3,7 @@
3
4
<Project Sdk="Microsoft.NET.Sdk">
5
<PropertyGroup>
6
- <TargetFramework>netstandard2.0</TargetFramework>
6
+ <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
7
<Description>Core</Description>
8
<Title>WiX Toolset Core</Title>
9
<DebugType>embedded</DebugType>
@@ -20,8 +20,8 @@
20
you update these here, be sure to update them there.
21
-->
22
<ItemGroup>
23
- <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" />
24
- <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
23
+ <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0" />
24
+ <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
25
</ItemGroup>
26
27
<ItemGroup>