xsd got moved to doc repo. Update dependencies.
Sean Hall committed
Dec 4, 2020 at 17:29 UTC
ee12b7fcba1a007783b9c7488d968c8c9a66bcbf
6 files changed
+9
-158
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0163"
3
+ "WixToolset.Sdk": "4.0.0-build-0170"
4
}
5
}
src/ca/httpca.vcxproj
+4
-4
@@ -1,8 +1,8 @@
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
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
5
- <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
4
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
5
+ <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" />
6
7
<ItemGroup Label="ProjectConfigurations">
8
<ProjectConfiguration Include="Debug|Win32">
@@ -65,7 +65,7 @@
65
<PropertyGroup>
66
<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>
67
</PropertyGroup>
68
- <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'))" />
69
- <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'))" />
68
+ <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'))" />
69
+ <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'))" />
70
</Target>
71
</Project>
\ No newline at end of file
src/ca/packages.config
+2
-2
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
- <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
4
- <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" />
3
+ <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
4
+ <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" />
5
</packages>
\ No newline at end of file
src/wixext/WixToolset.Http.wixext.csproj
+1
-2
@@ -13,7 +13,6 @@
13
14
<ItemGroup>
15
<Content Include="$(MSBuildThisFileName).targets" />
16
- <Content Include="http.xsd" PackagePath="tools" />
16
<EmbeddedResource Include="$(OutputPath)..\http.wixlib" />
17
</ItemGroup>
18
@@ -27,6 +26,6 @@
26
</ItemGroup>
27
28
<ItemGroup>
30
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
29
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
30
</ItemGroup>
31
</Project>
src/wixext/http.xsd
deleted
-148
@@ -1,148 +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
-
5
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
6
- xmlns:xse="http://wixtoolset.org/schemas/XmlSchemaExtension"
7
- xmlns:html="http://www.w3.org/1999/xhtml"
8
- targetNamespace="http://wixtoolset.org/schemas/v4/wxs/http"
9
- xmlns="http://wixtoolset.org/schemas/v4/wxs/http">
10
- <xs:annotation>
11
- <xs:documentation>
12
- The source code schema for the Windows Installer XML Toolset Http Extension.
13
- </xs:documentation>
14
- </xs:annotation>
15
-
16
- <xs:import namespace="http://wixtoolset.org/schemas/v4/wxs" />
17
-
18
- <xs:element name="UrlReservation">
19
- <xs:annotation>
20
- <xs:documentation>
21
- Makes a reservation record for the HTTP Server API configuration store on Windows XP SP2,
22
- Windows Server 2003, and later. For more information about the HTTP Server API, see
23
- <html:a href="http://msdn.microsoft.com/library/windows/desktop/aa364510.aspx">
24
- HTTP Server API
25
- </html:a>.
26
- </xs:documentation>
27
- <xs:appinfo>
28
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
29
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="ServiceInstall" />
30
- </xs:appinfo>
31
- </xs:annotation>
32
-
33
- <xs:complexType>
34
- <xs:choice minOccurs="0" maxOccurs="unbounded">
35
- <xs:annotation>
36
- <xs:documentation>
37
- The access control entries for the access control list.
38
- </xs:documentation>
39
- </xs:annotation>
40
- <xs:element ref="UrlAce" />
41
- </xs:choice>
42
-
43
- <xs:attribute name="HandleExisting">
44
- <xs:annotation>
45
- <xs:documentation>
46
- Specifies the behavior when trying to install a URL reservation and it already exists.
47
- </xs:documentation>
48
- </xs:annotation>
49
- <xs:simpleType>
50
- <xs:restriction base="xs:NMTOKEN">
51
- <xs:enumeration value="replace">
52
- <xs:annotation>
53
- <xs:documentation>
54
- Replaces the existing URL reservation (the default).
55
- </xs:documentation>
56
- </xs:annotation>
57
- </xs:enumeration>
58
- <xs:enumeration value="ignore">
59
- <xs:annotation>
60
- <xs:documentation>
61
- Keeps the existing URL reservation.
62
- </xs:documentation>
63
- </xs:annotation>
64
- </xs:enumeration>
65
- <xs:enumeration value="fail">
66
- <xs:annotation>
67
- <xs:documentation>
68
- The installation fails.
69
- </xs:documentation>
70
- </xs:annotation>
71
- </xs:enumeration>
72
- </xs:restriction>
73
- </xs:simpleType>
74
- </xs:attribute>
75
-
76
- <xs:attribute name="Id" type="xs:string">
77
- <xs:annotation>
78
- <xs:documentation>
79
- Unique ID of this URL reservation.
80
- If this attribute is not specified, an identifier will be generated automatically.
81
- </xs:documentation>
82
- </xs:annotation>
83
- </xs:attribute>
84
-
85
- <xs:attribute name="Sddl" type="xs:string">
86
- <xs:annotation>
87
- <xs:documentation>
88
- Security descriptor to apply to the URL reservation.
89
- Can't be specified when using children UrlAce elements.
90
- </xs:documentation>
91
- </xs:annotation>
92
- </xs:attribute>
93
-
94
- <xs:attribute name="Url" type="xs:string" use="required">
95
- <xs:annotation>
96
- <xs:documentation>
97
- The <html:a href="http://msdn.microsoft.com/library/windows/desktop/aa364698.aspx">UrlPrefix</html:a>
98
- string that defines the portion of the URL namespace to which this reservation pertains.
99
- </xs:documentation>
100
- </xs:annotation>
101
- </xs:attribute>
102
- </xs:complexType>
103
- </xs:element>
104
-
105
- <xs:element name="UrlAce">
106
- <xs:annotation>
107
- <xs:documentation>
108
- The security principal and which rights to assign to them for the URL reservation.
109
- </xs:documentation>
110
- </xs:annotation>
111
- <xs:complexType>
112
- <xs:attribute name="Id" type="xs:string">
113
- <xs:annotation>
114
- <xs:documentation>
115
- Unique ID of this URL ACE.
116
- If this attribute is not specified, an identifier will be generated automatically.
117
- </xs:documentation>
118
- </xs:annotation>
119
- </xs:attribute>
120
-
121
- <xs:attribute name="SecurityPrincipal" type="xs:string">
122
- <xs:annotation>
123
- <xs:documentation>
124
- The security principal for this ACE. When the UrlReservation is under a ServiceInstall element, this defaults to
125
- "NT SERVICE\ServiceInstallName". This may be either a SID or an account name in a format that
126
- <html:a href="http://msdn.microsoft.com/library/windows/desktop/aa379159.aspx">LookupAccountName</html:a>
127
- supports. When using a SID, an asterisk must be prepended. For example, "*S-1-5-18".
128
- </xs:documentation>
129
- </xs:annotation>
130
- </xs:attribute>
131
-
132
- <xs:attribute name="Rights">
133
- <xs:annotation>
134
- <xs:documentation>
135
- Rights for this ACE. Default is "all".
136
- </xs:documentation>
137
- </xs:annotation>
138
- <xs:simpleType>
139
- <xs:restriction base="xs:NMTOKEN">
140
- <xs:enumeration value="register" />
141
- <xs:enumeration value="delegate" />
142
- <xs:enumeration value="all" />
143
- </xs:restriction>
144
- </xs:simpleType>
145
- </xs:attribute>
146
- </xs:complexType>
147
- </xs:element>
148
-</xs:schema>
src/wixlib/http.wixproj
+1
-1
@@ -19,6 +19,6 @@
19
</ItemGroup>
20
21
<ItemGroup>
22
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
22
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
23
</ItemGroup>
24
</Project>
\ No newline at end of file