Skip to content
代码片段 群组 项目
提交 6a3e58e2 编辑于 作者: dotnet-bot's avatar dotnet-bot
浏览文件

Merge in 'release/7.0' changes

上级 cb6d26d9 8a9e0919
No related branches found
No related tags found
无相关合并请求
展开全部 隐藏空白变更内容
行内 左右并排
eng/Baseline.Designer.props
+ 210
− 210
浏览文件 @ 6a3e58e2
此差异已折叠。
eng/Baseline.xml
+ 104
− 104
浏览文件 @ 6a3e58e2
......@@ -4,109 +4,109 @@ 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="7.0.7">
<Package Id="AspNetCoreRuntime.7.0.x64" Version="7.0.7" />
<Package Id="AspNetCoreRuntime.7.0.x86" Version="7.0.7" />
<Package Id="dotnet-sql-cache" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Ref" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.CustomElements" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Components.WebView" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="7.0.7" />
<Baseline Version="7.0.9">
<Package Id="AspNetCoreRuntime.7.0.x64" Version="7.0.9" />
<Package Id="AspNetCoreRuntime.7.0.x86" Version="7.0.9" />
<Package Id="dotnet-sql-cache" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Ref" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.CustomElements" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Components.WebView" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Grpc.JsonTranscoding" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Grpc.Swagger" Version="0.3.3" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.OpenApi" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.Owin" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SpaProxy" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="7.0.7" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="7.0.7" />
<Package Id="Microsoft.dotnet-openapi" Version="7.0.7" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="7.0.7" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates.7.0" Version="7.0.7" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.7.0" Version="7.0.7" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.7.0" Version="7.0.7" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="7.0.7" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Features" Version="7.0.7" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Http.Polly" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Localization" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="7.0.7" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.7" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="7.0.7" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="7.0.7" />
<Package Id="Microsoft.JSInterop" Version="7.0.7" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="7.0.7" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.OpenApi" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.Owin" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SpaProxy" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.9" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="7.0.9" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="7.0.9" />
<Package Id="Microsoft.dotnet-openapi" Version="7.0.9" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="7.0.9" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates.7.0" Version="7.0.9" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.7.0" Version="7.0.9" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.7.0" Version="7.0.9" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="7.0.9" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Features" Version="7.0.9" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Http.Polly" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Localization" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="7.0.9" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="7.0.9" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="7.0.9" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="7.0.9" />
<Package Id="Microsoft.JSInterop" Version="7.0.9" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="7.0.9" />
</Baseline>
\ No newline at end of file
eng/Versions.props
+ 2
− 2
浏览文件 @ 6a3e58e2
......@@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>7</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>10</AspNetCorePatchVersion>
<ValidateBaseline>false</ValidateBaseline>
<ValidateBaseline>true</ValidateBaseline>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
......@@ -238,7 +238,7 @@
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.18-servicing-23269-9</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>6.0.20-servicing-23321-6</MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension60Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension60x86Version>
<!-- 3rd party dependencies -->
......
global.json
+ 2
− 2
浏览文件 @ 6a3e58e2
{
"sdk": {
"version": "7.0.107"
"version": "7.0.109"
},
"tools": {
"dotnet": "7.0.107",
"dotnet": "7.0.109",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
......
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或