42 files changed, 158 insertions, 324 deletions

diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
index 8df40d5c..5591abde 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
+++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
deleted file mode 100644
index cdbb001c..00000000
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>$authors$</authors>
-    <owners>$authors$</owners>
-    <icon>wix-white-bg.png</icon>
-    <license type="expression">MS-RL</license>
-    <projectUrl>$projectUrl$</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <title>$title$</title>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\$id$.targets" target="build" />
-    <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
-
-    <file src="$id$.dll" target="tools" />
-  </files>
-</package>
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets b/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets
index 70c5a19c..bf6df083 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets
+++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetBalWixextPath Condition=" '$(WixToolsetBalWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Bal.wixext.dll</WixToolsetBalWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetBalWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
index 77f9a8d3..1975d7d4 100644
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
deleted file mode 100644
index 7143d993..00000000
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
-    <authors>$authors$</authors>
-    <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\$id$.targets" target="build" />
-
-    <file src="$id$.dll" target="tools" />
-  </files>
-</package>
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
index 8115b715..bf6df083 100644
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetComPlusWixextPath Condition=" '$(WixToolsetComPlusWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.ComPlus.wixext.dll</WixToolsetComPlusWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetComPlusWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
index b477ddf3..b61c6665 100644
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
+++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\dependency.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec
deleted file mode 100644
index 7143d993..00000000
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
-    <authors>$authors$</authors>
-    <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\$id$.targets" target="build" />
-
-    <file src="$id$.dll" target="tools" />
-  </files>
-</package>
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
index 2b298736..bf6df083 100644
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
+++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetDependencyWixextPath Condition=" '$(WixToolsetDependencyWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Dependency.wixext.dll</WixToolsetDependencyWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetDependencyWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
index 9f2d353e..ec52e897 100644
--- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
+++ b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets
index b01d4116..bf6df083 100644
--- a/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets
+++ b/src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetDifxAppWixextPath Condition=" '$(WixToolsetDifxAppWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.DifxApp.wixext.dll</WixToolsetDifxAppWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetDifxAppWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
index c5f4770d..80263e9a 100644
--- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
+++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
index 4e27a6da..bf6df083 100644
--- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
+++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetDirectXWixextPath Condition=" '$(WixToolsetDirectXWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.DirectX.wixext.dll</WixToolsetDirectXWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetDirectXWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
index 4c2eed7e..8d1dc77e 100644
--- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
+++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\firewall.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
index c717450f..bf6df083 100644
--- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
+++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetFirewallWixextPath Condition=" '$(WixToolsetFirewallWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Firewall.wixext.dll</WixToolsetFirewallWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetFirewallWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj
index d11e28cc..cee26f86 100644
--- a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj
+++ b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\http.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.targets b/src/ext/Http/wixext/WixToolset.Http.wixext.targets
index 254b0010..bf6df083 100644
--- a/src/ext/Http/wixext/WixToolset.Http.wixext.targets
+++ b/src/ext/Http/wixext/WixToolset.Http.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetHttpWixextPath Condition=" '$(WixToolsetHttpWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Http.wixext.dll</WixToolsetHttpWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetHttpWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
index 090d9150..79c8dae7 100644
--- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
+++ b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\iis.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets b/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
index 6398fce1..bf6df083 100644
--- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
+++ b/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetIisWixextPath Condition=" '$(WixToolsetIisWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Iis.wixext.dll</WixToolsetIisWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetIisWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
index 0c2325a8..ef369c2c 100644
--- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
+++ b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\msmq.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
index 5f69fe48..bf6df083 100644
--- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
+++ b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetMsmqWixextPath Condition=" '$(WixToolsetMsmqWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Msmq.wixext.dll</WixToolsetMsmqWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetMsmqWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 8db3db46..6a75f30f 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -21,13 +21,19 @@ namespace WixToolsetTest.Netfx
                 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
                 var intermediateFolder = Path.Combine(baseFolder, "obj");
 
