pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated to the final build of WiX 3.0 (3.0.5419) 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@4396 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 16 years ago
parent
4b1a54a220
commit
3851cecf1f
37 changed files with 249 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      data/schemas/sql.xsd
  2. 23
      data/schemas/vs.xsd
  3. 93
      data/schemas/wix.xsd
  4. 3
      src/Setup/Files.wxs
  5. 1
      src/Setup/Setup.wxs
  6. BIN
      src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll
  7. BIN
      src/Tools/wix/WixComPlusExtension.dll
  8. BIN
      src/Tools/wix/WixCop.exe
  9. BIN
      src/Tools/wix/WixDifxAppExtension.dll
  10. BIN
      src/Tools/wix/WixDirectXExtension.dll
  11. BIN
      src/Tools/wix/WixFirewallExtension.dll
  12. BIN
      src/Tools/wix/WixGamingExtension.dll
  13. BIN
      src/Tools/wix/WixIIsExtension.dll
  14. BIN
      src/Tools/wix/WixIsolatedAppExtension.dll
  15. BIN
      src/Tools/wix/WixMsmqExtension.dll
  16. BIN
      src/Tools/wix/WixNetFxExtension.dll
  17. BIN
      src/Tools/wix/WixOfficeExtension.dll
  18. BIN
      src/Tools/wix/WixPSExtension.dll
  19. BIN
      src/Tools/wix/WixSqlExtension.dll
  20. BIN
      src/Tools/wix/WixTasks.dll
  21. BIN
      src/Tools/wix/WixUIExtension.dll
  22. BIN
      src/Tools/wix/WixUtilExtension.dll
  23. BIN
      src/Tools/wix/WixVSExtension.dll
  24. BIN
      src/Tools/wix/candle.exe
  25. BIN
      src/Tools/wix/dark.exe
  26. BIN
      src/Tools/wix/heat.exe
  27. BIN
      src/Tools/wix/light.exe
  28. BIN
      src/Tools/wix/lit.exe
  29. BIN
      src/Tools/wix/melt.exe
  30. BIN
      src/Tools/wix/pyro.exe
  31. BIN
      src/Tools/wix/smoke.exe
  32. BIN
      src/Tools/wix/torch.exe
  33. BIN
      src/Tools/wix/wconsole.dll
  34. BIN
      src/Tools/wix/winterop.dll
  35. BIN
      src/Tools/wix/wix.dll
  36. 190
      src/Tools/wix/wix.targets
  37. BIN
      src/Tools/wix/wui.dll

4
data/schemas/sql.xsd
Unescape View File

@ -72,7 +72,9 @@
<xs:attribute name="Database" use="required" type="xs:string"> <xs:attribute name="Database" use="required" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation> <xs:documentation>
The name of the database. If the name does not follow the SQL server "Rules for Regular Identifiers" (see <html:a href="http://msdn.microsoft.com/en-us/library/ms175874.aspx">MSDN</html:a>) 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 <html:a href='http://msdn.microsoft.com/library/aa368609.aspx' target='_blank'>Formatted</html:a>
syntax.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>

23
data/schemas/vs.xsd
Unescape View File

