aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-05-20 22:33:48 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-05-20 23:20:10 +1000
commit4029dacd2053cc35bdbce158fb9b2c4c832ebb78 (patch)
tree24ce597c1d91f9a39b1ec50d842908c76051b45a /src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
parent037243df84151413db9666c78526fc60ff5e3b53 (diff)
downloadwix-4029dacd2053cc35bdbce158fb9b2c4c832ebb78.tar.gz
wix-4029dacd2053cc35bdbce158fb9b2c4c832ebb78.tar.bz2
wix-4029dacd2053cc35bdbce158fb9b2c4c832ebb78.zip
Update .NET Core packages so they don't conflict.
Make it easier to add new ones. Add AsPrereq package group for DotNetCoreRuntime packages.
Diffstat (limited to 'src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj')
-rw-r--r--src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index 88303fcd..cf7afa8b 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -12,17 +12,23 @@
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
15 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" /> 16 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> 17 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
17 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> 18 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="TestData\UsingNativeImage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> 19 <Content Include="TestData\UsingNativeImage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
19 </ItemGroup> 20 </ItemGroup>
20 21
22 <Target Name="CopyExtensions" AfterTargets="Build">
23 <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
24 </Target>
25
21 <ItemGroup> 26 <ItemGroup>
22 <ProjectReference Include="..\..\wixext\WixToolset.Netfx.wixext.csproj" /> 27 <ProjectReference Include="..\..\wixext\WixToolset.Netfx.wixext.csproj" />
23 </ItemGroup> 28 </ItemGroup>
24 29
25 <ItemGroup> 30 <ItemGroup>
31 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" />
26 <PackageReference Include="WixToolset.Core" Version="4.0.*" /> 32 <PackageReference Include="WixToolset.Core" Version="4.0.*" />
27 <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> 33 <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
28 <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> 34 <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />