Fix 3.1.8 desktop runtime payloads and remove version specific tests
James Parsons committed
Oct 15, 2020 at 15:23 UTC
9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7
6 files changed
+8
-88
src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
-50
@@ -61,56 +61,6 @@ namespace WixToolsetTest.Netfx
61
}
62
}
63
64
- [Fact]
65
- public void CanBuildUsingDotNetCorePackages()
66
- {
67
- using (var fs = new DisposableFileSystem())
68
- {
69
- var baseFolder = fs.GetFolder();
70
- var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
71
- var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
72
- var intermediateFolder = Path.Combine(baseFolder, "obj");
73
-
74
- var compileResult = WixRunner.Execute(new[]
75
- {
76
- "build",
77
- Path.Combine(bundleSourceFolder, "Bundle.wxs"),
78
- "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
79
- "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
80
- "-intermediateFolder", intermediateFolder,
81
- "-o", bundleFile,
82
- });
83
- compileResult.AssertSuccess();
84
-
85
- Assert.True(File.Exists(bundleFile));
86
- }
87
- }
88
-
89
- [Fact]
90
- public void CanBuildUsingDotNetCorePackages_X64()
91
- {
92
- using (var fs = new DisposableFileSystem())
93
- {
94
- var baseFolder = fs.GetFolder();
95
- var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
96
- var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
97
- var intermediateFolder = Path.Combine(baseFolder, "obj");
98
-
99
- var compileResult = WixRunner.Execute(new[]
100
- {
101
- "build",
102
- Path.Combine(bundleSourceFolder, "Bundle_x64.wxs"),
103
- "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
104
- "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
105
- "-intermediateFolder", intermediateFolder,
106
- "-o", bundleFile,
107
- });
108
- compileResult.AssertSuccess();
109
-
110
- Assert.True(File.Exists(bundleFile));
111
- }
112
- }
113
-
64
[Fact]
65
public void CanBuildUsingNativeImage()
66
{
src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
deleted
-14
@@ -1,14 +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="AspNetCoreRuntime318Redist_x86" />
10
- <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
11
- <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
12
- </Chain>
13
- </Bundle>
14
-</Wix>
src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
deleted
-14
@@ -1,14 +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="AspNetCoreRuntime318Redist_x64" />
10
- <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
11
- <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
12
- </Chain>
13
- </Bundle>
14
-</Wix>
src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
-2
@@ -12,8 +12,6 @@
12
</PropertyGroup>
13
14
<ItemGroup>
15
- <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
16
- <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
15
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
16
<Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
17
<Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
src/wixlib/NetCore3.1.8_x64.wxs
+4
-4
@@ -76,10 +76,10 @@
76
<RemotePayload
77
CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78
CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79
- Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
80
- Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
81
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
82
- Size="26089480"
79
+ Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
80
+ Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
81
+ ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
82
+ Size="54253328"
83
Version="3.1.8.29220" />
84
</ExePackage>
85
</PackageGroup>
src/wixlib/NetCore3.1.8_x86.wxs
+4
-4
@@ -76,10 +76,10 @@
76
<RemotePayload
77
CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78
CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79
- Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
80
- Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
81
- ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
82
- Size="23183576"
79
+ Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
80
+ Hash="6105823D7417C265929DF2978A7214E7394E404F"
81
+ ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
82
+ Size="48377976"
83
Version="3.1.8.29220" />
84
</ExePackage>
85
</PackageGroup>