From ee12b7fcba1a007783b9c7488d968c8c9a66bcbf Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 4 Dec 2020 17:29:32 -0600
Subject: xsd got moved to doc repo. Update dependencies.

---
 global.json                              |   2 +-
 src/ca/httpca.vcxproj                    |   8 +-
 src/ca/packages.config                   |   4 +-
 src/wixext/WixToolset.Http.wixext.csproj |   3 +-
 src/wixext/http.xsd                      | 148 -------------------------------
 src/wixlib/http.wixproj                  |   2 +-
 6 files changed, 9 insertions(+), 158 deletions(-)
 delete mode 100644 src/wixext/http.xsd

diff --git a/global.json b/global.json
index 10345833..77a81322 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "WixToolset.Sdk": "4.0.0-build-0163"
+    "WixToolset.Sdk": "4.0.0-build-0170"
   }
 }
diff --git a/src/ca/httpca.vcxproj b/src/ca/httpca.vcxproj
index eba0df68..9abe7598 100644
--- a/src/ca/httpca.vcxproj
+++ b/src/ca/httpca.vcxproj
@@ -1,8 +1,8 @@
 <?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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
-  <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" />
   
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -65,7 +65,7 @@
     <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\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
+    <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'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/ca/packages.config b/src/ca/packages.config
index e3dc0e43..9d88f529 100644
--- a/src/ca/packages.config
+++ b/src/ca/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
-  <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
+  <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/wixext/WixToolset.Http.wixext.csproj b/src/wixext/WixToolset.Http.wixext.csproj
index 59c278e6..089a51d0 100644
--- a/src/wixext/WixToolset.Http.wixext.csproj
+++ b/src/wixext/WixToolset.Http.wixext.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <Content Include="$(MSBuildThisFileName).targets" />
-    <Content Include="http.xsd" PackagePath="tools" />
     <EmbeddedResource Include="$(OutputPath)..\http.wixlib" />
   </ItemGroup>
 
@@ -27,6 +26,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/wixext/http.xsd b/src/wixext/http.xsd
deleted file mode 100644
index b96a6ded..00000000
--- a/src/wixext/http.xsd
+++ /dev/null
@@ -1,148 +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. -->
-
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          xmlns:xse="http://wixtoolset.org/schemas/XmlSchemaExtension"
-         xmlns:html="http://www.w3.org/1999/xhtml"
-    targetNamespace="http://wixtoolset.org/schemas/v4/wxs/http"
-              xmlns="http://wixtoolset.org/schemas/v4/wxs/http">
-  <xs:annotation>
-    <xs:documentation>
-      The source code schema for the Windows Installer XML Toolset Http Extension.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:import namespace="http://wixtoolset.org/schemas/v4/wxs" />
-
-  <xs:element name="UrlReservation">
-    <xs:annotation>
-      <xs:documentation>
-        Makes a reservation record for the HTTP Server API configuration store on Windows XP SP2,
-        Windows Server 2003, and later.  For more information about the HTTP Server API, see
-        <html:a href="http://msdn.microsoft.com/library/windows/desktop/aa364510.aspx">
-          HTTP Server API
-        </html:a>.
-      </xs:documentation>
-      <xs:appinfo>
-        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
-        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="ServiceInstall" />
-      </xs:appinfo>
-    </xs:annotation>
-
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:annotation>
-          <xs:documentation>
-            The access control entries for the access control list.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:element ref="UrlAce" />
-      </xs:choice>
-
-      <xs:attribute name="HandleExisting">
-        <xs:annotation>
-          <xs:documentation>
-            Specifies the behavior when trying to install a URL reservation and it already exists.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-          <xs:restriction base="xs:NMTOKEN">
-            <xs:enumeration value="replace">
-              <xs:annotation>
-                <xs:documentation>
-                  Replaces the existing URL reservation (the default).
-                </xs:documentation>
-              </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="ignore">
-              <xs:annotation>
-                <xs:documentation>
-                  Keeps the existing URL reservation.
-                </xs:documentation>
-              </xs:annotation>
-            </xs:enumeration>
-            <xs:enumeration value="fail">
-              <xs:annotation>
-                <xs:documentation>
-                  The installation fails.
-                </xs:documentation>
-              </xs:annotation>
-            </xs:enumeration>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-
-      <xs:attribute name="Id" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>
-            Unique ID of this URL reservation.
-            If this attribute is not specified, an identifier will be generated automatically.
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-
-      <xs:attribute name="Sddl" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>
-            Security descriptor to apply to the URL reservation.
-            Can't be specified when using children UrlAce elements.
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-
-      <xs:attribute name="Url" type="xs:string" use="required">
-        <xs:annotation>
-          <xs:documentation>
-            The <html:a href="http://msdn.microsoft.com/library/windows/desktop/aa364698.aspx">UrlPrefix</html:a>
-            string that defines the portion of the URL namespace to which this reservation pertains.
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="UrlAce">
-    <xs:annotation>
-      <xs:documentation>
-        The security principal and which rights to assign to them for the URL reservation.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attribute name="Id" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>
-            Unique ID of this URL ACE.
-            If this attribute is not specified, an identifier will be generated automatically.
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-
-      <xs:attribute name="SecurityPrincipal" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>
-            The security principal for this ACE.  When the UrlReservation is under a ServiceInstall element, this defaults to
-            "NT SERVICE\ServiceInstallName".  This may be either a SID or an account name in a format that
-            <html:a href="http://msdn.microsoft.com/library/windows/desktop/aa379159.aspx">LookupAccountName</html:a>
-            supports.  When using a SID, an asterisk must be prepended.  For example, "*S-1-5-18".
-          </xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-
-      <xs:attribute name="Rights">
-        <xs:annotation>
-          <xs:documentation>
-            Rights for this ACE. Default is "all".
-          </xs:documentation>
-        </xs:annotation>
-        <xs:simpleType>
-          <xs:restriction base="xs:NMTOKEN">
-            <xs:enumeration value="register" />
-            <xs:enumeration value="delegate" />
-            <xs:enumeration value="all" />
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
diff --git a/src/wixlib/http.wixproj b/src/wixlib/http.wixproj
index 7a99fbb9..999b7334 100644
--- a/src/wixlib/http.wixproj
+++ b/src/wixlib/http.wixproj
@@ -19,6 +19,6 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb