diff --git a/build/Branding.props b/build/Branding.props index 07cf66d29..913041dac 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -1,9 +1,9 @@ - Microsoft .NET Core SDK 2.0.0 Preview 2 - Microsoft .NET Core Runtime 2.0.0 - Microsoft .NET Core Host 2.0.0 - Microsoft .NET Core Host FX Resolver 2.0.0 + Microsoft .NET Core SDK - 2.0.0 Preview 2 + Microsoft .NET Core Runtime - 2.0.0 + Microsoft .NET Core Host - 2.0.0 + Microsoft .NET Core Host FX Resolver - 2.0.0 Microsoft.NETCore.App $(SharedFrameworkName) diff --git a/packaging/windows/clisdk/bundle.thm b/packaging/windows/clisdk/bundle.thm index 71b7ef054..a9c3d64d3 100644 --- a/packaging/windows/clisdk/bundle.thm +++ b/packaging/windows/clisdk/bundle.thm @@ -1,6 +1,6 @@ - #(loc.Caption) + #(loc.Caption) Segoe UI Segoe UI Segoe UI @@ -20,19 +20,23 @@ - - - #(loc.Motto) + - - #(loc.InstallAcceptCheckbox) - + #(loc.WelcomeHeaderMessage) + #(loc.WelcomeDescription) + #(loc.LearnMoreTitle) + #(loc.CoreDocumentationLink) + #(loc.SDKDocumentation) + #(loc.PrivacyStatementLink) + #(loc.MITLicenseLink) + #(loc.InstallationNoteTitle) + #(loc.InstallationNote) - + #(loc.FilesInUseHeader) #(loc.FilesInUseLabel) @@ -47,7 +51,7 @@ - + #(loc.ProgressHeader) #(loc.ProgressLabel) @@ -57,7 +61,7 @@ - + #(loc.ModifyHeader) @@ -66,12 +70,12 @@ - + #(loc.SuccessHeader) - #(loc.FirstTimeWelcomeMessage) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) + #(loc.FirstTimeWelcomeMessage) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) #(loc.SuccessRestartText) @@ -79,7 +83,7 @@ - + #(loc.FailureHeader) #(loc.FailureInstallHeader) diff --git a/packaging/windows/clisdk/bundle.wxl b/packaging/windows/clisdk/bundle.wxl index e61e26427..7c93a4955 100644 --- a/packaging/windows/clisdk/bundle.wxl +++ b/packaging/windows/clisdk/bundle.wxl @@ -2,9 +2,6 @@ [WixBundleName] Installer [BUNDLEMONIKER] - You just need a shell, a text editor and 10 minutes of your time. - -Ready? Set? Let's go! Are you sure you want to cancel? Previous version Setup Help @@ -50,16 +47,30 @@ Ready? Set? Let's go! &Do not close applications. A reboot will be required. &OK &Cancel - Installation completed successfully. Welcome to .NET Core! + The installation was successful -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. +The following were installed at [DOTNETHOME] + • .NET Core SDK 2.0.0 + • .NET Core Runtime 2.0.0 + • Runtime Package Store -.NET Core Tools Telemetry +Resources -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. - -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. - -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. + • Core Documentation https://aka.ms/dotnet-docs + • SDK Documentation https://aka.ms/dotnet-cli-docs + • Release Notes https://aka.ms/20-p2-rel-notes + • Tutorials https://aka.ms/dotnet-tutorials + • .NET Core Telemetry https://aka.ms/dotnet-cli-telemetry + .NET Core SDK + + .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! + Learn more about .NET Core + Resources + <A HREF="https://aka.ms/dotnet-docs">Core Documentation</A> + <A HREF="https://aka.ms/dotnet-cli-docs">SDK Documentation</A> + <A HREF="https://aka.ms/dev-privacy">Privacy Statement</A> + <A HREF="https://aka.ms/dotnet-license">MIT License</A> + Installation note + 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.