aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorJames Parsons <japarson@microsoft.com>2020-09-23 14:06:22 -0700
committerJames Parsons <japarson@microsoft.com>2020-09-23 14:06:22 -0700
commite0a88194af923cb523384352165bca91780c4289 (patch)
tree60ca39881c97502f46ce3fb8a85a5c0975bbc33e /src/test
parent2586d9355abacc7294499dd81217012385d3d8a8 (diff)
downloadwix-e0a88194af923cb523384352165bca91780c4289.tar.gz
wix-e0a88194af923cb523384352165bca91780c4289.tar.bz2
wix-e0a88194af923cb523384352165bca91780c4289.zip
Add package definitions for the latest version of .NET Core 3.1
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs25
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs32
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs34
-rw-r--r--src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj1
4 files changed, 83 insertions, 9 deletions
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 8bcac8df..845e1373 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -37,6 +37,31 @@ namespace WixToolsetTest.Netfx
37 } 37 }
38 38
39 [Fact] 39 [Fact]
40 public void CanBuildUsingDotNetCorePackages_X64()
41 {
42 using (var fs = new DisposableFileSystem())
43 {
44 var baseFolder = fs.GetFolder();
45 var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
46 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
47 var intermediateFolder = Path.Combine(baseFolder, "obj");
48
49 var compileResult = WixRunner.Execute(new[]
50 {
51 "build",
52 Path.Combine(bundleSourceFolder, "Bundle_x64.wxs"),
53 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
54 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
55 "-intermediateFolder", intermediateFolder,
56 "-o", bundleFile,
57 });
58 compileResult.AssertSuccess();
59
60 Assert.True(File.Exists(bundleFile));
61 }
62 }
63
64 [Fact]
40 public void CanBuildUsingNativeImage() 65 public void CanBuildUsingNativeImage()
41 { 66 {
42 var folder = TestData.Get(@"TestData\UsingNativeImage"); 67 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
index 7c008171..a31848a7 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -6,15 +6,29 @@
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> 6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
7 </BootstrapperApplicationRef> 7 </BootstrapperApplicationRef>
8 <Chain> 8 <Chain>
9 <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" /> 9 <PackageGroupRef Id="AspNetCoreRuntime310Redist_x86" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" /> 10 <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x86" />
11 <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" /> 11 <PackageGroupRef Id="DotNetCoreRuntime310Redist_x86" />
12 <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" /> 12
13 <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" /> 13 <PackageGroupRef Id="AspNetCoreRuntime311Redist_x86" />
14 <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" /> 14 <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x86" />
15 <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" /> 15 <PackageGroupRef Id="DotNetCoreRuntime311Redist_x86" />
16 <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" /> 16
17 <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" /> 17 <PackageGroupRef Id="AspNetCoreRuntime312Redist_x86" />
18 <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x86" />
19 <PackageGroupRef Id="DotNetCoreRuntime312Redist_x86" />
20
21 <PackageGroupRef Id="AspNetCoreRuntime313Redist_x86" />
22 <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x86" />
23 <PackageGroupRef Id="DotNetCoreRuntime313Redist_x86" />
24
25 <PackageGroupRef Id="AspNetCoreRuntime314Redist_x86" />
26 <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x86" />
27 <PackageGroupRef Id="DotNetCoreRuntime314Redist_x86" />
28
29 <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x86" />
30 <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x86" />
31 <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x86" />
18 </Chain> 32 </Chain>
19 </Bundle> 33 </Bundle>
20</Wix> 34</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
new file mode 100644
index 00000000..a5e91532
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
@@ -0,0 +1,34 @@
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="DotNetCoreRuntime310Redist_x64" />
12
13 <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" />
14 <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" />
15 <PackageGroupRef Id="DotNetCoreRuntime311Redist_x64" />
16
17 <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" />
18 <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" />
19 <PackageGroupRef Id="DotNetCoreRuntime312Redist_x64" />
20
21 <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" />
22 <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" />
23 <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" />
24
25 <PackageGroupRef Id="AspNetCoreRuntime314Redist_x64" />
26 <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x64" />
27 <PackageGroupRef Id="DotNetCoreRuntime314Redist_x64" />
28
29 <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x64" />
30 <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x64" />
31 <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x64" />
32 </Chain>
33 </Bundle>
34</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index cf7afa8b..1df84972 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -13,6 +13,7 @@
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" /> 15 <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" /> 17 <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
17 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> 18 <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> 19 <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-29 08:07:09 +0000