Use "wixext4" instead of "tools" as the root folder in ".wixext.nupkg"s

Fixes 6944

2 files changed, 7 insertions, 9 deletions

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>