Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 07ce4a0

Browse files
author
William Li
committed
Windows installer refresh
According to https://github.com/dotnet/cli/issues/6683 - Remove Motto - Change size to fit the first screen - Update Introduction step content - Include installation location and list of all components installed - Update Summary step content
1 parent dc88177 commit 07ce4a0

File tree

3 files changed

+45
-30
lines changed

3 files changed

+45
-30
lines changed

‎build/Branding.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project ToolsVersion="14.0">
22
<PropertyGroup>
3-
<SdkBrandName>Microsoft .NET Core SDK 2.0.0 Preview 2</SdkBrandName>
4-
<SharedFrameworkBrandName>Microsoft .NET Core Runtime 2.0.0</SharedFrameworkBrandName>
5-
<SharedHostBrandName>Microsoft .NET Core Host 2.0.0</SharedHostBrandName>
6-
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver 2.0.0</HostFxrBrandName>
3+
<SdkBrandName>Microsoft .NET Core SDK - 2.0.0 Preview 2</SdkBrandName>
4+
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.0</SharedFrameworkBrandName>
5+
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.0</SharedHostBrandName>
6+
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName>
77

88
<SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
99
<SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>

‎packaging/windows/clisdk/bundle.thm‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
3-
<Window Width="620" Height="418" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
3+
<Window Width="660" Height="488" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
44
<Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
55
<Font Id="1" Height="-24" Weight="900" Foreground="FFFFFF" Background="682079">Segoe UI</Font>
66
<Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
@@ -20,19 +20,23 @@
2020
</Page>
2121
<Page Name="Install">
2222
<Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
23-
<Text X="0" Y="0" Width="620" Height="75" FontId="1" />
24-
25-
<Text X="11" Y="80" Width="135" Height="100" FontId="5" DisablePrefix="yes">#(loc.Motto)</Text>
23+
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
2624

2725
<Text X="155" Y="80" Width="-11" Height="-70" TabStop="no" FontId="2" HexStyle="0x800000" DisablePrefix="yes" />
28-
<Richedit Name="EulaRichedit" X="158" Y="81" Width="-12" Height="-71" TabStop="yes" FontId="0" />
29-
<Checkbox Name="EulaAcceptCheckbox" X="-11" Y="-41" Width="260" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
30-
<Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
26+
<Text Name="WelcomeHeaderMessage" X="160" Y="81" Width="300" Height="30" TabStop="yes" FontId="2">#(loc.WelcomeHeaderMessage)</Text>
27+
<Text Name="WelcomeDescription" X="160" Y="125" Width="460" Height="65" TabStop="yes" FontId="3">#(loc.WelcomeDescription)</Text>
28+
<Text Name="LearnMoreTitle" X="160" Y="179" Width="460" Height="30" TabStop="yes" FontId="2">#(loc.LearnMoreTitle)</Text>
29+
<Hypertext Name="CoreDocumentationLink" X="185" Y="223" Width="400" Height="22" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.CoreDocumentationLink)</Hypertext>
30+
<Hypertext Name="SDKDocumentation" X="185" Y="243" Width="400" Height="22" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SDKDocumentation)</Hypertext>
31+
<Hypertext Name="PrivacyStatementLink" X="185" Y="263" Width="400" Height="22" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.PrivacyStatementLink)</Hypertext>
32+
<Hypertext Name="MITLicenseLink" X="185" Y="283" Width="400" Height="22" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.MITLicenseLink)</Hypertext>
33+
<Text Name="InstallationNoteTitle" X="160" Y="308" Width="460" Height="30" TabStop="yes" FontId="2">#(loc.InstallationNoteTitle)</Text>
34+
<Text Name="InstallationNote" X="160" Y="352" Width="460" Height="30" TabStop="yes" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.InstallationNote)</Text>
3135
<Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
3236
<Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
3337
</Page>
3438
<Page Name="FilesInUse">
35-
<Text X="0" Y="0" Width="620" Height="75" FontId="1" />
39+
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
3640

3741
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
3842
<Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
@@ -47,7 +51,7 @@
4751
</Page>
4852
<Page Name="Progress">
4953
<Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
50-
<Text X="0" Y="0" Width="620" Height="75" FontId="1" />
54+
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
5155

5256
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
5357
<Text X="11" Y="121" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
@@ -57,7 +61,7 @@
5761
</Page>
5862
<Page Name="Modify">
5963
<Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
60-
<Text X="0" Y="0" Width="620" Height="75" FontId="1" />
64+
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
6165

