From a3af25607b56f5ecf21d6712a8367217e5c43eb0 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 14 Oct 2022 14:27:03 -0700
Subject: Use "wixext4" instead of "tools" as the root folder in
 ".wixext.nupkg"s

Fixes 6944
---
 src/ext/Util/wixext/WixToolset.Util.wixext.csproj  | 13 +++++-------
 src/ext/Util/wixext/WixToolset.Util.wixext.nuspec  | 24 ----------------------
 src/ext/Util/wixext/WixToolset.Util.wixext.targets | 10 ++++-----
 3 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 src/ext/Util/wixext/WixToolset.Util.wixext.nuspec

(limited to 'src/ext/Util')

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>
-- 
cgit v1.2.3-55-g6feb