Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/relea…

…se/2.0.0-to-master-20170620-070043 * dotnet/release/2.0.0: (34 commits) Simple clean up to the store tests Updating xlf files for the Configurer. Removing NuGetConfig from the first run experience and replacing the sentinel with the FirstUseNoticeSentinel when needed. Moving the expanding fallback folder to the dotnet folder hive. The folder will be expanded at sdk/NuGetFallbackFolder. Fixing CRLF issue. Updating xlf and fixing line ending problems with one file. Add rhel and Debian download link Fix race in telemetry msbuild arg tests Avoid repeating the first-run message if lzma archive is missing Use fluent helper for line-end normalization Update CoreSetup to preview3-25419-01 Updating Roslyn to 2.3.0-beta3-61816-04 Update CoreSetup to preview3-25418-01 insert new tpv2 which fixes following issue microsoft/vstest#632 microsoft/vstest#844 microsoft/vstest#847 microsoft/vstest#840 microsoft/vstest#843 Windows installer refresh Update SDK to 1.1.0-alpha-20170615-3 Updating NuGet to 4.3.0-preview3-4168 MSBuild 15.3.388 Make dotnet-sln-add.Tests pass on localized setup Make dotnet-sln-list.Tests pass on localized setup ...
dotnet · Jun 20, 2017 · 9258d7c · 9258d7c
2 parents bd7bd69 + 3299513
commit 9258d7c
Show file tree

Hide file tree

Showing 435 changed files with 2,587 additions and 1,368 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -45,6 +45,8 @@
 *.fsx text=auto
 *.hs text=auto
 
+*.props text=auto
+*.targets text=auto
 *.csproj text=auto
 *.vbproj text=auto
 *.fsproj text=auto

diff --git a/README.md b/README.md
@@ -76,9 +76,9 @@ In order to download just the .NET Core runtime without the SDK, please visit ht
 | **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
 | **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
 | **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
-| **Debian 8**  | tar.gz - See **Linux x64** |
+| **Debian 8**  | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
 | **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** |
-| **RHEL 7.2** | tar.gz - See **Linux x64** |
+| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
 | **Fedora 24** | tar.gz - See **Linux x64** |
 | **OpenSUSE 42.1** | tar.gz - See **Linux x64** |
 