@ -43,6 +43,9 @@
<xs:attribute name="Name" use="required" type="xs:string"> <xs:attribute name="Name" use="required" type="xs:string">
<xs:annotation><xs:documentation>Internal Microsoft Help ID for this Namespace.</xs:documentation></xs:annotation> <xs:annotation><xs:documentation>Internal Microsoft Help ID for this Namespace.</xs:documentation></xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="SuppressCustomActions" type="YesNoType">
<xs:annotation><xs:documentation>Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module.</xs:documentation></xs:annotation>
</xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
@ -53,6 +56,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" /> <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Module" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" /> <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" />
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
@ -66,6 +70,9 @@
<xs:attribute name="Name" use="required" type="xs:string"> <xs:attribute name="Name" use="required" type="xs:string">
<xs:annotation><xs:documentation>Friendly name for Filter.</xs:documentation></xs:annotation> <xs:annotation><xs:documentation>Friendly name for Filter.</xs:documentation></xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="SuppressCustomActions" type="YesNoType">
<xs:annotation><xs:documentation>Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module.</xs:documentation></xs:annotation>
</xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
@ -100,6 +107,9 @@
<xs:attribute name="Search" type="xs:string"> <xs:attribute name="Search" type="xs:string">
<xs:annotation><xs:documentation>Key for HxQ (Query) file.</xs:documentation></xs:annotation> <xs:annotation><xs:documentation>Key for HxQ (Query) file.</xs:documentation></xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="SuppressCustomActions" type="YesNoType">
<xs:annotation><xs:documentation>Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module.</xs:documentation></xs:annotation>
</xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
@ -126,6 +136,9 @@
<xs:attribute name="TargetFeature" type="xs:string"> <xs:attribute name="TargetFeature" type="xs:string">
<xs:annotation><xs:documentation>Key for the feature parent of this help collection. Required only when plugging into external namespaces.</xs:documentation></xs:annotation> <xs:annotation><xs:documentation>Key for the feature parent of this help collection. Required only when plugging into external namespaces.</xs:documentation></xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="SuppressExternalNamespaces" type="YesNoType">
<xs:annotation><xs:documentation>Suppress linking Visual Studio Help namespaces. Help redistributable merge modules will be required. Use this when building a merge module.</xs:documentation></xs:annotation>
</xs:attribute>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
@ -164,6 +177,7 @@
<xs:documentation>Create a reference to a HelpCollection element in another Fragment.</xs:documentation> <xs:documentation>Create a reference to a HelpCollection element in another Fragment.</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" /> <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Fragment" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Module" />
<xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" /> <xse:parent namespace="http://schemas.microsoft.com/wix/2006/wi" ref="Product" />
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
@ -183,4 +197,13 @@
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:simpleType name="YesNoType">
<xs:annotation>
<xs:documentation>Values of this type will either be "yes" or "no".</xs:documentation>
</xs:annotation>
<xs:restriction base='xs:NMTOKEN'>
<xs:enumeration value="no"/>
<xs:enumeration value="yes"/>
</xs:restriction>
</xs:simpleType>
</xs:schema> </xs:schema>

93
data/schemas/wix.xsd
Unescape View File

