aboutsummaryrefslogtreecommitdiff
path: root/src/ext/UI
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/UI')
-rw-r--r--src/ext/UI/Directory.Build.props23
-rw-r--r--src/ext/UI/Directory.Build.targets51
-rw-r--r--src/ext/UI/Directory.csproj.props13
-rw-r--r--src/ext/UI/Directory.csproj.targets26
-rw-r--r--src/ext/UI/Directory.vcxproj.props111
-rw-r--r--src/ext/UI/UI.wixext.sln8
-rw-r--r--src/ext/UI/appveyor.cmd14
-rw-r--r--src/ext/UI/appveyor.yml40
-rw-r--r--src/ext/UI/ca/uica.vcxproj8
-rw-r--r--src/ext/UI/nuget.config17
-rw-r--r--src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj23
-rw-r--r--src/ext/UI/ui.cmd25
-rw-r--r--src/ext/UI/wix.snkbin596 -> 0 bytes
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.csproj12
-rw-r--r--src/ext/UI/wixext/WixToolset.UI.wixext.nuspec6
-rw-r--r--src/ext/UI/wixlib/ui.wixproj3
16 files changed, 51 insertions, 329 deletions
diff --git a/src/ext/UI/Directory.Build.props b/src/ext/UI/Directory.Build.props
index b3c6287c..ee3d2302 100644
--- a/src/ext/UI/Directory.Build.props
+++ b/src/ext/UI/Directory.Build.props
@@ -1,27 +1,10 @@
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 Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props
5 then update all of the repos.
6-->
7<Project> 4<Project>
8 <PropertyGroup> 5 <PropertyGroup>
9 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <SegmentName>UI.wixext</SegmentName>
10 <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11 <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages>
12
13 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
14 <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
15 <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
16 <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
17
18 <Authors>WiX Toolset Team</Authors>
19 <Company>WiX Toolset</Company>
20 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
21 <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
22 <Product>WiX Toolset</Product>
23 </PropertyGroup> 7 </PropertyGroup>
24 8
25 <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " /> 9 <Import Project="..\..\Directory.Build.props" />
26 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
27</Project> 10</Project>
diff --git a/src/ext/UI/Directory.Build.targets b/src/ext/UI/Directory.Build.targets
deleted file mode 100644
index 2fcc765a..00000000
--- a/src/ext/UI/Directory.Build.targets
+++ /dev/null
@@ -1,51 +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 Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets
5 then update all of the repos.
6-->
7<!--
8 Replace PackageReferences with ProjectReferences when the projects can be found in .sln.
9 See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
10-->
11<Project>
12 <PropertyGroup>
13 <ReplacePackageReferences>true</ReplacePackageReferences>
14 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
15 <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath>
16 </PropertyGroup>
17
18 <Choose>
19 <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')">
20
21 <PropertyGroup>
22 <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent>
23 <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir>
24 <RegexPattern>(?&lt;="[PackageName]", ")(.*)(?=", ")</RegexPattern>
25 </PropertyGroup>
26
27 <ItemGroup>
28 <!-- Keep the identity of the PackageReference -->
29 <SmartPackageReference Include="@(PackageReference)">
30 <PackageName>%(Identity)</PackageName>
31 <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution>
32 </SmartPackageReference>
33
34 <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function -->
35 <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))">
36 <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern>
37 <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath>
38 </PackageInSolution>
39
40 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
41
42 <!-- Remove the package references that are now referenced as projects -->
43 <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
44 </ItemGroup>
45
46 </When>
47 </Choose>
48
49 <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
50 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
51</Project>
diff --git a/src/ext/UI/Directory.csproj.props b/src/ext/UI/Directory.csproj.props
deleted file mode 100644
index 81d24ad1..00000000
--- a/src/ext/UI/Directory.csproj.props
+++ /dev/null
@@ -1,13 +0,0 @@
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<!--
3 Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props
4 then update all of the repos.
5-->
6<Project>
7 <PropertyGroup>
8 <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9 <SignAssembly>true</SignAssembly>
10 <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11 <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
12 </PropertyGroup>
13</Project>
diff --git a/src/ext/UI/Directory.csproj.targets b/src/ext/UI/Directory.csproj.targets
deleted file mode 100644
index c3270426..00000000
--- a/src/ext/UI/Directory.csproj.targets
+++ /dev/null
@@ -1,26 +0,0 @@
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<!--
3 Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
4 then update all of the repos.
5-->
6<Project>
7 <PropertyGroup>
8 <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
9 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
10 </PropertyGroup>
11
12 <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
13 Condition=" Exists('$(MSBuildProjectName).nuspec') ">
14 <PropertyGroup>
15 <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
16
17 <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
18 <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
19 <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
20 <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
21 <PublishRepositoryUrl>true</PublishRepositoryUrl>
22 <SymbolPackageFormat>snupkg</SymbolPackageFormat>
23 </PropertyGroup>
24 </Target>
25
26</Project>
diff --git a/src/ext/UI/Directory.vcxproj.props b/src/ext/UI/Directory.vcxproj.props
deleted file mode 100644
index bcf26c57..00000000
--- a/src/ext/UI/Directory.vcxproj.props
+++ /dev/null
@@ -1,111 +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<Project>
5 <PropertyGroup>
6 <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7 <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
8 <OutDir>$(OutputPath)$(Platform)\</OutDir>
9
10 <!-- NBGV properties -->
11 <AssemblyCompany>$(Company)</AssemblyCompany>
12 <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
13
14 <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
15 <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
16 </PropertyGroup>
17
18 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
19 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
20 </PropertyGroup>
21
22 <ItemDefinitionGroup>
23 <ClCompile>
24 <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
25 <WarningLevel>Level4</WarningLevel>
26 <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
27 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
28 <PrecompiledHeader>Use</PrecompiledHeader>
29 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
30 <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
31 <TreatWarningAsError>true</TreatWarningAsError>
32 <ExceptionHandling>false</ExceptionHandling>
33 <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
34 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
35 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
36 </ClCompile>
37 <ResourceCompile>
38 <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
39 <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
40 </ResourceCompile>
41 <Lib>
42 <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
43 </Lib>
44 <Link>
45 <SubSystem>$(ProjectSubSystem)</SubSystem>
46 <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
47 <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
48 <GenerateDebugInformation>true</GenerateDebugInformation>
49 <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
50 <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
51 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
52 </Link>
53 </ItemDefinitionGroup>
54
55 <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
56 <ClCompile>
57 <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
58 </ClCompile>
59 </ItemDefinitionGroup>
60 <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
61 <ClCompile>
62 <CallingConvention>CDecl</CallingConvention>
63 </ClCompile>
64 </ItemDefinitionGroup>
65 <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
66 <ClCompile>
67 <DebugInformationFormat>OldStyle</DebugInformationFormat>
68 <OmitDefaultLibName>true</OmitDefaultLibName>
69 <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
70 </ClCompile>
71 </ItemDefinitionGroup>
72 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
73 <ClCompile>
74 <Optimization>Disabled</Optimization>
75 <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
76 <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
77 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
78 </ClCompile>
79 </ItemDefinitionGroup>
80 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
81 <ClCompile>
82 <BasicRuntimeChecks></BasicRuntimeChecks>
83 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
84 </ClCompile>
85 </ItemDefinitionGroup>
86 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
87 <ClCompile>
88 <Optimization>MinSpace</Optimization>
89 <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
90 <FunctionLevelLinking>true</FunctionLevelLinking>
91 <IntrinsicFunctions>true</IntrinsicFunctions>
92 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
93 </ClCompile>
94 <Link>
95 <EnableCOMDATFolding>true</EnableCOMDATFolding>
96 <OptimizeReferences>true</OptimizeReferences>
97 </Link>
98 </ItemDefinitionGroup>
99 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
100 <ClCompile>
101 <BasicRuntimeChecks></BasicRuntimeChecks>
102 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
103 </ClCompile>
104 </ItemDefinitionGroup>
105 <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
106 <Link>
107 <KeyFile>$(LinkKeyFile)</KeyFile>
108 <DelaySign>$(LinkDelaySign)</DelaySign>
109 </Link>
110 </ItemDefinitionGroup>
111</Project>
diff --git a/src/ext/UI/UI.wixext.sln b/src/ext/UI/UI.wixext.sln
index bab6232e..c71826dc 100644
--- a/src/ext/UI/UI.wixext.sln
+++ b/src/ext/UI/UI.wixext.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio Version 16 3# Visual Studio Version 16
4VisualStudioVersion = 16.0.30320.27 4VisualStudioVersion = 16.0.30320.27
5MinimumVisualStudioVersion = 15.0.26124.0 5MinimumVisualStudioVersion = 15.0.26124.0
6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uica", "src\ca\uica.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}" 6Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uica", "ca\uica.vcxproj", "{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}"
7EndProject 7EndProject
8Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ui", "src\wixlib\ui.wixproj", "{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}" 8Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ui", "wixlib\ui.wixproj", "{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}"
9EndProject 9EndProject
10Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.UI.wixext", "src\wixext\WixToolset.UI.wixext.csproj", "{33F6ABF5-FA13-4B73-99FA-F9BBA894DD9A}" 10Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.UI.wixext", "wixext\WixToolset.UI.wixext.csproj", "{33F6ABF5-FA13-4B73-99FA-F9BBA894DD9A}"
11EndProject 11EndProject
12Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.UI", "src\test\WixToolsetTest.UI\WixToolsetTest.UI.csproj", "{A37CC793-F659-4C77-A01C-D183023B6880}" 12Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.UI", "test\WixToolsetTest.UI\WixToolsetTest.UI.csproj", "{A37CC793-F659-4C77-A01C-D183023B6880}"
13EndProject 13EndProject
14Global 14Global
15 GlobalSection(SolutionConfigurationPlatforms) = preSolution 15 GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/ext/UI/appveyor.cmd b/src/ext/UI/appveyor.cmd
deleted file mode 100644
index 2c727278..00000000
--- a/src/ext/UI/appveyor.cmd
+++ /dev/null
@@ -1,14 +0,0 @@
1@setlocal
2@pushd %~dp0
3
4nuget restore || exit /b
5
6msbuild -p:Configuration=Release -t:Restore || exit /b
7
8msbuild -p:Configuration=Release src\test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b
9dotnet test -c Release --no-build src\test\WixToolsetTest.UI || exit /b
10
11msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.UI.wixext.csproj || exit /b
12
13@popd
14@endlocal \ No newline at end of file
diff --git a/src/ext/UI/appveyor.yml b/src/ext/UI/appveyor.yml
deleted file mode 100644
index 7c686b04..00000000
--- a/src/ext/UI/appveyor.yml
+++ /dev/null
@@ -1,40 +0,0 @@
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#
3# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
4# then update all of the repos.
5
6branches:
7 only:
8 - master
9 - develop
10
11image: Visual Studio 2019
12
13version: 0.0.0.{build}
14configuration: Release
15
16environment:
17 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
18 DOTNET_CLI_TELEMETRY_OPTOUT: 1
19 NUGET_XMLDOC_MODE: skip
20
21build_script:
22 - appveyor.cmd
23
24pull_requests:
25 do_not_increment_build_number: true
26
27nuget:
28 disable_publish_on_pr: true
29
30skip_branch_with_pr: true
31skip_tags: true
32
33artifacts:
34- path: build\Release\**\*.nupkg
35 name: nuget
36
37notifications:
38- provider: Slack
39 incoming_webhook:
40 secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/ext/UI/ca/uica.vcxproj b/src/ext/UI/ca/uica.vcxproj
index 5ded1266..1b145192 100644
--- a/src/ext/UI/ca/uica.vcxproj
+++ b/src/ext/UI/ca/uica.vcxproj
@@ -48,10 +48,10 @@
48 </ItemGroup> 48 </ItemGroup>
49 49
50 <ItemGroup> 50 <ItemGroup>
51 <PackageReference Include="WixToolset.Dutil" Version="4.0.72" /> 51 <PackageReference Include="WixToolset.Dutil" />
52 <PackageReference Include="WixToolset.WcaUtil" Version="4.0.19" /> 52 <PackageReference Include="WixToolset.WcaUtil" />
53 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> 53 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
54 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> 54 <PackageReference Include="GitInfo" PrivateAssets="All" />
55 </ItemGroup> 55 </ItemGroup>
56 56
57 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 57 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/ext/UI/nuget.config b/src/ext/UI/nuget.config
deleted file mode 100644
index db7aba29..00000000
--- a/src/ext/UI/nuget.config
+++ /dev/null
@@ -1,17 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<configuration>
3 <packageSources>
4 <clear />
5 <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
6 <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
7 <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" />
8 <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" />
9 <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
10 <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
11 <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
12 <add key="wixtoolset-wcautil" value="https://ci.appveyor.com/nuget/wixtoolset-wcautil" />
13 <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" />
14 <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
15 <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
16 </packageSources>
17</configuration> \ No newline at end of file
diff --git a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
index a61676dd..61407107 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
+++ b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
@@ -5,6 +5,7 @@
5 <PropertyGroup> 5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework> 6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IsPackable>false</IsPackable> 7 <IsPackable>false</IsPackable>
8 <SignOutput>false</SignOutput>
8 </PropertyGroup> 9 </PropertyGroup>
9 10
10 <PropertyGroup> 11 <PropertyGroup>
@@ -12,12 +13,7 @@
12 </PropertyGroup> 13 </PropertyGroup>
13 14
14 <ItemGroup> 15 <ItemGroup>
15 <Content Include="TestData\data\example.txt" CopyToOutputDirectory="PreserveNewest" /> 16 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="TestData\WixUI_Advanced\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
17 <Content Include="TestData\WixUI_FeatureTree\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="TestData\WixUI_InstallDir\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
19 <Content Include="TestData\WixUI_Minimal\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
20 <Content Include="TestData\WixUI_Mondo\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
21 </ItemGroup> 17 </ItemGroup>
22 18
23 <ItemGroup> 19 <ItemGroup>
@@ -25,19 +21,12 @@
25 </ItemGroup> 21 </ItemGroup>
26 22
27 <ItemGroup> 23 <ItemGroup>
28 <PackageReference Include="WixToolset.Core" Version="4.0.*" /> 24 <PackageReference Include="WixToolset.Core.TestPackage" />
29 <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
30 <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
31 <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
32 </ItemGroup> 25 </ItemGroup>
33 26
34 <ItemGroup> 27 <ItemGroup>
35 <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> 28 <PackageReference Include="Microsoft.NET.Test.Sdk" />
36 </ItemGroup> 29 <PackageReference Include="xunit" />
37 30 <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" />
38 <ItemGroup>
39 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
40 <PackageReference Include="xunit" Version="2.4.1" />
41 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" />
42 </ItemGroup> 31 </ItemGroup>
43</Project> 32</Project>
diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd
new file mode 100644
index 00000000..1b5a3a6c
--- /dev/null
+++ b/src/ext/UI/ui.cmd
@@ -0,0 +1,25 @@
1@setlocal
2@pushd %~dp0
3
4@set _C=Debug
5:parse_args
6@if /i "%1"=="release" set _C=Release& shift
7@if not "%1"=="" shift & goto parse_args
8
9@echo Building ext\UI %_C%
10
11:: Restore
12@REM nuget restore || exit /b
13msbuild -t:Restore -p:RestorePackagesConfig=true -p:Configuration=%_C% || exit /b
14
15:: Build
16msbuild -t:Build -p:Configuration=%_C% test\WixToolsetTest.UI\WixToolsetTest.UI.csproj || exit /b
17
18:: Test
19dotnet test -c %_C% --no-build test\WixToolsetTest.UI || exit /b
20
21:: Pack
22msbuild -t:Pack -p:Configuration=%_C% wixext\WixToolset.UI.wixext.csproj || exit /b
23
24@popd
25@endlocal
diff --git a/src/ext/UI/wix.snk b/src/ext/UI/wix.snk
deleted file mode 100644
index 3908a66a..00000000
--- a/src/ext/UI/wix.snk
+++ /dev/null
Binary files differ
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
index 67c949b2..043cb259 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
@@ -15,16 +15,12 @@
15 <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" />
16 </ItemGroup> 16 </ItemGroup>
17 17
18 <ItemGroup> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
19 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 19 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" />
20 </ItemGroup>
21
22 <ItemGroup>
23 <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
24 </ItemGroup> 20 </ItemGroup>
25 21
26 <ItemGroup> 22 <ItemGroup>
27 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 23 <PackageReference Include="WixToolset.Data" />
28 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> 24 <PackageReference Include="WixToolset.Extensibility" />
29 </ItemGroup> 25 </ItemGroup>
30</Project> 26</Project>
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
index 51c9708e..504d4458 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
@@ -14,10 +14,10 @@
14 </metadata> 14 </metadata>
15 15
16 <files> 16 <files>
17 <file src="$projectFolder$$id$.targets" target="build" /> 17 <file src="$projectFolder$\$id$.targets" target="build" />
18 18
19 <file src="netstandard2.0\$id$.dll" target="tools" /> 19 <file src="$id$.dll" target="tools" />
20 20
21 <file src="x86\*.pdb" target="pdbs\x86" /> 21 <file src="..\x86\*.pdb" target="pdbs\x86" />
22 </files> 22 </files>
23</package> 23</package>
diff --git a/src/ext/UI/wixlib/ui.wixproj b/src/ext/UI/wixlib/ui.wixproj
index e9529283..2b335f01 100644
--- a/src/ext/UI/wixlib/ui.wixproj
+++ b/src/ext/UI/wixlib/ui.wixproj
@@ -31,6 +31,7 @@
31 </ItemGroup> 31 </ItemGroup>
32 32
33 <ItemGroup> 33 <ItemGroup>
34 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> 34 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
35 <PackageReference Include="GitInfo" PrivateAssets="All" />
35 </ItemGroup> 36 </ItemGroup>
36</Project> 37</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 20:14:07 +0000