Skip to content

[automated] Merge branch 'release/2.1' => 'release/3.1' #24375

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 21 commits into from
Aug 13, 2020
Merged

[automated] Merge branch 'release/2.1' => 'release/3.1' #24375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bccd1ea
Merged PR 9014: [2.1] Cancel SendFile copy loops
Tratcher Jul 16, 2020
07b8318
Merged PR 9042: [3.1] Pass RequestAborted to SendFileAsync
Tratcher Jul 16, 2020
b110c81
Merge in 'release/3.1' changes
dotnet-bot Jul 16, 2020
c9f75a1
Merged PR 9163: [3.1] Fix HttSys tests
Tratcher Jul 17, 2020
40383cf
Merged PR 9189: Modify WebSockets ValueTaskSource
BrennanConroy Jul 20, 2020
84562dd
Merged PR 9096: [internal/release/3.1] Update dependencies from dncen…
dotnet-bot Jul 22, 2020
1bf292d
Merged PR 9260: [internal/release/3.1] Update dependencies from dncen…
dotnet-bot Jul 22, 2020
94076d4
Use legacy MyGet feeds (#23929)
garath Jul 28, 2020
adc6f4d
Merge in 'release/2.1' changes
dotnet-bot Jul 28, 2020
9f03b0a
Update branding to 3.1.8
dougbu Aug 8, 2020
522088b
Do not run hostname tests on macOS
dougbu Aug 8, 2020
5d1a8b4
Remove internal feeds
dougbu Aug 11, 2020
8f21d61
Update to 3.1.107 SDK
dougbu Aug 11, 2020
1709e5b
Update Baseline.* files
dougbu Aug 11, 2020
95386ff
Undo package downgrade
dougbu Aug 11, 2020
2cb52f0
Update branding to 2.1.22
dougbu Aug 12, 2020
7fc3da2
Update EF submodule
dougbu Aug 12, 2020
a8e8fe2
Merge pull request #24709 from dotnet/dougbu/update.branding
dougbu Aug 12, 2020
06f86cd
Do not run hostname tests on macOS
dougbu Aug 12, 2020
0a0e1ad
Merge pull request #24826 from dotnet/dougbu/update.branding.2.1
dougbu Aug 12, 2020
1b31674
Merge remote-tracking branch 'origin/release/2.1' into release/3.1
Tratcher Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
<RuntimeInstallerBaseName>aspnetcore-runtime</RuntimeInstallerBaseName>
<TargetingPackInstallerBaseName>aspnetcore-targeting-pack</TargetingPackInstallerBaseName>

<!-- Produce targeting pack installers/packages once per major.minor except in extraordinary cases i.e. 3.1.3. -->
<!-- Produce targeting pack installers/packages once per major.minor except in extraordinary cases i.e. 3.1.8. -->
<IsTargetingPackBuilding Condition=" '$(DotNetBuildFromSource)' == 'true' ">false</IsTargetingPackBuilding>
<IsTargetingPackBuilding
Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '0' ">false</IsTargetingPackBuilding>
Condition=" '$(IsTargetingPackBuilding)' == '' AND '$(AspNetCorePatchVersion)' != '8' ">false</IsTargetingPackBuilding>
<IsTargetingPackBuilding Condition=" '$(IsTargetingPackBuilding)' == '' ">true</IsTargetingPackBuilding>

<!--
Expand Down
3 changes: 3 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
<packageSources>
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<add key="darc-pub-dotnet-core-setup-2d163b8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-core-setup-2d163b87/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-8a3ffed" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-8a3ffed5/nuget/v3/index.json" />
<add key="darc-pub-dotnet-corefx-66409e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-66409e39/nuget/v3/index.json" />
<add key="darc-pub-dotnet-blazor-cc44960" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-blazor-cc449601/nuget/v3/index.json" />
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
434 changes: 217 additions & 217 deletions eng/Baseline.Designer.props
View file
Open in desktop

Large diffs are not rendered by default.

150 changes: 75 additions & 75 deletions eng/Baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,87 +4,87 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch.

-->
<Baseline Version="3.1.6">
<Baseline Version="3.1.7">
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
<Package Id="dotnet-sql-cache" Version="3.1.6" />
<Package Id="dotnet-sql-cache" Version="3.1.7" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.6" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.6" />
<Package Id="Microsoft.dotnet-openapi" Version="3.1.6" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.6" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.6" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.6" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.6" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.6" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.6" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.6" />
</Baseline>
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.7" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.7" />
<Package Id="Microsoft.dotnet-openapi" Version="3.1.7" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.7" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.7" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.7" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.7" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.7" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.7" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.7" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.7" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.7" />
</Baseline>
Loading