From 761eb8b2f6a49f33fb733d8469572796ded6ae0f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 4 Dec 2020 17:36:58 -0600 Subject: xsd got moved to doc repo. Update dependencies. --- global.json | 2 +- src/ca/netfxca.vcxproj | 8 +- src/ca/packages.config | 4 +- src/wixext/WixToolset.Netfx.wixext.csproj | 3 +- src/wixext/netfx.xsd | 235 ------------------------------ src/wixlib/netfx.wixproj | 2 +- src/wixlib/packages.config | 2 +- 7 files changed, 10 insertions(+), 246 deletions(-) delete mode 100644 src/wixext/netfx.xsd diff --git a/global.json b/global.json index 10345833..77a81322 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0163" + "WixToolset.Sdk": "4.0.0-build-0170" } } 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 @@ - - + + Debug @@ -62,7 +62,7 @@ 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}. - - + + \ 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 @@  - - + + \ 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 @@ - @@ -27,6 +26,6 @@ - + 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 @@ - - - - - - - - The source code schema for the WiX Toolset .NET Framework Extension. - - - - - - - Improves the performance of managed applications by creating native images. - Requires the .NET Framework 2.0 or newer to be installed on the target machine since - it runs NGen. - - - - - - Native images are files containing compiled processor-specific machine code, which - are installed into the native image cache on the local computer. The runtime - can use native images from the cache instead using the just-in-time (JIT) - compiler to compile the original assembly. - - - The native image custom actions are configured to ignore failures so that failing - to generate or remove a native image will not cause setup to fail and roll back. - - - Note for patches: if you built your target, or baseline, MSI with - previous versions 3.0 or 3.5 of this extension and want to upgrade to formattable - values for @AssemblyApplication or @AppBaseDirectory you must also include a - BinaryRef to "NetFxCA" to pull in necessary changes. If you do use formattable - values and do not include the binary changes ngen.exe will not optimize your - native images for the specified application. - - - This should be a rare occurrence, however. Because you cannot remove components - in a patch - and pyro does validate you do not - it is not practical to switch - from using identifiers to formattable values in a patch. One practical possibility - is if you wanted to use a different application to optimize your native images - and that application is not already installed with the MSI to be updated. - - - - - - - - - The identifier for this NativeImage. - - - - - - - - The directory to use for locating dependent assemblies. - For DLL assemblies and assemblies installed to the Global Assembly Cache (GAC), - this attribute should be set to the directory of the application which loads this - assembly. For EXE assemblies, this attribute does not need to be set because NGen - will use the directory of the assembly file by default. - - - The value can be in the form of a directory identifier, or a formatted string - that resolves to either a directory identifier or a full path to a directory. - - - - - - - - - The application which will load this assembly. - For DLL assemblies which are loaded via reflection, this attribute should - be set to indicate the application which will load this assembly. - The configuration of the application (usually specified via an exe.config file) will be used - to determine how to resolve dependencies for this assembly. - - - The value can be in the form of a file identifier, or a formatted string - that resolves to either a file identifier or a full path to a file. - - - When a shared component is loaded at run time, using the Load method, the - application's configuration file determines the dependencies that are loaded - for the shared component — for example, the version of a dependency that is loaded. - This attribute gives guidance on which dependencies would be loaded at run time in order - to figure out which dependency assemblies will also need to have native images generated - (assuming the Dependency attribute is not set to "no"). - - - This attribute cannot be set if the AssemblyApplication attribute is set on the parent - File element (please note that these attributes both refer to the same application - assembly but do very different things: specifiying File/@AssemblyApplication will force - an assembly to install to a private location next to the indicated application, whereas - this AssemblyApplication attribute will be used to help resolve dependent assemblies - while generating native images for this assembly). - - - - - - - - Set to "yes" to generate native images that can be used under a debugger. - The default value is "no". - - - - - - - Set to "no" to generate the minimum number of native images. - The default value is "yes". - - - - - - - Sets the platform(s) for which native images will be generated. - - - - - - - - Attempt to generate native images only for the 32-bit version of the .NET Framework - on the target machine. If the 32-bit version of the .NET Framework 2.0 or newer is not - present on the target machine, native image custom actions will not be scheduled. - This is the default value. - - - - - - - Attempt to generate native images only for the 64-bit version of the .NET Framework - on the target machine. If a 64-bit version of the .NET Framework 2.0 or newer is not - present on the target machine, native image custom actions will not be scheduled. - - - - - - - Attempt to generate native images for the 32-bit and 64-bit versions of the .NET Framework - on the target machine. If a version of the .NET Framework 2.0 or newer is not present on the - target machine for a processor architecture, native image custom actions will not be - scheduled for that processor architecture. - - - - - - - - - - Sets the priority of generating the native images for this assembly. - - - - - - - - This is the highest priority, it means that image generation occurs syncronously - during the setup process. This option will slow down setup performance. - - - - - - - This will queue image generation to the NGen service to occur immediately. - This option will slow down setup performance. - - - - - - - This will queue image generation to the NGen service to occur after all priority 1 - assemblies have completed. - This option will slow down setup performance. - - - - - - - This is the lowest priority, it will queue image generation to occur when the - machine is idle. - This option should not slow down setup performance. - This is the default value. - - - - - - - - - - Set to "yes" to generate native images that can be used under a profiler. - The default value is "no". - - - - - - - - - Values of this type will either be "yes" or "no". - - - - - - - - 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 @@ - + 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 @@  - + -- cgit v1.2.3-55-g6feb