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

Merge pull request #8109 from livarcocc/update_branding_to_2_1_2_and_take_2_0_4_runtime

Browse source 
Updating the CLI branding to 2.1.3 and ingesting the 2.0.4 runtime.
This commit is contained in:
Livar 2017-11-28 16:13:27 -08:00 committed by GitHub
commit a5cb7f38a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 38 additions and 39 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.1</SdkBrandName>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.3</SdkBrandName>
<MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.1</SharedFrameworkBrandName>
<SharedFrameworkBrandName>Microsoft .NET Core Runtime - 2.0.4</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>
<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"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CLI_SharedFrameworkVersion>2.0.3</CLI_SharedFrameworkVersion>
<CLI_SharedFrameworkVersion>2.0.4</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.5.179</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.6.0-beta3-62309-01</CLI_Roslyn_Version>
<CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>

2
build/Version.props
View file

@ -2,7 +2,7 @@
<PropertyGroup>
<VersionMajor>2</VersionMajor>
<VersionMinor>1</VersionMinor>
<VersionPatch>1</VersionPatch>
<VersionPatch>3</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0</li>
<li>.NET Core Runtime 2.0.0</li>
<li>.NET Core SDK 2.1.3</li>
<li>.NET Core Runtime 2.0.4</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.0.0
• .NET Core Runtime 2.0.0
• .NET Core SDK 2.1.3
• .NET Core Runtime 2.0.4
• Runtime Package Store
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.Args.Should().Contain("--fx-version 2.0.3");
result.Args.Should().Contain("--fx-version 2.0.4");
}
[Fact]

7
test/dotnet-new.Tests/GivenThatIWantANewApp.cs
View file

@ -75,14 +75,13 @@ namespace Microsoft.DotNet.New.Tests
}
[Theory]
[InlineData("console", "microsoft.netcore.app")]
[InlineData("classlib", "netstandard.library")]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName)
[InlineData("console", "microsoft.netcore.app", "2.0.0")]
[InlineData("classlib", "netstandard.library", "2.0.1")]
public void NewProjectRestoresCorrectPackageVersion(string type, string packageName, string expectedVersion)
{
var rootPath = TestAssets.CreateTestDirectory(identifier: $"_{type}").FullName;
var packagesDirectory = Path.Combine(rootPath, "packages");
var projectName = "Project";
var expectedVersion = "2.0.0";
var repoRootNuGetConfig = Path.Combine(RepoDirectoriesProvider.RepoRoot, "NuGet.Config");
new NewCommand()