huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[release/5.0] Merge, update baselines, SDK and runtimes (#30781) 

- dotnet/aspnetcore-internal#3783
- Merge commit 'e882394a7bb38930da748291fe2c2ceaa6a80588' into 'release/5.0'
- Update `$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)`
- Correct problem in `BaselineGenerator`
- Re-enable baseline validation
- Update package baselines
- Update SDK and runtime versions
This commit is contained in:
Doug Bunting 2021-03-10 09:38:59 -08:00 committed by GitHub
parent bf9a344a24 f636f74ac2
commit 6b1c28e772
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 448 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NuGet.config
View File

@ -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-int-dotnet-efcore-cfd206a" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-efcore-cfd206aa/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-f27d337" value="https://pkgs.dev.azure.com/dnceng/_packaging/darc-int-dotnet-runtime-f27d3372/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" />
@ -19,8 +21,10 @@
<disabledPackageSources>
<!--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-f27d337" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-cfd206a" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>

468
eng/Baseline.Designer.props
View File

File diff suppressed because it is too large Load Diff

200
eng/Baseline.xml
View File

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

74
eng/Version.Details.xml
View File

@ -9,37 +9,37 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="dotnet-ef" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
<Dependency Name="dotnet-ef" Version="5.0.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>efc2924e6e36db17611c7da480d5bc97a4514cb8</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>cfd206aa4bc7c878dbbd91959f1c9edada70da93</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -199,15 +199,15 @@
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d1e2874de3956c618626ee46554a093f28a330e2</Sha>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices.Protocols" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="5.0.1">
<Dependency Name="System.Drawing.Common" Version="5.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d1e2874de3956c618626ee46554a093f28a330e2</Sha>
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="5.0.1">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -266,9 +266,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
<Dependency Name="System.Text.Encodings.Web" Version="5.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="5.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@ -294,24 +294,24 @@
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.3">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.3-servicing.21072.12">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.4-servicing.21116.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.3-servicing.21072.12">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.4-servicing.21116.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
<Sha>f27d33729518f5aa478aa818b7b4f54a4d50bef1</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d1e2874de3956c618626ee46554a093f28a330e2</Sha>
<Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21159.2">
<Uri>https://github.com/dotnet/arcade</Uri>

30
eng/Versions.props
View File

@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>5</AspNetCorePatchVersion>
<ValidateBasline>false</ValidateBasline>
<ValidateBasline>true</ValidateBasline>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
@ -59,10 +59,10 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.3-servicing.21072.12</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.4-servicing.21116.14</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.3-servicing.21072.12</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.4-servicing.21116.14</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@ -104,7 +104,7 @@
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.1</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesProtocolsPackageVersion>5.0.0</SystemDirectoryServicesProtocolsPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.1</SystemDrawingCommonPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.2</SystemDrawingCommonPackageVersion>
<SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
<SystemNetHttpJsonPackageVersion>5.0.0</SystemNetHttpJsonPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>5.0.0</SystemNetHttpWinHttpHandlerPackageVersion>
@ -120,21 +120,21 @@
<SystemSecurityPermissionsPackageVersion>5.0.0</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>5.0.0</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>5.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextEncodingsWebPackageVersion>5.0.1</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>5.0.1</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>5.0.0</SystemThreadingChannelsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.1</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.3</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.3</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.3</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<dotnetefPackageVersion>5.0.4</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.4</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.4</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.4</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21159.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
@ -236,7 +236,7 @@
<!-- Packages from 2.1, 2.2, and 3.1 branches used for site extension build. -->
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.12-servicing-21070-12</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.13-servicing-21117-13</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>
<!-- 3rd party dependencies -->

6
eng/tools/BaselineGenerator/Program.cs
View File

@ -91,9 +91,11 @@ namespace PackageBaselineGenerator
var baselineVersion = input.Root.Attribute("Version").Value;
// Baseline and .NET Core versions always align in non-preview releases.
// But, NuspecReader reports netcoreapp5.0 instead of net5.0. We use net5.0 in Baseline.Designer.props.
var parsedVersion = Version.Parse(baselineVersion);
var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") +
$"{parsedVersion.Major}.{parsedVersion.Minor}";
var matchTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}";
var doc = new XDocument(
new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "),
@ -152,11 +154,11 @@ namespace PackageBaselineGenerator
var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
if (string.Equals(
group.TargetFramework.GetShortFolderName(),
defaultTarget,
matchTarget,
StringComparison.OrdinalIgnoreCase))
{
targetCondition =
$"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR {targetCondition})";
$"('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == '{defaultTarget}')";
}
var itemGroup = new XElement(

8
global.json
View File

@ -1,19 +1,19 @@
{
"sdk": {
"version": "5.0.103"
"version": "5.0.104"
},
"tools": {
"dotnet": "5.0.103",
"dotnet": "5.0.104",
"runtimes": {
"dotnet/x64": [
"2.1.25",
"2.1.26",
"$(MicrosoftNETCoreAppInternalPackageVersion)"
],
"dotnet/x86": [
"$(MicrosoftNETCoreAppInternalPackageVersion)"
],
"aspnetcore/x64": [
"3.1.12"
"3.1.13"
]
},
"Git": "2.22.0",

5
src/Razor/test/testassets/AppWithP2PReference/AppWithP2PReference.csproj
View File

@ -29,4 +29,9 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
</Project>

5
src/Razor/test/testassets/ClassLibrary/ClassLibrary.csproj
View File

@ -27,6 +27,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
</Project>

5
src/Razor/test/testassets/ClassLibrary2/ClassLibrary2.csproj
View File

@ -24,6 +24,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
</Project>

5
src/Razor/test/testassets/LargeProject/LargeProject.csproj
View File

@ -31,6 +31,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
</Project>

5
src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
View File

@ -24,6 +24,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
</Project>

5
src/Razor/test/testassets/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj
View File

@ -29,6 +29,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
<ItemGroup>

5
src/Razor/test/testassets/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
View File

@ -30,6 +30,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
</Project>

5
src/Razor/test/testassets/SimpleMvc/SimpleMvc.csproj
View File

@ -24,6 +24,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
</Project>

5
src/Razor/test/testassets/SimpleMvcFSharp/SimpleMvcFSharp.fsproj
View File

@ -29,6 +29,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
</Project>

5
src/Razor/test/testassets/SimplePages/SimplePages.csproj
View File

@ -24,6 +24,11 @@
<Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
</ItemGroup>
<!-- Test Placeholder -->
</Project>