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

Commit c5b0ed9

Browse files
author
Livar
authored
Merge pull request #8946 from livarcocc/update_branding_to_104
Updating the branding of the CLI to 2.1.104.
2 parents a0bb417 + 9ba1de5 commit c5b0ed9

File tree

19 files changed

+19
-19
lines changed

19 files changed

+19
-19
lines changed

‎build/Branding.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project ToolsVersion="14.0">
22
<PropertyGroup>
3-
<SdkBrandName>Microsoft .NET Core SDK - 2.1.103</SdkBrandName>
3+
<SdkBrandName>Microsoft .NET Core SDK - 2.1.104</SdkBrandName>
44
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
55
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.6</SharedFrameworkBrandName>
66
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>

‎build/DependencyVersions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<MicrosoftNETCoreAppPackageVersion>2.0.7-servicing-26322-01</MicrosoftNETCoreAppPackageVersion>
4+
<MicrosoftNETCoreAppPackageVersion>2.0.6</MicrosoftNETCoreAppPackageVersion>
55
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
66
<MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
77
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>

‎build/Version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<VersionMajor>2</VersionMajor>
44
<VersionMinor>1</VersionMinor>
5-
<VersionPatch>103</VersionPatch>
5+
<VersionPatch>104</VersionPatch>
66
<ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview</ReleaseSuffix>
77

88
<CliVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)</CliVersionPrefix>

‎packaging/osx/clisdk/resources/cs.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/de.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/en.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/es.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/fr.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/it.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/ja.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/ko.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/pl.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/ru.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/tr.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div align="left" style="font-family: Helvetica;padding-left:10px">
88
<p>The following was installed at /usr/local/share/dotnet</h2>
99
<ul>
10-
<li>.NET Core SDK 2.1.103</li>
10+
<li>.NET Core SDK 2.1.104</li>
1111
<li>.NET Core Runtime 2.0.6</li>
1212
<li>Runtime Package Store</li>
1313
</ul>

‎packaging/windows/clisdk/bundle.wxl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<String Id="FirstTimeWelcomeMessage">The installation was successful
5151

5252
The following were installed at [DOTNETHOME]
53-
• .NET Core SDK 2.1.103
53+
• .NET Core SDK 2.1.104
5454
• .NET Core Runtime 2.0.6
5555
• Runtime Package Store
5656

‎test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public void ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile()
303303

304304
result.Should().NotBeNull();
305305

306-
result.Args.Should().Contain("--fx-version 2.0.7-servicing-26322-01");
306+
result.Args.Should().Contain("--fx-version 2.0.6");
307307
}
308308

309309
[Fact]

0 commit comments

Comments
 (0)