BobArnson: SFBUG:3288872 - add Control loc overrides to fi-FI localiz…

…ation. BobArnson: SFBUG:3302804 - prevent hidden variables from showing up in log. RobMen: SFBUG:3459756 - pause autoupdates during execution in Burn. Only allow one Burn to be executing at at time. RobMen: SFBUG:3488534 - launch maintenance mode when Bundle already installed. Add WixBundleInstalled and WixBundleAction built-in variables. RobMen: Improve logging about cached packages in Burn. RobMen: Disable check to allow only one Burn to be executing at a time due to embedded and related bundle handling. HeathS: Improved logging when source list registration failed. RobMen: Fix progress from embedded/related bundles in Burn. BobArnson: SFBUG:3439124 - Use Control localization in locutil to localize ThmUtil controls. RobMen: Implement WixBundleLastUsedSource in Burn to better handle prompt for source scenarios. RobMen: Fix Burn progress for repair/uninstall and layout. Improve Burn acquisition logging a little more. BobArnson: Switch from Hyperlink to Hypertext controls in WixStdBA themes. Localization string ids have changed. RobMen: SFBUG:3495355 - fix feature selection for superseded MSIs in Burn. HeathS: Changed default bundle provider key to UpgradeCode and Version. RobMen: SFBUG:3487838 - Fix per-user packages in Burn. RobMen: SFBUG:3196900 - Burn attempts rollback of MSI packages even if the cancel happened after MSI finalized installation. Add execute state to log during Burn apply. BobArnson: Fix SFBUG:3496347 - tell the rich-edit control how much text is coming. Add WixStandardBootstrapperApplication and WixManagedBootstrapperApplicationHost to BalUtilExtension to simplify authoring of BA options (instead of undiscoverable WixVariables). Add bal:WixStandardBootstrapperApplication/@SuppressOptionsUI to hide the Options button if a bundle installation directory shouldn't be supported. Add bal:WixStandardBootstrapperApplication/@SuppressDowngradeFailure to let attempted downgrades happen. This is useful for redistributable bundles where a later version major-upgrades prior versions and where a product that ships with a prior version shouldn't cause an error when a later version of the redistributable is already present. Support localized strings for license file and URL. RobMen: Default Burn packages and rollback boundaries to be vital. Add MsiPackage/@visible to control MSI visibility in ARP. BobArnson: Use ClearType when available for ThmUtil controls. WixBuild: Version 3.6.2705.0 --HG-- branch : wix36
wixtoolset · Mar 6, 2012 · 2222d3e · 2222d3e
1 parent 2cbb17e
commit 2222d3e
Show file tree

Hide file tree

Showing 91 changed files with 3,741 additions and 1,007 deletions.
diff --git a/history.txt b/history.txt
@@ -1873,3 +1873,68 @@ RobMen: SFBUG:3428804 - show restart message in wixstdba appropriately.
 
 WixBuild: Version 3.6.2627.0
 
