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

Updating the branding of the CLI to 2.1.100 #8389

Merged
merged 4 commits into from
Jan 16, 2018
Merged

Updating the branding of the CLI to 2.1.100 #8389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6d3b45
Updating the branding of the CLI to 2.1.100
livarcocc Jan 12, 2018
1c380b3
Merge branch 'release/2.1.1xx' into update_branding_for_2_1_100
Jan 13, 2018
8caa7b9
Updating the channel to release/2.1.1xx. We can manually update relea…
livarcocc Jan 16, 2018
e7625eb
Merge branch 'update_branding_for_2_1_100' of github.com:livarcocc/cl…
livarcocc Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/BranchInfo.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Channel>release/15.5</Channel>
<BranchName>release/15.5</BranchName>
<Channel>release/2.1.1xx</Channel>
<BranchName>release/2.1.1xx</BranchName>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion build/Branding.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project ToolsVersion="14.0">
<PropertyGroup>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.4</SdkBrandName>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.100</SdkBrandName>
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.5</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
Expand Down
2 changes: 1 addition & 1 deletion build/Version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<VersionMajor>2</VersionMajor>
<VersionMinor>1</VersionMinor>
<VersionPatch>4</VersionPatch>
<VersionPatch>100</VersionPatch>
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>

<CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/cs.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/de.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/en.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/es.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/fr.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/it.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/ja.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/ko.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/pl.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/ru.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/tr.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px">
<p>The following was installed at /usr/local/share/dotnet</h2>
<ul>
<li>.NET Core SDK 2.1.4</li>
<li>.NET Core SDK 2.1.100</li>
<li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion packaging/windows/clisdk/bundle.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<String Id="FirstTimeWelcomeMessage">The installation was successful

The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.4
• .NET Core SDK 2.1.100
• .NET Core Runtime 2.0.5
• Runtime Package Store

Expand Down