aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-10-14 14:27:03 -0700
committerRob Mensching <rob@firegiant.com>2022-10-15 11:45:54 -0700
commita3af25607b56f5ecf21d6712a8367217e5c43eb0 (patch)
tree213634eab88ea51ab6775ea49df85a73a0f54287 /src
parent08f53f409020b12dffaa2aeefa943b667a4b9328 (diff)
downloadwix-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')
-rw-r--r--src/Directory.Build.targets4
-rw-r--r--src/api/wix/WixToolset.Extensibility/Services/IExtensionManager.cs6
-rw-r--r--src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec4
-rw-r--r--src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj6
-rw-r--r--src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec24
-rw-r--r--src/ext/Bal/wixext/WixToolset.Bal.wixext.targets10
-rw-r--r--src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj6
-rw-r--r--src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec21
-rw-r--r--src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets10
-rw-r--r--src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj6
-rw-r--r--src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec21
-rw-r--r--src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets10
-rw-r--r--src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.csproj6
-rw-r--r--src/ext/DifxApp/wixext/WixToolset.DifxApp.wixext.targets10
-rw-r--r--src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj6
-rw-r--r--src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets10
-rw-r--r--src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj6
-rw-r--r--src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets10
-rw-r--r--src/ext/Http/wixext/WixToolset.Http.wixext.csproj6
-rw-r--r--src/ext/Http/wixext/WixToolset.Http.wixext.targets10
-rw-r--r--src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj6
-rw-r--r--src/ext/Iis/wixext/WixToolset.Iis.wixext.targets10
-rw-r--r--src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj6
-rw-r--r--src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets10
-rw-r--r--src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs16
-rw-r--r--src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj5
-rw-r--r--src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj6
-rw-r--r--src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec24
-rw-r--r--src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets10
-rw-r--r--src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj6
-rw-r--r--src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets10
-rw-r--r--src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj6
-rw-r--r--src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec21
-rw-r--r--src/ext/Sql/wixext/WixToolset.Sql.wixext.targets10
-rw-r--r--src/ext/UI/ui.cmd18
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.csproj6
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.nuspec24
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.targets10
-rw-r--r--src/ext/Util/wixext/WixToolset.Util.wixext.csproj13
-rw-r--r--src/ext/Util/wixext/WixToolset.Util.wixext.nuspec24
-rw-r--r--src/ext/Util/wixext/WixToolset.Util.wixext.targets10
-rw-r--r--src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj6
-rw-r--r--src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec21
-rw-r--r--src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets7
-rw-r--r--src/ext/WixExt.props19
-rw-r--r--src/internal/images/wix-black-bg.pngbin11650 -> 7917 bytes
-rw-r--r--src/internal/images/wix-white-bg.pngbin22481 -> 17022 bytes
-rw-r--r--src/internal/images/wix.pngbin0 -> 3410 bytes
-rw-r--r--src/wix/WixToolset.Core.ExtensionCache/ExtensionCacheManager.cs4
-rw-r--r--src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs14
-rw-r--r--src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj22
-rw-r--r--src/wix/WixToolset.Sdk/tools/wix.props6
-rw-r--r--src/wix/WixToolset.Sdk/tools/wix.targets3
-rw-r--r--src/wix/pack-wix/pack-wix.nuspec4
-rw-r--r--src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs2
55 files changed, 215 insertions, 336 deletions
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 5a8ef429..3d70c04c 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -49,6 +49,10 @@
49 <PublishRepositoryUrl>true</PublishRepositoryUrl> 49 <PublishRepositoryUrl>true</PublishRepositoryUrl>
50 50
51 <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(RepositoryUrl)'!='' ">$(RepositoryUrl)</ProjectUrl> 51 <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(RepositoryUrl)'!='' ">$(RepositoryUrl)</ProjectUrl>
52
53 <WixMajorVersion>$(GitBaseVersionMajor)</WixMajorVersion>
54 <WixMinorVersion>$(GitBaseVersionMinor)</WixMinorVersion>
55 <WixPatchVersion>$(GitBaseVersionPatch)</WixPatchVersion>
52 </PropertyGroup> 56 </PropertyGroup>
53 57
54 <Message Importance="$(GitInfoReportImportance)" Text="Properties from Git: 58 <Message Importance="$(GitInfoReportImportance)" Text="Properties from Git:
diff --git a/src/api/wix/WixToolset.Extensibility/Services/IExtensionManager.cs b/src/api/wix/WixToolset.Extensibility/Services/IExtensionManager.cs
index fe939a59..ef569a64 100644
--- a/src/api/wix/WixToolset.Extensibility/Services/IExtensionManager.cs
+++ b/src/api/wix/WixToolset.Extensibility/Services/IExtensionManager.cs
@@ -40,6 +40,12 @@ namespace WixToolset.Extensibility.Services
40 IReadOnlyCollection<IExtensionCacheLocation> GetCacheLocations(); 40 IReadOnlyCollection<IExtensionCacheLocation> GetCacheLocations();
41 41
42 /// <summary> 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>
43 /// Gets extensions of specified type from factories loaded into the extension manager. 49 /// Gets extensions of specified type from factories loaded into the extension manager.
44 /// </summary> 50 /// </summary>
45 /// <typeparam name="T">Type of extension to get.</typeparam> 51 /// <typeparam name="T">Type of extension to get.</typeparam>
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
index 4550e629..cbc53152 100644
--- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
@@ -6,7 +6,7 @@
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix-white-bg.png</icon> 9 <icon>wix.png</icon>
10 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -19,7 +19,7 @@
19 19
20 <files> 20 <files>
21 <file src="$projectFolder$\$id$.targets" target="build" /> 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" /> 23 <file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" />
24 <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" /> 24 <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" />
25 <file src="net472\WixToolset.Dtf.Compression.dll" target="tools" /> 25 <file src="net472\WixToolset.Dtf.Compression.dll" target="tools" />
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
index 8df40d5c..5591abde 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
+++ b/src/ext/Bal/wixext/WixToolset.Bal.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)..\bal.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\bal.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\bal.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\bal.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/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
deleted file mode 100644
index cdbb001c..00000000
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
+++ /dev/null
@@ -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>
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets b/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets
index 70c5a19c..bf6df083 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets
+++ b/src/ext/Bal/wixext/WixToolset.Bal.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 <WixToolsetBalWixextPath Condition=" '$(WixToolsetBalWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Bal.wixext.dll</WixToolsetBalWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
index 77f9a8d3..1975d7d4 100644
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.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)..\complus.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\complus.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/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
deleted file mode 100644
index 7143d993..00000000
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.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/ComPlus/wixext/WixToolset.ComPlus.wixext.targets b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
index 8115b715..bf6df083 100644
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.targets
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.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 <WixToolsetComPlusWixextPath Condition=" '$(WixToolsetComPlusWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.ComPlus.wixext.dll</WixToolsetComPlusWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
index b477ddf3..b61c6665 100644
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
+++ b/src/ext/Dependency/wixext/WixToolset.Dependency.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)..\dependency.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\dependency.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\dependency.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/Dependency/wixext/WixToolset.Dependency.wixext.nuspec b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec
deleted file mode 100644
index 7143d993..00000000
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.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/Dependency/wixext/WixToolset.Dependency.wixext.targets b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
index 2b298736..bf6df083 100644
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.targets
+++ b/src/ext/Dependency/wixext/WixToolset.Dependency.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 <WixToolsetDependencyWixextPath Condition=" '$(WixToolsetDependencyWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Dependency.wixext.dll</WixToolsetDependencyWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
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 @@
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)..\difxapp.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\difxapp.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\difxapp.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/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 @@
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 <WixToolsetDifxAppWixextPath Condition=" '$(WixToolsetDifxAppWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.DifxApp.wixext.dll</WixToolsetDifxAppWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
index c5f4770d..80263e9a 100644
--- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
+++ b/src/ext/DirectX/wixext/WixToolset.DirectX.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)..\directx.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\directx.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/DirectX/wixext/WixToolset.DirectX.wixext.targets b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
index 4e27a6da..bf6df083 100644
--- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.targets
+++ b/src/ext/DirectX/wixext/WixToolset.DirectX.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 <WixToolsetDirectXWixextPath Condition=" '$(WixToolsetDirectXWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.DirectX.wixext.dll</WixToolsetDirectXWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
index 4c2eed7e..8d1dc77e 100644
--- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
+++ b/src/ext/Firewall/wixext/WixToolset.Firewall.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)..\firewall.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\firewall.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\firewall.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/Firewall/wixext/WixToolset.Firewall.wixext.targets b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
index c717450f..bf6df083 100644
--- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.targets
+++ b/src/ext/Firewall/wixext/WixToolset.Firewall.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 <WixToolsetFirewallWixextPath Condition=" '$(WixToolsetFirewallWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Firewall.wixext.dll</WixToolsetFirewallWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj
index d11e28cc..cee26f86 100644
--- a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj
+++ b/src/ext/Http/wixext/WixToolset.Http.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)..\http.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\http.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\http.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/Http/wixext/WixToolset.Http.wixext.targets b/src/ext/Http/wixext/WixToolset.Http.wixext.targets
index 254b0010..bf6df083 100644
--- a/src/ext/Http/wixext/WixToolset.Http.wixext.targets
+++ b/src/ext/Http/wixext/WixToolset.Http.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 <WixToolsetHttpWixextPath Condition=" '$(WixToolsetHttpWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Http.wixext.dll</WixToolsetHttpWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
index 090d9150..79c8dae7 100644
--- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
+++ b/src/ext/Iis/wixext/WixToolset.Iis.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)..\iis.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\iis.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\iis.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/Iis/wixext/WixToolset.Iis.wixext.targets b/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
index 6398fce1..bf6df083 100644
--- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.targets
+++ b/src/ext/Iis/wixext/WixToolset.Iis.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 <WixToolsetIisWixextPath Condition=" '$(WixToolsetIisWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Iis.wixext.dll</WixToolsetIisWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
index 0c2325a8..ef369c2c 100644
--- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
+++ b/src/ext/Msmq/wixext/WixToolset.Msmq.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)..\msmq.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\msmq.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\msmq.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/Msmq/wixext/WixToolset.Msmq.wixext.targets b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
index 5f69fe48..bf6df083 100644
--- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.targets
+++ b/src/ext/Msmq/wixext/WixToolset.Msmq.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 <WixToolsetMsmqWixextPath Condition=" '$(WixToolsetMsmqWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Msmq.wixext.dll</WixToolsetMsmqWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 8db3db46..6a75f30f 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -21,13 +21,19 @@ namespace WixToolsetTest.Netfx
21 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); 21 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
22 var intermediateFolder = Path.Combine(baseFolder, "obj"); 22 var intermediateFolder = Path.Combine(baseFolder, "obj");
23 23
24 var extensionResult = WixRunner.Execute(new[]
25 {
26 "extension", "add",
27 "WixToolset.Bal.wixext"
28 });
29
24 var compileResult = WixRunner.Execute(new[] 30 var compileResult = WixRunner.Execute(new[]
25 { 31 {
26 "build", 32 "build",
27 Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), 33 Path.Combine(bundleSourceFolder, "BundleLatest.wxs"),
28 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"), 34 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x86.wxs"),
29 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), 35 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
30 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), 36 "-ext", "WixToolset.Bal.wixext",
31 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), 37 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
32 "-intermediateFolder", intermediateFolder, 38 "-intermediateFolder", intermediateFolder,
33 "-o", bundleFile, 39 "-o", bundleFile,
@@ -48,12 +54,18 @@ namespace WixToolsetTest.Netfx
48 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages"); 54 var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
49 var intermediateFolder = Path.Combine(baseFolder, "obj"); 55 var intermediateFolder = Path.Combine(baseFolder, "obj");
50 56
57 var extensionResult = WixRunner.Execute(new[]
58 {
59 "extension", "add",
60 "WixToolset.Bal.wixext"
61 });
62
51 var compileResult = WixRunner.Execute(new[] 63 var compileResult = WixRunner.Execute(new[]
52 { 64 {
53 "build", 65 "build",
54 Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"), 66 Path.Combine(bundleSourceFolder, "BundleLatest_x64.wxs"),
55 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"), 67 Path.Combine(bundleSourceFolder, "NetCore3.1.12_x64.wxs"),
56 "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), 68 "-ext", "WixToolset.Bal.wixext",
57 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), 69 "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
58 "-intermediateFolder", intermediateFolder, 70 "-intermediateFolder", intermediateFolder,
59 "-o", bundleFile, 71 "-o", bundleFile,
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index e2f97a16..8b13d357 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -16,11 +16,6 @@
16 </ItemGroup> 16 </ItemGroup>
17 17
18 <ItemGroup> 18 <ItemGroup>
19 <PackageReference Include="WixToolset.Bal.wixext" />
20 <PackageReference Include="WixToolset.Core.TestPackage" /> 19 <PackageReference Include="WixToolset.Core.TestPackage" />
21 </ItemGroup> 20 </ItemGroup>
22
23 <Target Name="CopyExtensions" AfterTargets="Build">
24 <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
25 </Target>
26</Project> 21</Project>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
index 15bf1654..67759ab3 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.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)..\netfx.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\netfx.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/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
deleted file mode 100644
index 4abfa98c..00000000
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
+++ /dev/null
@@ -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>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
index 2ed9c488..bf6df083 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.targets
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.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 <WixToolsetNetfxWixextPath Condition=" '$(WixToolsetNetfxWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Netfx.wixext.dll</WixToolsetNetfxWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
index 54079c4e..812915a8 100644
--- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
+++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.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)..\powershell.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\powershell.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/PowerShell/wixext/WixToolset.PowerShell.wixext.targets b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
index bf06e1e4..bf6df083 100644
--- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.targets
+++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.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 <WixToolsetPowerShellWixextPath Condition=" '$(WixToolsetPowerShellWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.PowerShell.wixext.dll</WixToolsetPowerShellWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
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>
diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd
index d62870d4..3823f45a 100644
--- a/src/ext/UI/ui.cmd
+++ b/src/ext/UI/ui.cmd
@@ -4,18 +4,34 @@
4@set _C=Debug 4@set _C=Debug
5:parse_args 5:parse_args
6@if /i "%1"=="release" set _C=Release 6@if /i "%1"=="release" set _C=Release
7@if /i "%1"=="inc" set _INC=1
8@if /i "%1"=="clean" set _CLEAN=1
7@if not "%1"=="" shift & goto parse_args 9@if not "%1"=="" shift & goto parse_args
8 10
11:: Clean
12
13@if "%_INC%"=="" call :clean
14@if NOT "%_CLEAN%"=="" goto :end
15
9@echo UI.wixext build %_C% 16@echo UI.wixext build %_C%
10 17
11:: Build 18:: Build
12msbuild -Restore -p:Configuration=%_C% || exit /b 19msbuild -Restore -p:Configuration=%_C% || exit /b
13 20
14:: Test 21:: Test
15dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b 22:: dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
16 23
17:: Pack 24:: Pack
18msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b 25msbuild -t:Pack -p:Configuration=%_C% -p:NoBuild=true wixext\WixToolset.UI.wixext.csproj || exit /b
19 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
20@popd 36@popd
21@endlocal 37@endlocal
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
index 09f748c3..288b4a85 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
+++ b/src/ext/UI/wixext/WixToolset.UI.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)..\ui.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\ui.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/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
deleted file mode 100644
index 4abfa98c..00000000
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
+++ /dev/null
@@ -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>
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.targets b/src/ext/UI/wixext/WixToolset.UI.wixext.targets
index b07a0886..bf6df083 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.targets
+++ b/src/ext/UI/wixext/WixToolset.UI.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 <WixToolsetUIWixextPath Condition=" '$(WixToolsetUIWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.UI.wixext.dll</WixToolsetUIWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
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 @@
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 <ProjectReference Include="..\wixlib\util.wixproj" 16 <EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
15 OutputItemType="EmbeddedResource"
16 ReferenceOutputAssembly="false"
17 SkipGetTargetFrameworkProperties="true"
18 />
19 <EmbeddedResource Include="$(OutputPath)..\util.wixlib" Condition=" '$(NCrunch)'=='1' " />
20 </ItemGroup> 17 </ItemGroup>
21 18
22 <ItemGroup> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
23 <PackageReference Include="WixToolset.Extensibility" PrivateAssets="all" /> 20 <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
24 </ItemGroup> 21 </ItemGroup>
25</Project> 22</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 @@
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>
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 @@
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 <WixToolsetUtilWixextPath Condition=" '$(WixToolsetUtilWixextPath)' == '' ">$(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll</WixToolsetUtilWixextPath>
7 </PropertyGroup>
8 <ItemGroup> 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> 10 </ItemGroup>
11</Project> 11</Project>
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
index 209ea00c..0224c98c 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.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)..\vs.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />
15 </ItemGroup> 17 </ItemGroup>
@@ -17,8 +19,4 @@
17 <ItemGroup Condition=" '$(NCrunch)'=='' "> 19 <ItemGroup Condition=" '$(NCrunch)'=='' ">
18 <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" /> 20 <ProjectReference Include="..\wixlib\vs.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/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
deleted file mode 100644
index 7143d993..00000000
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.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/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
index 4542375f..bf6df083 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.targets
@@ -1,8 +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 <ItemGroup> 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') " />
7 </ItemGroup> 10 </ItemGroup>
8</Project> 11</Project>
diff --git a/src/ext/WixExt.props b/src/ext/WixExt.props
new file mode 100644
index 00000000..23bce7fa
--- /dev/null
+++ b/src/ext/WixExt.props
@@ -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>
diff --git a/src/internal/images/wix-black-bg.png b/src/internal/images/wix-black-bg.png
index 375d05a4..8bf978a5 100644
--- a/src/internal/images/wix-black-bg.png
+++ b/src/internal/images/wix-black-bg.png
Binary files differ
diff --git a/src/internal/images/wix-white-bg.png b/src/internal/images/wix-white-bg.png
index 8e752f69..ebff9e13 100644
--- a/src/internal/images/wix-white-bg.png
+++ b/src/internal/images/wix-white-bg.png
Binary files differ
diff --git a/src/internal/images/wix.png b/src/internal/images/wix.png
new file mode 100644
index 00000000..9a92155e
--- /dev/null
+++ b/src/internal/images/wix.png
Binary files differ
diff --git a/src/wix/WixToolset.Core.ExtensionCache/ExtensionCacheManager.cs b/src/wix/WixToolset.Core.ExtensionCache/ExtensionCacheManager.cs
index b50ad6e8..5706413f 100644
--- a/src/wix/WixToolset.Core.ExtensionCache/ExtensionCacheManager.cs
+++ b/src/wix/WixToolset.Core.ExtensionCache/ExtensionCacheManager.cs
@@ -197,6 +197,8 @@ namespace WixToolset.Core.ExtensionCache
197 197
198 var extensionFolder = Path.Combine(cacheFolder, id, nugetVersion.ToString()); 198 var extensionFolder = Path.Combine(cacheFolder, id, nugetVersion.ToString());
199 199
200 var extensionPackageRootFolderName = this.ExtensionManager.GetExtensionPackageRootFolderName();
201
200 foreach (var source in searchSources) 202 foreach (var source in searchSources)
201 { 203 {
202 var repository = Repository.Factory.GetCoreV3(source.Source); 204 var repository = Repository.Factory.GetCoreV3(source.Source);
@@ -214,7 +216,7 @@ namespace WixToolset.Core.ExtensionCache
214 216
215 using (var archive = new PackageArchiveReader(stream)) 217 using (var archive = new PackageArchiveReader(stream))
216 { 218 {
217 var files = PackagingConstants.Folders.Known.SelectMany(folder => archive.GetFiles(folder)).Distinct(StringComparer.OrdinalIgnoreCase); 219 var files = archive.GetFiles(extensionPackageRootFolderName);
218 await archive.CopyFilesAsync(extensionFolder, files, this.ExtractProgress, logger, cancellationToken); 220 await archive.CopyFilesAsync(extensionFolder, files, this.ExtractProgress, logger, cancellationToken);
219 } 221 }
220 222
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
index 6e10744d..00ab5e6d 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
@@ -15,8 +15,11 @@ namespace WixToolset.Core.ExtensibilityServices
15 15
16 internal class ExtensionManager : IExtensionManager 16 internal class ExtensionManager : IExtensionManager
17 { 17 {
18 private const string UserWixFolderName = ".wix4"; 18 // This value needs to stay in sync with the Property in "wix.targets" with the same name.
19 private const string MachineWixFolderName = "WixToolset4"; 19 private const string WixToolsetExtensionPackageFolder = "wixext4";
20
21 private const string UserWixFolderName = ".wix";
22 private const string MachineWixFolderName = "WixToolset";
20 private const string ExtensionsFolderName = "extensions"; 23 private const string ExtensionsFolderName = "extensions";
21 private const string UserEnvironmentName = "WIX_EXTENSIONS"; 24 private const string UserEnvironmentName = "WIX_EXTENSIONS";
22 25
@@ -70,7 +73,7 @@ namespace WixToolset.Core.ExtensibilityServices
70 continue; 73 continue;
71 } 74 }
72 75
73 checkPath = Path.Combine(extensionFolder, versionFolder, "tools", extensionId + ".dll"); 76 checkPath = Path.Combine(extensionFolder, versionFolder, WixToolsetExtensionPackageFolder, extensionId + ".dll");
74 checkedPaths.Add(checkPath); 77 checkedPaths.Add(checkPath);
75 78
76 if (TryLoadFromPath(checkPath, out assembly)) 79 if (TryLoadFromPath(checkPath, out assembly))
@@ -128,6 +131,11 @@ namespace WixToolset.Core.ExtensibilityServices
128 return locations; 131 return locations;
129 } 132 }
130 133
134 public string GetExtensionPackageRootFolderName()
135 {
136 return WixToolsetExtensionPackageFolder;
137 }
138
131 public IReadOnlyCollection<T> GetServices<T>() where T : class 139 public IReadOnlyCollection<T> GetServices<T>() where T : class
132 { 140 {
133 if (!this.loadedExtensionsByType.TryGetValue(typeof(T), out var extensions)) 141 if (!this.loadedExtensionsByType.TryGetValue(typeof(T), out var extensions))
diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
index 8c2d866c..4a5e6229 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -31,13 +31,31 @@
31 <XmlPoke 31 <XmlPoke
32 XmlInputPath="$(PublishDir)tools\wix.props" 32 XmlInputPath="$(PublishDir)tools\wix.props"
33 Namespaces="$(Namespaces)" 33 Namespaces="$(Namespaces)"
34 Query="//msb:WixToolsetVersion" 34 Query="//msb:WixToolsetMajorVersion"
35 Value="$(Version)" /> 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)" />
36 48
37 <XmlPoke 49 <XmlPoke
38 XmlInputPath="$(PublishDir)tools\wix.props" 50 XmlInputPath="$(PublishDir)tools\wix.props"
39 Namespaces="$(Namespaces)" 51 Namespaces="$(Namespaces)"
40 Query="//msb:WixToolsetMajorMinorVersion" 52 Query="//msb:WixToolsetMajorMinorVersion"
41 Value="$(MajorMinorVersion)" /> 53 Value="$(MajorMinorVersion)" />
54
55 <XmlPoke
56 XmlInputPath="$(PublishDir)tools\wix.props"
57 Namespaces="$(Namespaces)"
58 Query="//msb:WixToolsetVersion"
59 Value="$(Version)" />
42 </Target> 60 </Target>
43</Project> 61</Project>
diff --git a/src/wix/WixToolset.Sdk/tools/wix.props b/src/wix/WixToolset.Sdk/tools/wix.props
index cd4aa4ac..d3c202bf 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.props
+++ b/src/wix/WixToolset.Sdk/tools/wix.props
@@ -4,8 +4,12 @@
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <PropertyGroup> 5 <PropertyGroup>
6 <WixPropsImported>true</WixPropsImported> 6 <WixPropsImported>true</WixPropsImported>
7 <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion> 7 <WixToolsetMajorVersion>$$WixToolsetMajorVersion$$</WixToolsetMajorVersion>
8 <WixToolsetMinorVersion>$$WixToolsetMinorVersion$$</WixToolsetMinorVersion>
9 <WixToolsetPatchVersion>$$WixToolsetPatchVersion$$</WixToolsetPatchVersion>
8 <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion> 10 <WixToolsetMajorMinorVersion>$$WixToolsetMajorMinorVersion$$</WixToolsetMajorMinorVersion>
11 <WixToolsetVersion>$$WixToolsetVersion$$</WixToolsetVersion>
12 <WixToolsetExtensionPackageFolder>wixext4</WixToolsetExtensionPackageFolder>
9 </PropertyGroup> 13 </PropertyGroup>
10 14
11 <ImportGroup> 15 <ImportGroup>
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 6a8b6055..8665f05c 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -577,6 +577,9 @@
577 <_WixBuildCabinetCachePath Condition=" '$(CabinetCachePath)'!='' ">$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))</_WixBuildCabinetCachePath> 577 <_WixBuildCabinetCachePath Condition=" '$(CabinetCachePath)'!='' ">$([MSBuild]::NormalizeDirectory($(CabinetCachePath), %(CultureGroup.OutputFolder)))</_WixBuildCabinetCachePath>
578 </PropertyGroup> 578 </PropertyGroup>
579 579
580 <Warning Text="@(UnsupportedWixExtension->'%(Identity)') does not have support for WiX Toolset v$(WixToolsetVersion)."
581 Condition=" '@(UnsupportedWixExtension)' != '' "/>
582
580 <WixBuild 583 <WixBuild
581 SourceFiles="@(Compile)" 584 SourceFiles="@(Compile)"
582 LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)" 585 LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
diff --git a/src/wix/pack-wix/pack-wix.nuspec b/src/wix/pack-wix/pack-wix.nuspec
index 2b1d2ae9..fef93cd2 100644
--- a/src/wix/pack-wix/pack-wix.nuspec
+++ b/src/wix/pack-wix/pack-wix.nuspec
@@ -6,7 +6,7 @@
6 <title>$title$</title> 6 <title>$title$</title>
7 <description>$description$</description> 7 <description>$description$</description>
8 <authors>$authors$</authors> 8 <authors>$authors$</authors>
9 <icon>wix-white-bg.png</icon> 9 <icon>wix.png</icon>
10 <license type="expression">MS-RL</license> 10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance> 11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright> 12 <copyright>$copyright$</copyright>
@@ -19,7 +19,7 @@
19 19
20 <files> 20 <files>
21 <file src="$projectFolder$\DotnetToolSettings.xml" target="tools\net6.0\any" /> 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" /> 23 <file src="**" target="tools\net6.0\any" />
24 </files> 24 </files>
25</package> 25</package>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
index 0d5418a5..aabaac42 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs
@@ -190,7 +190,7 @@ namespace WixToolsetTest.CoreIntegration
190 190
191 result.AssertSuccess(); 191 result.AssertSuccess();
192 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"); 194 Assert.True(Directory.Exists(cacheFolder), $"Expected folder '{cacheFolder}' to exist");
195 195
196 result = WixRunner.Execute(new[] 196 result = WixRunner.Execute(new[]
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 23:39:25 +0000