2 files changed, 7 insertions, 9 deletions

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>