Split up latest package and individual packages. Make corresponding changes to tests.

6 files changed, 86 insertions, 6 deletions

diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 845e1373..c9391074 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -12,6 +12,56 @@ namespace WixToolsetTest.Netfx
     public class NetfxExtensionFixture
     {
         [Fact]
+        public void CanBuildUsingLatestDotNetCorePackages()
+        {
+            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, "BundleLatest.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 CanBuildUsingLatestDotNetCorePackages_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, "BundleLatest_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 CanBuildUsingDotNetCorePackages()
         {
             using (var fs = new DisposableFileSystem())
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
index 49e8c022..d746226e 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -6,9 +6,9 @@
             <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
         </BootstrapperApplicationRef>
         <Chain>
-            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
-            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
         </Chain>
     </Bundle>
 </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 @@
+<?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="AspNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
+        </Chain>
+    </Bundle>
+</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 @@
+<?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="AspNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
+        </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
index 09c7bcdd..4d1ba73e 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
@@ -6,9 +6,9 @@
             <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
         </BootstrapperApplicationRef>
         <Chain>
-            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
-            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
+            <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 1df84972..a9e5cd2b 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -14,6 +14,8 @@
   <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" />
     <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />