Update supported WiX extension version to "7"

4 files changed, 7 insertions, 4 deletions

diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props
index 56f40f50..d2c4929a 100644
--- a/src/ext/WixExt.props
+++ b/src/ext/WixExt.props
@@ -6,7 +6,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <NoWarn>NU5100</NoWarn>
-    <WixExtensionPackageFolder>wixext6</WixExtensionPackageFolder>
+    <WixExtensionPackageFolder>wixext7</WixExtensionPackageFolder>
     <PackageTags>$(PackageTags) wixext CustomActions</PackageTags>
     <IsWixExtension>true</IsWixExtension>
   </PropertyGroup>
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
index 4a08ff63..970928f5 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Core.ExtensibilityServices
     internal class ExtensionManager : IExtensionManager
     {
         // This value needs to stay in sync with the Property in "wix.props" with the same name.
-        private const string WixToolsetExtensionPackageFolder = "wixext6";
+        private const string WixToolsetExtensionPackageFolder = "wixext7";
 
         private const string UserWixFolderName = ".wix";
         private const string MachineWixFolderName = "WixToolset";
diff --git a/src/wix/WixToolset.Sdk/tools/wix.props b/src/wix/WixToolset.Sdk/tools/wix.props
index a7239225..dde51e8a 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.props
+++ b/src/wix/WixToolset.Sdk/tools/wix.props
@@ -9,7 +9,7 @@
     <WixToolsetPatchVersion>$$WixToolsetPatchVersion$$</WixToolsetPatchVersion>
     <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion>
     <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion>
-    <WixToolsetExtensionPackageFolder>wixext6</WixToolsetExtensionPackageFolder>
+    <WixToolsetExtensionPackageFolder>wixext7</WixToolsetExtensionPackageFolder>
   </PropertyGroup>
 
   <ImportGroup>
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index ec20c404..2dcfd0e9 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -697,7 +697,10 @@
       <_WixBuildCabinetCachePath Condition=" '$(CabinetCachePath)'!='' ">$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))</_WixBuildCabinetCachePath>
     </PropertyGroup>
 
-    <Warning Text="@(UnsupportedWixExtension->'%(Identity)') does not have support for WiX Toolset v$(WixToolsetVersion)."
+    <Warning
+        Text="The WiX Extension '%(UnsupportedWixExtension.Identity)' does not support WiX Toolset v$(WixToolsetVersion). Check the Version of the PackageReference for '%(UnsupportedWixExtension.Identity)' in your project and ensure it supports WiX v$(WixToolsetVersion)."
+        Code="WIX1031"
+        File="$(MSBuildProjectFile)"
         Condition=" '@(UnsupportedWixExtension)' != '' "/>
 
     <WixBuild