Fix 3.1.8 desktop runtime payloads and remove version specific tests

author: James Parsons <japarson@microsoft.com> 2020-10-15 15:23:07 -0700
committer: James Parsons <japarson@microsoft.com> 2020-10-15 15:23:07 -0700
commit: 9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7 (patch)
tree: e459c056d7c1fcec4d790a0709c0593d2379a565
parent: af731a9631a7f7f6d7c3b2ef84f38a07bb4db211 (diff)
download: wix-9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7.tar.gz
wix-9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7.tar.bz2
wix-9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7.zip
6 files changed, 8 insertions, 88 deletions
diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index c9391074..72d4a682 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -62,56 +62,6 @@ namespace WixToolsetTest.Netfx
        }
        [Fact]
-        public void CanBuildUsingDotNetCorePackages()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
-                var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var compileResult = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(bundleSourceFolder, "Bundle.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
-                    "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundleFile,
-                });
-                compileResult.AssertSuccess();
-                Assert.True(File.Exists(bundleFile));
-            }
-        }
-        [Fact]
-        public void CanBuildUsingDotNetCorePackages_X64()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
-                var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-                var compileResult = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(bundleSourceFolder, "Bundle_x64.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
-                    "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundleFile,
-                });
-                compileResult.AssertSuccess();
-                Assert.True(File.Exists(bundleFile));
-            }
-        }
-        [Fact]
        public void CanBuildUsingNativeImage()
        {
            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
deleted file mode 100644
index d746226e..00000000
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-    <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
-        </BootstrapperApplicationRef>
-        <Chain>
-            <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
-            <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
deleted file mode 100644
index 4d1ba73e..00000000
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-    <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
-            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
-        </BootstrapperApplicationRef>
-        <Chain>
-            <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
-            <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index a9e5cd2b..4dea73da 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -12,8 +12,6 @@
  </PropertyGroup>
  <ItemGroup>
-    <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
    <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wixlib/NetCore3.1.8_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs
index 56f498de..d6877e56 100644
--- a/src/wixlib/NetCore3.1.8_x64.wxs
+++ b/src/wixlib/NetCore3.1.8_x64.wxs
@@ -76,10 +76,10 @@
                <RemotePayload
                    CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
                    CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
-                    Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+                    Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
-                    Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
+                    Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
-                    ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
+                    ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
-                    Size="26089480"
+                    Size="54253328"
                    Version="3.1.8.29220" />
            </ExePackage>
        </PackageGroup>
diff --git a/src/wixlib/NetCore3.1.8_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs
index 87d780c3..bf639c22 100644
--- a/src/wixlib/NetCore3.1.8_x86.wxs
+++ b/src/wixlib/NetCore3.1.8_x86.wxs
@@ -76,10 +76,10 @@
                <RemotePayload
                    CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
                    CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
-                    Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+                    Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
-                    Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
+                    Hash="6105823D7417C265929DF2978A7214E7394E404F"
-                    ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
+                    ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
-                    Size="23183576"
+                    Size="48377976"
                    Version="3.1.8.29220" />
            </ExePackage>
        </PackageGroup>
author	James Parsons <japarson@microsoft.com>	2020-10-15 15:23:07 -0700
committer	James Parsons <japarson@microsoft.com>	2020-10-15 15:23:07 -0700
commit	9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7 (patch)
tree	e459c056d7c1fcec4d790a0709c0593d2379a565
parent	af731a9631a7f7f6d7c3b2ef84f38a07bb4db211 (diff)
download	wix-9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7.tar.gz wix-9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7.tar.bz2 wix-9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7.zip

diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index c9391074..72d4a682 100644 --- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -62,56 +62,6 @@ namespace WixToolsetTest.Netfx
62	}	62	}
63		63
64	[Fact]	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
114	[Fact]
115	public void CanBuildUsingNativeImage()	65	public void CanBuildUsingNativeImage()
116	{	66	{
117	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 deleted file mode 100644 index d746226e..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs +++ /dev/null
@@ -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>


diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs deleted file mode 100644 index 4d1ba73e..00000000 --- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs +++ /dev/null
@@ -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>


diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj index a9e5cd2b..4dea73da 100644 --- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj +++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -12,8 +12,6 @@
12	</PropertyGroup>	12	</PropertyGroup>
13		13
14	<ItemGroup>	14	<ItemGroup>
15	<Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
16	<Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
17	<Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />	15	<Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
18	<Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />	16	<Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
19	<Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />	17	<Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />


diff --git a/src/wixlib/NetCore3.1.8_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs index 56f498de..d6877e56 100644 --- a/src/wixlib/NetCore3.1.8_x64.wxs +++ b/src/wixlib/NetCore3.1.8_x64.wxs
@@ -76,10 +76,10 @@
76	<RemotePayload	76	<RemotePayload
77	CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"	77	CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78	CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"	78	CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79	Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"	79	Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
80	Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"	80	Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
81	ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"	81	ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
82	Size="26089480"	82	Size="54253328"
83	Version="3.1.8.29220" />	83	Version="3.1.8.29220" />
84	</ExePackage>	84	</ExePackage>
85	</PackageGroup>	85	</PackageGroup>


diff --git a/src/wixlib/NetCore3.1.8_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs index 87d780c3..bf639c22 100644 --- a/src/wixlib/NetCore3.1.8_x86.wxs +++ b/src/wixlib/NetCore3.1.8_x86.wxs
@@ -76,10 +76,10 @@
76	<RemotePayload	76	<RemotePayload
77	CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"	77	CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78	CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"	78	CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79	Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"	79	Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
80	Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"	80	Hash="6105823D7417C265929DF2978A7214E7394E404F"
81	ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"	81	ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
82	Size="23183576"	82	Size="48377976"
83	Version="3.1.8.29220" />	83	Version="3.1.8.29220" />
84	</ExePackage>	84	</ExePackage>
85	</PackageGroup>	85	</PackageGroup>