From 5b85ba2b9823f4b6db4f5c4bff96a27cd41d39f8 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 27 Jun 2020 13:45:35 -0700
Subject: Build wixlib with WixToolset.Sdk

---
 global.json                 |  5 +++
 src/FindLocalWix.props      |  8 -----
 src/wixlib/firewall.wixproj | 76 ++++++---------------------------------------
 src/wixlib/packages.config  |  5 ---
 4 files changed, 14 insertions(+), 80 deletions(-)
 create mode 100644 global.json
 delete mode 100644 src/FindLocalWix.props
 delete mode 100644 src/wixlib/packages.config

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/firewall.wixproj b/src/wixlib/firewall.wixproj
index c1daa05a..7e92bf1a 100644
--- a/src/wixlib/firewall.wixproj
+++ b/src/wixlib/firewall.wixproj
@@ -1,79 +1,21 @@
-<?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-0102\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0102\build\WixToolset.MSBuild.props')" />
-  <Import Project="..\FindLocalWix.props" />
+<Project Sdk="WixToolset.Sdk">
+
   <PropertyGroup>
-    <ProjectGuid>{1acffefd-505a-41a5-acbf-a02b7b473aa2}</ProjectGuid>
-    <OutputName>firewall</OutputName>
     <OutputType>Library</OutputType>
     <BindFiles>true</BindFiles>
-    <Pedantic>true</Pedantic>
     <Cultures>en-us</Cultures>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="FirewallExtension.wxs" />
-    <Compile Include="FirewallExtension_arm.wxs" />
-    <Compile Include="FirewallExtension_arm64.wxs" />
-    <Compile Include="FirewallExtension_x64.wxs" />
-    <Compile Include="FirewallExtension_x86.wxs" />
-    <EmbeddedResource Include="en-us.wxl" />
-    <EmbeddedResource Include="es-es.wxl" />
-    <EmbeddedResource Include="ja-jp.wxl" />
-    <EmbeddedResource Include="pl-pl.wxl" />
-  </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>
+    <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM" />
+    <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" />
+    <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ca\fwca.vcxproj">
-      <Name>fwca</Name>
-      <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
-      <Properties>Platform=ARM</Properties>
-    </ProjectReference>
-    <ProjectReference Include="..\ca\fwca.vcxproj">
-      <Name>fwca</Name>
-      <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
-      <Properties>Platform=ARM64</Properties>
-    </ProjectReference>
-    <ProjectReference Include="..\ca\fwca.vcxproj">
-      <Name>fwca</Name>
-      <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
-      <Properties>Platform=x86</Properties>
-    </ProjectReference>
-    <ProjectReference Include="..\ca\fwca.vcxproj">
-      <Name>fwca</Name>
-      <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
-      <Properties>Platform=x64</Properties>
-    </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-0102\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0102\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>
\ No newline at end of file
+
+</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
deleted file mode 100644
index 8db41667..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-0102" developmentDependency="true" targetFramework="net40" />
-</packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb