xsd got moved to doc repo. Update dependencies.
Sean Hall committed
Dec 4, 2020 at 17:23 UTC
0f2fb968a2afdd9e950727250a8069f37bd3d2fc
6 files changed
+10
-228
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/fwca.vcxproj
+4
-4
@@ -2,8 +2,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
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
6
- <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" />
5
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
6
+ <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" />
7
8
<ItemGroup Label="ProjectConfigurations">
9
<ProjectConfiguration Include="Debug|ARM64">
@@ -75,7 +75,7 @@
75
<PropertyGroup>
76
<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>
77
</PropertyGroup>
78
- <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'))" />
79
- <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'))" />
78
+ <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'))" />
79
+ <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'))" />
80
</Target>
81
</Project>
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.Firewall.wixext.csproj
+2
-3
@@ -1,4 +1,4 @@
1
-<?xml version="1.0" encoding="utf-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
4
<Project Sdk="Microsoft.NET.Sdk">
@@ -13,7 +13,6 @@
13
14
<ItemGroup>
15
<Content Include="$(MSBuildThisFileName).targets" />
16
- <Content Include="firewall.xsd" PackagePath="tools" />
16
<EmbeddedResource Include="$(OutputPath)..\firewall.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/firewall.xsd
deleted
-217
@@ -1,217 +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/firewall"
9
- xmlns="http://wixtoolset.org/schemas/v4/wxs/firewall">
10
- <xs:annotation>
11
- <xs:documentation>
12
- The source code schema for the WiX Toolset Firewall Extension.
13
- </xs:documentation>
14
- </xs:annotation>
15
-
16
- <xs:import namespace="http://wixtoolset.org/schemas/v4/wxs" />
17
-
18
- <xs:element name="FirewallException">
19
- <xs:annotation>
20
- <xs:documentation>
21
- Registers an exception for a program or a specific port and protocol in the Windows Firewall
22
- on Windows XP SP2, Windows Server 2003 SP1, and later. For more information about the Windows
23
- Firewall, see <html:a href="http://msdn.microsoft.com/en-us/library/aa364679.aspx">
24
- About Windows Firewall API</html:a>.
25
- </xs:documentation>
26
- <xs:appinfo>
27
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
28
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />
29
- </xs:appinfo>
30
- </xs:annotation>
31
-
32
- <xs:complexType>
33
- <xs:choice minOccurs="0" maxOccurs="unbounded">
34
- <xs:annotation>
35
- <xs:documentation>
36
- Explicitly-listed remote addresses that this exception allows through the
37
- firewall.
38
- </xs:documentation>
39
- </xs:annotation>
40
- <xs:element ref="RemoteAddress" />
41
- </xs:choice>
42
-
43
- <xs:attribute name="Id" type="xs:string" use="required">
44
- <xs:annotation>
45
- <xs:documentation>
46
- Unique ID of this firewall exception.
47
- </xs:documentation>
48
- </xs:annotation>
49
- </xs:attribute>
50
-
51
- <xs:attribute name="Name" type="xs:string" use="required">
52
- <xs:annotation>
53
- <xs:documentation>
54
- Name of this firewall exception, visible to the user in the firewall
55
- control panel.
56
- </xs:documentation>
57
- </xs:annotation>
58
- </xs:attribute>
59
-
60
- <xs:attribute name="Scope">
61
- <xs:annotation>
62
- <xs:documentation>
63
- The scope of this firewall exception, which indicates whether incoming
64
- connections can come from any computer including those on the Internet
65
- or only those on the local network subnet. To more precisely specify
66
- allowed remote address, specify a custom scope using RemoteAddress
67
- child elements.
68
- </xs:documentation>
69
- </xs:annotation>
70
- <xs:simpleType>
71
- <xs:restriction base="xs:NMTOKEN">
72
- <xs:enumeration value="any" />
73
- <xs:enumeration value="localSubnet" />
74
- </xs:restriction>
75
- </xs:simpleType>
76
- </xs:attribute>
77
-
78
- <xs:attribute name="Port" type="xs:string">
79
- <xs:annotation>
80
- <xs:documentation>
81
- Port to allow through the firewall for this exception.
82
-
83
- If you use Port and also File or Program in the same
84
- FirewallException element, the exception will fail to install on
85
- Windows XP and Windows Server 2003. IgnoreFailure="yes" can be used to
86
- ignore the resulting failure, but the exception will not be added.
87
- </xs:documentation>
88
- </xs:annotation>
89
- </xs:attribute>
90
-
91
- <xs:attribute name="Protocol">
92
- <xs:annotation>
93
- <xs:documentation>
94
- IP protocol used for this firewall exception. If Port is defined,
95
- "tcp" is assumed if the protocol is not specified.
96
-
97
- If you use Protocol and also File or Program in the same
98
- FirewallException element, the exception will fail to install on
99
- Windows XP and Windows Server 2003. IgnoreFailure="yes" can be used to
100
- ignore the resulting failure, but the exception will not be added.
101
- </xs:documentation>
102
- </xs:annotation>
103
- <xs:simpleType>
104
- <xs:restriction base="xs:NMTOKEN">
105
- <xs:enumeration value="tcp" />
106
- <xs:enumeration value="udp" />
107
- </xs:restriction>
108
- </xs:simpleType>
109
- </xs:attribute>
110
-
111
- <xs:attribute name="File" type="xs:string">
112
- <xs:annotation>
113
- <xs:documentation>
114
- Identifier of a file to be granted access to all incoming ports and
115
- protocols. If you use File, you cannot also use Program.
116
-
117
- If you use File and also Port or Protocol in the same
118
- FirewallException element, the exception will fail to install on
119
- Windows XP and Windows Server 2003. IgnoreFailure="yes" can be used to
120
- ignore the resulting failure, but the exception will not be added.
121
- </xs:documentation>
122
- </xs:annotation>
123
- </xs:attribute>
124
-
125
- <xs:attribute name="Program" type="xs:string">
126
- <xs:annotation>
127
- <xs:documentation>
128
- Path to a target program to be granted access to all incoming ports and
129
- protocols. Note that this is a formatted field, so you can use [#fileId]
130
- syntax to refer to a file being installed. If you use Program, you cannot
131
- also use File.
132
-
133
- If you use Program and also Port or Protocol in the same
134
- FirewallException element, the exception will fail to install on
135
- Windows XP and Windows Server 2003. IgnoreFailure="yes" can be used to
136
- ignore the resulting failure, but the exception will not be added.
137
- </xs:documentation>
138
- </xs:annotation>
139
- </xs:attribute>
140
-
141
- <xs:attribute name="IgnoreFailure" type="YesNoType">
142
- <xs:annotation>
143
- <xs:documentation>
144
- If "yes", failures to register this firewall exception will be silently
145
- ignored. If "no" (the default), failures will cause rollback.
146
- </xs:documentation>
147
- </xs:annotation>
148
- </xs:attribute>
149
-
150
- <xs:attribute name="Profile">
151
- <xs:annotation>
152
- <xs:documentation>
153
- Profile type for this firewall exception. Default is "all".
154
- </xs:documentation>
155
- </xs:annotation>
156
- <xs:simpleType>
157
- <xs:restriction base="xs:NMTOKEN">
158
- <xs:enumeration value="domain" />
159
- <xs:enumeration value="private" />
160
- <xs:enumeration value="public" />
161
- <xs:enumeration value="all" />
162
- </xs:restriction>
163
- </xs:simpleType>
164
- </xs:attribute>
165
- <xs:attribute name="Description" type="xs:string">
166
- <xs:annotation>
167
- <xs:documentation>
168
- Description for this firewall rule displayed in Windows Firewall manager in
169
- Windows Vista and later.
170
- </xs:documentation>
171
- </xs:annotation>
172
- </xs:attribute>
173
-
174
- <xs:attribute name="Outbound" type="YesNoType">
175
- <xs:annotation>
176
- <xs:documentation>
177
- If "yes", registers an outbound firewall rule.
178
- </xs:documentation>
179
- </xs:annotation>
180
- </xs:attribute>
181
- </xs:complexType>
182
- </xs:element>
183
-
184
- <xs:element name="RemoteAddress">
185
- <xs:annotation>
186
- <xs:documentation>
187
- A remote address to which the port or program can listen. Address formats vary
188
- based on the version of Windows and Windows Firewall the program is being installed
189
- on. For Windows XP SP2 and Windows Server 2003 SP1, see
190
- <html:a href="http://msdn.microsoft.com/en-us/library/aa365270.aspx">
191
- RemoteAddresses Property</html:a>.
192
- For Windows Vista and Windows Server 2008, see
193
- <html:a href="https://docs.microsoft.com/en-us/windows/win32/api/netfw/nf-netfw-inetfwrule-get_remoteaddresses">
194
- RemoteAddresses Property</html:a>.
195
- </xs:documentation>
196
- </xs:annotation>
197
- <xs:complexType>
198
- <xs:attribute name="Value" type="xs:string" use="required">
199
- <xs:annotation>
200
- <xs:documentation>
201
- A remote address.
202
- </xs:documentation>
203
- </xs:annotation>
204
- </xs:attribute>
205
- </xs:complexType>
206
- </xs:element>
207
-
208
- <xs:simpleType name="YesNoType">
209
- <xs:annotation>
210
- <xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation>
211
- </xs:annotation>
212
- <xs:restriction base='xs:NMTOKEN'>
213
- <xs:enumeration value="no"/>
214
- <xs:enumeration value="yes"/>
215
- </xs:restriction>
216
- </xs:simpleType>
217
-</xs:schema>
src/wixlib/firewall.wixproj
+1
-1
@@ -20,7 +20,7 @@
20
</ItemGroup>
21
22
<ItemGroup>
23
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
23
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
24
</ItemGroup>
25
26
</Project>