diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-10-14 14:27:03 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-10-15 11:45:54 -0700 |
| commit | a3af25607b56f5ecf21d6712a8367217e5c43eb0 (patch) | |
| tree | 213634eab88ea51ab6775ea49df85a73a0f54287 /src/ext/Sql | |
| parent | 08f53f409020b12dffaa2aeefa943b667a4b9328 (diff) | |
| download | wix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.tar.gz wix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.tar.bz2 wix-a3af25607b56f5ecf21d6712a8367217e5c43eb0.zip | |
Use "wixext4" instead of "tools" as the root folder in ".wixext.nupkg"s
Fixes 6944
Diffstat (limited to 'src/ext/Sql')
| -rw-r--r-- | src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj | 6 | ||||
| -rw-r--r-- | src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec | 21 | ||||
| -rw-r--r-- | src/ext/Sql/wixext/WixToolset.Sql.wixext.targets | 10 |
3 files changed, 7 insertions, 30 deletions
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 @@ | |||
| 10 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
| 11 | </PropertyGroup> | 11 | </PropertyGroup> |
| 12 | 12 | ||
| 13 | <Import Project="..\..\WixExt.props" /> | ||
| 14 | |||
| 13 | <ItemGroup> | 15 | <ItemGroup> |
| 14 | <EmbeddedResource Include="$(OutputPath)..\sql.wixlib" /> | 16 | <EmbeddedResource Include="$(OutputPath)..\sql.wixlib" /> |
| 15 | </ItemGroup> | 17 | </ItemGroup> |
| @@ -17,8 +19,4 @@ | |||
| 17 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 19 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
| 18 | <ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> | 20 | <ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> |
| 19 | </ItemGroup> | 21 | </ItemGroup> |
| 20 | |||
| 21 | <ItemGroup> | ||
| 22 | <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> | ||
| 23 | </ItemGroup> | ||
| 24 | </Project> | 22 | </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 @@ | |||
| 1 | <?xml version="1.0"?> | ||
| 2 | <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> | ||
| 3 | <metadata minClientVersion="4.0"> | ||
| 4 | <id>$id$</id> | ||
| 5 | <version>$version$</version> | ||
| 6 | <title>$title$</title> | ||
| 7 | <description>$description$</description> | ||
| 8 | <authors>$authors$</authors> | ||
| 9 | <license type="expression">MS-RL</license> | ||
| 10 | <requireLicenseAcceptance>false</requireLicenseAcceptance> | ||
| 11 | <copyright>$copyright$</copyright> | ||
| 12 | <projectUrl>$projectUrl$</projectUrl> | ||
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | ||
| 14 | </metadata> | ||
| 15 | |||
| 16 | <files> | ||
| 17 | <file src="$projectFolder$\$id$.targets" target="build" /> | ||
| 18 | |||
| 19 | <file src="$id$.dll" target="tools" /> | ||
| 20 | </files> | ||
| 21 | </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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- 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. --> | 2 | <!-- 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. --> |
| 3 | 3 | ||
| 4 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | 4 | <Project> |
| 5 | <PropertyGroup> | ||
| 6 | <WixToolsetSqlWixextPath Condition=" '$(WixToolsetSqlWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Sql.wixext.dll</WixToolsetSqlWixextPath> | ||
| 7 | </PropertyGroup> | ||
| 8 | <ItemGroup> | 5 | <ItemGroup> |
| 9 | <WixExtension Include="$(WixToolsetSqlWixextPath)" /> | 6 | <WixExtension Include="$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll" |
| 7 | Condition=" Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " /> | ||
| 8 | <UnsupportedWixExtension Include="$(MSBuildThisFileName)" | ||
| 9 | Condition=" !Exists('$(MSBuildThisFileDirectory)..\$(WixToolsetExtensionPackageFolder)\$(MSBuildThisFileName).dll') " /> | ||
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | </Project> | 11 | </Project> |