xsd got moved to doc repo. Update dependencies.
Sean Hall committed
Dec 4, 2020 at 17:34 UTC
cb890fc1ecd6d6557607e7b34f251714481670f1
6 files changed
+9
-131
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/msmqca.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|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>
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.Msmq.wixext.csproj
+1
-2
@@ -13,7 +13,6 @@
13
14
<ItemGroup>
15
<Content Include="$(MSBuildThisFileName).targets" />
16
- <Content Include="msmq.xsd" PackagePath="tools" />
16
<EmbeddedResource Include="$(OutputPath)..\msmq.wixlib" />
17
</ItemGroup>
18
@@ -26,6 +25,6 @@
25
</ItemGroup>
26
27
<ItemGroup>
29
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
28
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
29
</ItemGroup>
30
</Project>
src/wixext/msmq.xsd
deleted
-121
@@ -1,121 +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/msmq"
10
- xmlns="http://wixtoolset.org/schemas/v4/wxs/msmq">
11
- <xs:annotation>
12
- <xs:documentation>
13
- The source code schema for the WiX Toolset MSMQ Extension.
14
- </xs:documentation>
15
- </xs:annotation>
16
-
17
- <xs:import namespace="http://wixtoolset.org/schemas/v4/wxs" />
18
-
19
- <xs:element name="MessageQueue">
20
- <xs:annotation><xs:documentation>
21
- </xs:documentation>
22
- <xs:appinfo>
23
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
24
- </xs:appinfo>
25
- </xs:annotation>
26
- <xs:complexType>
27
- <xs:sequence>
28
- <xs:element ref="MessageQueuePermission" minOccurs="0" maxOccurs="unbounded" />
29
- </xs:sequence>
30
- <xs:attribute name="Id" use="required" type="xs:string">
31
- <xs:annotation><xs:documentation>
32
- </xs:documentation></xs:annotation>
33
- </xs:attribute>
34
- <xs:attribute name="Authenticate" use="optional" type="YesNoType">
35
- <xs:annotation><xs:documentation>
36
- Default: No.
37
- </xs:documentation></xs:annotation>
38
- </xs:attribute>
39
- <xs:attribute name="BasePriority" use="optional" type="xs:integer" />
40
- <xs:attribute name="Journal" use="optional" type="YesNoType">
41
- <xs:annotation><xs:documentation>
42
- Default: No.
43
- </xs:documentation></xs:annotation>
44
- </xs:attribute>
45
- <xs:attribute name="JournalQuota" use="optional" type="xs:integer" />
46
- <xs:attribute name="Label" use="required" type="xs:string" />
47
- <xs:attribute name="MulticastAddress" use="optional" type="xs:string" />
48
- <xs:attribute name="PathName" use="required" type="xs:string" />
49
- <xs:attribute name="PrivLevel" use="optional">
50
- <xs:simpleType>
51
- <xs:restriction base="xs:NMTOKEN">
52
- <xs:enumeration value="none" />
53
- <xs:enumeration value="optional" />
54
- <xs:enumeration value="body" />
55
- </xs:restriction>
56
- </xs:simpleType>
57
- </xs:attribute>
58
- <xs:attribute name="Quota" use="optional" type="xs:integer" />
59
- <xs:attribute name="Transactional" use="optional" type="YesNoType">
60
- <xs:annotation><xs:documentation>
61
- Default: No.
62
- </xs:documentation></xs:annotation>
63
- </xs:attribute>
64
- <xs:attribute name="ServiceTypeGuid" use="optional" type="xs:string" />
65
- </xs:complexType>
66
- </xs:element>
67
-
68
- <xs:element name="MessageQueuePermission">
69
- <xs:annotation><xs:documentation>
70
- </xs:documentation>
71
- <xs:appinfo>
72
- <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
73
- </xs:appinfo>
74
- </xs:annotation>
75
- <xs:complexType>
76
- <xs:attribute name="Id" use="required" type="xs:string">
77
- <xs:annotation><xs:documentation>
78
- </xs:documentation></xs:annotation>
79
- </xs:attribute>
80
- <xs:attribute name="MessageQueue" use="optional" type="xs:string">
81
- <xs:annotation><xs:documentation>
82
- </xs:documentation></xs:annotation>
83
- </xs:attribute>
84
- <xs:attribute name="User" use="optional" type="xs:string">
85
- <xs:annotation><xs:documentation>
86
- </xs:documentation></xs:annotation>
87
- </xs:attribute>
88
- <xs:attribute name="Group" use="optional" type="xs:string">
89
- <xs:annotation><xs:documentation>
90
- </xs:documentation></xs:annotation>
91
- </xs:attribute>
92
- <xs:attribute name="DeleteMessage" use="optional" type="YesNoType" />
93
- <xs:attribute name="PeekMessage" use="optional" type="YesNoType" />
94
- <xs:attribute name="WriteMessage" use="optional" type="YesNoType" />
95
- <xs:attribute name="DeleteJournalMessage" use="optional" type="YesNoType" />
96
- <xs:attribute name="SetQueueProperties" use="optional" type="YesNoType" />
97
- <xs:attribute name="GetQueueProperties" use="optional" type="YesNoType" />
98
- <xs:attribute name="DeleteQueue" use="optional" type="YesNoType" />
99
- <xs:attribute name="GetQueuePermissions" use="optional" type="YesNoType" />
100
- <xs:attribute name="ChangeQueuePermissions" use="optional" type="YesNoType" />
101
- <xs:attribute name="TakeQueueOwnership" use="optional" type="YesNoType" />
102
- <xs:attribute name="ReceiveMessage" use="optional" type="YesNoType" />
103
- <xs:attribute name="ReceiveJournalMessage" use="optional" type="YesNoType" />
104
- <xs:attribute name="QueueGenericRead" use="optional" type="YesNoType" />
105
- <xs:attribute name="QueueGenericWrite" use="optional" type="YesNoType" />
106
- <xs:attribute name="QueueGenericExecute" use="optional" type="YesNoType" />
107
- <xs:attribute name="QueueGenericAll" use="optional" type="YesNoType" />
108
- </xs:complexType>
109
- </xs:element>
110
-
111
- <xs:simpleType name="YesNoType">
112
- <xs:annotation>
113
- <xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation>
114
- </xs:annotation>
115
- <xs:restriction base="xs:NMTOKEN">
116
- <xs:enumeration value="no" />
117
- <xs:enumeration value="yes" />
118
- </xs:restriction>
119
- </xs:simpleType>
120
-
121
-</xs:schema>
src/wixlib/msmq.wixproj
+1
-1
@@ -12,7 +12,7 @@
12
</ItemGroup>
13
14
<ItemGroup>
15
- <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
15
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
16
</ItemGroup>
17
18
</Project>