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

Merge pull request #644 from dotnet/merges/release/3.0.1xx-to-master

Browse source 
Merge release/3.0.1xx to master
This commit is contained in:
Nick Guerrera 2019-02-23 09:14:13 -08:00 • committed by GitHub
commit 85d9d02aa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -10,9 +10,9 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>e1e36e48fb64a7637cbb3d340e44fb97256dfb3c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App" Version="3.0.0-preview3-19120-02">
<Dependency Name="Microsoft.AspNetCore.App" Version="3.0.0-preview3-19122-14">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>895e1c69e07f460c83b3b098466a81c7902df129</Sha>
<Sha>e65004907a633a21e7e93b1c00e3944ffb10d8f8</Sha>
</Dependency>
<Dependency Name="dotnet-ef" Version="3.0.0-preview4.19121.2">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>

11
eng/Versions.props
View file

@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview3.19121.2</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview3.19123.1</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/EntityFrameworkCore -->
@ -20,7 +20,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppPackageVersion>3.0.0-preview3-19120-02</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>3.0.0-preview3-19122-14</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<DotnetDevCertsPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</DotnetDevCertsPackageVersion>
<DotnetSqlCachePackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</DotnetSqlCachePackageVersion>
@ -73,8 +73,11 @@
https://dotnet.myget.org/F/msbuild/api/v3/index.json;
https://dotnet.myget.org/F/nuget-build/api/v3/index.json;
https://dotnet.myget.org/F/templating/api/v3/index.json;
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json
https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json;
</RestoreSources>
</PropertyGroup>
</Project>

5
src/redist/targets/GenerateBundledVersions.targets
View file

@ -180,7 +180,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<AddDotnetfeedProjectSource Condition="'%24(AddDotnetfeedProjectSource)' == ''">%24(_NETCoreSdkIsPreview)</AddDotnetfeedProjectSource>
<RestoreAdditionalProjectSources Condition="'%24(AddDotnetfeedProjectSource)' == 'true'">%24(RestoreAdditionalProjectSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources Condition="'%24(AddDotnetfeedProjectSource)' == 'true'">%24(RestoreAdditionalProjectSources)%3Bhttps://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources Condition="'%24(AddDotnetfeedProjectSource)' == 'true'">%24(RestoreAdditionalProjectSources)%3Bhttps://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources Condition="'%24(AddDotnetfeedProjectSource)' == 'true'">%24(RestoreAdditionalProjectSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources Condition="'%24(AddDotnetfeedProjectSource)' == 'true'">%24(RestoreAdditionalProjectSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources Condition="'%24(AddDotnetfeedProjectSource)' == 'true'">%24(RestoreAdditionalProjectSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources Condition="'%24(AddDotnetfeedProjectSource)' == 'true'">%24(RestoreAdditionalProjectSources)%3Bhttps://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json</RestoreAdditionalProjectSources>
<!-- Default patch versions for each minor version of ASP.NET Core -->
<DefaultPatchVersionForAspNetCoreAll2_1>2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>