From 2a14c230453744ea896948ca0b4f6692f2962bee Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 12 Jan 2019 16:49:42 -0600
Subject: Integrate into latest v4.

---
 src/wixlib/UIExtension.wixproj | 114 ----------------------------------
 src/wixlib/caSuffix.wxi        |  28 +++++++++
 src/wixlib/packages.config     |   5 ++
 src/wixlib/ui.wixproj          | 135 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 168 insertions(+), 114 deletions(-)
 delete mode 100644 src/wixlib/UIExtension.wixproj
 create mode 100644 src/wixlib/caSuffix.wxi
 create mode 100644 src/wixlib/packages.config
 create mode 100644 src/wixlib/ui.wixproj

(limited to 'src/wixlib')

diff --git a/src/wixlib/UIExtension.wixproj b/src/wixlib/UIExtension.wixproj
deleted file mode 100644
index 213205a2..00000000
--- a/src/wixlib/UIExtension.wixproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- 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. -->
-
-
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <ProjectGuid>{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}</ProjectGuid>
-    <OutputName>ui</OutputName>
-    <OutputType>Library</OutputType>
-    <BindFiles>true</BindFiles>
-    <Pedantic>true</Pedantic>
-    <!-- Suppress ICE45 until we get a new darice.cub drop that properly supports the ElevationShield control attribute bit -->
-    <SuppressIces>ICE45</SuppressIces>
-    <Cultures>en-us</Cultures>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <DefineConstants>
-      $(DefineConstants);
-      bannerBmp=$(MSBuildProjectDirectory)\Bitmaps\bannrbmp.bmp;
-      dialogBmp=$(MSBuildProjectDirectory)\Bitmaps\dlgbmp.bmp;
-      exclamationIco=$(MSBuildProjectDirectory)\Bitmaps\exclamic.ico;
-      infoIco=$(MSBuildProjectDirectory)\Bitmaps\info.ico;
-      licenseRtf=$(MSBuildProjectDirectory)\license.rtf;
-      newIco=$(MSBuildProjectDirectory)\Bitmaps\new.ico;
-      upIco=$(MSBuildProjectDirectory)\Bitmaps\up.ico;
-    </DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="BrowseDlg.wxs" />
-    <Compile Include="CancelDlg.wxs" />
-    <Compile Include="Common.wxs" />
-    <Compile Include="Common_x86.wxs" />
-    <Compile Include="CustomizeDlg.wxs" />
-    <Compile Include="DiskCostDlg.wxs" />
-    <Compile Include="ErrorDlg.wxs" />
-    <Compile Include="ErrorProgressText.wxs" />
-    <Compile Include="ExitDialog.wxs" />
-    <Compile Include="FatalError.wxs" />
-    <Compile Include="FilesInUse.wxs" />
-    <Compile Include="InvalidDirDlg.wxs" />
-    <Compile Include="LicenseAgreementDlg.wxs" />
-    <Compile Include="MaintenanceTypeDlg.wxs" />
-    <Compile Include="MaintenanceWelcomeDlg.wxs" />
-    <Compile Include="MsiRMFilesInUse.wxs" />
-    <Compile Include="OutOfDiskDlg.wxs" />
-    <Compile Include="OutOfRbDiskDlg.wxs" />
-    <Compile Include="PrepareDlg.wxs" />
-    <Compile Include="ProgressDlg.wxs" />
-    <Compile Include="ResumeDlg.wxs" />
-    <Compile Include="SetupTypeDlg.wxs" />
-    <Compile Include="UserExit.wxs" />
-    <Compile Include="VerifyReadyDlg.wxs" />
-    <Compile Include="WaitForCostingDlg.wxs" />
-    <Compile Include="WelcomeDlg.wxs" />
-    <Compile Include="WixUI_FeatureTree.wxs" />
-    <Compile Include="InstallDirDlg.wxs" />
-    <Compile Include="WixUI_InstallDir.wxs" />
-    <Compile Include="WelcomeEulaDlg.wxs" />
-    <Compile Include="WixUI_Minimal.wxs" />
-    <Compile Include="WixUI_Mondo.wxs" />
-    <Compile Include="AdvancedWelcomeEulaDlg.wxs" />
-    <Compile Include="FeaturesDlg.wxs" />
-    <Compile Include="InstallScopeDlg.wxs" />
-    <Compile Include="WixUI_Advanced.wxs" />
-    <EmbeddedResource Include="WixUI_ar-SA.wxl" />
-    <EmbeddedResource Include="WixUI_bg-BG.wxl" />
-    <EmbeddedResource Include="WixUI_ca-ES.wxl" />
-    <EmbeddedResource Include="WixUI_cs-CZ.wxl" />
-    <EmbeddedResource Include="WixUI_da-DK.wxl" />
-    <EmbeddedResource Include="WixUI_de-DE.wxl" />
-    <EmbeddedResource Include="WixUI_el-GR.wxl" />
-    <EmbeddedResource Include="WixUI_en-US.wxl" />
-    <EmbeddedResource Include="WixUI_es-ES.wxl" />
-    <EmbeddedResource Include="WixUI_et-EE.wxl" />
-    <EmbeddedResource Include="WixUI_fi-FI.wxl" />
-    <EmbeddedResource Include="WixUI_fr-FR.wxl" />
-    <EmbeddedResource Include="WixUI_he-IL.wxl" />
-    <EmbeddedResource Include="WixUI_hi-IN.wxl" />
-    <EmbeddedResource Include="WixUI_hr-HR.wxl" />
-    <EmbeddedResource Include="WixUI_hu-HU.wxl" />
-    <EmbeddedResource Include="WixUI_it-IT.wxl" />
-    <EmbeddedResource Include="WixUI_ja-JP.wxl" />
-    <EmbeddedResource Include="WixUI_ko-KR.wxl" />
-    <EmbeddedResource Include="WixUI_kk-KZ.wxl" />
-    <EmbeddedResource Include="WixUI_lt-LT.wxl" />
-    <EmbeddedResource Include="WixUI_lv-LV.wxl" />
-    <EmbeddedResource Include="WixUI_nb-NO.wxl" />
-    <EmbeddedResource Include="WixUI_nl-NL.wxl" />
-    <EmbeddedResource Include="WixUI_pl-pl.wxl" />
-    <EmbeddedResource Include="WixUI_pt-BR.wxl" />
-    <EmbeddedResource Include="WixUI_pt-PT.wxl" />
-    <EmbeddedResource Include="WixUI_ro-RO.wxl" />
-    <EmbeddedResource Include="WixUI_ru-RU.wxl" />
-    <EmbeddedResource Include="WixUI_sk-SK.wxl" />
-    <EmbeddedResource Include="WixUI_sl-SI.wxl" />
-    <EmbeddedResource Include="WixUI_sq-AL.wxl" />
-    <EmbeddedResource Include="WixUI_sr-Latn-CS.wxl" />
-    <EmbeddedResource Include="WixUI_sv-SE.wxl" />
-    <EmbeddedResource Include="WixUI_th-TH.wxl" />
-    <EmbeddedResource Include="WixUI_tr-TR.wxl" />
-    <EmbeddedResource Include="WixUI_uk-UA.wxl" />
-    <EmbeddedResource Include="WixUI_zh-CN.wxl" />
-    <EmbeddedResource Include="WixUI_zh-HK.wxl" />
-    <EmbeddedResource Include="WixUI_zh-TW.wxl" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\ca\uica.vcxproj" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
-</Project>
diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi
new file mode 100644
index 00000000..a56a2393
--- /dev/null
+++ b/src/wixlib/caSuffix.wxi
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?ifndef platform ?>
+        <?error Required value "platform" not defined in include caSuffix.wxi ?>
+    <?endif ?>
+
+    <?ifdef Suffix ?>
+        <?undef Suffix ?>
+        <?undef DeferredSuffix ?>
+    <?endif ?>
+
+    <?if $(var.platform)="x86" ?>
+        <?define Suffix="" ?>
+        <?define DeferredSuffix="" ?>
+    <?endif ?>
+
+    <?if $(var.platform)="x64" ?>
+        <?define Suffix="_x64" ?>
+        <?define DeferredSuffix="_64" ?>
+    <?endif ?>
+
+    <?if $(var.platform)="arm" ?>
+        <?define Suffix="_ARM" ?>
+        <?define DeferredSuffix="_ARM" ?>
+    <?endif ?>
+</Include>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
new file mode 100644
index 00000000..7964daed
--- /dev/null
+++ b/src/wixlib/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0035" developmentDependency="true" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/src/wixlib/ui.wixproj b/src/wixlib/ui.wixproj
new file mode 100644
index 00000000..37ad94d0
--- /dev/null
+++ b/src/wixlib/ui.wixproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 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. -->
+<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\FindLocalWix.props" />
+  <PropertyGroup>
+    <ProjectGuid>{2D4FF07B-26F8-4BEF-B41C-E4383F86DC32}</ProjectGuid>
+    <OutputName>ui</OutputName>
+    <OutputType>Library</OutputType>
+    <BindFiles>true</BindFiles>
+    <Pedantic>true</Pedantic>
+    <Cultures>en-us</Cultures>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DefineConstants>
+      $(DefineConstants);
+      bannerBmp=$(MSBuildProjectDirectory)\Bitmaps\bannrbmp.bmp;
+      dialogBmp=$(MSBuildProjectDirectory)\Bitmaps\dlgbmp.bmp;
+      exclamationIco=$(MSBuildProjectDirectory)\Bitmaps\exclamic.ico;
+      infoIco=$(MSBuildProjectDirectory)\Bitmaps\info.ico;
+      licenseRtf=$(MSBuildProjectDirectory)\license.rtf;
+      newIco=$(MSBuildProjectDirectory)\Bitmaps\new.ico;
+      upIco=$(MSBuildProjectDirectory)\Bitmaps\up.ico;
+    </DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="BrowseDlg.wxs" />
+    <Compile Include="CancelDlg.wxs" />
+    <Compile Include="Common.wxs" />
+    <Compile Include="Common_x86.wxs" />
+    <Compile Include="CustomizeDlg.wxs" />
+    <Compile Include="DiskCostDlg.wxs" />
+    <Compile Include="ErrorDlg.wxs" />
+    <Compile Include="ErrorProgressText.wxs" />
+    <Compile Include="ExitDialog.wxs" />
+    <Compile Include="FatalError.wxs" />
+    <Compile Include="FilesInUse.wxs" />
+    <Compile Include="InvalidDirDlg.wxs" />
+    <Compile Include="LicenseAgreementDlg.wxs" />
+    <Compile Include="MaintenanceTypeDlg.wxs" />
+    <Compile Include="MaintenanceWelcomeDlg.wxs" />
+    <Compile Include="MsiRMFilesInUse.wxs" />
+    <Compile Include="OutOfDiskDlg.wxs" />
+    <Compile Include="OutOfRbDiskDlg.wxs" />
+    <Compile Include="PrepareDlg.wxs" />
+    <Compile Include="ProgressDlg.wxs" />
+    <Compile Include="ResumeDlg.wxs" />
+    <Compile Include="SetupTypeDlg.wxs" />
+    <Compile Include="UserExit.wxs" />
+    <Compile Include="VerifyReadyDlg.wxs" />
+    <Compile Include="WaitForCostingDlg.wxs" />
+    <Compile Include="WelcomeDlg.wxs" />
+    <Compile Include="WixUI_FeatureTree.wxs" />
+    <Compile Include="InstallDirDlg.wxs" />
+    <Compile Include="WixUI_InstallDir.wxs" />
+    <Compile Include="WelcomeEulaDlg.wxs" />
+    <Compile Include="WixUI_Minimal.wxs" />
+    <Compile Include="WixUI_Mondo.wxs" />
+    <Compile Include="AdvancedWelcomeEulaDlg.wxs" />
+    <Compile Include="FeaturesDlg.wxs" />
+    <Compile Include="InstallScopeDlg.wxs" />
+    <!-- TODO: Reenable when able to compile
+    <Compile Include="WixUI_Advanced.wxs" />
+    -->
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="WixUI_ar-SA.wxl" />
+    <EmbeddedResource Include="WixUI_bg-BG.wxl" />
+    <EmbeddedResource Include="WixUI_ca-ES.wxl" />
+    <EmbeddedResource Include="WixUI_cs-CZ.wxl" />
+    <EmbeddedResource Include="WixUI_da-DK.wxl" />
+    <EmbeddedResource Include="WixUI_de-DE.wxl" />
+    <EmbeddedResource Include="WixUI_el-GR.wxl" />
+    <EmbeddedResource Include="WixUI_en-US.wxl" />
+    <EmbeddedResource Include="WixUI_es-ES.wxl" />
+    <EmbeddedResource Include="WixUI_et-EE.wxl" />
+    <EmbeddedResource Include="WixUI_fi-FI.wxl" />
+    <EmbeddedResource Include="WixUI_fr-FR.wxl" />
+    <EmbeddedResource Include="WixUI_he-IL.wxl" />
+    <EmbeddedResource Include="WixUI_hi-IN.wxl" />
+    <EmbeddedResource Include="WixUI_hr-HR.wxl" />
+    <EmbeddedResource Include="WixUI_hu-HU.wxl" />
+    <EmbeddedResource Include="WixUI_it-IT.wxl" />
+    <EmbeddedResource Include="WixUI_ja-JP.wxl" />
+    <EmbeddedResource Include="WixUI_ko-KR.wxl" />
+    <EmbeddedResource Include="WixUI_kk-KZ.wxl" />
+    <EmbeddedResource Include="WixUI_lt-LT.wxl" />
+    <EmbeddedResource Include="WixUI_lv-LV.wxl" />
+    <EmbeddedResource Include="WixUI_nb-NO.wxl" />
+    <EmbeddedResource Include="WixUI_nl-NL.wxl" />
+    <EmbeddedResource Include="WixUI_pl-pl.wxl" />
+    <EmbeddedResource Include="WixUI_pt-BR.wxl" />
+    <EmbeddedResource Include="WixUI_pt-PT.wxl" />
+    <EmbeddedResource Include="WixUI_ro-RO.wxl" />
+    <EmbeddedResource Include="WixUI_ru-RU.wxl" />
+    <EmbeddedResource Include="WixUI_sk-SK.wxl" />
+    <EmbeddedResource Include="WixUI_sl-SI.wxl" />
+    <EmbeddedResource Include="WixUI_sq-AL.wxl" />
+    <EmbeddedResource Include="WixUI_sr-Latn-CS.wxl" />
+    <EmbeddedResource Include="WixUI_sv-SE.wxl" />
+    <EmbeddedResource Include="WixUI_th-TH.wxl" />
+    <EmbeddedResource Include="WixUI_tr-TR.wxl" />
+    <EmbeddedResource Include="WixUI_uk-UA.wxl" />
+    <EmbeddedResource Include="WixUI_zh-CN.wxl" />
+    <EmbeddedResource Include="WixUI_zh-HK.wxl" />
+    <EmbeddedResource Include="WixUI_zh-TW.wxl" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ca\uica.vcxproj">
+      <Name>uica</Name>
+      <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <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/." />
+  </Target>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <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>
+    </PropertyGroup>
+    <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'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props'))" />
+  </Target>
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+</Project>
-- 
cgit v1.2.3-55-g6feb