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

Merged PR 101962: Merge branch 'release/2.1' into 'release/2.1-MSRC'

Browse source
This commit is contained in:
Peter Huene 2018-01-18 18:53:44 +00:00
commit 2170143a18
17 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/Branding.props
View file

@ -1,6 +1,6 @@
<Project ToolsVersion="14.0"> <Project ToolsVersion="14.0">
<PropertyGroup> <PropertyGroup>
<SdkBrandName>Microsoft .NET Core SDK - 2.1.4</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.5</SharedFrameworkBrandName>
<SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName> <SharedHostBrandName>Microsoft .NET Core Host - 2.0.1</SharedHostBrandName>

2
build/Version.props
View file

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

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -7,7 +7,7 @@
<div align="left" style="font-family: Helvetica;padding-left:10px"> <div align="left" style="font-family: Helvetica;padding-left:10px">
<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.4</li> <li>.NET Core SDK 2.1.5</li>
<li>.NET Core Runtime 2.0.5</li> <li>.NET Core Runtime 2.0.5</li>
<li>Runtime Package Store</li> <li>Runtime Package Store</li>
</ul> </ul>

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

@ -50,7 +50,7 @@
<String Id="FirstTimeWelcomeMessage">The installation was successful <String Id="FirstTimeWelcomeMessage">The installation was successful
The following were installed at [DOTNETHOME] The following were installed at [DOTNETHOME]
• .NET Core SDK 2.1.4 • .NET Core SDK 2.1.5
• .NET Core Runtime 2.0.5 • .NET Core Runtime 2.0.5
• Runtime Package Store • Runtime Package Store