diff options
Diffstat (limited to 'src/test')
3 files changed, 52 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index 38724481..15c31088 100644 --- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs | |||
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | namespace WixToolsetTest.Netfx | 3 | namespace WixToolsetTest.Netfx |
4 | { | 4 | { |
5 | using System.IO; | ||
5 | using System.Linq; | 6 | using System.Linq; |
6 | using WixBuildTools.TestSupport; | 7 | using WixBuildTools.TestSupport; |
7 | using WixToolset.Core.TestPackage; | 8 | using WixToolset.Core.TestPackage; |
@@ -11,6 +12,31 @@ namespace WixToolsetTest.Netfx | |||
11 | public class NetfxExtensionFixture | 12 | public class NetfxExtensionFixture |
12 | { | 13 | { |
13 | [Fact] | 14 | [Fact] |
15 | public void CanBuildUsingDotNetCorePackages() | ||
16 | { | ||
17 | using (var fs = new DisposableFileSystem()) | ||
18 | { | ||
19 | var baseFolder = fs.GetFolder(); | ||
20 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | ||
21 | var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); | ||
22 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | ||
23 | |||
24 | var compileResult = WixRunner.Execute(new[] | ||
25 | { | ||
26 | "build", | ||
27 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | ||
28 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | ||
29 | "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), | ||
30 | "-intermediateFolder", intermediateFolder, | ||
31 | "-o", bundleFile, | ||
32 | }); | ||
33 | compileResult.AssertSuccess(); | ||
34 | |||
35 | Assert.True(File.Exists(bundleFile)); | ||
36 | } | ||
37 | } | ||
38 | |||
39 | [Fact] | ||
14 | public void CanBuildUsingNativeImage() | 40 | public void CanBuildUsingNativeImage() |
15 | { | 41 | { |
16 | var folder = TestData.Get(@"TestData\UsingNativeImage"); | 42 | var folder = TestData.Get(@"TestData\UsingNativeImage"); |
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs new file mode 100644 index 00000000..7c008171 --- /dev/null +++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs | |||
@@ -0,0 +1,20 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | ||
3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | ||
4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | ||
5 | <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense"> | ||
6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> | ||
7 | </BootstrapperApplicationRef> | ||
8 | <Chain> | ||
9 | <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" /> | ||
10 | <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" /> | ||
11 | <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" /> | ||
12 | <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" /> | ||
13 | <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" /> | ||
14 | <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" /> | ||
15 | <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" /> | ||
16 | <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" /> | ||
17 | <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" /> | ||
18 | </Chain> | ||
19 | </Bundle> | ||
20 | </Wix> | ||
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.*" /> |