@@ -115,6 +115,12 @@ In order to download just the .NET Core runtime without the SDK, please visit ht
 [ubuntu-16.10-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-ubuntu.16.10-x64.deb
 [ubuntu-16.10-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-ubuntu.16.10-x64.deb.sha
 
+[debian-8-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb
+[debian-8-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-debian-x64.deb.sha
+
+[rhel-7-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm
+[rhel-7-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/release/2.0.0/dotnet-sdk-latest-rhel-x64.rpm.sha
+
 # Debian daily feed
 
 Newest SDK binaries for 2.0.0 in debian feed may be delayed due to external issues by up to 24h.

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
@@ -1,46 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-preview3-25415-01</CLI_SharedFrameworkVersion>
-    <CLI_MSBuild_Version>15.3.0-preview-000388-01</CLI_MSBuild_Version>
-    <CLI_Roslyn_Version>2.3.0-beta3-61814-09</CLI_Roslyn_Version>
-    <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
-    <CLI_FSharp_Version>4.2.0-rc-170602-0</CLI_FSharp_Version>
-
-    <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
-         cases, so use separate properties but derive one from the other unless we want to
-         explicitly use different versions. -->
-    <CLI_NETSDK_Version>2.0.0-preview2-20170615-7</CLI_NETSDK_Version>
-    <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
-
-    <CLI_NuGet_Version>4.3.0-preview3-4168</CLI_NuGet_Version>
-    <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview2-25331-02</CLI_NETStandardLibraryNETFrameworkVersion>
-    <CLI_WEBSDK_Version>2.0.0-rel-20170518-512</CLI_WEBSDK_Version>
-    <CLI_TestPlatform_Version>15.3.0-preview-20170609-02</CLI_TestPlatform_Version>
-    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
-    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
-    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-    <TemplateEngineVersion>1.0.0-beta2-20170608-254</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta2-20170612-258</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170612-258</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview3-25415-01</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview3-25415-01</DependencyModelVersion>
-    <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
-    <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
-    <MicroBuildVersion>0.2.0</MicroBuildVersion>
-    <SpaTemplateVersion>1.0.0-preview-000297</SpaTemplateVersion>
-
-    <!-- This should either be timestamped or notimestamp as appropriate -->
-    <AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
-    <AspNetCoreRuntimeVersion>2.0.0-preview2-186</AspNetCoreRuntimeVersion>
-    <AspNetCoherenceLabel>preview2</AspNetCoherenceLabel>
-    <AspNetCoreCoherenceTimestamp>25661</AspNetCoreCoherenceTimestamp>
-
-  </PropertyGroup>
-
-  <!-- infrastructure and test only dependencies -->
-  <PropertyGroup>
-    <VersionToolsVersion>1.0.27-prerelease-01611-04</VersionToolsVersion>
-    <DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
-  </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <CLI_SharedFrameworkVersion>2.0.0-preview3-25419-01</CLI_SharedFrameworkVersion>
+    <CLI_MSBuild_Version>15.3.0-preview-000388-01</CLI_MSBuild_Version>
+    <CLI_Roslyn_Version>2.3.0-beta3-61816-04</CLI_Roslyn_Version>
+    <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
+    <CLI_FSharp_Version>4.2.0-rc-170602-0</CLI_FSharp_Version>
+
+    <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
+         cases, so use separate properties but derive one from the other unless we want to
+         explicitly use different versions. -->
+    <CLI_NETSDK_Version>2.0.0-preview2-20170615-7</CLI_NETSDK_Version>
+    <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
+
+    <CLI_NuGet_Version>4.3.0-preview3-4168</CLI_NuGet_Version>
+    <CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview2-25331-02</CLI_NETStandardLibraryNETFrameworkVersion>
+    <CLI_WEBSDK_Version>2.0.0-rel-20170518-512</CLI_WEBSDK_Version>
+    <CLI_TestPlatform_Version>15.3.0-preview-20170618-03</CLI_TestPlatform_Version>
+    <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
+    <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
+    <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
+    <TemplateEngineVersion>1.0.0-beta2-20170608-254</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta2-20170612-258</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170612-258</TemplateEngineTemplate2_0Version>
+    <PlatformAbstractionsVersion>2.0.0-preview3-25419-01</PlatformAbstractionsVersion>
+    <DependencyModelVersion>2.0.0-preview3-25419-01</DependencyModelVersion>
+    <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
+    <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
+    <MicroBuildVersion>0.2.0</MicroBuildVersion>
+    <SpaTemplateVersion>1.0.0-preview-000297</SpaTemplateVersion>
+    <XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
+
+    <!-- This should either be timestamped or notimestamp as appropriate -->
+    <AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
+    <AspNetCoreRuntimeVersion>2.0.0-preview2-186</AspNetCoreRuntimeVersion>
+    <AspNetCoherenceLabel>preview2</AspNetCoherenceLabel>
+    <AspNetCoreCoherenceTimestamp>25661</AspNetCoreCoherenceTimestamp>
+
+  </PropertyGroup>
+
+  <!-- infrastructure and test only dependencies -->
+  <PropertyGroup>
+    <VersionToolsVersion>1.0.27-prerelease-01611-04</VersionToolsVersion>
+    <DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
+  </PropertyGroup>
+</Project>
diff --git a/build/GenerateResxSource.targets b/build/GenerateResxSource.targets
@@ -15,12 +15,16 @@
   </Target>
 
   <Target Name="CustomizeResourceNames"
-          BeforeTargets="PrepareResourceNames"
+          BeforeTargets="PrepareResourceNames;GatherXlf"
           >
     <ItemGroup>
-      <EmbeddedResource>
-        <ManifestResourceName Condition="'%(EmbeddedResource.Namespace)' != ''">%(EmbeddedResource.Namespace).%(EmbeddedResource.Filename)</ManifestResourceName>
+      <EmbeddedResource Condition="'%(EmbeddedResource.Namespace)' != ''">
+        <ManifestResourceName>%(EmbeddedResource.Namespace).%(EmbeddedResource.Filename)</ManifestResourceName>
       </EmbeddedResource>
+      <XlfSource Condition="'%(XlfSource.Namespace)' != ''">
+        <ManifestResourceName>%(XlfSource.Namespace).%(XlfSource.Filename)</ManifestResourceName>
+        <XlfTranslatedFileName>%(XlfSource.Namespace).%(XlfSource.Filename)</XlfTranslatedFileName>
+      </XlfSource>
     </ItemGroup>
   </Target>
 
@@ -35,7 +39,7 @@
 
   <Target Name="GetEmbeddedResourcesWithSourceGeneration">
     <ItemGroup>
-      <EmbeddedResourceSG Include="@(EmbeddedResource)" Condition="'%(EmbeddedResource.GenerateSource)' == 'true'" />
+      <EmbeddedResourceSG Include="@(EmbeddedResource)" Condition="'%(EmbeddedResource.GenerateSource)' == 'true' and '%(EmbeddedResource.XlfLanguage)' == ''" />
       <EmbeddedResourceSG>
         <SourceOutputPath>$(IntermediateOutputPath)%(EmbeddedResourceSG.ManifestResourceName).cs</SourceOutputPath>
       </EmbeddedResourceSG>

diff --git a/build/Signing.proj b/build/Signing.proj
@@ -39,13 +39,15 @@
       <FilesToSign Include="$(OutputDirectory)/sdk/**/csc.exe;
                             $(OutputDirectory)/sdk/**/csc.dll;
                             $(OutputDirectory)/sdk/**/dotnet.dll;
+                            $(OutputDirectory)/sdk/**/dotnet.resources.dll;
                             $(OutputDirectory)/sdk/**/System.*.dll;
                             $(OutputDirectory)/sdk/**/Microsoft.*.dll;
                             $(OutputDirectory)/sdk/**/NuGet*.dll;
                             $(OutputDirectory)/sdk/**/datacollector.dll;
                             $(OutputDirectory)/sdk/**/MSBuild.dll;
                             $(OutputDirectory)/sdk/**/testhost.dll;
-                            $(OutputDirectory)/sdk/**/vstest.console.dll">
+                            $(OutputDirectory)/sdk/**/vstest.console.dll;
+                            $(OutputDirectory)/sdk/**/vstest.console.resources.dll">
         <Authenticode>$(InternalCertificateId)</Authenticode>
       </FilesToSign>
       <!-- Built files for the packages -->

diff --git a/packaging/deb/postinst b/packaging/deb/postinst
@@ -2,7 +2,7 @@
 echo "This software may collect information about you and your use of the software, and send that to Microsoft."
 echo "Please visit http://aka.ms/dotnet-cli-eula for more information."
 
-# Run 'dotnet new' as the user to trigger the first time experience to initialize the cache
+# Run 'dotnet new' to trigger the first time experience to initialize the cache
 echo "Welcome to .NET Core!
 ---------------------
 Learn more about .NET Core @ https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
@@ -15,4 +15,4 @@ The data collected is anonymous and will be published in an aggregated form for
 
 The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry."
 
-su - $SUDO_USER -c "dotnet new > /dev/null 2>&1 || true"
+dotnet new > /dev/null 2>&1 || true
diff --git a/packaging/osx/clisdk/scripts/postinstall b/packaging/osx/clisdk/scripts/postinstall
@@ -11,8 +11,7 @@ INSTALL_DESTINATION=$2
 # A temporary fix for the permissions issue(s)
 chmod -R 755 $INSTALL_DESTINATION
 
-# Run 'dotnet new' as user to trigger the first time experience to initialize the cache
-INSTALLER_USER=$(stat -f '%Su' $HOME)
-su - $INSTALLER_USER -c "$INSTALL_DESTINATION/dotnet new > /dev/null 2>&1 || true"
+# Run 'dotnet new' to trigger the first time experience to initialize the cache
+$INSTALL_DESTINATION/dotnet new > /dev/null 2>&1 || true
 
 exit 0
diff --git a/packaging/rpm/scripts/after_install_host.sh b/packaging/rpm/scripts/after_install_host.sh
@@ -19,4 +19,4 @@ The data collected is anonymous and will be published in an aggregated form for
 
 The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry."
 
-su - $SUDO_USER -c "dotnet new > /dev/null 2>&1 || true"
+dotnet new > /dev/null 2>&1 || true
diff --git a/packaging/windows/clisdk/bundle.thm b/packaging/windows/clisdk/bundle.thm
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
-  <Window Width="620" Height="418" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
+  <Window Width="660" Height="488" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
     <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
     <Font Id="1" Height="-24" Weight="900" Foreground="FFFFFF" Background="682079">Segoe UI</Font>
     <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
@@ -20,19 +20,23 @@
     </Page>
     <Page Name="Install">
         <Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
-        <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
-
-        <Text X="11" Y="80" Width="135" Height="100" FontId="5" DisablePrefix="yes">#(loc.Motto)</Text>
+        <Text X="0" Y="0" Width="660" Height="75" FontId="1" />
 
         <Text X="155" Y="80" Width="-11" Height="-70" TabStop="no" FontId="2" HexStyle="0x800000" DisablePrefix="yes" />
-        <Richedit Name="EulaRichedit" X="158" Y="81" Width="-12" Height="-71" TabStop="yes" FontId="0" />
-        <Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
-        <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
+        <Text Name="WelcomeHeaderMessage" X="160" Y="81" Width="300" Height="30" TabStop="yes" FontId="2">#(loc.WelcomeHeaderMessage)</Text>
+        <Text Name="WelcomeDescription" X="160" Y="125" Width="460" Height="65" TabStop="yes" FontId="3">#(loc.WelcomeDescription)</Text>
+        <Text Name="LearnMoreTitle" X="160" Y="179" Width="460" Height="30" TabStop="yes" FontId="2">#(loc.LearnMoreTitle)</Text>
+        <Hypertext Name="CoreDocumentationLink" X="185" Y="223" Width="400" Height="22" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.CoreDocumentationLink)</Hypertext>
+        <Hypertext Name="SDKDocumentation" X="185" Y="243" Width="400" Height="22" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SDKDocumentation)</Hypertext>
+        <Hypertext Name="PrivacyStatementLink" X="185" Y="263" Width="400" Height="22" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.PrivacyStatementLink)</Hypertext>
+        <Hypertext Name="MITLicenseLink" X="185" Y="283" Width="400" Height="22" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.MITLicenseLink)</Hypertext>
+        <Text Name="InstallationNoteTitle" X="160" Y="308" Width="460" Height="30" TabStop="yes" FontId="2">#(loc.InstallationNoteTitle)</Text>
+        <Text Name="InstallationNote" X="160" Y="352" Width="460" Height="30" TabStop="yes" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.InstallationNote)</Text>
         <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
         <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
     </Page>
     <Page Name="FilesInUse">
-        <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
+      <Text X="0" Y="0" Width="660" Height="75" FontId="1" />
 
       <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
       <Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
@@ -47,7 +51,7 @@
     </Page>
     <Page Name="Progress">
         <Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
-        <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
+        <Text X="0" Y="0" Width="660" Height="75" FontId="1" />
 
         <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
         <Text X="11" Y="121" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
@@ -57,7 +61,7 @@
     </Page>
     <Page Name="Modify">
         <Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
-        <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
+        <Text X="0" Y="0" Width="660" Height="75" FontId="1" />
 
         <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
         <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
@@ -66,20 +70,20 @@
     </Page>
     <Page Name="Success">
         <Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
-        <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
+        <Text X="0" Y="0" Width="660" Height="75" FontId="1" />
 
         <Text Name="SuccessHeader" X="11" Y="80"  Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
-        <Richedit Name="SuccessInstallHeader" X="158" Y="81" Width="-12" Height="-71" FontId="5" HideWhenDisabled="yes">#(loc.FirstTimeWelcomeMessage)</Richedit>
-        <Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
-        <Text Name="SuccessUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
+        <Richedit Name="SuccessInstallHeader" X="160" Y="81" Width="-12" Height="-71" FontId="5" HideWhenDisabled="yes">#(loc.FirstTimeWelcomeMessage)</Richedit>
+        <Text Name="SuccessRepairHeader" X="160" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
+        <Text Name="SuccessUninstallHeader" X="160" Y="80" Width="-11" Height="400" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
         <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
         <Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
         <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
         <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
     </Page>
     <Page Name="Failure">
         <Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
-        <Text X="0" Y="0" Width="620" Height="75" FontId="1" />
+        <Text X="0" Y="0" Width="660" Height="75" FontId="1" />
 
         <Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
         <Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>