diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-20 00:35:49 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-20 00:56:54 -0700 |
| commit | 57bcf8079d2e08eb87ba4915227cabe706a63f5d (patch) | |
| tree | 4ca6d9852f0c59003aebe35c596e7c2cb41e9704 /src | |
| parent | 133bbd2b519bf977638317fba3284ba02817f7bb (diff) | |
| download | wix-57bcf8079d2e08eb87ba4915227cabe706a63f5d.tar.gz wix-57bcf8079d2e08eb87ba4915227cabe706a63f5d.tar.bz2 wix-57bcf8079d2e08eb87ba4915227cabe706a63f5d.zip | |
Better support all .NETs
Diffstat (limited to 'src')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/WixToolset.Converters.Tupleizer/WixToolset.Converters.Tupleizer.csproj b/src/WixToolset.Converters.Tupleizer/WixToolset.Converters.Tupleizer.csproj index d9d92f4f..3fa1b57d 100644 --- a/src/WixToolset.Converters.Tupleizer/WixToolset.Converters.Tupleizer.csproj +++ b/src/WixToolset.Converters.Tupleizer/WixToolset.Converters.Tupleizer.csproj | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | 5 | ||
| 6 | <PropertyGroup> | 6 | <PropertyGroup> |
| 7 | <TargetFrameworks>netstandard2.0;net461</TargetFrameworks> | 7 | <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks> |
| 8 | <Description>Tupleizer</Description> | 8 | <Description>Tupleizer</Description> |
| 9 | <Title>WiX Toolset Converters Tuplizer</Title> | 9 | <Title>WiX Toolset Converters Tuplizer</Title> |
| 10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
| @@ -18,6 +18,7 @@ | |||
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <Reference Include="wix" HintPath="..\deps\wix.dll" /> | 19 | <Reference Include="wix" HintPath="..\deps\wix.dll" /> |
| 20 | <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net461" /> | 20 | <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net461" /> |
| 21 | <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net472" /> | ||
| 21 | <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\netstandard2.0" /> | 22 | <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\netstandard2.0" /> |
| 22 | </ItemGroup> | 23 | </ItemGroup> |
| 23 | 24 | ||
diff --git a/src/WixToolset.Converters/WixToolset.Converters.csproj b/src/WixToolset.Converters/WixToolset.Converters.csproj index 94a956d5..d223cf44 100644 --- a/src/WixToolset.Converters/WixToolset.Converters.csproj +++ b/src/WixToolset.Converters/WixToolset.Converters.csproj | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | 5 | ||
| 6 | <PropertyGroup> | 6 | <PropertyGroup> |
| 7 | <TargetFramework>netstandard2.0</TargetFramework> | 7 | <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks> |
| 8 | <Description>Converter</Description> | 8 | <Description>Converter</Description> |
| 9 | <Title>WiX Toolset Converters</Title> | 9 | <Title>WiX Toolset Converters</Title> |
| 10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
diff --git a/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj index d16c3d16..026a7d3e 100644 --- a/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj +++ b/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj | |||
| @@ -7,6 +7,10 @@ | |||
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
| 10 | <PropertyGroup> | ||
| 11 | <NoWarn>NU1701</NoWarn> | ||
| 12 | </PropertyGroup> | ||
| 13 | |||
| 10 | <ItemGroup> | 14 | <ItemGroup> |
| 11 | <None Remove="TestData\SingleFile\ConvertedSingleFile.wxs" /> | 15 | <None Remove="TestData\SingleFile\ConvertedSingleFile.wxs" /> |
| 12 | <None Remove="TestData\SingleFile\SingleFile.wxs" /> | 16 | <None Remove="TestData\SingleFile\SingleFile.wxs" /> |