xsd got moved to doc repo. Update dependencies.
Sean Hall committed
Dec 4, 2020 at 17:09 UTC
3adccec4a07610a87df53d718f679a0de48716ef
6 files changed
+9
-236
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/dependencyca.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
<ItemGroup Label="ProjectConfigurations">
7
<ProjectConfiguration Include="Debug|Win32">
8
<Configuration>Debug</Configuration>
@@ -62,7 +62,7 @@
62
<PropertyGroup>
63
<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>
64
</PropertyGroup>
65
- <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'))" />
66
- <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'))" />
65
+ <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'))" />
66
+ <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'))" />
67
</Target>
68
</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/Dependency.xsd
deleted
-226
@@ -1,226 +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:html="http://www.w3.org/1999/xhtml"
6
- xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"
7
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
8
- xmlns:xse=" http://wixtoolset.org/schemas/XmlSchemaExtension"
9
- targetNamespace="http://wixtoolset.org/schemas/v4/wxs/dependency"
10
- xmlns="http://wixtoolset.org/schemas/v4/wxs/dependency">
11
- <xs:annotation>
12
- <xs:documentation>
13
- The source code schema for the WiX Toolset Dependency Extension.
14
- </xs:documentation>
15
- </xs:annotation>
16
- <xs:element name="Provides">
17
- <xs:annotation>
18
- <xs:documentation>
19
- Describes the information for this product or feature that serves as a dependency of other products or features.
20
- </xs:documentation>
21
- <xs:appinfo>
22
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
23
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="ExePackage" />
24
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="MsiPackage" />
25
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="MspPackage" />
26
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="MsuPackage" />
27
- <xse:remarks>
28
- <html:p>
29
- This element is required for any product, feature, or bundle that will use the Dependency feature to properly reference count
30
- other products or features. It should be authored into a component that is always installed and removed with the
31
- product or features that contain it. This guarantees that product dependencies are not removed before those products that
32
- depend on them.
33
- </html:p>
34
- <html:p>
35
- The @Key attribute should identify a version range for your product that you guarantee will be backward compatible.
36
- This key is designed to persist throughout compatible upgrades so that dependent products do not have to be reinstalled
37
- and will not prevent your product from being upgraded. If this attribute is not authored, the value is the ProductCode
38
- and will not automatically support upgrades.
39
- </html:p>
40
- <html:p>
41
- By default this uses the Product/@Id attribute value, which may be automatically generated.
42
- </html:p>
43
- </xse:remarks>
44
- <xse:howtoRef href="author_product_dependencies.html">How To: Author product dependencies</xse:howtoRef>
45
- </xs:appinfo>
46
- </xs:annotation>
47
- <xs:complexType>
48
- <xs:choice minOccurs="0" maxOccurs="unbounded">
49
- <xs:element ref="Requires" />
50
- <xs:element ref="RequiresRef" />
51
- </xs:choice>
52
- <xs:attribute name="Id" type="xs:string">
53
- <xs:annotation>
54
- <xs:documentation>
55
- Dependency provider identity. If this attribute is not specified, an identifier will be generated automatically.
56
- </xs:documentation>
57
- </xs:annotation>
58
- </xs:attribute>
59
- <xs:attribute name="Key" type="xs:string">
60
- <xs:annotation>
61
- <xs:documentation>
62
- Optional unique registry key name that identifies a product version range on which other products can depend.
63
- This attribute is required in package authoring, but optional for components.
64
- </xs:documentation>
65
- </xs:annotation>
66
- </xs:attribute>
67
- <xs:attribute name="Version" type="VersionType">
68
- <xs:annotation>
69
- <xs:documentation>
70
- The version of the package. For MSI packages, the ProductVersion will be used by default
71
- and this attribute should not be specified.
72
- </xs:documentation>
73
- </xs:annotation>
74
- </xs:attribute>
75
- <xs:attribute name="DisplayName" type="xs:string">
76
- <xs:annotation>
77
- <xs:documentation>
78
- Optional display name of the package. For MSI packages, the ProductName will be used by default.
79
- </xs:documentation>
80
- </xs:annotation>
81
- </xs:attribute>
82
- </xs:complexType>
83
- </xs:element>
84
- <xs:element name="Requires">
85
- <xs:annotation>
86
- <xs:documentation>
87
- Describes a dependency on a provider for the current component or package.
88
- </xs:documentation>
89
- <xs:appinfo>
90
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
91
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
92
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
93
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Product" />
94
- <xse:remarks>
95
- <html:p>
96
- This element declares a dependency on any product that uses the Provides element. If that product is uninstalled
97
- before a product that requires it, the uninstall will err or warn the user that other products are installed
98
- which depend on that product. This behavior can be modified by changing the attribute values on the Requires element.
99
- </html:p>
100
- <html:p>
101
- If you do not nest this element under a Provides element, you must specify the @Id attribute
102
- so that it can be referenced by a RequiresRef element nested under a Provides element.
103
- </html:p>
104
- </xse:remarks>
105
- <xse:seeAlso ref="RequiresRef" />
106
- <xse:howtoRef href="author_product_dependencies.html">How To: Author product dependencies</xse:howtoRef>
107
- </xs:appinfo>
108
- </xs:annotation>
109
- <xs:complexType>
110
- <xs:attribute name="Id" type="xs:string">
111
- <xs:annotation>
112
- <xs:documentation>
113
- Dependency requirement identity. If this attribute is not specified, an identifier will be generated automatically.
114
- If this element is not authored under a Provides element, this attribute is required.
115
- </xs:documentation>
116
- </xs:annotation>
117
- </xs:attribute>
118
- <xs:attribute name="ProviderKey" type="xs:string" use="required">
119
- <xs:annotation>
120
- <xs:documentation>
121
- The unique registry key name for the dependency provider to require during installation of this product.
122
- </xs:documentation>
123
- </xs:annotation>
124
- </xs:attribute>
125
- <xs:attribute name="Minimum" type="VersionType">
126
- <xs:annotation>
127
- <xs:documentation>
128
- The minimum version of the dependency provider required to be installed. The default is unbound.
129
- </xs:documentation>
130
- </xs:annotation>
131
- </xs:attribute>
132
- <xs:attribute name="Maximum" type="VersionType">
133
- <xs:annotation>
134
- <xs:documentation>
135
- The maximum version of the dependency provider required to be installed. The default is unbound.
136
- </xs:documentation>
137
- </xs:annotation>
138
- </xs:attribute>
139
- <xs:attribute name="IncludeMinimum" type="YesNoType">
140
- <xs:annotation>
141
- <xs:documentation>
142
- Set to "yes" to make the range of dependency provider versions required include the value specified in Minimum.
143
- </xs:documentation>
144
- </xs:annotation>
145
- </xs:attribute>
146
- <xs:attribute name="IncludeMaximum" type="YesNoType">
147
- <xs:annotation>
148
- <xs:documentation>
149
- Set to "yes" to make the range of dependency provider versions required include the value specified in Maximum.
150
- </xs:documentation>
151
- </xs:annotation>
152
- </xs:attribute>
153
- </xs:complexType>
154
- </xs:element>
155
- <xs:element name="RequiresRef">
156
- <xs:annotation>
157
- <xs:documentation>
158
- References existing authoring for a dependency on a provider for the current component or package.
159
- </xs:documentation>
160
- <xs:appinfo>
161
- <xse:remarks>
162
- <html:p>
163
- This element references a dependency on any product that uses the Provides element. If that product is uninstalled
164
- before a product that requires it, the uninstall will err or warn the user that other products are installed
165
- which depend on that product. This behavior can be modified by changing the attribute values on the Requires element.
166
- </html:p>
167
- </xse:remarks>
168
- <xse:seeAlso ref="Requires" />
169
- <xse:howtoRef href="author_product_dependencies.html">How To: Author product dependencies</xse:howtoRef>
170
- </xs:appinfo>
171
- </xs:annotation>
172
- <xs:complexType>
173
- <xs:attribute name="Id" type="xs:string" use="required">
174
- <xs:annotation>
175
- <xs:documentation>
176
- The identifier of the Requires element to reference.
177
- </xs:documentation>
178
- </xs:annotation>
179
- </xs:attribute>
180
- </xs:complexType>
181
- </xs:element>
182
- <xs:attribute name="ProviderKey" type="xs:string">
183
- <xs:annotation>
184
- <xs:documentation>
185
- Optional attribute to explicitly author the provider key for the entire bundle.
186
- </xs:documentation>
187
- <xs:appinfo>
188
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Bundle" />
189
- <xse:remarks>
190
- <html:p>
191
- This provider key is designed to persist throughout compatible upgrades so that dependent bundles do not have to be reinstalled
192
- and will not prevent your product from being upgraded. If this attribute is not authored, the value is the
193
- automatically-generated bundle ID and will not automatically support upgrades.
194
- </html:p>
195
- <html:p>
196
- Only a single provider key is supported for bundles. To author that your bundle provides additional features via
197
- packages, author different provider keys for your packages.
198
- </html:p>
199
- </xse:remarks>
200
- <xse:seeAlso ref="Provides" />
201
- </xs:appinfo>
202
- </xs:annotation>
203
- </xs:attribute>
204
- <xs:simpleType name="VersionType">
205
- <xs:annotation>
206
- <xs:documentation>
207
- Values of this type will look like: "x.x.x.x" where x is an integer from 0 to 65534.
208
- This can also be a preprocessor, binder, or WiX variable.
209
- </xs:documentation>
210
- </xs:annotation>
211
- <xs:restriction base="xs:string">
212
- <xs:pattern value="(\d{1,5}\.){3}\d{1,5}|[!$]\((var|bind|wix)\.[_A-Za-z][\w\.]*\)" />
213
- </xs:restriction>
214
- </xs:simpleType>
215
- <xs:simpleType name="YesNoType">
216
- <xs:annotation>
217
- <xs:documentation>
218
- Values of this type will either be "yes" or "no".
219
- </xs:documentation>
220
- </xs:annotation>
221
- <xs:restriction base="xs:NMTOKEN">
222
- <xs:enumeration value="no" />
223
- <xs:enumeration value="yes" />
224
- </xs:restriction>
225
- </xs:simpleType>
226
-</xs:schema>
src/wixext/WixToolset.Dependency.wixext.csproj
+1
-2
@@ -13,7 +13,6 @@
13
14
<ItemGroup>
15
<Content Include="$(MSBuildThisFileName).targets" />
16
- <Content Include="dependency.xsd" PackagePath="tools" />
16
<EmbeddedResource Include="$(OutputPath)..\dependency.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/wixlib/dependency.wixproj
+1
-1
@@ -22,7 +22,7 @@
22
</ItemGroup>
23
24
<ItemGroup>
25
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
25
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
26
</ItemGroup>
27
28
</Project>