diff options
Diffstat (limited to 'src')
4 files changed, 6 insertions, 23 deletions
diff --git a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj index d9493b8a..3542f85a 100644 --- a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj +++ b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netstandard2.0</TargetFramework> | 6 | <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks> |
| 7 | <Description>Core Burn</Description> | 7 | <Description>Core Burn</Description> |
| 8 | <Title>WiX Toolset Core Burn</Title> | 8 | <Title>WiX Toolset Core Burn</Title> |
| 9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
diff --git a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj index d8559f94..e5a550f3 100644 --- a/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj +++ b/src/WixToolset.Core.TestPackage/WixToolset.Core.TestPackage.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netstandard2.0</TargetFramework> | 6 | <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks> |
| 7 | <Description>Internal WiX Toolset Test Package</Description> | 7 | <Description>Internal WiX Toolset Test Package</Description> |
| 8 | <DebugType>embedded</DebugType> | 8 | <DebugType>embedded</DebugType> |
| 9 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 9 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| @@ -15,22 +15,6 @@ | |||
| 15 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" IncludeAssets="true" /> | 15 | <ProjectReference Include="..\WixToolset.Core.WindowsInstaller\WixToolset.Core.WindowsInstaller.csproj" IncludeAssets="true" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | 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 | |||
| 34 | <ItemGroup> | 18 | <ItemGroup> |
| 35 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> | 19 | <PackageReference Include="WixToolset.Data" Version="4.0.*" /> |
| 36 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> | 20 | <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" /> |
| @@ -45,5 +29,4 @@ | |||
| 45 | <ItemGroup> | 29 | <ItemGroup> |
| 46 | <PackageReference Include="xunit.assert" Version="2.4.0" /> | 30 | <PackageReference Include="xunit.assert" Version="2.4.0" /> |
| 47 | </ItemGroup> | 31 | </ItemGroup> |
| 48 | |||
| 49 | </Project> | 32 | </Project> |
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj b/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj index b940e39b..f1351aba 100644 --- a/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj +++ b/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netstandard2.0</TargetFramework> | 6 | <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks> |
| 7 | <Description>Core Windows Installer</Description> | 7 | <Description>Core Windows Installer</Description> |
| 8 | <Title>WiX Toolset Core Windows Installer</Title> | 8 | <Title>WiX Toolset Core Windows Installer</Title> |
| 9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
diff --git a/src/WixToolset.Core/WixToolset.Core.csproj b/src/WixToolset.Core/WixToolset.Core.csproj index d573cbda..4e205641 100644 --- a/src/WixToolset.Core/WixToolset.Core.csproj +++ b/src/WixToolset.Core/WixToolset.Core.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netstandard2.0</TargetFramework> | 6 | <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks> |
| 7 | <Description>Core</Description> | 7 | <Description>Core</Description> |
| 8 | <Title>WiX Toolset Core</Title> | 8 | <Title>WiX Toolset Core</Title> |
| 9 | <DebugType>embedded</DebugType> | 9 | <DebugType>embedded</DebugType> |
| @@ -20,8 +20,8 @@ | |||
| 20 | you update these here, be sure to update them there. | 20 | you update these here, be sure to update them there. |
| 21 | --> | 21 | --> |
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.5.0" /> | 23 | <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0" /> |
| 24 | <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" /> | 24 | <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