@ -248,7 +248,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="Guid" type="Guid"> <xs:attribute name="Guid" type="Guid">
<xs:annotation> <xs:annotation>
<xs:documentation>This attribute is deprecated. Use the Package/@Id instead.</xs:documentation> <xs:documentation>This attribute is deprecated. Use the Package/@Id attribute instead.</xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="Language" type="LocalizableInteger" use="required"> <xs:attribute name="Language" type="LocalizableInteger" use="required">
@ -1144,6 +1144,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="Target" type="xs:string"> <xs:attribute name="Target" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the TargetImage attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="TargetImage" /> <xse:deprecated ref="TargetImage" />
</xs:appinfo> </xs:appinfo>
@ -1211,6 +1214,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the SourceFile attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="SourceFile" /> <xse:deprecated ref="SourceFile" />
</xs:appinfo> </xs:appinfo>
@ -1221,6 +1227,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="srcPatch" type="xs:string"> <xs:attribute name="srcPatch" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the SourcePatch attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="SourcePatch" /> <xse:deprecated ref="SourcePatch" />
</xs:appinfo> </xs:appinfo>
@ -1245,6 +1254,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the SourceFile attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="SourceFile" /> <xse:deprecated ref="SourceFile" />
</xs:appinfo> </xs:appinfo>
@ -1335,6 +1347,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Source attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Source" /> <xse:deprecated ref="Source" />
</xs:appinfo> </xs:appinfo>
@ -1477,7 +1492,7 @@
<xs:documentation> <xs:documentation>
The minimum version of the Windows Installer required to install this package. Take the major version of the required Windows Installer 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 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.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
@ -1498,6 +1513,10 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="Platforms" type="xs:string"> <xs:attribute name="Platforms" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
The list of platforms supported by the package. This attribute has been deprecated.
Use the Platform attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Platform" /> <xse:deprecated ref="Platform" />
</xs:appinfo> </xs:appinfo>
@ -1520,6 +1539,7 @@
<xs:annotation> <xs:annotation>
<xs:documentation> <xs:documentation>
Set this value to declare that the package is an ia64 package. 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.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
</xs:enumeration> </xs:enumeration>
@ -1527,20 +1547,21 @@
<xs:annotation> <xs:annotation>
<xs:documentation> <xs:documentation>
Set this value to declare that the package is an x64 package. 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.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
</xs:enumeration> </xs:enumeration>
<xs:enumeration value="intel"> <xs:enumeration value="intel">
<xs:annotation> <xs:annotation>
<xs:documentation> <xs:documentation>
Deprecated. Use &quot;x86&quot; instead. This value has been deprecated. Use &quot;x86&quot; instead.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
</xs:enumeration> </xs:enumeration>
<xs:enumeration value="intel64"> <xs:enumeration value="intel64">
<xs:annotation> <xs:annotation>
<xs:documentation> <xs:documentation>
Deprecated. Use &quot;ia64&quot; instead. This value has been deprecated. Use &quot;ia64&quot; instead.
</xs:documentation> </xs:documentation>
</xs:annotation> </xs:annotation>
</xs:enumeration> </xs:enumeration>
@ -1749,6 +1770,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="LongName" type="LongFileNameType"> <xs:attribute name="LongName" type="LongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Name attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Name" /> <xse:deprecated ref="Name" />
</xs:appinfo> </xs:appinfo>
@ -1936,6 +1960,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="LongName" type="LongFileNameType"> <xs:attribute name="LongName" type="LongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Name attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Name" /> <xse:deprecated ref="Name" />
</xs:appinfo> </xs:appinfo>
@ -2146,6 +2173,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="LongName" type="LongFileNameType"> <xs:attribute name="LongName" type="LongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Name attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Name" /> <xse:deprecated ref="Name" />
</xs:appinfo> </xs:appinfo>
@ -2504,6 +2534,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="LongName" type="LongFileNameType"> <xs:attribute name="LongName" type="LongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Name attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Name" /> <xse:deprecated ref="Name" />
</xs:appinfo> </xs:appinfo>
@ -2869,6 +2902,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="DestinationLongName" type="LongFileNameType"> <xs:attribute name="DestinationLongName" type="LongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the DestinationName attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="DestinationName" /> <xse:deprecated ref="DestinationName" />
</xs:appinfo> </xs:appinfo>
@ -2967,6 +3003,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="LongName" type="LongFileNameType"> <xs:attribute name="LongName" type="LongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Name attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Name" /> <xse:deprecated ref="Name" />
</xs:appinfo> </xs:appinfo>
@ -3090,7 +3129,7 @@
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="ProcessorArchitecture"> <xs:attribute name="ProcessorArchitecture">
<xs:annotation><xs:documentation>Specifies the architecture for this assembly. This attribute should only be used on .NET Framework 2.0 assemblies.</xs:documentation></xs:annotation> <xs:annotation><xs:documentation>Specifies the architecture for this assembly. This attribute should only be used on .NET Framework 2.0 or higher assemblies.</xs:documentation></xs:annotation>
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:NMTOKEN"> <xs:restriction base="xs:NMTOKEN">
<xs:enumeration value="msil"> <xs:enumeration value="msil">
@ -3141,6 +3180,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Source attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Source" /> <xse:deprecated ref="Source" />
</xs:appinfo> </xs:appinfo>
@ -3552,6 +3594,9 @@
<xs:element name="Registry"> <xs:element name="Registry">
<xs:annotation> <xs:annotation>
<xs:appinfo> <xs:appinfo>
<xs:documentation>
This element has been deprecated. Use the RegistryValue element instead.
</xs:documentation>
<xse:msiRef table="Registry" href="http://msdn.microsoft.com/library/aa371168.aspx"/> <xse:msiRef table="Registry" href="http://msdn.microsoft.com/library/aa371168.aspx"/>
<xse:deprecated ref="RegistryValue" /> <xse:deprecated ref="RegistryValue" />
</xs:appinfo> </xs:appinfo>
@ -3779,6 +3824,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="LongName" type="WildCardLongFileNameType"> <xs:attribute name="LongName" type="WildCardLongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Name attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Name" /> <xse:deprecated ref="Name" />
</xs:appinfo> </xs:appinfo>
@ -4017,6 +4065,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="Target" type="xs:string"> <xs:attribute name="Target" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the TargetFile attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="TargetFile" /> <xse:deprecated ref="TargetFile" />
</xs:appinfo> </xs:appinfo>
@ -5723,6 +5774,11 @@
</xs:annotation> </xs:annotation>
</xs:attribute> </xs:attribute>
<xs:attribute name="Location"> <xs:attribute name="Location">
<xs:annotation>
<xs:documentation>
Optional value that specifies the location that the component can be run from.
</xs:documentation>
</xs:annotation>
<xs:simpleType> <xs:simpleType>
<xs:restriction base="xs:NMTOKEN"> <xs:restriction base="xs:NMTOKEN">
<xs:enumeration value="local"> <xs:enumeration value="local">
@ -5997,6 +6053,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the SourceFile attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="SourceFile" /> <xse:deprecated ref="SourceFile" />
</xs:appinfo> </xs:appinfo>
@ -6094,6 +6153,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="LongName" type="LongFileNameType"> <xs:attribute name="LongName" type="LongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Name attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Name" /> <xse:deprecated ref="Name" />
</xs:appinfo> </xs:appinfo>
@ -6101,6 +6163,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="LongSource" type="LongFileNameType"> <xs:attribute name="LongSource" type="LongFileNameType">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the SourceName attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="SourceName" /> <xse:deprecated ref="SourceName" />
</xs:appinfo> </xs:appinfo>
@ -6164,6 +6229,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the FileSource attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="FileSource" /> <xse:deprecated ref="FileSource" />
</xs:appinfo> </xs:appinfo>
@ -6211,6 +6279,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the FileSource attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="FileSource" /> <xse:deprecated ref="FileSource" />
</xs:appinfo> </xs:appinfo>
@ -6713,6 +6784,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the Layout attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="Layout" /> <xse:deprecated ref="Layout" />
</xs:appinfo> </xs:appinfo>
@ -8463,6 +8537,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the SourceFile attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="SourceFile" /> <xse:deprecated ref="SourceFile" />
</xs:appinfo> </xs:appinfo>
@ -8504,6 +8581,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the SourceFile attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="SourceFile" /> <xse:deprecated ref="SourceFile" />
</xs:appinfo> </xs:appinfo>
@ -8888,6 +8968,9 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="src" type="xs:string"> <xs:attribute name="src" type="xs:string">
<xs:annotation> <xs:annotation>
<xs:documentation>
This attribute has been deprecated. Use the SourceFile attribute instead.
</xs:documentation>
<xs:appinfo> <xs:appinfo>
<xse:deprecated ref="SourceFile" /> <xse:deprecated ref="SourceFile" />
</xs:appinfo> </xs:appinfo>