+                var extensionResult = WixRunner.Execute(new[]
+                {
+                    "extension", "add",
+                    "WixToolset.Bal.wixext"
+                });
+
                 var compileResult = WixRunner.Execute(new[]
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", "WixToolset.Bal.wixext",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
@@ -48,12 +54,18 @@ namespace WixToolsetTest.Netfx
                 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
                 var intermediateFolder = Path.Combine(baseFolder, "obj");
 
+                var extensionResult = WixRunner.Execute(new[]
+                {
+                    "extension", "add",
+                    "WixToolset.Bal.wixext"
+                });
+
                 var compileResult = WixRunner.Execute(new[]
                 {
                     "build",
                     Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
                     Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
+                    "-ext", "WixToolset.Bal.wixext",
                     "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
                     "-intermediateFolder", intermediateFolder,
                     "-o", bundleFile,
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index e2f97a16..8b13d357 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -16,11 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Bal.wixext" />
     <PackageReference Include="WixToolset.Core.TestPackage" />
   </ItemGroup>
-
-  <Target Name="CopyExtensions" AfterTargets="Build">
-    <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
-  </Target>
 </Project>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
index 15bf1654..67759ab3 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
deleted file mode 100644
index 4abfa98c..00000000
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>$authors$</authors>
-    <owners>$authors$</owners>
-    <icon>wix-white-bg.png</icon>
-    <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <title>$title$</title>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\$id$.targets" target="build" />
-    <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
-
-    <file src="$id$.dll" target="tools" />
-  </files>
-</package>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
index 2ed9c488..bf6df083 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetNetfxWixextPath Condition=" '$(WixToolsetNetfxWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Netfx.wixext.dll</WixToolsetNetfxWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetNetfxWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
index 54079c4e..812915a8 100644
--- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
+++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
index bf06e1e4..bf6df083 100644
--- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
+++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetPowerShellWixextPath Condition=" '$(WixToolsetPowerShellWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.PowerShell.wixext.dll</WixToolsetPowerShellWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetPowerShellWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj
index b3eb5a4c..28a66297 100644
--- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj
+++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\sql.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec
deleted file mode 100644
index 7143d993..00000000
--- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
-    <authors>$authors$</authors>
-    <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\$id$.targets" target="build" />
-
-    <file src="$id$.dll" target="tools" />
-  </files>
-</package>
diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.targets b/src/ext/Sql/wixext/WixToolset.Sql.wixext.targets
index 4950e119..bf6df083 100644
--- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.targets
+++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetSqlWixextPath Condition=" '$(WixToolsetSqlWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Sql.wixext.dll</WixToolsetSqlWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetSqlWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd
index d62870d4..3823f45a 100644
--- a/src/ext/UI/ui.cmd
+++ b/src/ext/UI/ui.cmd
@@ -4,18 +4,34 @@
 @set _C=Debug
 :parse_args
 @if /i "%1"=="release" set _C=Release
+@if /i "%1"=="inc" set _INC=1
+@if /i "%1"=="clean" set _CLEAN=1
 @if not "%1"=="" shift & goto parse_args
 
+:: Clean
+
+@if "%_INC%"=="" call :clean
+@if NOT "%_CLEAN%"=="" goto :end
+
 @echo UI.wixext build %_C%
 
 :: Build
 msbuild -Restore -p:Configuration=%_C% || exit /b
 
 :: Test
-dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
+:: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
 
 :: Pack
 msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b
 
+@goto :end
+
+:clean
+@rd /s/q "..\..\..\build\UI.wixext" 2> nul
+@del "..\..\..\build\artifacts\WixToolset.UI.wixext.*.nupkg" 2> nul
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.ui.wixext" 2> nul
+@exit /b
+
+:end
 @popd
 @endlocal
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
index 09f748c3..288b4a85 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
deleted file mode 100644
index 4abfa98c..00000000
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>$authors$</authors>
-    <owners>$authors$</owners>
-    <icon>wix-white-bg.png</icon>
-    <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <title>$title$</title>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\$id$.targets" target="build" />
-    <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
-
-    <file src="$id$.dll" target="tools" />
-  </files>
-</package>
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.targets b/src/ext/UI/wixext/WixToolset.UI.wixext.targets
index b07a0886..bf6df083 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.targets
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetUIWixextPath Condition=" '$(WixToolsetUIWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.UI.wixext.dll</WixToolsetUIWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetUIWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
index 82e1886b..a4fcaf14 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
@@ -10,16 +10,13 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
-    <ProjectReference Include="..\wixlib\util.wixproj"
-                      OutputItemType="EmbeddedResource"
-                      ReferenceOutputAssembly="false"
-                      SkipGetTargetFrameworkProperties="true"
-                      />
-    <EmbeddedResource Include="$(OutputPath)..\util.wixlib" Condition=" '$(NCrunch)'=='1' " />
+    <EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
+  <ItemGroup Condition=" '$(NCrunch)'=='' ">
+    <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
deleted file mode 100644
index 4abfa98c..00000000
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <authors>$authors$</authors>
-    <owners>$authors$</owners>
-    <icon>wix-white-bg.png</icon>
-    <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <title>$title$</title>
-    <description>$description$</description>
-    <copyright>$copyright$</copyright>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\$id$.targets" target="build" />
-    <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
-
-    <file src="$id$.dll" target="tools" />
-  </files>
-</package>
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.targets b/src/ext/Util/wixext/WixToolset.Util.wixext.targets
index 64dff429..bf6df083 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.targets
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.targets
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <WixToolsetUtilWixextPath Condition=" '$(WixToolsetUtilWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll</WixToolsetUtilWixextPath>
-  </PropertyGroup>
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(WixToolsetUtilWixextPath)" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
index 209ea00c..0224c98c 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
@@ -10,6 +10,8 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <Import Project="..\..\WixExt.props" />
+
   <ItemGroup>
     <EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />
   </ItemGroup>
@@ -17,8 +19,4 @@
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
-  </ItemGroup>
 </Project>
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
deleted file mode 100644
index 7143d993..00000000
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata minClientVersion="4.0">
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
-    <authors>$authors$</authors>
-    <license type="expression">MS-RL</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
-    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-  </metadata>
-
-  <files>
-    <file src="$projectFolder$\$id$.targets" target="build" />
-
-    <file src="$id$.dll" target="tools" />
-  </files>
-</package>
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
index 4542375f..bf6df083 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project>
   <ItemGroup>
-    <WixExtension Include="$(MSBuildThisFileDirectory)..\tools\WixToolset.VisualStudio.wixext.dll" />
+    <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll"
+       Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
+    <UnsupportedWixExtension Include="$(MSBuildThisFileName)"
+      Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " />
   </ItemGroup>
 </Project>
diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props
new file mode 100644
index 00000000..23bce7fa
--- /dev/null
+++ b/src/ext/WixExt.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<Project>
+  <PropertyGroup>
+    <PackageIcon>wix.png</PackageIcon>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+    <NoWarn>NU5100</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)..\internal\images\wix.png" PackagePath="/" />
+    <Content Include="$(MSBuildProjectName).targets" PackagePath="build" />
+    <Content Include="$(TargetPath)" PackagePath="wixext4" />
+
+    <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
+  </ItemGroup>
+</Project>