mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #8946 from livarcocc/update_branding_to_104

Browse source 
Updating the branding of the CLI to 2.1.104.
This commit is contained in:
Livar 2018-03-29 23:36:36 -07:00 • committed by GitHub
commit c5b0ed91f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/Branding.props
View file

@ -1,6 +1,6 @@
<Project ToolsVersion="14.0"> <Project ToolsVersion="14.0">
<PropertyGroup> <PropertyGroup>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.103</SdkBrandName> <SdkBrandName>Microsoft .NET Core SDK - 2.1.104</SdkBrandName>
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName> <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.6</SharedFrameworkBrandName> <SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.6</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName> <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>

2
build/DependencyVersions.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>2.0.7-servicing-26322-01</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.0.6</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion> <MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion> <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>

2
build/Version.props
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<VersionMajor>2</VersionMajor> <VersionMajor>2</VersionMajor>
<VersionMinor>1</VersionMinor> <VersionMinor>1</VersionMinor>
<VersionPatch>103</VersionPatch> <VersionPatch>104</VersionPatch>
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix> <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
<CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix> <CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>

2
packaging/osx/clisdk/resources/cs.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/de.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/en.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/es.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/fr.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/it.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/ja.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/ko.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/pl.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/ru.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/tr.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
View file

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2> <p>The following was installed at /usr/local/share/dotnet</h2>
<ul> <ul>
<li>.NET Core SDK 2.1.103</li> <li>.NET Core SDK 2.1.104</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

2
packaging/windows/clisdk/bundle.wxl
View file

@ -50,7 +50,7 @@
<String Id="FirstTimeWelcomeMessage">The installation was successful <String Id="FirstTimeWelcomeMessage">The installation was successful
The following were installed at [DOTNETHOME] The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.103 • .NET Core SDK 2.1.104
• .NET Core Runtime 2.0.6 • .NET Core Runtime 2.0.6
• Runtime Package Store • Runtime Package Store

2
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
View file

@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull(); result.Should().NotBeNull();
result.Args.Should().Contain("--fx-version 2.0.7-servicing-26322-01"); result.Args.Should().Contain("--fx-version 2.0.6");
} }
[Fact] [Fact]