From ec9e2678b2051583ea24d8cec29572851f3db105 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 22 Mar 2024 14:24:43 -0700
Subject: [PATCH] Work around lack of upper-bound limit on extension versions

See issue 8033 for more details
---
 .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs    | 12 ++++++------
 .../ExtensionFixture.cs                              |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index bb3b7b35f..4c01a78f8 100644
--- 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,7 +57,7 @@ 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[]
@@ -65,7 +65,7 @@ public void CanBuildUsingLatestDotNetCorePackages_X64()
                     "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
index 710f3b8df..0731700b2 100644
--- 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;