aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore43
-rw-r--r--global.json2
-rw-r--r--src/Directory.Build.props4
-rw-r--r--src/Directory.Build.targets5
-rw-r--r--src/Directory.csproj.props (renamed from src/CSharp.Build.props)2
-rw-r--r--src/Directory.csproj.targets26
-rw-r--r--src/Directory.vcxproj.props (renamed from src/Cpp.Build.props)25
-rw-r--r--src/ca/packages.config5
-rw-r--r--src/ca/uica.vcxproj25
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs13
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs11
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs11
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs11
-rw-r--r--src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs11
-rw-r--r--src/wixext/WixToolset.UI.wixext.csproj13
-rw-r--r--src/wixext/WixToolset.UI.wixext.nuspec23
-rw-r--r--src/wixlib/ui.wixproj7
17 files changed, 151 insertions, 86 deletions
diff --git a/.gitignore b/.gitignore
index 3e8a1553..1ee53850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@
13# User-specific files (MonoDevelop/Xamarin Studio) 13# User-specific files (MonoDevelop/Xamarin Studio)
14*.userprefs 14*.userprefs
15 15
16# Mono auto generated files
17mono_crash.*
18
16# Build results 19# Build results
17[Dd]ebug/ 20[Dd]ebug/
18[Dd]ebugPublic/ 21[Dd]ebugPublic/
@@ -20,12 +23,14 @@
20[Rr]eleases/ 23[Rr]eleases/
21x64/ 24x64/
22x86/ 25x86/
26[Ww][Ii][Nn]32/
23[Aa][Rr][Mm]/ 27[Aa][Rr][Mm]/
24[Aa][Rr][Mm]64/ 28[Aa][Rr][Mm]64/
25bld/ 29bld/
26[Bb]in/ 30[Bb]in/
27[Oo]bj/ 31[Oo]bj/
28[Ll]og/ 32[Ll]og/
33[Ll]ogs/
29 34
30# Visual Studio 2015/2017 cache/options directory 35# Visual Studio 2015/2017 cache/options directory
31.vs/ 36.vs/
@@ -39,9 +44,10 @@ Generated\ Files/
39[Tt]est[Rr]esult*/ 44[Tt]est[Rr]esult*/
40[Bb]uild[Ll]og.* 45[Bb]uild[Ll]og.*
41 46
42# NUNIT 47# NUnit
43*.VisualState.xml 48*.VisualState.xml
44TestResult.xml 49TestResult.xml
50nunit-*.xml
45 51
46# Build Results of an ATL Project 52# Build Results of an ATL Project
47[Dd]ebugPS/ 53[Dd]ebugPS/
@@ -56,6 +62,9 @@ project.lock.json
56project.fragment.lock.json 62project.fragment.lock.json
57artifacts/ 63artifacts/
58 64
65# ASP.NET Scaffolding
66ScaffoldingReadMe.txt
67
59# StyleCop 68# StyleCop
60StyleCopReport.xml 69StyleCopReport.xml
61 70
@@ -122,9 +131,6 @@ _ReSharper*/
122*.[Rr]e[Ss]harper 131*.[Rr]e[Ss]harper
123*.DotSettings.user 132*.DotSettings.user
124 133
125# JustCode is a .NET coding add-in
126.JustCode
127
128# TeamCity is a build add-in 134# TeamCity is a build add-in
129_TeamCity* 135_TeamCity*
130 136
@@ -135,6 +141,11 @@ _TeamCity*
135.axoCover/* 141.axoCover/*
136!.axoCover/settings.json 142!.axoCover/settings.json
137 143
144# Coverlet is a free, cross platform Code Coverage Tool
145coverage*.json
146coverage*.xml
147coverage*.info
148
138# Visual Studio code coverage results 149# Visual Studio code coverage results
139*.coverage 150*.coverage
140*.coveragexml 151*.coveragexml
@@ -182,6 +193,8 @@ PublishScripts/
182 193
183# NuGet Packages 194# NuGet Packages
184*.nupkg 195*.nupkg
196# NuGet Symbol Packages
197*.snupkg
185# The packages folder can be ignored because of Package Restore 198# The packages folder can be ignored because of Package Restore
186**/[Pp]ackages/* 199**/[Pp]ackages/*
187# except build/, which is used as an MSBuild target. 200# except build/, which is used as an MSBuild target.
@@ -206,6 +219,8 @@ BundleArtifacts/
206Package.StoreAssociation.xml 219Package.StoreAssociation.xml
207_pkginfo.txt 220_pkginfo.txt
208*.appx 221*.appx
222*.appxbundle
223*.appxupload
209 224
210# Visual Studio cache files 225# Visual Studio cache files
211# files ending in .cache can be ignored 226# files ending in .cache can be ignored
@@ -231,8 +246,6 @@ orleans.codegen.cs
231# Since there are multiple workflows, uncomment next line to ignore bower_components 246# Since there are multiple workflows, uncomment next line to ignore bower_components
232# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) 247# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
233#bower_components/ 248#bower_components/
234# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
235**/wwwroot/lib/
236 249
237# RIA/Silverlight projects 250# RIA/Silverlight projects
238Generated_Code/ 251Generated_Code/
@@ -257,6 +270,9 @@ ServiceFabricBackup/
257*.bim.layout 270*.bim.layout
258*.bim_*.settings 271*.bim_*.settings
259*.rptproj.rsuser 272*.rptproj.rsuser
273*- [Bb]ackup.rdl
274*- [Bb]ackup ([0-9]).rdl
275*- [Bb]ackup ([0-9][0-9]).rdl
260 276
261# Microsoft Fakes 277# Microsoft Fakes
262FakesAssemblies/ 278FakesAssemblies/
@@ -292,10 +308,6 @@ paket-files/
292# FAKE - F# Make 308# FAKE - F# Make
293.fake/ 309.fake/
294 310
295# JetBrains Rider
296.idea/
297*.sln.iml
298
299# CodeRush personal settings 311# CodeRush personal settings
300.cr/personal 312.cr/personal
301 313
@@ -337,5 +349,14 @@ ASALocalRun/
337# Local History for Visual Studio 349# Local History for Visual Studio
338.localhistory/ 350.localhistory/
339 351
340# BeatPulse healthcheck temp database 352# BeatPulse healthcheck temp database
341healthchecksdb 353healthchecksdb
354
355# Backup folder for Package Reference Convert tool in Visual Studio 2017
356MigrationBackup/
357
358# Ionide (cross platform F# VS Code tools) working folder
359.ionide/
360
361# Fody - auto-generated XML schema
362FodyWeavers.xsd
diff --git a/global.json b/global.json
index 6b0e711a..6df1b3ab 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0176" 3 "WixToolset.Sdk": "4.0.0-build-0206"
4 }, 4 },
5 "sdk": { 5 "sdk": {
6 "allowPrerelease": false 6 "allowPrerelease": false
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index f83cc154..b3c6287c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,8 +22,6 @@
22 <Product>WiX Toolset</Product> 22 <Product>WiX Toolset</Product>
23 </PropertyGroup> 23 </PropertyGroup>
24 24
25 <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " /> 25 <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
26 <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
27 <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
28 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> 26 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
29</Project> 27</Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index dac7452a..2fcc765a 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -40,9 +40,12 @@
40 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/> 40 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
41 41
42 <!-- Remove the package references that are now referenced as projects --> 42 <!-- Remove the package references that are now referenced as projects -->
43 <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/> 43 <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
44 </ItemGroup> 44 </ItemGroup>
45 45
46 </When> 46 </When>
47 </Choose> 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') " />
48</Project> 51</Project>
diff --git a/src/CSharp.Build.props b/src/Directory.csproj.props
index b12f4c6e..81d24ad1 100644
--- a/src/CSharp.Build.props
+++ b/src/Directory.csproj.props
@@ -5,7 +5,9 @@
5--> 5-->
6<Project> 6<Project>
7 <PropertyGroup> 7 <PropertyGroup>
8 <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
8 <SignAssembly>true</SignAssembly> 9 <SignAssembly>true</SignAssembly>
9 <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> 10 <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11 <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
10 </PropertyGroup> 12 </PropertyGroup>
11</Project> 13</Project>
diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets
new file mode 100644
index 00000000..c3270426
--- /dev/null
+++ b/src/Directory.csproj.targets
@@ -0,0 +1,26 @@
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/Cpp.Build.props b/src/Directory.vcxproj.props
index 9b7a1bb5..bcf26c57 100644
--- a/src/Cpp.Build.props
+++ b/src/Directory.vcxproj.props
@@ -6,6 +6,13 @@
6 <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform> 6 <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7 <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir> 7 <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
8 <OutDir>$(OutputPath)$(Platform)\</OutDir> 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>
9 </PropertyGroup> 16 </PropertyGroup>
10 17
11 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'"> 18 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
@@ -70,6 +77,12 @@
70 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 77 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
71 </ClCompile> 78 </ClCompile>
72 </ItemDefinitionGroup> 79 </ItemDefinitionGroup>
80 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
81 <ClCompile>
82 <BasicRuntimeChecks></BasicRuntimeChecks>
83 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
84 </ClCompile>
85 </ItemDefinitionGroup>
73 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' "> 86 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
74 <ClCompile> 87 <ClCompile>
75 <Optimization>MinSpace</Optimization> 88 <Optimization>MinSpace</Optimization>
@@ -83,4 +96,16 @@
83 <OptimizeReferences>true</OptimizeReferences> 96 <OptimizeReferences>true</OptimizeReferences>
84 </Link> 97 </Link>
85 </ItemDefinitionGroup> 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>
86</Project> 111</Project>
diff --git a/src/ca/packages.config b/src/ca/packages.config
deleted file mode 100644
index fd2df281..00000000
--- a/src/ca/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="WixToolset.DUtil" version="4.0.58" targetFramework="native" />
4 <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" />
5</packages> \ No newline at end of file
diff --git a/src/ca/uica.vcxproj b/src/ca/uica.vcxproj
index ebe287b7..09501a32 100644
--- a/src/ca/uica.vcxproj
+++ b/src/ca/uica.vcxproj
@@ -1,10 +1,7 @@
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 DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
6 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" />
7 <Import Project="..\..\packages\WixToolset.DUtil.4.0.58\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.58\build\WixToolset.DUtil.props')" />
8 <ItemGroup Label="ProjectConfigurations"> 5 <ItemGroup Label="ProjectConfigurations">
9 <ProjectConfiguration Include="Debug|Win32"> 6 <ProjectConfiguration Include="Debug|Win32">
10 <Configuration>Debug</Configuration> 7 <Configuration>Debug</Configuration>
@@ -19,9 +16,9 @@
19 <PropertyGroup Label="Globals"> 16 <PropertyGroup Label="Globals">
20 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> 17 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
21 <ConfigurationType>DynamicLibrary</ConfigurationType> 18 <ConfigurationType>DynamicLibrary</ConfigurationType>
22 <CharacterSet>MultiByte</CharacterSet>
23 <TargetName>uica</TargetName> 19 <TargetName>uica</TargetName>
24 <PlatformToolset>v142</PlatformToolset> 20 <PlatformToolset>v142</PlatformToolset>
21 <CharacterSet>MultiByte</CharacterSet>
25 <ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile> 22 <ProjectModuleDefinitionFile>uica.def</ProjectModuleDefinitionFile>
26 <Description>WiX Toolset UI CustomAction</Description> 23 <Description>WiX Toolset UI CustomAction</Description>
27 </PropertyGroup> 24 </PropertyGroup>
@@ -40,22 +37,22 @@
40 <ClCompile Include="DriveCheck.cpp" /> 37 <ClCompile Include="DriveCheck.cpp" />
41 <ClCompile Include="PrintEula.cpp" /> 38 <ClCompile Include="PrintEula.cpp" />
42 </ItemGroup> 39 </ItemGroup>
40
43 <ItemGroup> 41 <ItemGroup>
44 <ClInclude Include="cost.h" /> 42 <ClInclude Include="cost.h" />
45 <ClInclude Include="precomp.h" /> 43 <ClInclude Include="precomp.h" />
46 </ItemGroup> 44 </ItemGroup>
45
47 <ItemGroup> 46 <ItemGroup>
48 <None Include="packages.config" />
49 <None Include="uica.def" /> 47 <None Include="uica.def" />
50 </ItemGroup> 48 </ItemGroup>
51 49
52 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 50 <ItemGroup>
51 <PackageReference Include="WixToolset.Dutil" Version="4.0.65" />
52 <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
53 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
54 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
55 </ItemGroup>
53 56
54 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 57 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
55 <PropertyGroup>
56 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
57 </PropertyGroup>
58 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.58\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.58\build\WixToolset.DUtil.props'))" />
59 <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props'))" />
60 </Target>
61</Project> 58</Project>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
index 2e416f0f..5ce4b00f 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Advanced/Package.wxs
@@ -1,9 +1,6 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 3 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
7 4
8 <Feature Id="ProductFeature" Title="MsiPackage"> 5 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 6 <ComponentGroupRef Id="ProductComponents" />
@@ -21,12 +18,10 @@
21 </Package> 18 </Package>
22 19
23 <Fragment> 20 <Fragment>
24 <Directory Id="TARGETDIR" Name="SourceDir"> 21 <StandardDirectory Id="ProgramFilesFolder">
25 <Directory Id="ProgramFilesFolder"> 22 <Directory Id="INSTALLFOLDER" Name="MsiPackage">
26 <Directory Id="INSTALLFOLDER" Name="MsiPackage"> 23 <Directory Id="APPLICATIONFOLDER" />
27 <Directory Id="APPLICATIONFOLDER" Name="." />
28 </Directory>
29 </Directory> 24 </Directory>
30 </Directory> 25 </StandardDirectory>
31 </Fragment> 26 </Fragment>
32</Wix> 27</Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
index 5f8cd07d..aff1c077 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_FeatureTree/Package.wxs
@@ -1,9 +1,6 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 3 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
7 4
8 <Feature Id="ProductFeature" Title="MsiPackage"> 5 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 6 <ComponentGroupRef Id="ProductComponents" />
@@ -19,10 +16,8 @@
19 </Package> 16 </Package>
20 17
21 <Fragment> 18 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 19 <StandardDirectory Id="ProgramFilesFolder">
23 <Directory Id="ProgramFilesFolder"> 20 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 21 </StandardDirectory>
25 </Directory>
26 </Directory>
27 </Fragment> 22 </Fragment>
28</Wix> 23</Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
index 4e873add..7c2ceae0 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_InstallDir/Package.wxs
@@ -1,9 +1,6 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 3 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
7 4
8 <Feature Id="ProductFeature" Title="MsiPackage"> 5 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 6 <ComponentGroupRef Id="ProductComponents" />
@@ -19,10 +16,8 @@
19 </Package> 16 </Package>
20 17
21 <Fragment> 18 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 19 <StandardDirectory Id="ProgramFilesFolder">
23 <Directory Id="ProgramFilesFolder"> 20 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 21 </StandardDirectory>
25 </Directory>
26 </Directory>
27 </Fragment> 22 </Fragment>
28</Wix> 23</Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
index 96ab46ff..d2ff256c 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Minimal/Package.wxs
@@ -1,9 +1,6 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 3 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
7 4
8 <Feature Id="ProductFeature" Title="MsiPackage"> 5 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 6 <ComponentGroupRef Id="ProductComponents" />
@@ -19,10 +16,8 @@
19 </Package> 16 </Package>
20 17
21 <Fragment> 18 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 19 <StandardDirectory Id="ProgramFilesFolder">
23 <Directory Id="ProgramFilesFolder"> 20 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 21 </StandardDirectory>
25 </Directory>
26 </Directory>
27 </Fragment> 22 </Fragment>
28</Wix> 23</Wix>
diff --git a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
index 9bbc4ba0..8d5a856a 100644
--- a/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
+++ b/src/test/WixToolsetTest.UI/TestData/WixUI_Mondo/Package.wxs
@@ -1,9 +1,6 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200"> 2 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" InstallerVersion="200">
3
4
5 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> 3 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
6
7 4
8 <Feature Id="ProductFeature" Title="MsiPackage"> 5 <Feature Id="ProductFeature" Title="MsiPackage">
9 <ComponentGroupRef Id="ProductComponents" /> 6 <ComponentGroupRef Id="ProductComponents" />
@@ -19,10 +16,8 @@
19 </Package> 16 </Package>
20 17
21 <Fragment> 18 <Fragment>
22 <Directory Id="TARGETDIR" Name="SourceDir"> 19 <StandardDirectory Id="ProgramFilesFolder">
23 <Directory Id="ProgramFilesFolder"> 20 <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
24 <Directory Id="INSTALLFOLDER" Name="MsiPackage" /> 21 </StandardDirectory>
25 </Directory>
26 </Directory>
27 </Fragment> 22 </Fragment>
28</Wix> 23</Wix>
diff --git a/src/wixext/WixToolset.UI.wixext.csproj b/src/wixext/WixToolset.UI.wixext.csproj
index 5300e78f..67c949b2 100644
--- a/src/wixext/WixToolset.UI.wixext.csproj
+++ b/src/wixext/WixToolset.UI.wixext.csproj
@@ -7,23 +7,24 @@
7 <RootNamespace>WixToolset.UI</RootNamespace> 7 <RootNamespace>WixToolset.UI</RootNamespace>
8 <Description>WiX Toolset UI Extension</Description> 8 <Description>WiX Toolset UI Extension</Description>
9 <Title>WiX Toolset UI Extension</Title> 9 <Title>WiX Toolset UI Extension</Title>
10 <IsTool>true</IsTool> 10 <DebugType>embedded</DebugType>
11 <ContentTargetFolders>build</ContentTargetFolders> 11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup> 12 </PropertyGroup>
13
13 <ItemGroup> 14 <ItemGroup>
14 <Content Include="$(MSBuildThisFileName).targets" />
15 <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" />
16 </ItemGroup> 16 </ItemGroup>
17
17 <ItemGroup> 18 <ItemGroup>
18 <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" /> 19 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
19 <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
20 </ItemGroup> 20 </ItemGroup>
21 21
22 <ItemGroup> 22 <ItemGroup>
23 <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> 23 <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
24 </ItemGroup> 24 </ItemGroup>
25 25
26 <ItemGroup> 26 <ItemGroup>
27 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
27 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> 28 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
28 </ItemGroup> 29 </ItemGroup>
29</Project> 30</Project>
diff --git a/src/wixext/WixToolset.UI.wixext.nuspec b/src/wixext/WixToolset.UI.wixext.nuspec
new file mode 100644
index 00000000..51c9708e
--- /dev/null
+++ b/src/wixext/WixToolset.UI.wixext.nuspec
@@ -0,0 +1,23 @@
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="netstandard2.0\$id$.dll" target="tools" />
20
21 <file src="x86\*.pdb" target="pdbs\x86" />
22 </files>
23</package>
diff --git a/src/wixlib/ui.wixproj b/src/wixlib/ui.wixproj
index d2421be2..e9529283 100644
--- a/src/wixlib/ui.wixproj
+++ b/src/wixlib/ui.wixproj
@@ -21,17 +21,16 @@
21 </PropertyGroup> 21 </PropertyGroup>
22 22
23 <ItemGroup> 23 <ItemGroup>
24 <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' /> 24 <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
25 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> 25 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
26 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' /> 26 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
27 </ItemGroup> 27 </ItemGroup>
28 28
29 <ItemGroup> 29 <ItemGroup>
30 <ProjectReference Include="..\ca\uica.vcxproj" /> 30 <ProjectReference Include="..\ca\uica.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
31 </ItemGroup> 31 </ItemGroup>
32 32
33 <ItemGroup> 33 <ItemGroup>
34 <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" /> 34 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
35 </ItemGroup> 35 </ItemGroup>
36
37</Project> 36</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-26 16:36:21 +0000