From c95213afde7af57af4b2bbaa2d29344accbebf01 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 26 Jun 2020 11:57:56 -0700
Subject: Build wixlib with WixToolset.Sdk

---
 Util.wixext.sln            |  4 +-
 appveyor.cmd               | 12 +++---
 global.json                |  5 +++
 src/FindLocalWix.props     |  8 ----
 src/wixlib/packages.config |  5 ---
 src/wixlib/util.wixproj    | 93 ++++++++--------------------------------------
 6 files changed, 28 insertions(+), 99 deletions(-)
 create mode 100644 global.json
 delete mode 100644 src/FindLocalWix.props
 delete mode 100644 src/wixlib/packages.config

diff --git a/Util.wixext.sln b/Util.wixext.sln
index 86ee4d2a..36949676 100644
--- a/Util.wixext.sln
+++ b/Util.wixext.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2003
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30204.135
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}"
 EndProject
diff --git a/appveyor.cmd b/appveyor.cmd
index eae4e787..2347f074 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -1,14 +1,14 @@
 @setlocal
 @pushd %~dp0
 
-nuget restore
+nuget restore || exit /b
 
-msbuild -p:Configuration=Release -t:Restore
+msbuild -p:Configuration=Release -t:Restore || exit /b
 
-msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj
-dotnet test -c Release --no-build src\test\WixToolsetTest.Util
+msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
+dotnet test -c Release --no-build src\test\WixToolsetTest.Util || exit /b
 
-msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj
+msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b
 
 @popd
-@endlocal
\ No newline at end of file
+@endlocal
diff --git a/global.json b/global.json
new file mode 100644
index 00000000..7a995d0a
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+  "msbuild-sdks": {
+    "WixToolset.Sdk": "4.0.0-build-0143"
+  }
+}
diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props
deleted file mode 100644
index 1666e4fe..00000000
--- a/src/FindLocalWix.props
+++ /dev/null
@@ -1,8 +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 xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <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>
-  </PropertyGroup>
-</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
deleted file mode 100644
index f37af421..00000000
--- a/src/wixlib/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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-0139" developmentDependency="true" targetFramework="net40" />
-</packages>
\ No newline at end of file
diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj
index be62632b..82b06c00 100644
--- a/src/wixlib/util.wixproj
+++ b/src/wixlib/util.wixproj
@@ -1,91 +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. -->
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props')" />
-  <Import Project="..\FindLocalWix.props" />
+<Project Sdk="WixToolset.Sdk">
+
   <PropertyGroup>
-    <ProjectGuid>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid>
-    <OutputName>util</OutputName>
     <OutputType>Library</OutputType>
     <BindFiles>true</BindFiles>
-    <Pedantic>true</Pedantic>
   </PropertyGroup>
+
   <ItemGroup>
-    <Compile Include="UtilExtension.wxs" />
-    <Compile Include="UtilExtension_x86.wxs" />
-    <Compile Include="UtilExtension_x64.wxs" />
-    <Compile Include="UtilExtension_arm.wxs" />
-    <Compile Include="UtilExtension_arm64.wxs" />
-    <EmbeddedResource Include="en-us.wxl" />
-    <EmbeddedResource Include="de-de.wxl" />
-    <EmbeddedResource Include="es-es.wxl" />
-    <EmbeddedResource Include="fr-fr.wxl" />
-    <EmbeddedResource Include="ja-jp.wxl" />
-    <EmbeddedResource Include="pt-br.wxl" />
-    <EmbeddedResource Include="it-it.wxl" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)Win32">
-        <BindName>x86</BindName>
-    </BindInputPaths>
-    <BindInputPaths Include="$(OutputPath)x64)">
-        <BindName>x64</BindName>
-    </BindInputPaths>
-    <BindInputPaths Include="$(OutputPath)arm)">
-        <BindName>arm</BindName>
-    </BindInputPaths>
-    <BindInputPaths Include="$(OutputPath)arm64)">
-        <BindName>arm64</BindName>
-    </BindInputPaths>
+    <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
+    <BindInputPaths Include="$(OutputPath)x64)" BindName='x64' />
+    <BindInputPaths Include="$(OutputPath)arm)" BindName='arm' />
+    <BindInputPaths Include="$(OutputPath)arm64)" BindName='arm64' />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\be\utilbe.vcxproj">
-      <Name>utilbe</Name>
-      <Project>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\ca\utilca.vcxproj">
-      <Name>utilca</Name>
-      <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project>
-      <Properties>Platform=ARM</Properties>
-    </ProjectReference>
-    <ProjectReference Include="..\ca\utilca.vcxproj">
-      <Name>utilca</Name>
-      <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project>
-      <Properties>Platform=ARM64</Properties>
-    </ProjectReference>
-    <ProjectReference Include="..\ca\utilca.vcxproj">
-      <Name>utilca</Name>
-      <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project>
-      <Properties>Platform=x86</Properties>
-    </ProjectReference>
-    <ProjectReference Include="..\ca\utilca.vcxproj">
-      <Name>utilca</Name>
-      <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project>
-      <Properties>Platform=x64</Properties>
-    </ProjectReference>
+    <ProjectReference Include="..\be\utilbe.vcxproj" />
+    <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM" />
+    <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" />
+    <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <None Include="caerr.wxi" />
-    <None Include="caDecor.wxi" />
-    <None Include="UtilExtension_Platform.wxi" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
-  
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
-  
-  <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-0139\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\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