aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-12-04 17:36:58 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-12-04 17:36:58 -0600
commit761eb8b2f6a49f33fb733d8469572796ded6ae0f (patch)
tree951d796d2672acbbe019e8125b054ee7e0348fcd
parentdfe065e92bac86b9c6e1679907ce67c507913fd5 (diff)
downloadwix-761eb8b2f6a49f33fb733d8469572796ded6ae0f.tar.gz
wix-761eb8b2f6a49f33fb733d8469572796ded6ae0f.tar.bz2
wix-761eb8b2f6a49f33fb733d8469572796ded6ae0f.zip
xsd got moved to doc repo. Update dependencies.
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/ca/netfxca.vcxproj8
-rw-r--r--src/ca/packages.config4
-rw-r--r--src/wixext/WixToolset.Netfx.wixext.csproj3
-rw-r--r--src/wixext/netfx.xsd235
-rw-r--r--src/wixlib/netfx.wixproj2
-rw-r--r--src/wixlib/packages.config2
7 files changed, 10 insertions, 246 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/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj
index 703e98fa..b00e4506 100644
--- a/src/ca/netfxca.vcxproj
+++ b/src/ca/netfxca.vcxproj
@@ -1,8 +1,8 @@
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. --> 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"> 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')" /> 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.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.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"> 6 <ItemGroup Label="ProjectConfigurations">
7 <ProjectConfiguration Include="Debug|Win32"> 7 <ProjectConfiguration Include="Debug|Win32">
8 <Configuration>Debug</Configuration> 8 <Configuration>Debug</Configuration>
@@ -62,7 +62,7 @@
62 <PropertyGroup> 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> 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> 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'))" /> 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.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.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> 67 </Target>
68</Project> \ No newline at end of file 68</Project> \ No newline at end of file
diff --git a/src/ca/packages.config b/src/ca/packages.config
index e3dc0e43..9d88f529 100644
--- a/src/ca/packages.config
+++ b/src/ca/packages.config
@@ -1,5 +1,5 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<packages> 2<packages>
3 <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> 3 <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
4 <package id="WixToolset.WcaUtil" version="4.0.16" targetFramework="native" /> 4 <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" />
5</packages> \ No newline at end of file 5</packages> \ No newline at end of file
diff --git a/src/wixext/WixToolset.Netfx.wixext.csproj b/src/wixext/WixToolset.Netfx.wixext.csproj
index 5f02a850..434a7c79 100644
--- a/src/wixext/WixToolset.Netfx.wixext.csproj
+++ b/src/wixext/WixToolset.Netfx.wixext.csproj
@@ -13,7 +13,6 @@
13 13
14 <ItemGroup> 14 <ItemGroup>
15 <Content Include="$(MSBuildThisFileName).targets" /> 15 <Content Include="$(MSBuildThisFileName).targets" />
16 <Content Include="netfx.xsd" PackagePath="tools" />
17 <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" /> 16 <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
18 </ItemGroup> 17 </ItemGroup>
19 18
@@ -27,6 +26,6 @@
27 </ItemGroup> 26 </ItemGroup>
28 27
29 <ItemGroup> 28 <ItemGroup>
30 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> 29 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
31 </ItemGroup> 30 </ItemGroup>
32</Project> 31</Project>
diff --git a/src/wixext/netfx.xsd b/src/wixext/netfx.xsd
deleted file mode 100644
index 6ef4e9b6..00000000
--- a/src/wixext/netfx.xsd
+++ /dev/null
@@ -1,235 +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/netfx"
9 xmlns="http://wixtoolset.org/schemas/v4/wxs/netfx">
10 <xs:annotation>
11 <xs:documentation>
12 The source code schema for the WiX Toolset .NET Framework Extension.
13 </xs:documentation>
14 </xs:annotation>
15
16 <xs:element name="NativeImage">
17 <xs:annotation>
18 <xs:documentation>
19 Improves the performance of managed applications by creating native images.
20 Requires the .NET Framework 2.0 or newer to be installed on the target machine since
21 it runs <html:a href="http://msdn.microsoft.com/en-us/library/6t9t5wcf.aspx">NGen</html:a>.
22 </xs:documentation>
23 <xs:appinfo>
24 <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="File" />
25 <xse:remarks>
26 <html:p>
27 Native images are files containing compiled processor-specific machine code, which
28 are installed into the native image cache on the local computer. The runtime
29 can use native images from the cache instead using the just-in-time (JIT)
30 compiler to compile the original assembly.
31 </html:p>
32 <html:p>
33 The native image custom actions are configured to ignore failures so that failing
34 to generate or remove a native image will not cause setup to fail and roll back.
35 </html:p>
36 <html:p>
37 <html:b>Note for patches:</html:b> if you built your target, or baseline, MSI with
38 previous versions 3.0 or 3.5 of this extension and want to upgrade to formattable
39 values for @AssemblyApplication or @AppBaseDirectory you must also include a
40 BinaryRef to "NetFxCA" to pull in necessary changes. If you do use formattable
41 values and do not include the binary changes ngen.exe will not optimize your
42 native images for the specified application.
43 </html:p>
44 <html:p>
45 This should be a rare occurrence, however. Because you cannot remove components
46 in a patch - and pyro does validate you do not - it is not practical to switch
47 from using identifiers to formattable values in a patch. One practical possibility
48 is if you wanted to use a different application to optimize your native images
49 and that application is not already installed with the MSI to be updated.
50 </html:p>
51 </xse:remarks>
52 </xs:appinfo>
53 </xs:annotation>
54 <xs:complexType>
55 <xs:attribute name="Id" type="xs:string" use="required">
56 <xs:annotation>
57 <xs:documentation>
58 The identifier for this NativeImage.
59 </xs:documentation>
60 </xs:annotation>
61 </xs:attribute>
62 <xs:attribute name="AppBaseDirectory" type="xs:string">
63 <xs:annotation>
64 <xs:documentation>
65 <html:p>
66 The directory to use for locating dependent assemblies.
67 For DLL assemblies and assemblies installed to the Global Assembly Cache (GAC),
68 this attribute should be set to the directory of the application which loads this
69 assembly. For EXE assemblies, this attribute does not need to be set because NGen
70 will use the directory of the assembly file by default.
71 </html:p>
72 <html:p>
73 The value can be in the form of a directory identifier, or a formatted string
74 that resolves to either a directory identifier or a full path to a directory.
75 </html:p>
76 </xs:documentation>
77 </xs:annotation>
78 </xs:attribute>
79 <xs:attribute name="AssemblyApplication" type="xs:string">
80 <xs:annotation>
81 <xs:documentation>
82 <html:p>
83 The application which will load this assembly.
84 For DLL assemblies which are loaded via reflection, this attribute should
85 be set to indicate the application which will load this assembly.
86 The configuration of the application (usually specified via an exe.config file) will be used
87 to determine how to resolve dependencies for this assembly.
88 </html:p>
89 <html:p>
90 The value can be in the form of a file identifier, or a formatted string
91 that resolves to either a file identifier or a full path to a file.
92 </html:p>
93 <html:p>
94 When a shared component is loaded at run time, using the Load method, the
95 application's configuration file determines the dependencies that are loaded
96 for the shared component — for example, the version of a dependency that is loaded.
97 This attribute gives guidance on which dependencies would be loaded at run time in order
98 to figure out which dependency assemblies will also need to have native images generated
99 (assuming the Dependency attribute is not set to "no").
100 </html:p>
101 <html:p>
102 This attribute cannot be set if the AssemblyApplication attribute is set on the parent
103 File element (please note that these attributes both refer to the same application
104 assembly but do very different things: specifiying File/@AssemblyApplication will force
105 an assembly to install to a private location next to the indicated application, whereas
106 this AssemblyApplication attribute will be used to help resolve dependent assemblies
107 while generating native images for this assembly).
108 </html:p>
109 </xs:documentation>
110 </xs:annotation>
111 </xs:attribute>
112 <xs:attribute name="Debug" type="YesNoType">
113 <xs:annotation>
114 <xs:documentation>
115 Set to "yes" to generate native images that can be used under a debugger.
116 The default value is "no".
117 </xs:documentation>
118 </xs:annotation>
119 </xs:attribute>
120 <xs:attribute name="Dependencies" type="YesNoType">
121 <xs:annotation>
122 <xs:documentation>
123 Set to "no" to generate the minimum number of native images.
124 The default value is "yes".
125 </xs:documentation>
126 </xs:annotation>
127 </xs:attribute>
128 <xs:attribute name="Platform">
129 <xs:annotation>
130 <xs:documentation>
131 Sets the platform(s) for which native images will be generated.
132 </xs:documentation>
133 </xs:annotation>
134 <xs:simpleType>
135 <xs:restriction base="xs:NMTOKEN">
136 <xs:enumeration value="32bit">
137 <xs:annotation>
138 <xs:documentation>
139 Attempt to generate native images only for the 32-bit version of the .NET Framework
140 on the target machine. If the 32-bit version of the .NET Framework 2.0 or newer is not
141 present on the target machine, native image custom actions will not be scheduled.
142 This is the default value.
143 </xs:documentation>
144 </xs:annotation>
145 </xs:enumeration>
146 <xs:enumeration value="64bit">
147 <xs:annotation>
148 <xs:documentation>
149 Attempt to generate native images only for the 64-bit version of the .NET Framework
150 on the target machine. If a 64-bit version of the .NET Framework 2.0 or newer is not
151 present on the target machine, native image custom actions will not be scheduled.
152 </xs:documentation>
153 </xs:annotation>
154 </xs:enumeration>
155 <xs:enumeration value="all">
156 <xs:annotation>
157 <xs:documentation>
158 Attempt to generate native images for the 32-bit and 64-bit versions of the .NET Framework
159 on the target machine. If a version of the .NET Framework 2.0 or newer is not present on the
160 target machine for a processor architecture, native image custom actions will not be
161 scheduled for that processor architecture.
162 </xs:documentation>
163 </xs:annotation>
164 </xs:enumeration>
165 </xs:restriction>
166 </xs:simpleType>
167 </xs:attribute>
168 <xs:attribute name="Priority">
169 <xs:annotation>
170 <xs:documentation>
171 Sets the priority of generating the native images for this assembly.
172 </xs:documentation>
173 </xs:annotation>
174 <xs:simpleType>
175 <xs:restriction base="xs:NMTOKEN">
176 <xs:enumeration value="0">
177 <xs:annotation>
178 <xs:documentation>
179 This is the highest priority, it means that image generation occurs syncronously
180 during the setup process. This option will slow down setup performance.
181 </xs:documentation>
182 </xs:annotation>
183 </xs:enumeration>
184 <xs:enumeration value="1">
185 <xs:annotation>
186 <xs:documentation>
187 This will queue image generation to the NGen service to occur immediately.
188 This option will slow down setup performance.
189 </xs:documentation>
190 </xs:annotation>
191 </xs:enumeration>
192 <xs:enumeration value="2">
193 <xs:annotation>
194 <xs:documentation>
195 This will queue image generation to the NGen service to occur after all priority 1
196 assemblies have completed.
197 This option will slow down setup performance.
198 </xs:documentation>
199 </xs:annotation>
200 </xs:enumeration>
201 <xs:enumeration value="3">
202 <xs:annotation>
203 <xs:documentation>
204 This is the lowest priority, it will queue image generation to occur when the
205 machine is idle.
206 This option should not slow down setup performance.
207 This is the default value.
208 </xs:documentation>
209 </xs:annotation>
210 </xs:enumeration>
211 </xs:restriction>
212 </xs:simpleType>
213 </xs:attribute>
214 <xs:attribute name="Profile" type="YesNoType">
215 <xs:annotation>
216 <xs:documentation>
217 Set to "yes" to generate native images that can be used under a profiler.
218 The default value is "no".
219 </xs:documentation>
220 </xs:annotation>
221 </xs:attribute>
222 </xs:complexType>
223 </xs:element>
224
225 <xs:simpleType name="YesNoType">
226 <xs:annotation>
227 <xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation>
228 </xs:annotation>
229 <xs:restriction base='xs:NMTOKEN'>
230 <xs:enumeration value="no"/>
231 <xs:enumeration value="yes"/>
232 </xs:restriction>
233 </xs:simpleType>
234
235</xs:schema>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index 700293d3..8ee73326 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -24,7 +24,7 @@
24 </ItemGroup> 24 </ItemGroup>
25 25
26 <ItemGroup> 26 <ItemGroup>
27 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> 27 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
28 </ItemGroup> 28 </ItemGroup>
29 29
30</Project> 30</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index e71c3d9d..89d73c36 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> 3 <package id="Nerdbank.GitVersioning" version="3.3.37" developmentDependency="true" targetFramework="net40" />
4 <package id="WixToolset.MSBuild" version="4.0.0-build-0133" developmentDependency="true" targetFramework="net40" /> 4 <package id="WixToolset.MSBuild" version="4.0.0-build-0133" developmentDependency="true" targetFramework="net40" />
5 <package id="WixToolset.Bal.wixext" version="4.0.40" targetFramework="net40" /> 5 <package id="WixToolset.Bal.wixext" version="4.0.40" targetFramework="net40" />
6 <package id="WixToolset.Util.wixext" version="4.0.36" targetFramework="net40" /> 6 <package id="WixToolset.Util.wixext" version="4.0.36" targetFramework="net40" />
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 05:34:07 +0000