3
src/Setup/Files.wxs
Unescape View File

@ -308,9 +308,6 @@
<Component Guid="96DD82B8-5183-4C6C-BF15-455895F78A89" Id="UtilXsd" DiskId="1"> <Component Guid="96DD82B8-5183-4C6C-BF15-455895F78A89" Id="UtilXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\util.xsd" Name="util.xsd" Id="util.xsd" KeyPath="yes" /> <File Source="..\..\bin\Tools\Wix\doc\util.xsd" Name="util.xsd" Id="util.xsd" KeyPath="yes" />
</Component> </Component>
<Component Guid="F76E3D02-BE6C-4D89-8FA7-E648D77FB186" Id="ComPlusXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\complus.xsd" Name="complus.xsd" Id="complus.xsd" KeyPath="yes" />
</Component>
<Component Guid="3E8291C1-F920-40C9-BFF2-3E0DD361EBB6" Id="MSMQXsd" DiskId="1"> <Component Guid="3E8291C1-F920-40C9-BFF2-3E0DD361EBB6" Id="MSMQXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\msmq.xsd" Name="msmq.xsd" Id="msmq.xsd" KeyPath="yes" /> <File Source="..\..\bin\Tools\Wix\doc\msmq.xsd" Name="msmq.xsd" Id="msmq.xsd" KeyPath="yes" />
</Component> </Component>

1
src/Setup/Setup.wxs
Unescape View File

@ -238,7 +238,6 @@
<ComponentRef Id="WixVSExtension"/> <ComponentRef Id="WixVSExtension"/>
<ComponentRef Id="Difxapp_x64Wixlib"/> <ComponentRef Id="Difxapp_x64Wixlib"/>
<ComponentRef Id="Difxapp_x86Wixlib"/> <ComponentRef Id="Difxapp_x86Wixlib"/>
<ComponentRef Id="ComPlusXsd"/>
<ComponentRef Id="MSMQXsd"/> <ComponentRef Id="MSMQXsd"/>
<ComponentRef Id="WixFirewallXsd"/> <ComponentRef Id="WixFirewallXsd"/>
<ComponentRef Id="WixGamingXsd"/> <ComponentRef Id="WixGamingXsd"/>

BIN
src/Tools/wix/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixComPlusExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixCop.exe
View File

Binary file not shown.

BIN
src/Tools/wix/WixDifxAppExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixDirectXExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixFirewallExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixGamingExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixIIsExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixIsolatedAppExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixMsmqExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixNetFxExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixOfficeExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixPSExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixSqlExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixTasks.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixUIExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixUtilExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/WixVSExtension.dll
View File

Binary file not shown.

BIN
src/Tools/wix/candle.exe
View File

Binary file not shown.

BIN
src/Tools/wix/dark.exe
View File

Binary file not shown.

BIN
src/Tools/wix/heat.exe
View File

Binary file not shown.

BIN
src/Tools/wix/light.exe
View File