6266
<Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
6367
<Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
@@ -66,20 +70,20 @@
6670
</Page>
6771
<Page Name="Success">
6872
<Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
69-
<Text X="0" Y="0" Width="620" Height="75" FontId="1" />
73+
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
7074

7175
<Text Name="SuccessHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
72-
<Richedit Name="SuccessInstallHeader" X="158" Y="81" Width="-12" Height="-71" FontId="5" HideWhenDisabled="yes">#(loc.FirstTimeWelcomeMessage)</Richedit>
73-
<Text Name="SuccessRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
74-
<Text Name="SuccessUninstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
76+
<Richedit Name="SuccessInstallHeader" X="160" Y="81" Width="-12" Height="-71" FontId="5" HideWhenDisabled="yes">#(loc.FirstTimeWelcomeMessage)</Richedit>
77+
<Text Name="SuccessRepairHeader" X="160" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
78+
<Text Name="SuccessUninstallHeader" X="160" Y="80" Width="-11" Height="400" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
7579
<Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
7680
<Text Name="SuccessRestartText" X="-11" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
7781
<Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
7882
<Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
7983
</Page>
8084
<Page Name="Failure">
8185
<Image X="0" Y="0" Width="620" Height="418" ImageFile="bg.png" />
82-
<Text X="0" Y="0" Width="620" Height="75" FontId="1" />
86+
<Text X="0" Y="0" Width="660" Height="75" FontId="1" />
8387

8488
<Text Name="FailureHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
8589
<Text Name="FailureInstallHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>

‎packaging/windows/clisdk/bundle.wxl‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
33
<String Id="Caption">[WixBundleName] Installer</String>
44
<String Id="Title">[BUNDLEMONIKER]</String>
5-
<String Id="Motto">You just need a shell, a text editor and 10 minutes of your time.
6-
7-
Ready? Set? Let's go!</String>
85
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
96
<String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
107
<String Id="HelpHeader">Setup Help</String>
@@ -50,16 +47,30 @@ Ready? Set? Let's go!</String>
5047
<String Id="FilesInUseDontCloseRadioButton">&amp;Do not close applications. A reboot will be required.</String>
5148
<String Id="FilesInUseOkButton">&amp;OK</String>
5249
<String Id="FilesInUseCancelButton">&amp;Cancel</String>
53-
<String Id="FirstTimeWelcomeMessage">Installation completed successfully. Welcome to .NET Core!
54-
55-
Learn more about .NET Core at https://aka.ms/dotnet-docs. Use dotnet --help to see available commands or go to https://aka.ms/dotnet-cli-docs.
56-
57-
.NET Core Tools Telemetry
50+
<String Id="FirstTimeWelcomeMessage">The installation was successful
5851

59-
The .NET Core Tools include a telemetry feature that collects usage information. It is important that the .NET Team understands how the tools are being used so that we can improve them.
52+
The following were installed at [DOTNETHOME]
53+
• .NET Core SDK 2.0.0
54+
• .NET Core Runtime 2.0.0
55+
• Runtime Package Store
6056

61-
The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
57+
Resources
6258

63-
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.
59+
• Core Documentation https://aka.ms/dotnet-docs
60+
• SDK Documentation https://aka.ms/dotnet-cli-docs
61+
• Release Notes https://aka.ms/20-p2-rel-notes
62+
• Tutorials https://aka.ms/dotnet-tutorials
63+
• .NET Core Telemetry https://aka.ms/dotnet-cli-telemetry</String>
64+
<String Id="WelcomeHeaderMessage">.NET Core SDK</String>
65+
<String Id="WelcomeDescription">
66+
.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!</String>
67+
<String Id="LearnMoreTitle">Learn more about .NET Core</String>
68+
<String Id="ResourcesHeader">Resources</String>
69+
<String Id="CoreDocumentationLink">&lt;A HREF=&quot;https://aka.ms/dotnet-docs&quot;&gt;Core Documentation&lt;/A&gt;</String>
70+
<String Id="SDKDocumentation">&lt;A HREF=&quot;https://aka.ms/dotnet-cli-docs&quot;&gt;SDK Documentation&lt;/A&gt;</String>
71+
<String Id="PrivacyStatementLink">&lt;A HREF=&quot;https://aka.ms/dev-privacy&quot;&gt;Privacy Statement&lt;/A&gt;</String>
72+
<String Id="MITLicenseLink">&lt;A HREF=&quot;https://aka.ms/dotnet-license&quot;&gt;MIT License&lt;/A&gt;</String>
73+
<String Id="InstallationNoteTitle">Installation note</String>
74+
<String Id="InstallationNote">A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.
6475
</String>
6576
</WixLocalization>

0 commit comments

Comments
 (0)