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

Merge pull request #8853 from livarcocc/update_nuget

Browse source 
Updating NuGet to 4.6.1-rtm-5019
This commit is contained in:
Livar 2018-03-20 15:56:43 -07:00 committed by GitHub
commit c91ab95952
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 19 additions and 18 deletions
Show stats 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.102</SdkBrandName> <SdkBrandName>Microsoft .NET Core SDK - 2.1.103</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.6</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>

2
build/DependencyVersions.props
View file

@ -31,7 +31,7 @@
<MicrosoftDotNetProjectJsonMigrationPackageVersion>1.2.1-alpha-002133</MicrosoftDotNetProjectJsonMigrationPackageVersion> <MicrosoftDotNetProjectJsonMigrationPackageVersion>1.2.1-alpha-002133</MicrosoftDotNetProjectJsonMigrationPackageVersion>
<MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion> <MicrosoftDotNetToolsMigrateCommandPackageVersion>$(MicrosoftDotNetProjectJsonMigrationPackageVersion)</MicrosoftDotNetToolsMigrateCommandPackageVersion>
<MicrosoftDiaSymReaderNativePackageVersion>1.6.0-beta2-25304</MicrosoftDiaSymReaderNativePackageVersion> <MicrosoftDiaSymReaderNativePackageVersion>1.6.0-beta2-25304</MicrosoftDiaSymReaderNativePackageVersion>
<NuGetBuildTasksPackageVersion>4.6.0-rtm-4918</NuGetBuildTasksPackageVersion> <NuGetBuildTasksPackageVersion>4.6.1-rtm-5019</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion> <NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
<NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion> <NuGetCommonPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommonPackageVersion>
<NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion> <NuGetCommandLineXPlatPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetCommandLineXPlatPackageVersion>

1
build/NugetConfigFile.targets
View file

@ -31,6 +31,7 @@
<add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" /> <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
<add key="AspNetMaster" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" /> <add key="AspNetMaster" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
<add key="AspNetDev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" /> <add key="AspNetDev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
]]> ]]>
</NugetConfigCLIFeeds> </NugetConfigCLIFeeds>

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>102</VersionPatch> <VersionPatch>103</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102</li> <li>.NET Core SDK 2.1.103</li>
<li>.NET Core Runtime 2.0.6</li> <li>.NET Core Runtime 2.0.6</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.102 • .NET Core SDK 2.1.103
• .NET Core Runtime 2.0.6 • .NET Core Runtime 2.0.6
• Runtime Package Store • Runtime Package Store