Binary file not shown.

BIN
src/Tools/wix/lit.exe
View File

Binary file not shown.

BIN
src/Tools/wix/melt.exe
View File

Binary file not shown.

BIN
src/Tools/wix/pyro.exe
View File

Binary file not shown.

BIN
src/Tools/wix/smoke.exe
View File

Binary file not shown.

BIN
src/Tools/wix/torch.exe
View File

Binary file not shown.

BIN
src/Tools/wix/wconsole.dll
View File

Binary file not shown.

BIN
src/Tools/wix/winterop.dll
View File

Binary file not shown.

BIN
src/Tools/wix/wix.dll
View File

Binary file not shown.

190
src/Tools/wix/wix.targets
Unescape View File

@ -93,19 +93,20 @@ Copyright (c) Microsoft Corporation. All rights reserved.
<UsingTask TaskName="HeatProject" AssemblyFile="$(WixTasksPath)" /> <UsingTask TaskName="HeatProject" AssemblyFile="$(WixTasksPath)" />
<!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. --> <!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. -->
<UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' == '' " /> <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' or '$(MSBuildToolsVersion)' == '2.0' " />
<UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' == '' " /> <UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' or '$(MSBuildToolsVersion)' == '2.0' " />
<UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' == '' " /> <UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' or '$(MSBuildToolsVersion)' == '2.0' " />
<UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' == '' " /> <UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' or '$(MSBuildToolsVersion)' == '2.0' " />
<UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' != '' " /> <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " />
<UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' != '' " /> <UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " />
<UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' != '' " /> <UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " />
<UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' != '' " /> <UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " />
<UsingTask TaskName="CreateProjectReferenceDefineConstants" AssemblyFile="$(WixTasksPath)" /> <UsingTask TaskName="CreateProjectReferenceDefineConstants" AssemblyFile="$(WixTasksPath)" />
<UsingTask TaskName="WixAssignCulture" AssemblyFile="$(WixTasksPath)" /> <UsingTask TaskName="WixAssignCulture" AssemblyFile="$(WixTasksPath)" />
<UsingTask TaskName="ResolveWixExtensionReference" AssemblyFile="$(WixTasksPath)"/> <UsingTask TaskName="ResolveWixReferences" AssemblyFile="$(WixTasksPath)"/>
<UsingTask TaskName="ReplaceString" AssemblyFile="$(WixTasksPath)"/>
<!-- <!--
Several properties must be set in the main project file, before using this .targets file. Several properties must be set in the main project file, before using this .targets file.
@ -557,8 +558,11 @@ Copyright (c) Microsoft Corporation. All rights reserved.
Prepare the prerequisites for building. Prepare the prerequisites for building.
================================================================================================== ==================================================================================================
--> -->
<PropertyGroup>
<PrepareForBuildDependsOn></PrepareForBuildDependsOn>
</PropertyGroup>
<Target <Target
Name="PrepareForBuild"> Name="PrepareForBuild" DependsOnTargets="$(PrepareForBuildDependsOn)">
<!-- <!--
These CreateProperty calls are required because TargetDir and TargetPath are defined These CreateProperty calls are required because TargetDir and TargetPath are defined
@ -583,7 +587,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
<!-- <!--
================================================================================================== ==================================================================================================
ResolveWixExtensionPaths ResolveWixExtensionReferences
Resolves WiX extension references to full paths. Any properties you use Resolves WiX extension references to full paths. Any properties you use
to resolve paths to extensions must be defined before importing this to resolve paths to extensions must be defined before importing this
@ -596,30 +600,42 @@ Copyright (c) Microsoft Corporation. All rights reserved.
@(_ResolvedWixExtensionPaths) - Item group with full paths to extensions @(_ResolvedWixExtensionPaths) - Item group with full paths to extensions
================================================================================================== ==================================================================================================
--> -->
<PropertyGroup>
<ResolveWixExtensionReferencesDependsOn>
PrepareForBuild
</ResolveWixExtensionReferencesDependsOn>
</PropertyGroup>
<Target <Target
Name="ResolveWixExtensionPaths"> Name="ResolveWixExtensionReferences"
<PropertyGroup> DependsOnTargets="$(ResolveWixExtensionReferencesDependsOn)"
<WixExtensionSearchPaths> Condition=" '@(WixExtension)' != ''">
$(ReferencePaths);
{HintPathFromItem};
{RawFileName};
$(WixExtDir)
</WixExtensionSearchPaths>
</PropertyGroup>
<ResolveWixExtensionReference
WixExtensions="@(WixExtension)"
SearchPaths="$(WixExtensionSearchPaths)">
<Output TaskParameter="ResolvedWixExtensions" ItemName="_AllResolvedWixExtensionPaths" />
</ResolveWixExtensionReference>
<!-- Normalize the paths to ensure remove duplicates catches everything --> <!--
<ConvertToAbsolutePath Paths="@(_AllResolvedWixExtensionPaths)"> The WixExtensionSearchPaths property is set to find assemblies in the following order:
<Output TaskParameter="AbsolutePaths" ItemName="_AllResolvedWixExtensionFullPaths" />
</ConvertToAbsolutePath> (1) $(ReferencePaths) - the reference paths property, which comes from the .USER file.
(2) The hintpath from the referenced item itself, indicated by {HintPathFromItem}.
(3) Treat the reference's Include as if it were a real file name.
(4) Path specified by the WixExtDir property.
-->
<CreateProperty Condition=" '$(WixExtensionSearchPaths)' == '' " Value="
$(ReferencePaths);
{HintPathFromItem};
{RawFileName};
$(WixExtDir)
">
<Output TaskParameter="Value" PropertyName="WixExtensionSearchPaths" />
</CreateProperty>
<ResolveWixReferences
WixReferences="@(WixExtension)"
SearchPaths="$(WixExtensionSearchPaths)"
SearchFilenameExtensions=".dll">
<Output TaskParameter="ResolvedWixReferences" ItemName="_AllResolvedWixExtensionPaths" />
</ResolveWixReferences>
<!-- Remove duplicate extension items that would cause build errors --> <!-- Remove duplicate extension items that would cause build errors -->
<RemoveDuplicates Inputs="@(_AllResolvedWixExtensionFullPaths)"> <RemoveDuplicates Inputs="@(_AllResolvedWixExtensionPaths)">
<Output TaskParameter="Filtered" ItemName="_ResolvedWixExtensionPaths" /> <Output TaskParameter="Filtered" ItemName="_ResolvedWixExtensionPaths" />
</RemoveDuplicates> </RemoveDuplicates>
</Target> </Target>
@ -632,14 +648,30 @@ Copyright (c) Microsoft Corporation. All rights reserved.
================================================================================================== ==================================================================================================
--> -->
<PropertyGroup> <PropertyGroup>
<PreBuildEventDependsOn></PreBuildEventDependsOn> <PreBuildEventDependsOn>GetTargetPath</PreBuildEventDependsOn>
</PropertyGroup> </PropertyGroup>
<Target <Target
Name="PreBuildEvent" Name="PreBuildEvent"
DependsOnTargets="$(PreBuildEventDependsOn)" DependsOnTargets="$(PreBuildEventDependsOn)"
Condition=" '$(PreBuildEvent)' != '' "> Condition=" '$(PreBuildEvent)' != '' ">
<Exec WorkingDirectory="$(OutDir)" Command="$(PreBuildEvent)" /> <ReplaceString
Text="$(PreBuildEvent)"
OldValue="!(TargetPath)"
NewValue="$(TargetPath)">
<Output TaskParameter="Text" PropertyName="ExpandedPreBuildEvent" />
</ReplaceString>
<ReplaceString
Text="$(ExpandedPreBuildEvent)"
OldValue="!(TargetPdbPath)"
NewValue="$(TargetPdbPath)">
<Output TaskParameter="Text" PropertyName="ExpandedPreBuildEvent" />
</ReplaceString>
<Exec WorkingDirectory="$(OutDir)" Command="$(ExpandedPreBuildEvent)" />
</Target> </Target>
<!-- <!--
@ -662,6 +694,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
ResolveProjectReferences; ResolveProjectReferences;
ResolveVCProjectReferences; ResolveVCProjectReferences;
ResolveWixLibraryReferences; ResolveWixLibraryReferences;
ResolveWixExtensionReferences;
AfterResolveReferences AfterResolveReferences
</ResolveReferencesDependsOn> </ResolveReferencesDependsOn>
</PropertyGroup> </PropertyGroup>
@ -872,9 +905,15 @@ Copyright (c) Microsoft Corporation. All rights reserved.
produced if we built this project. produced if we built this project.
================================================================================================ ================================================================================================
--> -->
<PropertyGroup>
<GetTargetPathDependsOn>
PrepareForBuild;
AssignCultures
</GetTargetPathDependsOn>
</PropertyGroup>
<Target <Target
Name="GetTargetPath" Name="GetTargetPath"
DependsOnTargets="PrepareForBuild" DependsOnTargets="$(GetTargetPathDependsOn)"
Outputs="$(TargetPath)" /> Outputs="$(TargetPath)" />
<!-- <!--
@ -923,6 +962,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
</ResolveVCProjectOutput> </ResolveVCProjectOutput>
<Error <Error
Code="WIXTARGETS104"
Text="MSBuild cannot resolve the reference to the Visual C++ project '%(VCProjectReference.Identity)' when building a stand-alone MSBuild project. To correctly resolve this reference, please build the solution file containing these projects." Text="MSBuild cannot resolve the reference to the Visual C++ project '%(VCProjectReference.Identity)' when building a stand-alone MSBuild project. To correctly resolve this reference, please build the solution file containing these projects."
Condition=" '$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true' " /> Condition=" '$(BuildingSolutionFile)' != 'true' and '$(BuildingInsideVisualStudio)' != 'true' " />
@ -936,33 +976,54 @@ Copyright (c) Microsoft Corporation. All rights reserved.
================================================================================================ ================================================================================================
ResolveWixLibraryReferences ResolveWixLibraryReferences
Resolve the library references by copying them to the local build directory. Used in Votive Resolve the library references to full paths.
when CopyLocal = true on a wixlib or wix extension reference node.
[IN] [IN]
@(WixLibrary) - The list of .wixlib files. @(WixLibrary) - The list of .wixlib files.
@(WixExtension) - The list of wix dll extension files.
[OUT]
@(_ResolvedWixLibraryPaths) - Item group with full paths to libraries
================================================================================================ ================================================================================================
--> -->
<!-- Resolve the library references by copying them to the local build directory. Used in Votive when CopyLocal = true on a wixlib reference node. -->
<PropertyGroup> <PropertyGroup>
<ResolveWixLibraryReferencesDependsOn> <ResolveWixLibraryReferencesDependsOn>
PrepareForBuild; PrepareForBuild;
ResolveWixExtensionPaths
</ResolveWixLibraryReferencesDependsOn> </ResolveWixLibraryReferencesDependsOn>
</PropertyGroup> </PropertyGroup>
<Target <Target
Name="ResolveWixLibraryReferences" Name="ResolveWixLibraryReferences"
Inputs="@(WixLibrary);
@(_ResolvedWixExtensionPaths);
$(MSBuildAllProjects)"
Outputs="@(WixLibrary->'$(OutDir)%(Filename)%(Extension)');
@(_ResolvedWixExtensionPaths->'$(OutDir)%(Filename)%(Extension)')"
DependsOnTargets="$(ResolveWixLibraryReferencesDependsOn)" DependsOnTargets="$(ResolveWixLibraryReferencesDependsOn)"
Condition=" '@(WixLibrary)@(_ResolvedWixExtensionPaths)' != ''"> Condition=" '@(WixLibrary)' != ''">
<!--
The WixLibrarySearchPaths property is set to find assemblies in the following order:
(1) $(ReferencePaths) - the reference paths property, which comes from the .USER file.
(2) The hintpath from the referenced item itself, indicated by {HintPathFromItem}.
(3) Treat the reference's Include as if it were a real file name.
(4) Path specified by the WixExtDir property.
-->
<CreateProperty Condition=" '$(WixLibrarySearchPaths)' == '' " Value="
$(ReferencePaths);
{HintPathFromItem};
{RawFileName};
$(WixExtDir)
">
<Output TaskParameter="Value" PropertyName="WixLibrarySearchPaths" />
</CreateProperty>
<ResolveWixReferences
WixReferences="@(WixLibrary)"
SearchPaths="$(WixLibrarySearchPaths)"
SearchFilenameExtensions=".wixlib">
<Output TaskParameter="ResolvedWixReferences" ItemName="_AllResolvedWixLibraryPaths" />
</ResolveWixReferences>
<!-- Remove duplicate library items that would cause build errors -->
<RemoveDuplicates Inputs="@(_AllResolvedWixLibraryPaths)">
<Output TaskParameter="Filtered" ItemName="_ResolvedWixLibraryPaths" />
</RemoveDuplicates>
<!-- TODO: Recurse any project references that build wixlibs or wixext and add their outputs to WixLibrary or WixExtension -->
<!-- TODO: Copy the references marked with CopyLocal=true to the output directory -->
</Target> </Target>
<!-- <!--
@ -1222,7 +1283,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
<PropertyGroup> <PropertyGroup>
<CompileDependsOn> <CompileDependsOn>
PrepareForBuild; PrepareForBuild;
ResolveWixExtensionPaths ResolveWixExtensionReferences
</CompileDependsOn> </CompileDependsOn>
</PropertyGroup> </PropertyGroup>
<Target <Target
@ -1287,7 +1348,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
<PropertyGroup> <PropertyGroup>
<LibDependsOn> <LibDependsOn>
PrepareForBuild; PrepareForBuild;
ResolveWixExtensionPaths ResolveWixExtensionReferences
</LibDependsOn> </LibDependsOn>
</PropertyGroup> </PropertyGroup>
<Target <Target
@ -1360,7 +1421,10 @@ Copyright (c) Microsoft Corporation. All rights reserved.
================================================================================================ ================================================================================================
--> -->
<Target Name="AssignCultures"> <Target
Name="AssignCultures"
Condition=" ('$(OutputType)' == 'Package' or '$(OutputType)' == 'PatchCreation' or '$(OutputType)' == 'Module')">
<WixAssignCulture <WixAssignCulture
Cultures="$(Cultures)" Cultures="$(Cultures)"
Files="@(EmbeddedResource)" Files="@(EmbeddedResource)"
@ -1421,7 +1485,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
<PropertyGroup> <PropertyGroup>
<LinkDependsOn> <LinkDependsOn>
PrepareForBuild; PrepareForBuild;
ResolveWixExtensionPaths; ResolveReferences;
AssignCultures; AssignCultures;
</LinkDependsOn> </LinkDependsOn>
</PropertyGroup> </PropertyGroup>
@ -1431,8 +1495,8 @@ Copyright (c) Microsoft Corporation. All rights reserved.
Inputs="@(CompileObjOutput); Inputs="@(CompileObjOutput);
@(EmbeddedResource); @(EmbeddedResource);
@(WixObject); @(WixObject);
@(WixLibrary);
@(_ResolvedProjectReferencePaths); @(_ResolvedProjectReferencePaths);
@(_ResolvedWixLibraryPaths);
@(_ResolvedWixExtensionPaths); @(_ResolvedWixExtensionPaths);
$(MSBuildAllProjects)" $(MSBuildAllProjects)"
Outputs="$(TargetPath)" Outputs="$(TargetPath)"
@ -1441,7 +1505,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
<!-- Call light using the culture subdirectory for output --> <!-- Call light using the culture subdirectory for output -->
<Light <Light
ObjectFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)" ObjectFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
AdditionalOptions="$(LinkerAdditionalOptions)" AdditionalOptions="$(LinkerAdditionalOptions)"
AllowIdenticalRows="$(AllowIdenticalRows)" AllowIdenticalRows="$(AllowIdenticalRows)"
AllowUnresolvedReferences="$(AllowUnresolvedReferences)" AllowUnresolvedReferences="$(AllowUnresolvedReferences)"
@ -1802,7 +1866,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
================================================================================================== ==================================================================================================
--> -->
<PropertyGroup> <PropertyGroup>
<PostBuildEventDependsOn></PostBuildEventDependsOn> <PostBuildEventDependsOn>GetTargetPath</PostBuildEventDependsOn>
</PropertyGroup> </PropertyGroup>
<Target <Target
Name="PostBuildEvent" Name="PostBuildEvent"
@ -1810,7 +1874,23 @@ Copyright (c) Microsoft Corporation. All rights reserved.
( '$(RunPostBuildEvent)' != 'OnOutputUpdated' or '$(_TargetOutputTimestampBeforeCompileAndLink)' != '$(_TargetOutputTimestampAfterCompileAndLink)' )" ( '$(RunPostBuildEvent)' != 'OnOutputUpdated' or '$(_TargetOutputTimestampBeforeCompileAndLink)' != '$(_TargetOutputTimestampAfterCompileAndLink)' )"
DependsOnTargets="$(PostBuildEventDependsOn)"> DependsOnTargets="$(PostBuildEventDependsOn)">
<Exec WorkingDirectory="$(OutDir)" Command="$(PostBuildEvent)" /> <ReplaceString
Text="$(PostBuildEvent)"
OldValue="!(TargetPath)"
NewValue="$(TargetPath)">
<Output TaskParameter="Text" PropertyName="ExpandedPostBuildEvent" />
</ReplaceString>
<ReplaceString
Text="$(ExpandedPostBuildEvent)"
OldValue="!(TargetPdbPath)"
NewValue="$(TargetPdbPath)">
<Output TaskParameter="Text" PropertyName="ExpandedPostBuildEvent" />
</ReplaceString>
<Exec WorkingDirectory="$(OutDir)" Command="$(ExpandedPostBuildEvent)" />
</Target> </Target>
<!-- <!--

BIN
src/Tools/wix/wui.dll
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save