diff --git a/data/schemas/sql.xsd b/data/schemas/sql.xsd index a476dc02be..756a9e7440 100644 --- a/data/schemas/sql.xsd +++ b/data/schemas/sql.xsd @@ -72,7 +72,9 @@ - The name of the database. If the name does not follow the SQL server "Rules for Regular Identifiers" (see MSDN) it must be surrounded by quotes or square brackets. Since this value can be formatted text, this means that if you choose to use square brackets you must use the MSI method for escaping square brackets, for example: [\[]blah[\]]. + The name of the database. The value can be a literal value or derived from a + Property element using the Formatted + syntax. diff --git a/data/schemas/vs.xsd b/data/schemas/vs.xsd index 31e2a1669b..e9dca81808 100644 --- a/data/schemas/vs.xsd +++ b/data/schemas/vs.xsd @@ -43,6 +43,9 @@ Internal Microsoft Help ID for this Namespace. + + Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module. + @@ -53,6 +56,7 @@ + @@ -66,6 +70,9 @@ Friendly name for Filter. + + Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module. + @@ -100,6 +107,9 @@ Key for HxQ (Query) file. + + Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module. + @@ -126,6 +136,9 @@ Key for the feature parent of this help collection. Required only when plugging into external namespaces. + + Suppress linking Visual Studio Help namespaces. Help redistributable merge modules will be required. Use this when building a merge module. + @@ -164,6 +177,7 @@ Create a reference to a HelpCollection element in another Fragment. + @@ -183,4 +197,13 @@ + + + Values of this type will either be "yes" or "no". + + + + + + diff --git a/data/schemas/wix.xsd b/data/schemas/wix.xsd index b75a6afdf9..8d1f6418be 100644 --- a/data/schemas/wix.xsd +++ b/data/schemas/wix.xsd @@ -248,7 +248,7 @@ - This attribute is deprecated. Use the Package/@Id instead. + This attribute is deprecated. Use the Package/@Id attribute instead. @@ -1144,6 +1144,9 @@ + + This attribute has been deprecated. Use the TargetImage attribute instead. + @@ -1211,6 +1214,9 @@ + + This attribute has been deprecated. Use the SourceFile attribute instead. + @@ -1221,6 +1227,9 @@ + + This attribute has been deprecated. Use the SourcePatch attribute instead. + @@ -1245,6 +1254,9 @@ + + This attribute has been deprecated. Use the SourceFile attribute instead. + @@ -1335,6 +1347,9 @@ + + This attribute has been deprecated. Use the Source attribute instead. + @@ -1477,7 +1492,7 @@ The minimum version of the Windows Installer required to install this package. Take the major version of the required Windows Installer and multiply by a 100 then add the minor version of the Windows Installer. For example, "200" would represent Windows Installer 2.0 and - "405" would represent Windows Installer 4.5. + "405" would represent Windows Installer 4.5. For 64-bit Windows Installer packages, this property must be set to 200 or greater. @@ -1498,6 +1513,10 @@ + + The list of platforms supported by the package. This attribute has been deprecated. + Use the Platform attribute instead. + @@ -1520,6 +1539,7 @@ Set this value to declare that the package is an ia64 package. + This value requires that the InstallerVersion property be set to 200 or greater. @@ -1527,20 +1547,21 @@ Set this value to declare that the package is an x64 package. + This value requires that the InstallerVersion property be set to 200 or greater. - Deprecated. Use "x86" instead. + This value has been deprecated. Use "x86" instead. - Deprecated. Use "ia64" instead. + This value has been deprecated. Use "ia64" instead. @@ -1749,6 +1770,9 @@ + + This attribute has been deprecated. Use the Name attribute instead. + @@ -1936,6 +1960,9 @@ + + This attribute has been deprecated. Use the Name attribute instead. + @@ -2146,6 +2173,9 @@ + + This attribute has been deprecated. Use the Name attribute instead. + @@ -2504,6 +2534,9 @@ + + This attribute has been deprecated. Use the Name attribute instead. + @@ -2869,6 +2902,9 @@ + + This attribute has been deprecated. Use the DestinationName attribute instead. + @@ -2967,6 +3003,9 @@ + + This attribute has been deprecated. Use the Name attribute instead. + @@ -3090,7 +3129,7 @@ - Specifies the architecture for this assembly. This attribute should only be used on .NET Framework 2.0 assemblies. + Specifies the architecture for this assembly. This attribute should only be used on .NET Framework 2.0 or higher assemblies. @@ -3141,6 +3180,9 @@ + + This attribute has been deprecated. Use the Source attribute instead. + @@ -3552,6 +3594,9 @@ + + This element has been deprecated. Use the RegistryValue element instead. + @@ -3779,6 +3824,9 @@ + + This attribute has been deprecated. Use the Name attribute instead. + @@ -4017,6 +4065,9 @@ + + This attribute has been deprecated. Use the TargetFile attribute instead. + @@ -5723,6 +5774,11 @@ + + + Optional value that specifies the location that the component can be run from. + + @@ -5997,6 +6053,9 @@ + + This attribute has been deprecated. Use the SourceFile attribute instead. + @@ -6094,6 +6153,9 @@ + + This attribute has been deprecated. Use the Name attribute instead. + @@ -6101,6 +6163,9 @@ + + This attribute has been deprecated. Use the SourceName attribute instead. + @@ -6164,6 +6229,9 @@ + + This attribute has been deprecated. Use the FileSource attribute instead. + @@ -6211,6 +6279,9 @@ + + This attribute has been deprecated. Use the FileSource attribute instead. + @@ -6713,6 +6784,9 @@ + + This attribute has been deprecated. Use the Layout attribute instead. + @@ -8463,6 +8537,9 @@ + + This attribute has been deprecated. Use the SourceFile attribute instead. + @@ -8504,6 +8581,9 @@ + + This attribute has been deprecated. Use the SourceFile attribute instead. + @@ -8888,6 +8968,9 @@ + + This attribute has been deprecated. Use the SourceFile attribute instead. + diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 2d86e02d90..0967ea9faf 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -308,9 +308,6 @@ - - - diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index bbcae7df15..c079b7fdea 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -238,7 +238,6 @@ - diff --git a/src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll b/src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll index 3a58e28194..f7d818c5ed 100755 Binary files a/src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll and b/src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll differ diff --git a/src/Tools/wix/WixComPlusExtension.dll b/src/Tools/wix/WixComPlusExtension.dll index 4cde8e652b..721de38107 100755 Binary files a/src/Tools/wix/WixComPlusExtension.dll and b/src/Tools/wix/WixComPlusExtension.dll differ diff --git a/src/Tools/wix/WixCop.exe b/src/Tools/wix/WixCop.exe index b7d2ed0054..a1e83c7ec7 100755 Binary files a/src/Tools/wix/WixCop.exe and b/src/Tools/wix/WixCop.exe differ diff --git a/src/Tools/wix/WixDifxAppExtension.dll b/src/Tools/wix/WixDifxAppExtension.dll index aa8b1c8bd9..d757446582 100755 Binary files a/src/Tools/wix/WixDifxAppExtension.dll and b/src/Tools/wix/WixDifxAppExtension.dll differ diff --git a/src/Tools/wix/WixDirectXExtension.dll b/src/Tools/wix/WixDirectXExtension.dll index 0cd029b3f9..7b3a98d11c 100755 Binary files a/src/Tools/wix/WixDirectXExtension.dll and b/src/Tools/wix/WixDirectXExtension.dll differ diff --git a/src/Tools/wix/WixFirewallExtension.dll b/src/Tools/wix/WixFirewallExtension.dll index 0785a5fda6..8b2836227b 100755 Binary files a/src/Tools/wix/WixFirewallExtension.dll and b/src/Tools/wix/WixFirewallExtension.dll differ diff --git a/src/Tools/wix/WixGamingExtension.dll b/src/Tools/wix/WixGamingExtension.dll index dba6bf110b..919704a058 100755 Binary files a/src/Tools/wix/WixGamingExtension.dll and b/src/Tools/wix/WixGamingExtension.dll differ diff --git a/src/Tools/wix/WixIIsExtension.dll b/src/Tools/wix/WixIIsExtension.dll index 33f2753d64..fbf3085dbf 100755 Binary files a/src/Tools/wix/WixIIsExtension.dll and b/src/Tools/wix/WixIIsExtension.dll differ diff --git a/src/Tools/wix/WixIsolatedAppExtension.dll b/src/Tools/wix/WixIsolatedAppExtension.dll index 94fdd6de54..0b5ff5e2f0 100755 Binary files a/src/Tools/wix/WixIsolatedAppExtension.dll and b/src/Tools/wix/WixIsolatedAppExtension.dll differ diff --git a/src/Tools/wix/WixMsmqExtension.dll b/src/Tools/wix/WixMsmqExtension.dll index ce7bf5cf11..3d6e8e727e 100755 Binary files a/src/Tools/wix/WixMsmqExtension.dll and b/src/Tools/wix/WixMsmqExtension.dll differ diff --git a/src/Tools/wix/WixNetFxExtension.dll b/src/Tools/wix/WixNetFxExtension.dll index 7727c4b353..9810bda6a4 100755 Binary files a/src/Tools/wix/WixNetFxExtension.dll and b/src/Tools/wix/WixNetFxExtension.dll differ diff --git a/src/Tools/wix/WixOfficeExtension.dll b/src/Tools/wix/WixOfficeExtension.dll index 90c377e8bc..5c4db26081 100755 Binary files a/src/Tools/wix/WixOfficeExtension.dll and b/src/Tools/wix/WixOfficeExtension.dll differ diff --git a/src/Tools/wix/WixPSExtension.dll b/src/Tools/wix/WixPSExtension.dll index d5ddfab539..b1b1ed3e78 100755 Binary files a/src/Tools/wix/WixPSExtension.dll and b/src/Tools/wix/WixPSExtension.dll differ diff --git a/src/Tools/wix/WixSqlExtension.dll b/src/Tools/wix/WixSqlExtension.dll index 109a1f7916..78626cece7 100755 Binary files a/src/Tools/wix/WixSqlExtension.dll and b/src/Tools/wix/WixSqlExtension.dll differ diff --git a/src/Tools/wix/WixTasks.dll b/src/Tools/wix/WixTasks.dll index 6b24a4260c..d30d04fe2f 100755 Binary files a/src/Tools/wix/WixTasks.dll and b/src/Tools/wix/WixTasks.dll differ diff --git a/src/Tools/wix/WixUIExtension.dll b/src/Tools/wix/WixUIExtension.dll index c87592502f..ae602eac57 100755 Binary files a/src/Tools/wix/WixUIExtension.dll and b/src/Tools/wix/WixUIExtension.dll differ diff --git a/src/Tools/wix/WixUtilExtension.dll b/src/Tools/wix/WixUtilExtension.dll index 3a640b1a40..d814c7d557 100755 Binary files a/src/Tools/wix/WixUtilExtension.dll and b/src/Tools/wix/WixUtilExtension.dll differ diff --git a/src/Tools/wix/WixVSExtension.dll b/src/Tools/wix/WixVSExtension.dll index 2582ad1907..33780d9e0c 100755 Binary files a/src/Tools/wix/WixVSExtension.dll and b/src/Tools/wix/WixVSExtension.dll differ diff --git a/src/Tools/wix/candle.exe b/src/Tools/wix/candle.exe index 4249ea8610..04e31c0823 100755 Binary files a/src/Tools/wix/candle.exe and b/src/Tools/wix/candle.exe differ diff --git a/src/Tools/wix/dark.exe b/src/Tools/wix/dark.exe index 99ce1c6015..5201a75b21 100755 Binary files a/src/Tools/wix/dark.exe and b/src/Tools/wix/dark.exe differ diff --git a/src/Tools/wix/heat.exe b/src/Tools/wix/heat.exe index 8c3fb19e32..c4625bb98d 100755 Binary files a/src/Tools/wix/heat.exe and b/src/Tools/wix/heat.exe differ diff --git a/src/Tools/wix/light.exe b/src/Tools/wix/light.exe index 43d13addb2..ccad41fa46 100755 Binary files a/src/Tools/wix/light.exe and b/src/Tools/wix/light.exe differ diff --git a/src/Tools/wix/lit.exe b/src/Tools/wix/lit.exe index 1077575109..a32b350bc9 100755 Binary files a/src/Tools/wix/lit.exe and b/src/Tools/wix/lit.exe differ diff --git a/src/Tools/wix/melt.exe b/src/Tools/wix/melt.exe index e6e84db1ac..e80d0ce9df 100755 Binary files a/src/Tools/wix/melt.exe and b/src/Tools/wix/melt.exe differ diff --git a/src/Tools/wix/pyro.exe b/src/Tools/wix/pyro.exe index 78c8721af7..60f456c0b1 100755 Binary files a/src/Tools/wix/pyro.exe and b/src/Tools/wix/pyro.exe differ diff --git a/src/Tools/wix/smoke.exe b/src/Tools/wix/smoke.exe index a2a9577d45..a4a3c7be93 100755 Binary files a/src/Tools/wix/smoke.exe and b/src/Tools/wix/smoke.exe differ diff --git a/src/Tools/wix/torch.exe b/src/Tools/wix/torch.exe index 817ed57950..61d88d8d5b 100755 Binary files a/src/Tools/wix/torch.exe and b/src/Tools/wix/torch.exe differ diff --git a/src/Tools/wix/wconsole.dll b/src/Tools/wix/wconsole.dll index cc413482b4..e94663bf49 100755 Binary files a/src/Tools/wix/wconsole.dll and b/src/Tools/wix/wconsole.dll differ diff --git a/src/Tools/wix/winterop.dll b/src/Tools/wix/winterop.dll index 46057e173e..72fc106c4c 100755 Binary files a/src/Tools/wix/winterop.dll and b/src/Tools/wix/winterop.dll differ diff --git a/src/Tools/wix/wix.dll b/src/Tools/wix/wix.dll index d2b389d55a..b2b4677bbd 100755 Binary files a/src/Tools/wix/wix.dll and b/src/Tools/wix/wix.dll differ diff --git a/src/Tools/wix/wix.targets b/src/Tools/wix/wix.targets index e10d4a5d9b..b29f401d38 100644 --- a/src/Tools/wix/wix.targets +++ b/src/Tools/wix/wix.targets @@ -93,19 +93,20 @@ Copyright (c) Microsoft Corporation. All rights reserved. - - - - + + + + - - - - + + + + - + + + + + + Name="PrepareForBuild" DependsOnTargets="$(PrepareForBuildDependsOn)"> + + + PrepareForBuild + + - - - $(ReferencePaths); - {HintPathFromItem}; - {RawFileName}; - $(WixExtDir) - - - - - - + Name="ResolveWixExtensionReferences" + DependsOnTargets="$(ResolveWixExtensionReferencesDependsOn)" + Condition=" '@(WixExtension)' != ''"> - - - - + + + + + + + + - + @@ -632,14 +648,30 @@ Copyright (c) Microsoft Corporation. All rights reserved. ================================================================================================== --> - + GetTargetPath - + + + + + + + + + + + + + + PrepareForBuild; + AssignCultures + + - PrepareForBuild; - ResolveWixExtensionPaths + Condition=" '@(WixLibrary)' != ''"> + + + + + + + + + + + + + + - - - + + PrepareForBuild; - ResolveWixExtensionPaths; + ResolveReferences; AssignCultures; @@ -1431,8 +1495,8 @@ Copyright (c) Microsoft Corporation. All rights reserved. Inputs="@(CompileObjOutput); @(EmbeddedResource); @(WixObject); - @(WixLibrary); @(_ResolvedProjectReferencePaths); + @(_ResolvedWixLibraryPaths); @(_ResolvedWixExtensionPaths); $(MSBuildAllProjects)" Outputs="$(TargetPath)" @@ -1441,7 +1505,7 @@ Copyright (c) Microsoft Corporation. All rights reserved. - + GetTargetPath - + + + + + + + + + + +