Build wixlib with WixToolset.Sdk
Rob Mensching committed
Jun 27, 2020 at 15:28 UTC
734b1bd19acdeeadcc7cf30497974710336d74cc
4 files changed
+13
-118
global.json
new
+5
@@ -0,0 +1,5 @@
1
+{
2
+ "msbuild-sdks": {
3
+ "WixToolset.Sdk": "4.0.0-build-0143"
4
+ }
5
+}
src/FindLocalWix.props
deleted
-8
@@ -1,8 +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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <PropertyGroup>
6
- <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') And Exists('$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath>
7
- </PropertyGroup>
8
-</Project>
src/wixlib/packages.config
deleted
-5
@@ -1,5 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.MSBuild" version="4.0.0-build-0101" developmentDependency="true" targetFramework="net40" />
5
-</packages>
\ No newline at end of file
src/wixlib/ui.wixproj
+8
-105
@@ -1,14 +1,9 @@
1
-<?xml version="1.0" encoding="utf-8" ?>
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. -->
3
-<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" />
5
- <Import Project="..\FindLocalWix.props" />
2
+<Project Sdk="WixToolset.Sdk">
3
+
4
<PropertyGroup>
7
- <ProjectGuid>{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}</ProjectGuid>
8
- <OutputName>ui</OutputName>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
11
- <Pedantic>true</Pedantic>
7
<Cultures>en-us</Cultures>
8
</PropertyGroup>
9
@@ -26,110 +21,18 @@
21
</PropertyGroup>
22
23
<ItemGroup>
29
- <Compile Include="BrowseDlg.wxs" />
30
- <Compile Include="CancelDlg.wxs" />
31
- <Compile Include="Common.wxs" />
32
- <Compile Include="Common_x86.wxs" />
33
- <Compile Include="CustomizeDlg.wxs" />
34
- <Compile Include="DiskCostDlg.wxs" />
35
- <Compile Include="ErrorDlg.wxs" />
36
- <Compile Include="ErrorProgressText.wxs" />
37
- <Compile Include="ExitDialog.wxs" />
38
- <Compile Include="FatalError.wxs" />
39
- <Compile Include="FilesInUse.wxs" />
40
- <Compile Include="InvalidDirDlg.wxs" />
41
- <Compile Include="LicenseAgreementDlg.wxs" />
42
- <Compile Include="MaintenanceTypeDlg.wxs" />
43
- <Compile Include="MaintenanceWelcomeDlg.wxs" />
44
- <Compile Include="MsiRMFilesInUse.wxs" />
45
- <Compile Include="OutOfDiskDlg.wxs" />
46
- <Compile Include="OutOfRbDiskDlg.wxs" />
47
- <Compile Include="PrepareDlg.wxs" />
48
- <Compile Include="ProgressDlg.wxs" />
49
- <Compile Include="ResumeDlg.wxs" />
50
- <Compile Include="SetupTypeDlg.wxs" />
51
- <Compile Include="UserExit.wxs" />
52
- <Compile Include="VerifyReadyDlg.wxs" />
53
- <Compile Include="WaitForCostingDlg.wxs" />
54
- <Compile Include="WelcomeDlg.wxs" />
55
- <Compile Include="WixUI_FeatureTree.wxs" />
56
- <Compile Include="InstallDirDlg.wxs" />
57
- <Compile Include="WixUI_InstallDir.wxs" />
58
- <Compile Include="WelcomeEulaDlg.wxs" />
59
- <Compile Include="WixUI_Minimal.wxs" />
60
- <Compile Include="WixUI_Mondo.wxs" />
61
- <Compile Include="AdvancedWelcomeEulaDlg.wxs" />
62
- <Compile Include="FeaturesDlg.wxs" />
63
- <Compile Include="InstallScopeDlg.wxs" />
64
- <!-- TODO: Reenable when able to compile
65
- <Compile Include="WixUI_Advanced.wxs" />
66
- -->
24
+ <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
25
+ <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
26
+ <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
27
+ <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
28
</ItemGroup>
29
30
<ItemGroup>
70
- <EmbeddedResource Include="WixUI_ar-SA.wxl" />
71
- <EmbeddedResource Include="WixUI_bg-BG.wxl" />
72
- <EmbeddedResource Include="WixUI_ca-ES.wxl" />
73
- <EmbeddedResource Include="WixUI_cs-CZ.wxl" />
74
- <EmbeddedResource Include="WixUI_da-DK.wxl" />
75
- <EmbeddedResource Include="WixUI_de-DE.wxl" />
76
- <EmbeddedResource Include="WixUI_el-GR.wxl" />
77
- <EmbeddedResource Include="WixUI_en-US.wxl" />
78
- <EmbeddedResource Include="WixUI_es-ES.wxl" />
79
- <EmbeddedResource Include="WixUI_et-EE.wxl" />
80
- <EmbeddedResource Include="WixUI_fi-FI.wxl" />
81
- <EmbeddedResource Include="WixUI_fr-FR.wxl" />
82
- <EmbeddedResource Include="WixUI_he-IL.wxl" />
83
- <EmbeddedResource Include="WixUI_hi-IN.wxl" />
84
- <EmbeddedResource Include="WixUI_hr-HR.wxl" />
85
- <EmbeddedResource Include="WixUI_hu-HU.wxl" />
86
- <EmbeddedResource Include="WixUI_it-IT.wxl" />
87
- <EmbeddedResource Include="WixUI_ja-JP.wxl" />
88
- <EmbeddedResource Include="WixUI_ko-KR.wxl" />
89
- <EmbeddedResource Include="WixUI_kk-KZ.wxl" />
90
- <EmbeddedResource Include="WixUI_lt-LT.wxl" />
91
- <EmbeddedResource Include="WixUI_lv-LV.wxl" />
92
- <EmbeddedResource Include="WixUI_nb-NO.wxl" />
93
- <EmbeddedResource Include="WixUI_nl-NL.wxl" />
94
- <EmbeddedResource Include="WixUI_pl-pl.wxl" />
95
- <EmbeddedResource Include="WixUI_pt-BR.wxl" />
96
- <EmbeddedResource Include="WixUI_pt-PT.wxl" />
97
- <EmbeddedResource Include="WixUI_ro-RO.wxl" />
98
- <EmbeddedResource Include="WixUI_ru-RU.wxl" />
99
- <EmbeddedResource Include="WixUI_sk-SK.wxl" />
100
- <EmbeddedResource Include="WixUI_sl-SI.wxl" />
101
- <EmbeddedResource Include="WixUI_sq-AL.wxl" />
102
- <EmbeddedResource Include="WixUI_sr-Latn-CS.wxl" />
103
- <EmbeddedResource Include="WixUI_sv-SE.wxl" />
104
- <EmbeddedResource Include="WixUI_th-TH.wxl" />
105
- <EmbeddedResource Include="WixUI_tr-TR.wxl" />
106
- <EmbeddedResource Include="WixUI_uk-UA.wxl" />
107
- <EmbeddedResource Include="WixUI_zh-CN.wxl" />
108
- <EmbeddedResource Include="WixUI_zh-HK.wxl" />
109
- <EmbeddedResource Include="WixUI_zh-TW.wxl" />
31
+ <ProjectReference Include="..\ca\uica.vcxproj" />
32
</ItemGroup>
33
34
<ItemGroup>
113
- <None Include="packages.config" />
35
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
36
</ItemGroup>
37
116
- <ItemGroup>
117
- <ProjectReference Include="..\ca\uica.vcxproj">
118
- <Name>uica</Name>
119
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
120
- </ProjectReference>
121
- </ItemGroup>
122
- <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
123
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
124
- <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
125
- <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
126
- </Target>
127
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
128
- <PropertyGroup>
129
- <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>
130
- </PropertyGroup>
131
- <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
132
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props'))" />
133
- </Target>
134
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
38
</Project>