Work around lack of upper-bound limit on extension versions

See issue 8033 for more details
wixtoolset · Mar 22, 2024 · ec9e267 · ec9e267
1 parent 75a8c75
commit ec9e267
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -24,7 +24,7 @@ public void CanBuildUsingLatestDotNetCorePackages()
                 var extensionResult = WixRunner.Execute(new[]
                 {
                     "extension", "add",
-                    "WixToolset.Bal.wixext"
+                    "WixToolset.Bal.wixext/4.0.0"
                 });
 
                 var compileResult = WixRunner.Execute(new[]
@@ -33,7 +33,7 @@ public void CanBuildUsingLatestDotNetCorePackages()
                     Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
-                    "-ext", "WixToolset.Bal.wixext",
+                    "-ext", "WixToolset.Bal.wixext/4.0.0",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
@@ -57,15 +57,15 @@ public void CanBuildUsingLatestDotNetCorePackages_X64()
                 var extensionResult = WixRunner.Execute(new[]
                 {
                     "extension", "add",
-                    "WixToolset.Bal.wixext"
+                    "WixToolset.Bal.wixext/4.0.0"
                 });
 
                 var compileResult = WixRunner.Execute(new[]
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
-                    "-ext", "WixToolset.Bal.wixext",
+                    "-ext", "WixToolset.Bal.wixext/4.0.0",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
@@ -89,14 +89,14 @@ public void CanBuildUsingNetFx481Packages()
                 var extensionResult = WixRunner.Execute(new[]
                 {
                     "extension", "add",
-                    "WixToolset.Bal.wixext"
+                    "WixToolset.Bal.wixext/4.0.0"
                 });
 
                 var compileResult = WixRunner.Execute(new[]
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
-                    "-ext", "WixToolset.Bal.wixext",
+                    "-ext", "WixToolset.Bal.wixext/4.0.0",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,

diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
@@ -231,7 +231,7 @@ public void CannotBuildWithMissingVersionedExtension()
             }
         }
 
-        [Fact]
+        [Fact(Skip = "Blocked by issue #8033.")]
         public void CanManipulateExtensionCache()
         {
             var currentFolder = Environment.CurrentDirectory;
-Original file line number
+Diff line change
@@ Expand Up / @@ -231,7 +231,7 @@ public void CannotBuildWithMissingVersionedExtension() @@
                 }
             }
-            [Fact]
+            [Fact(Skip = "Blocked by issue #8033.")]
             public void CanManipulateExtensionCache()
             {
                 var currentFolder = Environment.CurrentDirectory;
@@ Expand Down @@