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/Sql/wixext/WixToolset.Sql.wixext.csproj | 6 ++----
src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec | 21 ---------------------
src/ext/Sql/wixext/WixToolset.Sql.wixext.targets | 10 +++++-----
3 files changed, 7 insertions(+), 30 deletions(-)
delete mode 100644 src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec
(limited to 'src/ext/Sql')
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>
--
cgit v1.2.3-55-g6feb