Use "wixext4" instead of "tools" as the root folder in ".wixext.nupkg"s
Fixes 6944
Rob Mensching committed
Oct 14, 2022 at 14:27 UTC
a3af25607b56f5ecf21d6712a8367217e5c43eb0
55 files changed
+215
-336
src/Directory.Build.targets
+4
@@ -49,6 +49,10 @@
49
<PublishRepositoryUrl>true</PublishRepositoryUrl>
50
51
<ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(RepositoryUrl)'!='' ">$(RepositoryUrl)</ProjectUrl>
52
+
53
+ <WixMajorVersion>$(GitBaseVersionMajor)</WixMajorVersion>
54
+ <WixMinorVersion>$(GitBaseVersionMinor)</WixMinorVersion>
55
+ <WixPatchVersion>$(GitBaseVersionPatch)</WixPatchVersion>
56
</PropertyGroup>
57
58
<Message Importance="$(GitInfoReportImportance)" Text="Properties from Git:
src/api/wix/WixToolset.Extensibility/Services/IExtensionManager.cs
+6
@@ -39,6 +39,12 @@ namespace WixToolset.Extensibility.Services
39
/// <returns>List of cache locations where extensions may be found.</returns>
40
IReadOnlyCollection<IExtensionCacheLocation> GetCacheLocations();
41
42
+ /// <summary>
43
+ /// Gets the root folder name used in extension's package.
44
+ /// </summary>
45
+ /// <returns>Root folder name to find extension in a package.</returns>
46
+ string GetExtensionPackageRootFolderName();
47
+
48
/// <summary>
49
/// Gets extensions of specified type from factories loaded into the extension manager.
50
/// </summary>
src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
+2
-2
@@ -6,7 +6,7 @@
6
<title>$title$</title>
7
<description>$description$</description>
8
<authors>$authors$</authors>
9
- <icon>wix-white-bg.png</icon>
9
+ <icon>wix.png</icon>
10
<license type="expression">MS-RL</license>
11
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12
<copyright>$copyright$</copyright>
@@ -19,7 +19,7 @@
19
20
<files>
21
<file src="$projectFolder$\$id$.targets" target="build" />
22
- <file src="$projectFolder$\..\..\internal\images\wix-white-bg.png" />
22
+ <file src="$projectFolder$\..\..\internal\images\wix.png" />
23
<file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" />
24
<file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" />
25
<file src="net472\WixToolset.Dtf.Compression.dll" target="tools" />
src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
deleted
-24
@@ -1,24 +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
- <authors>$authors$</authors>
7
- <owners>$authors$</owners>
8
- <icon>wix-white-bg.png</icon>
9
- <license type="expression">MS-RL</license>
10
- <projectUrl>$projectUrl$</projectUrl>
11
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
12
- <title>$title$</title>
13
- <description>$description$</description>
14
- <copyright>$copyright$</copyright>
15
- <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
16
- </metadata>
17
-
18
- <files>
19
- <file src="$projectFolder$\$id$.targets" target="build" />
20
- <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
-
22
- <file src="$id$.dll" target="tools" />
23
- </files>
24
-</package>
src/ext/Bal/wixext/WixToolset.Bal.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetBalWixextPath Condition=" '$(WixToolsetBalWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Bal.wixext.dll</WixToolsetBalWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetBalWixextPath)" />
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>
11
</Project>
src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
deleted
-21
@@ -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>
src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetComPlusWixextPath Condition=" '$(WixToolsetComPlusWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.ComPlus.wixext.dll</WixToolsetComPlusWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetComPlusWixextPath)" />
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>
11
</Project>
src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\dependency.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec
deleted
-21
@@ -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>
src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetDependencyWixextPath Condition=" '$(WixToolsetDependencyWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Dependency.wixext.dll</WixToolsetDependencyWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetDependencyWixextPath)" />
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>
11
</Project>
src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetDifxAppWixextPath Condition=" '$(WixToolsetDifxAppWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.DifxApp.wixext.dll</WixToolsetDifxAppWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetDifxAppWixextPath)" />
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>
11
</Project>
src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\directx.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetDirectXWixextPath Condition=" '$(WixToolsetDirectXWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.DirectX.wixext.dll</WixToolsetDirectXWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetDirectXWixextPath)" />
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>
11
</Project>
src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\firewall.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetFirewallWixextPath Condition=" '$(WixToolsetFirewallWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Firewall.wixext.dll</WixToolsetFirewallWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetFirewallWixextPath)" />
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>
11
</Project>
src/ext/Http/wixext/WixToolset.Http.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\http.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/Http/wixext/WixToolset.Http.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetHttpWixextPath Condition=" '$(WixToolsetHttpWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Http.wixext.dll</WixToolsetHttpWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetHttpWixextPath)" />
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>
11
</Project>
src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\iis.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetIisWixextPath Condition=" '$(WixToolsetIisWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Iis.wixext.dll</WixToolsetIisWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetIisWixextPath)" />
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>
11
</Project>
src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\msmq.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetMsmqWixextPath Condition=" '$(WixToolsetMsmqWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Msmq.wixext.dll</WixToolsetMsmqWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetMsmqWixextPath)" />
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>
11
</Project>
src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+14
-2
@@ -21,13 +21,19 @@ namespace WixToolsetTest.Netfx
21
var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
22
var intermediateFolder = Path.Combine(baseFolder, "obj");
23
24
+ var extensionResult = WixRunner.Execute(new[]
25
+ {
26
+ "extension", "add",
27
+ "WixToolset.Bal.wixext"
28
+ });
29
+
30
var compileResult = WixRunner.Execute(new[]
31
{
32
"build",
33
Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
34
Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"),
35
Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
30
- "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
36
+ "-ext", "WixToolset.Bal.wixext",
37
"-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
38
"-intermediateFolder", intermediateFolder,
39
"-o", bundleFile,
@@ -48,12 +54,18 @@ namespace WixToolsetTest.Netfx
54
var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
55
var intermediateFolder = Path.Combine(baseFolder, "obj");
56
57
+ var extensionResult = WixRunner.Execute(new[]
58
+ {
59
+ "extension", "add",
60
+ "WixToolset.Bal.wixext"
61
+ });
62
+
63
var compileResult = WixRunner.Execute(new[]
64
{
65
"build",
66
Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
67
Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
56
- "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
68
+ "-ext", "WixToolset.Bal.wixext",
69
"-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
70
"-intermediateFolder", intermediateFolder,
71
"-o", bundleFile,
src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
-5
@@ -16,11 +16,6 @@
16
</ItemGroup>
17
18
<ItemGroup>
19
- <PackageReference Include="WixToolset.Bal.wixext" />
19
<PackageReference Include="WixToolset.Core.TestPackage" />
20
</ItemGroup>
22
-
23
- <Target Name="CopyExtensions" AfterTargets="Build">
24
- <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
25
- </Target>
21
</Project>
src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
deleted
-24
@@ -1,24 +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
- <authors>$authors$</authors>
7
- <owners>$authors$</owners>
8
- <icon>wix-white-bg.png</icon>
9
- <license type="expression">MS-RL</license>
10
- <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
12
- <title>$title$</title>
13
- <description>$description$</description>
14
- <copyright>$copyright$</copyright>
15
- <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
16
- </metadata>
17
-
18
- <files>
19
- <file src="$projectFolder$\$id$.targets" target="build" />
20
- <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
-
22
- <file src="$id$.dll" target="tools" />
23
- </files>
24
-</package>
src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetNetfxWixextPath Condition=" '$(WixToolsetNetfxWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Netfx.wixext.dll</WixToolsetNetfxWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetNetfxWixextPath)" />
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>
11
</Project>
src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetPowerShellWixextPath Condition=" '$(WixToolsetPowerShellWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.PowerShell.wixext.dll</WixToolsetPowerShellWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetPowerShellWixextPath)" />
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>
11
</Project>
src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\sql.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec
deleted
-21
@@ -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>
src/ext/Sql/wixext/WixToolset.Sql.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetSqlWixextPath Condition=" '$(WixToolsetSqlWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Sql.wixext.dll</WixToolsetSqlWixextPath>
7
- </PropertyGroup>
4
+<Project>
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>
11
</Project>
src/ext/UI/ui.cmd
+17
-1
@@ -4,18 +4,34 @@
4
@set _C=Debug
5
:parse_args
6
@if /i "%1"=="release" set _C=Release
7
+@if /i "%1"=="inc" set _INC=1
8
+@if /i "%1"=="clean" set _CLEAN=1
9
@if not "%1"=="" shift & goto parse_args
10
11
+:: Clean
12
+
13
+@if "%_INC%"=="" call :clean
14
+@if NOT "%_CLEAN%"=="" goto :end
15
+
16
@echo UI.wixext build %_C%
17
18
:: Build
19
msbuild -Restore -p:Configuration=%_C% || exit /b
20
21
:: Test
15
-dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
22
+:: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
23
24
:: Pack
25
msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b
26
27
+@goto :end
28
+
29
+:clean
30
+@rd /s/q "..\..\..\build\UI.wixext" 2> nul
31
+@del "..\..\..\build\artifacts\WixToolset.UI.wixext.*.nupkg" 2> nul
32
+@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.ui.wixext" 2> nul
33
+@exit /b
34
+
35
+:end
36
@popd
37
@endlocal
src/ext/UI/wixext/WixToolset.UI.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\ui.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
deleted
-24
@@ -1,24 +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
- <authors>$authors$</authors>
7
- <owners>$authors$</owners>
8
- <icon>wix-white-bg.png</icon>
9
- <license type="expression">MS-RL</license>
10
- <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
12
- <title>$title$</title>
13
- <description>$description$</description>
14
- <copyright>$copyright$</copyright>
15
- <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
16
- </metadata>
17
-
18
- <files>
19
- <file src="$projectFolder$\$id$.targets" target="build" />
20
- <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
-
22
- <file src="$id$.dll" target="tools" />
23
- </files>
24
-</package>
src/ext/UI/wixext/WixToolset.UI.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetUIWixextPath Condition=" '$(WixToolsetUIWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.UI.wixext.dll</WixToolsetUIWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetUIWixextPath)" />
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>
11
</Project>
src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+5
-8
@@ -10,16 +10,13 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
14
- <ProjectReference Include="..\wixlib\util.wixproj"
15
- OutputItemType="EmbeddedResource"
16
- ReferenceOutputAssembly="false"
17
- SkipGetTargetFrameworkProperties="true"
18
- />
19
- <EmbeddedResource Include="$(OutputPath)..\util.wixlib" Condition=" '$(NCrunch)'=='1' " />
16
+ <EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
17
</ItemGroup>
18
22
- <ItemGroup>
23
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
19
+ <ItemGroup Condition=" '$(NCrunch)'=='' ">
20
+ <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
22
</Project>
src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
deleted
-24
@@ -1,24 +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
- <authors>$authors$</authors>
7
- <owners>$authors$</owners>
8
- <icon>wix-white-bg.png</icon>
9
- <license type="expression">MS-RL</license>
10
- <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
12
- <title>$title$</title>
13
- <description>$description$</description>
14
- <copyright>$copyright$</copyright>
15
- <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
16
- </metadata>
17
-
18
- <files>
19
- <file src="$projectFolder$\$id$.targets" target="build" />
20
- <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
-
22
- <file src="$id$.dll" target="tools" />
23
- </files>
24
-</package>
src/ext/Util/wixext/WixToolset.Util.wixext.targets
+5
-5
@@ -1,11 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixToolsetUtilWixextPath Condition=" '$(WixToolsetUtilWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll</WixToolsetUtilWixextPath>
7
- </PropertyGroup>
4
+<Project>
5
<ItemGroup>
9
- <WixExtension Include="$(WixToolsetUtilWixextPath)" />
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>
11
</Project>
src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
+2
-4
@@ -10,6 +10,8 @@
10
<DebugType>embedded</DebugType>
11
</PropertyGroup>
12
13
+ <Import Project="..\..\WixExt.props" />
14
+
15
<ItemGroup>
16
<EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />
17
</ItemGroup>
@@ -17,8 +19,4 @@
19
<ItemGroup Condition=" '$(NCrunch)'=='' ">
20
<ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
21
</ItemGroup>
20
-
21
- <ItemGroup>
22
- <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
23
- </ItemGroup>
22
</Project>
src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
deleted
-21
@@ -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>
src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
+5
-2
@@ -1,8 +1,11 @@
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. -->
3
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
4
+<Project>
5
<ItemGroup>
6
- <WixExtension Include="$(MSBuildThisFileDirectory)..\tools\WixToolset.VisualStudio.wixext.dll" />
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>
11
</Project>
src/ext/WixExt.props
new
+19
@@ -0,0 +1,19 @@
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. -->
3
+
4
+<Project>
5
+ <PropertyGroup>
6
+ <PackageIcon>wix.png</PackageIcon>
7
+ <IncludeBuildOutput>false</IncludeBuildOutput>
8
+ <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
9
+ <NoWarn>NU5100</NoWarn>
10
+ </PropertyGroup>
11
+
12
+ <ItemGroup>
13
+ <Content Include="$(MSBuildThisFileDirectory)..\internal\images\wix.png" PackagePath="/" />
14
+ <Content Include="$(MSBuildProjectName).targets" PackagePath="build" />
15
+ <Content Include="$(TargetPath)" PackagePath="wixext4" />
16
+
17
+ <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" />
18
+ </ItemGroup>
19
+</Project>
src/internal/images/wix-black-bg.png
Binary files a/src/internal/images/wix-black-bg.png and b/src/internal/images/wix-black-bg.png differ
src/internal/images/wix-white-bg.png
Binary files a/src/internal/images/wix-white-bg.png and b/src/internal/images/wix-white-bg.png differ
src/internal/images/wix.png
Binary files /dev/null and b/src/internal/images/wix.png differ
src/wix/WixToolset.Core.ExtensionCache/ExtensionCacheManager.cs
+3
-1
@@ -197,6 +197,8 @@ namespace WixToolset.Core.ExtensionCache
197
198
var extensionFolder = Path.Combine(cacheFolder, id, nugetVersion.ToString());
199
200
+ var extensionPackageRootFolderName = this.ExtensionManager.GetExtensionPackageRootFolderName();
201
+
202
foreach (var source in searchSources)
203
{
204
var repository = Repository.Factory.GetCoreV3(source.Source);
@@ -214,7 +216,7 @@ namespace WixToolset.Core.ExtensionCache
216
217
using (var archive = new PackageArchiveReader(stream))
218
{
217
- var files = PackagingConstants.Folders.Known.SelectMany(folder => archive.GetFiles(folder)).Distinct(StringComparer.OrdinalIgnoreCase);
219
+ var files = archive.GetFiles(extensionPackageRootFolderName);
220
await archive.CopyFilesAsync(extensionFolder, files, this.ExtractProgress, logger, cancellationToken);
221
}
222
src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
+11
-3
@@ -15,8 +15,11 @@ namespace WixToolset.Core.ExtensibilityServices
15
16
internal class ExtensionManager : IExtensionManager
17
{
18
- private const string UserWixFolderName = ".wix4";
19
- private const string MachineWixFolderName = "WixToolset4";
18
+ // This value needs to stay in sync with the Property in "wix.targets" with the same name.
19
+ private const string WixToolsetExtensionPackageFolder = "wixext4";
20
+
21
+ private const string UserWixFolderName = ".wix";
22
+ private const string MachineWixFolderName = "WixToolset";
23
private const string ExtensionsFolderName = "extensions";
24
private const string UserEnvironmentName = "WIX_EXTENSIONS";
25
@@ -70,7 +73,7 @@ namespace WixToolset.Core.ExtensibilityServices
73
continue;
74
}
75
73
- checkPath = Path.Combine(extensionFolder, versionFolder, "tools", extensionId + ".dll");
76
+ checkPath = Path.Combine(extensionFolder, versionFolder, WixToolsetExtensionPackageFolder, extensionId + ".dll");
77
checkedPaths.Add(checkPath);
78
79
if (TryLoadFromPath(checkPath, out assembly))
@@ -128,6 +131,11 @@ namespace WixToolset.Core.ExtensibilityServices
131
return locations;
132
}
133
134
+ public string GetExtensionPackageRootFolderName()
135
+ {
136
+ return WixToolsetExtensionPackageFolder;
137
+ }
138
+
139
public IReadOnlyCollection<T> GetServices<T>() where T : class
140
{
141
if (!this.loadedExtensionsByType.TryGetValue(typeof(T), out var extensions))
src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+20
-2
@@ -31,13 +31,31 @@
31
<XmlPoke
32
XmlInputPath="$(PublishDir)tools\wix.props"
33
Namespaces="$(Namespaces)"
34
- Query="//msb:WixToolsetVersion"
35
- Value="$(Version)" />
34
+ Query="//msb:WixToolsetMajorVersion"
35
+ Value="$(WixMajorVersion)" />
36
+
37
+ <XmlPoke
38
+ XmlInputPath="$(PublishDir)tools\wix.props"
39
+ Namespaces="$(Namespaces)"
40
+ Query="//msb:WixToolsetMinorVersion"
41
+ Value="$(WixMinorVersion)" />
42
+
43
+ <XmlPoke
44
+ XmlInputPath="$(PublishDir)tools\wix.props"
45
+ Namespaces="$(Namespaces)"
46
+ Query="//msb:WixToolsetPatchVersion"
47
+ Value="$(WixPatchVersion)" />
48
49
<XmlPoke
50
XmlInputPath="$(PublishDir)tools\wix.props"
51
Namespaces="$(Namespaces)"
52
Query="//msb:WixToolsetMajorMinorVersion"
53
Value="$(MajorMinorVersion)" />
54
+
55
+ <XmlPoke
56
+ XmlInputPath="$(PublishDir)tools\wix.props"
57
+ Namespaces="$(Namespaces)"
58
+ Query="//msb:WixToolsetVersion"
59
+ Value="$(Version)" />
60
</Target>
61
</Project>
src/wix/WixToolset.Sdk/tools/wix.props
+5
-1
@@ -4,8 +4,12 @@
4
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<PropertyGroup>
6
<WixPropsImported>true</WixPropsImported>
7
- <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion>
7
+ <WixToolsetMajorVersion>$$WixToolsetMajorVersion$$</WixToolsetMajorVersion>
8
+ <WixToolsetMinorVersion>$$WixToolsetMinorVersion$$</WixToolsetMinorVersion>
9
+ <WixToolsetPatchVersion>$$WixToolsetPatchVersion$$</WixToolsetPatchVersion>
10
<WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion>
11
+ <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion>
12
+ <WixToolsetExtensionPackageFolder>wixext4</WixToolsetExtensionPackageFolder>
13
</PropertyGroup>
14
15
<ImportGroup>
src/wix/WixToolset.Sdk/tools/wix.targets
+3
@@ -577,6 +577,9 @@
577
<_WixBuildCabinetCachePath Condition=" '$(CabinetCachePath)'!='' ">$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))</_WixBuildCabinetCachePath>
578
</PropertyGroup>
579
580
+ <Warning Text="@(UnsupportedWixExtension->'%(Identity)') does not have support for WiX Toolset v$(WixToolsetVersion)."
581
+ Condition=" '@(UnsupportedWixExtension)' != '' "/>
582
+
583
<WixBuild
584
SourceFiles="@(Compile)"
585
LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
src/wix/pack-wix/pack-wix.nuspec
+2
-2
@@ -6,7 +6,7 @@
6
<title>$title$</title>
7
<description>$description$</description>
8
<authors>$authors$</authors>
9
- <icon>wix-white-bg.png</icon>
9
+ <icon>wix.png</icon>
10
<license type="expression">MS-RL</license>
11
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12
<copyright>$copyright$</copyright>
@@ -19,7 +19,7 @@
19
20
<files>
21
<file src="$projectFolder$\DotnetToolSettings.xml" target="tools\net6.0\any" />
22
- <file src="$projectFolder$\..\..\internal\images\wix-white-bg.png" />
22
+ <file src="$projectFolder$\..\..\internal\images\wix.png" />
23
<file src="**" target="tools\net6.0\any" />
24
</files>
25
</package>
src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+1
-1
@@ -190,7 +190,7 @@ namespace WixToolsetTest.CoreIntegration
190
191
result.AssertSuccess();
192
193
- var cacheFolder = Path.Combine(folder, ".wix4", "extensions", "WixToolset.UI.wixext");
193
+ var cacheFolder = Path.Combine(folder, ".wix", "extensions", "WixToolset.UI.wixext");
194
Assert.True(Directory.Exists(cacheFolder), $"Expected folder '{cacheFolder}' to exist");
195
196
result = WixRunner.Execute(new[]