diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-04 17:14:34 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-04 17:14:34 -0600 |
commit | bc6cf51b0e617ccaf461ff356ad7309f5f1a8945 (patch) | |
tree | 83fc6304a66ddc292c9849f4882d598f2e1d2f41 | |
parent | acad47756e2ccb0a6af06d2ae37cd9ff5961d06c (diff) | |
download | wix-bc6cf51b0e617ccaf461ff356ad7309f5f1a8945.tar.gz wix-bc6cf51b0e617ccaf461ff356ad7309f5f1a8945.tar.bz2 wix-bc6cf51b0e617ccaf461ff356ad7309f5f1a8945.zip |
xsd got moved to doc repo. Update dependencies.
-rw-r--r-- | global.json | 2 | ||||
-rw-r--r-- | src/wixext/WixToolset.DifxApp.wixext.csproj | 3 | ||||
-rw-r--r-- | src/wixext/difxapp.xsd | 108 | ||||
-rw-r--r-- | src/wixlib/difxapp.wixproj | 2 |
4 files changed, 3 insertions, 112 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.DifxApp.wixext.csproj b/src/wixext/WixToolset.DifxApp.wixext.csproj index ca27b04e..50d3debf 100644 --- a/src/wixext/WixToolset.DifxApp.wixext.csproj +++ b/src/wixext/WixToolset.DifxApp.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="difxapp.xsd" PackagePath="tools" /> | ||
16 | <EmbeddedResource Include="$(OutputPath)..\difxapp.wixlib" /> | 15 | <EmbeddedResource Include="$(OutputPath)..\difxapp.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/difxapp.xsd b/src/wixext/difxapp.xsd deleted file mode 100644 index e665d034..00000000 --- a/src/wixext/difxapp.xsd +++ /dev/null | |||
@@ -1,108 +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/difxapp" | ||
10 | xmlns="http://wixtoolset.org/schemas/v4/wxs/difxapp"> | ||
11 | <xs:annotation> | ||
12 | <xs:documentation> | ||
13 | The source code schema for the WiX Toolset Driver Install Frameworks for Applications Extension. | ||
14 | </xs:documentation> | ||
15 | </xs:annotation> | ||
16 | |||
17 | <xs:import namespace="http://wixtoolset.org/schemas/v4/wxs" /> | ||
18 | |||
19 | <xs:element name="Driver"> | ||
20 | <xs:annotation> | ||
21 | <xs:appinfo> | ||
22 | <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" /> | ||
23 | </xs:appinfo> | ||
24 | <xs:documentation> | ||
25 | Installs a driver. To use this element, you need to reference the WixDifxAppExtension extension and add the | ||
26 | .wixlib appropriate for the target platform (difxapp_x86.wixlib or difxapp_x64.wixlib) | ||
27 | to your project. | ||
28 | </xs:documentation> | ||
29 | </xs:annotation> | ||
30 | <xs:complexType> | ||
31 | <xs:attribute name="AddRemovePrograms" type="YesNoType"> | ||
32 | <xs:annotation> | ||
33 | <xs:documentation> | ||
34 | Specifies that the DIFxApp CustomActions should add an entry in the Add/Remove Programs Control | ||
35 | Panel applet. The default is 'yes'. | ||
36 | </xs:documentation> | ||
37 | </xs:annotation> | ||
38 | </xs:attribute> | ||
39 | <xs:attribute name="DeleteFiles" type="YesNoType"> | ||
40 | <xs:annotation> | ||
41 | <xs:documentation> | ||
42 | If set to "yes", configures DIFxApp to delete binary files that were copied to the system from the driver | ||
43 | store when a driver package was installed. If this attribute is set to "no" or not present, DIFxApp does not | ||
44 | remove these files from a system. Note that configuring DIFxApp to delete these files is controlled by the | ||
45 | Flags entry value of the component that represents the driver package in the MsiDriverPackages custom table. | ||
46 | Setting DeleteFiles to "yes" sets the corresponding bit in the Flags entry value. Setting DeleteFiles to "no" | ||
47 | clears the corresponding bit in the Flags entry value. If this attribute is not present, DIFxApp uses a | ||
48 | default value of "no". | ||
49 | </xs:documentation> | ||
50 | </xs:annotation> | ||
51 | </xs:attribute> | ||
52 | <xs:attribute name="ForceInstall" type="YesNoType"> | ||
53 | <xs:annotation> | ||
54 | <xs:documentation> | ||
55 | Specifies that the DIFxApp CustomActions should force the installation of a new Plug and Play driver | ||
56 | on a device, even if the currently installed driver on the device is a better match than the new driver. | ||
57 | Specifying 'no' is an excellent way to ensure the DIFxApp CustomActions recognize the Component contains | ||
58 | a driver for installation. The default is null which means the Component does not install a driver via | ||
59 | DIFxApp CustomActions. See <html:a href='http://www.microsoft.com/whdc/driver/install/difxtools.mspx'>http://www.microsoft.com/whdc/driver/install/difxtools.mspx</html:a> | ||
60 | for more information. | ||
61 | </xs:documentation> | ||
62 | </xs:annotation> | ||
63 | </xs:attribute> | ||
64 | <xs:attribute name="Legacy" type="YesNoType"> | ||
65 | <xs:annotation> | ||
66 | <xs:documentation> | ||
67 | If set to "yes", configures DIFxApp to install unsigned driver packages and driver packages with missing | ||
68 | files. For more information, see "Installing Unsigned Driver Packages in Legacy Mode" earlier in this paper. | ||
69 | If this attribute is set to "no" or not present, DIFxApp will install only signed driver packages. Note | ||
70 | that configuring DIFxApp to install unsigned drivers is controlled by the Flags entry value of the component | ||
71 | that represents the driver package in the MsiDriverPackages custom table. Setting Legacy to "yes" sets | ||
72 | the corresponding bit in the Flags entry value. Setting Legacy to "no" clears the bit in the Flags | ||
73 | entry value that configures DIFxApp to install unsigned driver packages. If this attribute is not present, | ||
74 | DIFxApp uses a default value of "no". | ||
75 | </xs:documentation> | ||
76 | </xs:annotation> | ||
77 | </xs:attribute> | ||
78 | <xs:attribute name="PlugAndPlayPrompt" type="YesNoType"> | ||
79 | <xs:annotation> | ||
80 | <xs:documentation> | ||
81 | Specifies that the DIFxApp CustomActions should prompt the user to connect the Plug and Play | ||
82 | device if it is not connected. The default is 'yes'. | ||
83 | </xs:documentation> | ||
84 | </xs:annotation> | ||
85 | </xs:attribute> | ||
86 | <xs:attribute name="Sequence" type="xs:integer"> | ||
87 | <xs:annotation> | ||
88 | <xs:documentation> | ||
89 | Specifies an optional installation sequence number. DIFxApp CustomActions install the driver packages in | ||
90 | an installation package in the order of increasing sequence numbers. The same sequence number can be used | ||
91 | for more than one driver; however, the order in which packages with the same sequence number are actually | ||
92 | installed cannot be determined. | ||
93 | </xs:documentation> | ||
94 | </xs:annotation> | ||
95 | </xs:attribute> | ||
96 | </xs:complexType> | ||
97 | </xs:element> | ||
98 | |||
99 | <xs:simpleType name="YesNoType"> | ||
100 | <xs:annotation> | ||
101 | <xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation> | ||
102 | </xs:annotation> | ||
103 | <xs:restriction base='xs:NMTOKEN'> | ||
104 | <xs:enumeration value="no"/> | ||
105 | <xs:enumeration value="yes"/> | ||
106 | </xs:restriction> | ||
107 | </xs:simpleType> | ||
108 | </xs:schema> | ||
diff --git a/src/wixlib/difxapp.wixproj b/src/wixlib/difxapp.wixproj index 4f368c0e..2ae9a097 100644 --- a/src/wixlib/difxapp.wixproj +++ b/src/wixlib/difxapp.wixproj | |||
@@ -8,7 +8,7 @@ | |||
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | 9 | ||
10 | <ItemGroup> | 10 | <ItemGroup> |
11 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> | 11 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> |
12 | </ItemGroup> | 12 | </ItemGroup> |
13 | 13 | ||
14 | </Project> | 14 | </Project> |