Skip to content

Commit

Permalink
Merge pull request #31763 from dotnet/wtgodbe/505Merge
Browse files Browse the repository at this point in the history 
[release/5.0] Merge in internal changes, update SDK/baseline
  • Loading branch information
@wtgodbe
wtgodbe committed Apr 13, 2021
2 parents c8b3b4a + 943df8c commit 415693c
Show file tree
Hide file tree
Showing 7 changed files with 375 additions and 370 deletions.
3 changes: 3 additions & 0 deletions NuGet.config
View file
Expand Up @@ -4,8 +4,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-pub-dotnet-efcore-5420351" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-54203510/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2f740ad" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-2f740adc/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -20,6 +22,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-2f740ad" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<!-- End: Package sources from dotnet-efcore -->
Expand Down
430 changes: 215 additions & 215 deletions eng/Baseline.Designer.props
View file

Large diffs are not rendered by default.

202 changes: 101 additions & 101 deletions eng/Baseline.xml
View file
Expand Up @@ -4,105 +4,105 @@ 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="5.0.4">
<Package Id="AspNetCoreRuntime.5.0.x64" Version="5.0.4" />
<Package Id="AspNetCoreRuntime.5.0.x86" Version="5.0.4" />
<Package Id="dotnet-sql-cache" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="5.0.4" />
<Baseline Version="5.0.5">
<Package Id="AspNetCoreRuntime.5.0.x64" Version="5.0.5" />
<Package Id="AspNetCoreRuntime.5.0.x86" Version="5.0.5" />
<Package Id="dotnet-sql-cache" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Ref" Version="5.0.0" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Components" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Owin" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.4" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="5.0.4" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="5.0.4" />
<Package Id="Microsoft.CodeAnalysis.Razor" Version="5.0.4" />
<Package Id="Microsoft.dotnet-openapi" Version="5.0.4" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="5.0.4" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="5.0.4" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.5.0" Version="5.0.4" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="5.0.4" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="5.0.4" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.4" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Localization" Version="5.0.4" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.4" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="5.0.4" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="5.0.4" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="5.0.4" />
<Package Id="Microsoft.JSInterop" Version="5.0.4" />
</Baseline>
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Components" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Http.Features" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Owin" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.5" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="5.0.5" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="5.0.5" />
<Package Id="Microsoft.CodeAnalysis.Razor" Version="5.0.5" />
<Package Id="Microsoft.dotnet-openapi" Version="5.0.5" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="5.0.5" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="5.0.5" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.5.0" Version="5.0.5" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.5.0" Version="5.0.5" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="5.0.5" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="5.0.5" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Localization" Version="5.0.5" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="5.0.5" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="5.0.5" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="5.0.5" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="5.0.5" />
<Package Id="Microsoft.JSInterop" Version="5.0.5" />
</Baseline>

0 comments on commit 415693c

Please sign in to comment.