aboutsummaryrefslogtreecommitdiff
path: root/src/wixext
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext')
-rw-r--r--src/wixext/UIDecompiler.cs2
-rw-r--r--src/wixext/UIExtensionData.cs36
-rw-r--r--src/wixext/UIExtensionFactory.cs16
-rw-r--r--src/wixext/WixToolset.UI.wixext.csproj29
-rw-r--r--src/wixext/WixToolset.UI.wixext.targets11
-rw-r--r--src/wixext/WixUIExtension.csproj31
6 files changed, 66 insertions, 59 deletions
diff --git a/src/wixext/UIDecompiler.cs b/src/wixext/UIDecompiler.cs
index 4bdd48fc..2493e7c7 100644
--- a/src/wixext/UIDecompiler.cs
+++ b/src/wixext/UIDecompiler.cs
@@ -2,6 +2,7 @@
2 2
3namespace WixToolset.Extensions 3namespace WixToolset.Extensions
4{ 4{
5#if TODO_CONSIDER_DECOMPILER
5 using System; 6 using System;
6 using System.Collections; 7 using System.Collections;
7 using System.Diagnostics; 8 using System.Diagnostics;
@@ -54,4 +55,5 @@ namespace WixToolset.Extensions
54 } 55 }
55 } 56 }
56 } 57 }
58#endif
57} 59}
diff --git a/src/wixext/UIExtensionData.cs b/src/wixext/UIExtensionData.cs
index a833b82b..327d20c8 100644
--- a/src/wixext/UIExtensionData.cs
+++ b/src/wixext/UIExtensionData.cs
@@ -1,43 +1,23 @@
1// 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. 1// 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 2
3namespace WixToolset.Extensions 3namespace WixToolset.UI
4{ 4{
5 using System;
6 using System.Reflection;
7 using WixToolset.Data; 5 using WixToolset.Data;
8 using WixToolset.Extensibility; 6 using WixToolset.Extensibility;
9 7
10 /// <summary> 8 public sealed class UIExtensionData : BaseExtensionData
11 /// The WiX Toolset UI Extension.
12 /// </summary>
13 public sealed class UIExtensionData : ExtensionData
14 { 9 {
15 /// <summary> 10 public override string DefaultCulture => "en-US";
16 /// Gets the default culture.
17 /// </summary>
18 /// <value>The default culture.</value>
19 public override string DefaultCulture
20 {
21 get { return "en-us"; }
22 }
23 11
24 /// <summary> 12 public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
25 /// Gets the library associated with this extension.
26 /// </summary>
27 /// <param name="tableDefinitions">The table definitions to use while loading the library.</param>
28 /// <returns>The loaded library.</returns>
29 public override Library GetLibrary(TableDefinitionCollection tableDefinitions)
30 { 13 {
31 return UIExtensionData.GetExtensionLibrary(tableDefinitions); 14 tupleDefinition = null;
15 return tupleDefinition != null;
32 } 16 }
33 17
34 /// <summary> 18 public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
35 /// Internal mechanism to access the extension's library.
36 /// </summary>
37 /// <returns>Extension's library.</returns>
38 internal static Library GetExtensionLibrary(TableDefinitionCollection tableDefinitions)
39 { 19 {
40 return ExtensionData.LoadLibraryHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.ui.wixlib", tableDefinitions); 20 return Intermediate.Load(typeof(UIExtensionData).Assembly, "WixToolset.UI.ui.wixlib", tupleDefinitions);
41 } 21 }
42 } 22 }
43} 23}
diff --git a/src/wixext/UIExtensionFactory.cs b/src/wixext/UIExtensionFactory.cs
new file mode 100644
index 00000000..1c9caacc
--- /dev/null
+++ b/src/wixext/UIExtensionFactory.cs
@@ -0,0 +1,16 @@
1// 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
3namespace WixToolset.UI
4{
5 using System;
6 using System.Collections.Generic;
7 using WixToolset.Extensibility;
8
9 public class UIExtensionFactory : BaseExtensionFactory
10 {
11 protected override IEnumerable<Type> ExtensionTypes => new[]
12 {
13 typeof(UIExtensionData),
14 };
15 }
16}
diff --git a/src/wixext/WixToolset.UI.wixext.csproj b/src/wixext/WixToolset.UI.wixext.csproj
new file mode 100644
index 00000000..f8b47f63
--- /dev/null
+++ b/src/wixext/WixToolset.UI.wixext.csproj
@@ -0,0 +1,29 @@
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 Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7 <RootNamespace>WixToolset.UI</RootNamespace>
8 <Description>WiX Toolset UI Extension</Description>
9 <Title>WiX Toolset UI Extension</Title>
10 <IsTool>true</IsTool>
11 <ContentTargetFolders>build</ContentTargetFolders>
12 </PropertyGroup>
13 <ItemGroup>
14 <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" />
16 </ItemGroup>
17 <ItemGroup>
18 <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
19 <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
20 </ItemGroup>
21
22 <ItemGroup>
23 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
24 </ItemGroup>
25
26 <ItemGroup>
27 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
28 </ItemGroup>
29</Project>
diff --git a/src/wixext/WixToolset.UI.wixext.targets b/src/wixext/WixToolset.UI.wixext.targets
new file mode 100644
index 00000000..b07a0886
--- /dev/null
+++ b/src/wixext/WixToolset.UI.wixext.targets
@@ -0,0 +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>
8 <ItemGroup>
9 <WixExtension Include="$(WixToolsetUIWixextPath)" />
10 </ItemGroup>
11</Project>
diff --git a/src/wixext/WixUIExtension.csproj b/src/wixext/WixUIExtension.csproj
deleted file mode 100644
index ba1b5c58..00000000
--- a/src/wixext/WixUIExtension.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
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
5<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
6 <PropertyGroup>
7 <ProjectGuid>{33F6ABF5-FA13-4B73-99FA-F9BBA894DD9A}</ProjectGuid>
8 <AssemblyName>WixUIExtension</AssemblyName>
9 <OutputType>Library</OutputType>
10 <RootNamespace>WixToolset.Extensions</RootNamespace>
11 </PropertyGroup>
12 <ItemGroup>
13 <Compile Include="AssemblyInfo.cs" />
14 <Compile Include="UIDecompiler.cs" />
15 <Compile Include="UIExtensionData.cs" />
16 <EmbeddedResource Include="$(OutputPath)ui.wixlib">
17 <Link>Data\ui.wixlib</Link>
18 </EmbeddedResource>
19 </ItemGroup>
20 <ItemGroup>
21 <Reference Include="System" />
22 <Reference Include="System.Xml" />
23 <ProjectReference Include="..\..\..\libs\WixToolset.Data\WixToolset.Data.csproj" />
24 <ProjectReference Include="..\..\..\libs\WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
25 <ProjectReference Include="..\..\..\tools\wix\Wix.csproj" />
26 <ProjectReference Include="..\wixlib\UIExtension.wixproj">
27 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
28 </ProjectReference>
29 </ItemGroup>
30 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
31</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-03 23:15:31 +0000