aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-12-04 17:39:31 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-12-04 17:39:31 -0600
commit8203897431e76a2a9162bd2e5e019cc8628fc200 (patch)
tree4b16346191daea94ec7f16976f94529de252eacc
parenta5a6c2fc839ee3223aeb4d7549db35cdaf8e4dca (diff)
downloadwix-8203897431e76a2a9162bd2e5e019cc8628fc200.tar.gz
wix-8203897431e76a2a9162bd2e5e019cc8628fc200.tar.bz2
wix-8203897431e76a2a9162bd2e5e019cc8628fc200.zip
xsd got moved to doc repo. Update dependencies.
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/wixext/WixToolset.PowerShell.wixext.csproj3
-rw-r--r--src/wixext/ps.xsd191
-rw-r--r--src/wixlib/powershell.wixproj2
4 files changed, 3 insertions, 195 deletions
diff --git a/global.json b/global.json
index 10345833..77a81322 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0163" 3 "WixToolset.Sdk": "4.0.0-build-0170"
4 } 4 }
5} 5}
diff --git a/src/wixext/WixToolset.PowerShell.wixext.csproj b/src/wixext/WixToolset.PowerShell.wixext.csproj
index 666e8aba..32bd9bac 100644
--- a/src/wixext/WixToolset.PowerShell.wixext.csproj
+++ b/src/wixext/WixToolset.PowerShell.wixext.csproj
@@ -12,7 +12,6 @@
12 </PropertyGroup> 12 </PropertyGroup>
13 <ItemGroup> 13 <ItemGroup>
14 <Content Include="$(MSBuildThisFileName).targets" /> 14 <Content Include="$(MSBuildThisFileName).targets" />
15 <Content Include="ps.xsd" PackagePath="tools" />
16 <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" /> 15 <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
17 </ItemGroup> 16 </ItemGroup>
18 <ItemGroup> 17 <ItemGroup>
@@ -24,6 +23,6 @@
24 </ItemGroup> 23 </ItemGroup>
25 24
26 <ItemGroup> 25 <ItemGroup>
27 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> 26 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
28 </ItemGroup> 27 </ItemGroup>
29</Project> 28</Project>
diff --git a/src/wixext/ps.xsd b/src/wixext/ps.xsd
deleted file mode 100644
index 0c4c2bef..00000000
--- a/src/wixext/ps.xsd
+++ /dev/null
@@ -1,191 +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 xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"
9 targetNamespace="http://wixtoolset.org/schemas/v4/wxs/powershell"
10 xmlns="http://wixtoolset.org/schemas/v4/wxs/powershell">
11 <xs:annotation>
12 <xs:documentation>
13 The source code schema for the WiX Toolset PowerShell Extension.
14 </xs:documentation>
15 </xs:annotation>
16 <xs:import namespace="http://wixtoolset.org/schemas/v4/wxs" />
17 <xs:element name="FormatsFile">
18 <xs:annotation>
19 <xs:documentation>
20 Identifies the parent File as a formats XML file for the referenced PowerShell snap-in.
21 </xs:documentation>
22 <xs:appinfo>
23 <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />
24 <xse:remarks>
25 A formats XML file that defines output formats for objects on the pipeline.
26 </xse:remarks>
27 </xs:appinfo>
28 </xs:annotation>
29 <xs:complexType>
30 <xs:attribute name="FileId" type="xs:string">
31 <xs:annotation>
32 <xs:documentation>
33 Reference to the formats File ID. This is required when nested under the SnapIn element.
34 </xs:documentation>
35 </xs:annotation>
36 </xs:attribute>
37 <xs:attribute name="SnapIn" type="xs:string">
38 <xs:annotation>
39 <xs:documentation>
40 Reference to the PowerShell snap-in ID for which this formats file is associated. This is required when nested under the File element.
41 </xs:documentation>
42 </xs:annotation>
43 </xs:attribute>
44 </xs:complexType>
45 </xs:element>
46 <xs:element name="TypesFile">
47 <xs:annotation>
48 <xs:documentation>
49 Identifies the parent File as a types XML file for the referenced PowerShell snap-in.
50 </xs:documentation>
51 <xs:appinfo>
52 <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />
53 <xse:remarks>
54 A types XML file used by the extensible type system.
55 </xse:remarks>
56 </xs:appinfo>
57 </xs:annotation>
58 <xs:complexType>
59 <xs:attribute name="FileId" type="xs:string">
60 <xs:annotation>
61 <xs:documentation>
62 Reference to the types File ID. This is required when nested under the SnapIn element.
63 </xs:documentation>
64 </xs:annotation>
65 </xs:attribute>
66 <xs:attribute name="SnapIn" type="xs:string">
67 <xs:annotation>
68 <xs:documentation>
69 Reference to the PowerShell snap-in ID for which this types file is associated. This is required when nested under the File element.
70 </xs:documentation>
71 </xs:annotation>
72 </xs:attribute>
73 </xs:complexType>
74 </xs:element>
75 <xs:element name="SnapIn">
76 <xs:annotation>
77 <xs:documentation>
78 Identifies the parent File as a PowerShell snap-in to be registered on the system.
79 </xs:documentation>
80 <xs:appinfo>
81 <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />
82 <xse:remarks>
83 <html:a href="http://www.microsoft.com/powershell">PowerShell</html:a> snap-ins
84 allow developers to extend the functionality of of the PowerShell engine.
85 Add this element to identify the parent File as a PowerShell snap-in that will
86 get registered on the system.
87 </xse:remarks>
88 </xs:appinfo>
89 </xs:annotation>
90 <xs:complexType>
91 <xs:choice minOccurs="0" maxOccurs="unbounded">
92 <xs:element ref="FormatsFile" />
93 <xs:element ref="TypesFile" />
94 </xs:choice>
95 <xs:attribute name="Id" type="xs:string" use="required">
96 <xs:annotation>
97 <xs:documentation>
98 The identifier for this PowerShell snap-in.
99 </xs:documentation>
100 </xs:annotation>
101 </xs:attribute>
102 <xs:attribute name="AssemblyName" type="xs:string">
103 <xs:annotation>
104 <xs:documentation>
105 The fully-qualified name of the assembly.
106 </xs:documentation>
107 <xs:appinfo>
108 <xse:deprecated />
109 </xs:appinfo>
110 </xs:annotation>
111 </xs:attribute>
112 <xs:attribute name="CustomSnapInType" type="xs:string">
113 <xs:annotation>
114 <xs:documentation>
115 The full type name of a class that is used to register a list of cmdlets and providers.
116 </xs:documentation>
117 </xs:annotation>
118 </xs:attribute>
119 <xs:attribute name="Description" type="xs:string">
120 <xs:annotation>
121 <xs:documentation>
122 A brief description of the snap-in.
123 </xs:documentation>
124 </xs:annotation>
125 </xs:attribute>
126 <xs:attribute name="DescriptionIndirect" type="EmbeddedResource">
127 <xs:annotation>
128 <xs:documentation>
129 An embedded resource that contains a brief description of the snap-in.
130 This resource must be embedded in the current snap-in assembly.
131 </xs:documentation>
132 </xs:annotation>
133 </xs:attribute>
134 <xs:attribute name="RequiredPowerShellVersion" type="VersionType">
135 <xs:annotation>
136 <xs:documentation>
137 The required version of PowerShell that must be installed and is associated with the
138 snap-in registration. The default value is "1.0".
139 </xs:documentation>
140 </xs:annotation>
141 </xs:attribute>
142 <xs:attribute name="Vendor" type="xs:string">
143 <xs:annotation>
144 <xs:documentation>
145 The name of the snap-in vendor.
146 </xs:documentation>
147 </xs:annotation>
148 </xs:attribute>
149 <xs:attribute name="VendorIndirect" type="EmbeddedResource">
150 <xs:annotation>
151 <xs:documentation>
152 An embedded resource that contains the name of the snap-in vendor.
153 This resource must be embedded in the current snap-in assembly.
154 </xs:documentation>
155 </xs:annotation>
156 </xs:attribute>
157 <xs:attribute name="Version" type="VersionType">
158 <xs:annotation>
159 <xs:documentation>
160 The version of the snapin. If not specified, this is taken from the assembly name.
161 </xs:documentation>
162 </xs:annotation>
163 </xs:attribute>
164 </xs:complexType>
165 </xs:element>
166 <xs:simpleType name="EmbeddedResource">
167 <xs:annotation>
168 <xs:documentation>
169 <html:p>
170 Values should be in the format <html:i>ResourceName,StringName</html:i>, where <html:i>ResourceName</html:i>
171 is the name of the embedded resource in your assembly sans the ".resources" extension, and <html:i>StringName</html:i>
172 is the name of the string resource in the embedded resource.
173 </html:p>
174 <html:p>
175 Example: UtilityMshSnapInResources,Description
176 </html:p>
177 </xs:documentation>
178 </xs:annotation>
179 <xs:restriction base="xs:string" />
180 </xs:simpleType>
181 <xs:simpleType name="VersionType">
182 <xs:annotation>
183 <xs:documentation>
184 Values of this type will look like: "x", "x.x", "x.x.x", or "x.x.x.x" where x is an integer from 0 to 65534.
185 </xs:documentation>
186 </xs:annotation>
187 <xs:restriction base="xs:string">
188 <xs:pattern value="\d{1,5}(\.\d{1,5}){0,3}"/>
189 </xs:restriction>
190 </xs:simpleType>
191</xs:schema>
diff --git a/src/wixlib/powershell.wixproj b/src/wixlib/powershell.wixproj
index d841de4f..6d6b413b 100644
--- a/src/wixlib/powershell.wixproj
+++ b/src/wixlib/powershell.wixproj
@@ -6,6 +6,6 @@
6 </PropertyGroup> 6 </PropertyGroup>
7 7
8 <ItemGroup> 8 <ItemGroup>
9 <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" /> 9 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
10 </ItemGroup> 10 </ItemGroup>
11</Project> 11</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 06:30:34 +0000