BobArnson: SFBUG:3447325 - clean up message if all conditions pass

BobArnson: SFBUG:3419080 - use CSIDL_PROGRAM_FILES for 32-bit Program Files

EricStJ: Fix typo in native custom action project template setup authoring.

BobArnson: SFBUG:3431541 - handle Tab/Shift+Tab for rich-edit control

BobArnson: - Add Hypertext control to ThmUtil (using Syslink commctrl)
           - Add Hypertext/Richedit link handling to ThmUtil

RobMen (jbtibor): SFBUG:3467540 - fix WixUI_ro-RO.wxl file.

PMarcu: Adjusting retry message on failure of database commit.

HeathS: Ignore the return code when registering MSI package source.

RobMen: SFBUG:3431330;3458417 - wixstdba uninstall cancel now rollback.
        SFBUG:3431449 - disable wixsdtba cancel button appropriately.
        SFBUG:3476390 - fix wixstdba crash when cancelling.

WixBuild: Version 3.6.2624.0

RobMen: Prevent hang if Burn pipe communication fail during initialization.

RobMen: Improve cancel handling in Burn during parallel cache and rollback.

greggm: Add more support for Vista-and-later firewall rules: descriptions and
        application+port/protocol rules.

RobMen: SFBUG:3428949 - enable wixstdba to show hyperlinks in failure messages.
        SFBUG:3431333 - enable wixstdba cancel confirmation to be localized.

HeathS: Reduced number of strings compiled into the executable.

HeathS: Added related bundle test for chained uninstall.

RobMen: Burn will continue without logging when appending to ensure setup
        always resumes after restart.

BobArnson: Add <Control> to .wxl schema: Override size, location, and text of
           MSI UI controls.

RobMen: SFBUG:3428804 - show restart message in wixstdba appropriately.

WixBuild: Version 3.6.2627.0

--HG--
branch : wix36

history.txt

@@ -1826,3 +1826,50 @@ RobMen: Display related bundles in plan in Burn log.
 
 WixBuild: Version 3.6.2617.0
 
+BobArnson: SFBUG:3447325 - clean up message if all conditions pass
+
+BobArnson: SFBUG:3419080 - use CSIDL_PROGRAM_FILES for 32-bit Program Files
+
+EricStJ: Fix typo in native custom action project template setup authoring.
+
+BobArnson: SFBUG:3431541 - handle Tab/Shift+Tab for rich-edit control
+
+BobArnson: - Add Hypertext control to ThmUtil (using Syslink commctrl)
+           - Add Hypertext/Richedit link handling to ThmUtil
+
+RobMen (jbtibor): SFBUG:3467540 - fix WixUI_ro-RO.wxl file.
+
+PMarcu: Adjusting retry message on failure of database commit.
+
+HeathS: Ignore the return code when registering MSI package source.
+
+RobMen: SFBUG:3431330;3458417 - wixstdba uninstall cancel now rollback.
+        SFBUG:3431449 - disable wixsdtba cancel button appropriately.
+        SFBUG:3476390 - fix wixstdba crash when cancelling.
+
+WixBuild: Version 3.6.2624.0
+
+RobMen: Prevent hang if Burn pipe communication fail during initialization.
+
+RobMen: Improve cancel handling in Burn during parallel cache and rollback.
+
+greggm: Add more support for Vista-and-later firewall rules: descriptions and
+        application+port/protocol rules.
+
+RobMen: SFBUG:3428949 - enable wixstdba to show hyperlinks in failure messages.
+        SFBUG:3431333 - enable wixstdba cancel confirmation to be localized.
+
+HeathS: Reduced number of strings compiled into the executable.
+
+HeathS: Added related bundle test for chained uninstall.
+
+RobMen: Burn will continue without logging when appending to ensure setup
+        always resumes after restart.
+
+BobArnson: Add <Control> to .wxl schema: Override size, location, and text of
+           MSI UI controls.
+
+RobMen: SFBUG:3428804 - show restart message in wixstdba appropriately.
+
+WixBuild: Version 3.6.2627.0
+

inc/wixver.cs

@@ -11,4 +11,4 @@
 //
 
 [assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.6.2617.0")]
+[assembly: AssemblyFileVersion("3.6.2627.0")]

inc/wixver.h

@@ -1,17 +1,17 @@
 /* **************************************************************************
  * E:\delivery\Dev\wix36_public\inc\wixver.h - version information for project
  *
- * 2012.2.17 - generated by build system.
+ * 2012.2.27 - generated by build system.
  * **************************************************************************/
 
 #ifndef _VERSION_FILE_H_
 #define _VERSION_FILE_H_
 
 #define szVerMajorMinor "3.6"
-#define szVerMajorMinorBuild "3.6.2617.0"
+#define szVerMajorMinorBuild "3.6.2627.0"
 #define rmj	3
 #define rmm	6
-#define rup	2617
+#define rup	2627
 #define szVerName	"Official Release"
 
 #endif // _VERSION_FILE_H_

inc/wixver.targets

@@ -3,9 +3,9 @@
   <PropertyGroup>
     <WixMajorVersion>3</WixMajorVersion>
     <WixMinorVersion>6</WixMinorVersion>
-    <WixBuildVersion>2617</WixBuildVersion>
+    <WixBuildVersion>2627</WixBuildVersion>
     <WixRevisionVersion>0</WixRevisionVersion>
     <WixMajorMinorVersion>3.6</WixMajorMinorVersion>
-    <WixFullVersion>3.6.2617.0</WixFullVersion>
+    <WixFullVersion>3.6.2627.0</WixFullVersion>
   </PropertyGroup>
 </Project>

inc/wixver.wxi

@@ -8,7 +8,7 @@
   <?ifdef WixBuildNum?>
     <?error WixBuildNum variable is already defined?>
   <?endif?>
-  <?define WixBuildNum = "2617" ?>
+  <?define WixBuildNum = "2627" ?>
   <?ifdef WixVersion?>
     <?error WixVersion variable is already defined?>
   <?endif?>

src/Setup/NativeSdkMsi/ProjectTemplates.wxs

@@ -6,7 +6,7 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
-        <ComponentGroup Id="ProjectTemplates" Directory="VsItemTemplatesWix$(var.VisualStudioTargetVersion)Folder">
+        <ComponentGroup Id="ProjectTemplates" Directory="VsProjectTemplatesWix$(var.VisualStudioTargetVersion)Folder">
           <Component>
             <File Name="CustomActionCPP_$(var.VisualStudioTargetVersion).zip" />
           </Component>

src/WixTasks/wix200x.targets

@@ -63,7 +63,7 @@ Copyright (c) Microsoft Corporation. All rights reserved.
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(MSBuildExtensionsPath)\..\WiX Toolset v3.6\bin\WixTasks.dll</WixTasksPath>
     <LuxTargetsPath Condition=" '$(LuxTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Lux.targets</LuxTargetsPath>
-    <LuxTasksPath Condition=" '$(LuxTasksPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\..\WiX Toolset XML v3.6\bin\LuxTasks.dll</LuxTasksPath>
+    <LuxTasksPath Condition=" '$(LuxTasksPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\..\WiX Toolset v3.6\bin\LuxTasks.dll</LuxTasksPath>
     <LuxTargetsPath Condition=" '$(LuxTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Lux.targets</LuxTargetsPath>
     <LuxTasksPath Condition=" '$(LuxTasksPath)' == '' ">$(MSBuildExtensionsPath)\..\WiX Toolset v3.6\bin\LuxTasks.dll</LuxTasksPath>
   </PropertyGroup>