aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs29
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs20
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs14
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs14
-rw-r--r--src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj3
5 files changed, 57 insertions, 23 deletions
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 8bcac8df..72d4a682 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -12,7 +12,7 @@ namespace WixToolsetTest.Netfx
12 public class NetfxExtensionFixture 12 public class NetfxExtensionFixture
13 { 13 {
14 [Fact] 14 [Fact]
15 public void CanBuildUsingDotNetCorePackages() 15 public void CanBuildUsingLatestDotNetCorePackages()
16 { 16 {
17 using (var fs = new DisposableFileSystem()) 17 using (var fs = new DisposableFileSystem())
18 { 18 {
@@ -24,7 +24,32 @@ namespace WixToolsetTest.Netfx
24 var compileResult = WixRunner.Execute(new[] 24 var compileResult = WixRunner.Execute(new[]
25 { 25 {
26 "build", 26 "build",
27 Path.Combine(bundleSourceFolder, "Bundle.wxs"), 27 Path.Combine(bundleSourceFolder, "BundleLatest.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]
40 public void CanBuildUsingLatestDotNetCorePackages_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, "BundleLatest_x64.wxs"),
28 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), 53 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
29 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), 54 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
30 "-intermediateFolder", intermediateFolder, 55 "-intermediateFolder", intermediateFolder,
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
deleted file mode 100644
index 7c008171..00000000
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
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/TestData/UsingDotNetCorePackages/BundleLatest.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
new file mode 100644
index 00000000..49e8c022
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
@@ -0,0 +1,14 @@
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="AspNetCoreRuntime31Redist_x86" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
11 <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
12 </Chain>
13 </Bundle>
14</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
new file mode 100644
index 00000000..09c7bcdd
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
@@ -0,0 +1,14 @@
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="AspNetCoreRuntime31Redist_x64" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
11 <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
12 </Chain>
13 </Bundle>
14</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index cf7afa8b..4dea73da 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -12,7 +12,8 @@
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" /> 15 <Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\UsingDotNetCorePackages\BundleLatest_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 2025-04-16 08:34:59 +0000