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

Merged PR 102075: Update runtime and branding to 2.0.6.

Browse source 
Update runtime and branding to 2.0.6.
This commit is contained in:
Peter Huene 2018-01-18 22:13:27 +00:00
commit ab104fa26d
18 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/Branding.props
View file

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.5</SdkBrandName> <SdkBrandName>Microsoft .NET Core SDK - 2.1.5</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.5</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>
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName> <HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName>

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.5</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>2.0.6-servicing-26118-01</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftBuildPackageVersion>15.5.180</MicrosoftBuildPackageVersion> <MicrosoftBuildPackageVersion>15.5.180</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion> <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -8,7 +8,7 @@
<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.5</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.6</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>
</div> </div>

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

@ -51,7 +51,7 @@
The following were installed at [DOTNETHOME] The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.5 • .NET Core SDK 2.1.5
• .NET Core Runtime 2.0.5 • .NET Core Runtime 2.0.6
• Runtime Package Store • Runtime Package Store
This product collects usage data This product collects usage data

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.5"); result.Args.Should().Contain("--fx-version 2.0.6-servicing-26118-01");
} }
[Fact] [Fact]