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

Merge pull request #8945 from livarcocc/update_runtime_for_20

Browse source 
Updating the runtime to 2.0.7 and the CLI branding to 2.1.105.
This commit is contained in:
Livar 2018-03-30 20:50:29 -07:00 committed by GitHub
commit 19b0b1c8ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 64 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/Branding.props
View file

@ -1,8 +1,8 @@
<Project ToolsVersion="14.0">
<PropertyGroup>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.104</SdkBrandName>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.105</SdkBrandName>
<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.7</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
<HostFxrBrandName>Microsoft .NET Core Host FX Resolver - 2.0.0</HostFxrBrandName>

3
build/DependencyVersions.props
View file

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

2
build/Version.props
View file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -50,8 +50,8 @@
<String Id="FirstTimeWelcomeMessage">The installation was successful
The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.104
• .NET Core Runtime 2.0.6
• .NET Core SDK 2.1.105
• .NET Core Runtime 2.0.7
• Runtime Package Store
This product collects usage data

0
scripts/docker/opensuse.42.3/Dockerfile → scripts/docker/opensuse.43.2/Dockerfile
View file

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

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

30
test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
View file

@ -4,7 +4,9 @@
using System;
using System.IO;
using System.Diagnostics;
using System.Linq;
using System.Runtime.InteropServices;
using System.Xml.Linq;
using FluentAssertions;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.PlatformAbstractions;
@ -103,7 +105,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
var testInstance = TestAssets.Get(testAppName)
.CreateInstance()
.WithSourceFiles()
.WithRestoreFiles();
.WithProjectChanges(project =>
{
var ns = project.Root.Name.Namespace;
var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
// This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0.
// M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the
// latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we
// need a manual roll-forward.
propertyGroup.Add(
new XElement(ns + "RuntimeFrameworkVersion", "2.0.*"));
});
var testProjectDirectory = testInstance.Root;
@ -170,7 +184,19 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
var testInstance = TestAssets.Get(testAppName)
.CreateInstance($"PublishesSelfContained{selfContained}")
.WithSourceFiles()
.WithRestoreFiles();
.WithProjectChanges(project =>
{
var ns = project.Root.Name.Namespace;
var propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
// This is needed to be able to restore for RIDs that were not available in Microsoft.NetCore.App 2.0.0.
// M.NC.App 2.0.0 depends on a version of Microsoft.NetCore.Platforms that lacks the mapping for the
// latest RIDs. Given that self-contained apps are pinned to 2.0.0 in this version of the SDK, we
// need a manual roll-forward.
propertyGroup.Add(
new XElement(ns + "RuntimeFrameworkVersion", "2.0.*"));
});
var testProjectDirectory = testInstance.Root;