+BobArnson: SFBUG:3288872 - add Control loc overrides to fi-FI localization.
+
+BobArnson: SFBUG:3302804 - prevent hidden variables from showing up in log.
+
+RobMen: SFBUG:3459756 - pause autoupdates during execution in Burn.
+        Only allow one Burn to be executing at at time.
+
+RobMen: SFBUG:3488534 - launch maintenance mode when Bundle already installed.
+        Add WixBundleInstalled and WixBundleAction built-in variables.
+
+RobMen: Improve logging about cached packages in Burn.
+
+RobMen: Disable check to allow only one Burn to be executing at a time due to
+        embedded and related bundle handling.
+
+HeathS: Improved logging when source list registration failed.
+
+RobMen: Fix progress from embedded/related bundles in Burn.
+
+BobArnson: SFBUG:3439124 - Use Control localization in locutil to localize
+           ThmUtil controls.
+
+RobMen: Implement WixBundleLastUsedSource in Burn to better handle prompt for
+        source scenarios.
+
+RobMen: Fix Burn progress for repair/uninstall and layout.
+        Improve Burn acquisition logging a little more.
+
+BobArnson: Switch from Hyperlink to Hypertext controls in WixStdBA themes.
+           Localization string ids have changed.
+
+RobMen: SFBUG:3495355 - fix feature selection for superseded MSIs in Burn.
+
+HeathS: Changed default bundle provider key to UpgradeCode and Version.
+
+RobMen: SFBUG:3487838 - Fix per-user packages in Burn.
+
+RobMen: SFBUG:3196900 - Burn attempts rollback of MSI packages even if the
+                        cancel happened after MSI finalized installation.
+        Add execute state to log during Burn apply.
+
+BobArnson:  Fix SFBUG:3496347 - tell the rich-edit control how much text is 
+              coming.
+            Add WixStandardBootstrapperApplication and 
+              WixManagedBootstrapperApplicationHost to BalUtilExtension to 
+              simplify authoring of BA options (instead of undiscoverable 
+              WixVariables).
+            Add bal:WixStandardBootstrapperApplication/@SuppressOptionsUI to 
+              hide the Options button if a bundle installation directory 
+              shouldn't be supported.
+            Add bal:WixStandardBootstrapperApplication/@SuppressDowngradeFailure 
+              to let attempted downgrades happen. This is useful for 
+              redistributable bundles where a later version major-upgrades 
+              prior versions and where a product that ships with a prior 
+              version shouldn't cause an error when a later version of the 
+              redistributable is already present.
+            Support localized strings for license file and URL.
+
+RobMen: Default Burn packages and rollback boundaries to be vital.
+        Add MsiPackage/@Visible to control MSI visibility in ARP.
+
+BobArnson: Use ClearType when available for ThmUtil controls.
+
+WixBuild: Version 3.6.2705.0
+
diff --git a/inc/wixver.cs b/inc/wixver.cs
@@ -11,4 +11,4 @@
 //
 
 [assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.6.2627.0")]
+[assembly: AssemblyFileVersion("3.6.2705.0")]
diff --git a/inc/wixver.h b/inc/wixver.h
@@ -1,17 +1,17 @@
 /* **************************************************************************
  * E:\delivery\Dev\wix36_public\inc\wixver.h - version information for project
  *
- * 2012.2.27 - generated by build system.
+ * 2012.3.5 - generated by build system.
  * **************************************************************************/
 
 #ifndef _VERSION_FILE_H_
 #define _VERSION_FILE_H_
 
 #define szVerMajorMinor "3.6"
-#define szVerMajorMinorBuild "3.6.2627.0"
+#define szVerMajorMinorBuild "3.6.2705.0"
 #define rmj	3
 #define rmm	6
-#define rup	2627
+#define rup	2705
 #define szVerName	"Official Release"
 
 #endif // _VERSION_FILE_H_
diff --git a/inc/wixver.targets b/inc/wixver.targets
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <WixMajorVersion>3</WixMajorVersion>
     <WixMinorVersion>6</WixMinorVersion>
-    <WixBuildVersion>2627</WixBuildVersion>
+    <WixBuildVersion>2705</WixBuildVersion>
     <WixRevisionVersion>0</WixRevisionVersion>
     <WixMajorMinorVersion>3.6</WixMajorMinorVersion>
-    <WixFullVersion>3.6.2627.0</WixFullVersion>
+    <WixFullVersion>3.6.2705.0</WixFullVersion>
   </PropertyGroup>
 </Project>
diff --git a/inc/wixver.wxi b/inc/wixver.wxi
@@ -8,7 +8,7 @@
   <?ifdef WixBuildNum?>
     <?error WixBuildNum variable is already defined?>
   <?endif?>
-  <?define WixBuildNum = "2627" ?>
+  <?define WixBuildNum = "2705" ?>
   <?ifdef WixVersion?>
     <?error WixVersion variable is already defined?>
   <?endif?>