Skip to content
代码片段 群组 项目
未验证 提交 0ceffe0a 编辑于 作者: William Godbe's avatar William Godbe 提交者： GitHub
浏览文件

Merge pull request #41611 from vseanreesermsft/internal-merge-6.0-2022-05-10-1209 

Merging internal commits for release/6.0
上级 fd5cd430 3803c1f5
No related branches found
No related tags found
无相关合并请求
展开全部 隐藏空白变更内容
行内 左右并排
显示
有 488 个添加 和 407 个删除
NuGet.config
+ 4
− 0
浏览文件 @ 0ceffe0a
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-70ae3df" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-70ae3df4/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-9b03633" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-9b03633b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore --> <!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--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" /> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
...@@ -25,8 +27,10 @@ ...@@ -25,8 +27,10 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore --> <!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-9b03633" value="true" />
<!-- End: Package sources from dotnet-efcore --> <!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-70ae3df" value="true" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources> </disabledPackageSources>
......
eng/Baseline.Designer.props
+ 232
− 232
浏览文件 @ 0ceffe0a
此差异已折叠。
eng/Baseline.xml
+ 107
− 107
浏览文件 @ 0ceffe0a
...@@ -4,111 +4,111 @@ This file contains a list of all the packages and their versions which were rele ...@@ -4,111 +4,111 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch. Update this list when preparing for a new patch.
--> -->
<Baseline Version="6.0.4"> <Baseline Version="6.0.5">
<Package Id="AspNetCoreRuntime.6.0.x64" Version="6.0.4" /> <Package Id="AspNetCoreRuntime.6.0.x64" Version="6.0.5" />
<Package Id="AspNetCoreRuntime.6.0.x86" Version="6.0.4" /> <Package Id="AspNetCoreRuntime.6.0.x86" Version="6.0.5" />
<Package Id="dotnet-sql-cache" Version="6.0.4" /> <Package Id="dotnet-sql-cache" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Ref" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Ref" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.Google" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Authorization" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Authorization" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.Authorization" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.Forms" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.Web" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.Web" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Components.WebView" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Components.WebView" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.DataProtection" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Identity.UI" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.JsonPatch" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Metadata" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Metadata" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Owin" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Owin" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Razor.Language" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Client" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Common" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SpaProxy" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SpaProxy" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.5" />
<Package Id="Microsoft.AspNetCore.TestHost" Version="6.0.4" /> <Package Id="Microsoft.AspNetCore.TestHost" Version="6.0.5" />
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.4" /> <Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.5" />
<Package Id="Microsoft.CodeAnalysis.Razor" Version="6.0.4" /> <Package Id="Microsoft.CodeAnalysis.Razor" Version="6.0.5" />
<Package Id="Microsoft.dotnet-openapi" Version="6.0.4" /> <Package Id="Microsoft.dotnet-openapi" Version="6.0.5" />
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="6.0.4" /> <Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="6.0.5" />
<Package Id="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="6.0.4" /> <Package Id="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="6.0.5" />
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.6.0" Version="6.0.4" /> <Package Id="Microsoft.DotNet.Web.ProjectTemplates.6.0" Version="6.0.5" />
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="6.0.4" /> <Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="6.0.5" />
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="6.0.4" /> <Package Id="Microsoft.Extensions.ApiDescription.Client" Version="6.0.5" />
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="6.0.4" /> <Package Id="Microsoft.Extensions.ApiDescription.Server" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Caching.SqlServer" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Features" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Features" Version="6.0.5" />
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.4" /> <Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Http.Polly" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Http.Polly" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Identity.Core" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Identity.Core" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Identity.Stores" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Identity.Stores" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Localization" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Localization" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Localization.Abstractions" Version="6.0.5" />
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.4" /> <Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.5" />
<Package Id="Microsoft.Extensions.ObjectPool" Version="6.0.4" /> <Package Id="Microsoft.Extensions.ObjectPool" Version="6.0.5" />
<Package Id="Microsoft.Extensions.WebEncoders" Version="6.0.4" /> <Package Id="Microsoft.Extensions.WebEncoders" Version="6.0.5" />
<Package Id="Microsoft.JSInterop" Version="6.0.4" /> <Package Id="Microsoft.JSInterop" Version="6.0.5" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="6.0.4" /> <Package Id="Microsoft.JSInterop.WebAssembly" Version="6.0.5" />
</Baseline> </Baseline>
\ No newline at end of file
eng/Version.Details.xml
+ 37
− 37
浏览文件 @ 0ceffe0a
...@@ -9,37 +9,37 @@ ...@@ -9,37 +9,37 @@
--> -->
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="dotnet-ef" Version="6.0.4"> <Dependency Name="dotnet-ef" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>aca50aef8604cc23910d18edce820e0fa7c61910</Sha> <Sha>9b03633bb18b617088b32260065ee385bf9c4491</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.4"> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>aca50aef8604cc23910d18edce820e0fa7c61910</Sha> <Sha>9b03633bb18b617088b32260065ee385bf9c4491</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.4"> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>aca50aef8604cc23910d18edce820e0fa7c61910</Sha> <Sha>9b03633bb18b617088b32260065ee385bf9c4491</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.4"> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>aca50aef8604cc23910d18edce820e0fa7c61910</Sha> <Sha>9b03633bb18b617088b32260065ee385bf9c4491</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.4"> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>aca50aef8604cc23910d18edce820e0fa7c61910</Sha> <Sha>9b03633bb18b617088b32260065ee385bf9c4491</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.4"> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>aca50aef8604cc23910d18edce820e0fa7c61910</Sha> <Sha>9b03633bb18b617088b32260065ee385bf9c4491</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.4"> <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>aca50aef8604cc23910d18edce820e0fa7c61910</Sha> <Sha>9b03633bb18b617088b32260065ee385bf9c4491</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.4"> <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>aca50aef8604cc23910d18edce820e0fa7c61910</Sha> <Sha>9b03633bb18b617088b32260065ee385bf9c4491</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0"> <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -177,9 +177,9 @@ ...@@ -177,9 +177,9 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.4-servicing.22164.4"> <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.5-servicing.22213.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0"> <Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -193,9 +193,9 @@ ...@@ -193,9 +193,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha> <Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
</Dependency> </Dependency>
<Dependency Name="System.IO.Pipelines" Version="6.0.2"> <Dependency Name="System.IO.Pipelines" Version="6.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Net.Http.Json" Version="6.0.0"> <Dependency Name="System.Net.Http.Json" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -217,9 +217,9 @@ ...@@ -217,9 +217,9 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.0"> <Dependency Name="System.Security.Cryptography.Pkcs" Version="6.0.1">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0"> <Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -233,9 +233,9 @@ ...@@ -233,9 +233,9 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Text.Json" Version="6.0.3"> <Dependency Name="System.Text.Json" Version="6.0.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Threading.Channels" Version="6.0.0"> <Dependency Name="System.Threading.Channels" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -245,33 +245,33 @@ ...@@ -245,33 +245,33 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.4"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.4"> <Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.4"> <Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<!-- <!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. 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. All Runtime.$rid packages should have the same version.
--> -->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.4"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.4"> <Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.4-servicing.22164.4"> <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.5-servicing.22213.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha> <Sha>70ae3df4a6f3c92fb6b315afc405edd10ff38579</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
......
eng/Versions.props
+ 21
− 21
浏览文件 @ 0ceffe0a
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion> <AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion> <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>6</AspNetCorePatchVersion> <AspNetCorePatchVersion>6</AspNetCorePatchVersion>
<ValidateBaseline>false</ValidateBaseline> <ValidateBaseline>true</ValidateBaseline>
<!-- <!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
--> -->
...@@ -63,12 +63,12 @@ ...@@ -63,12 +63,12 @@
<PropertyGroup Label="Automated"> <PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime --> <!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion> <MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.4</MicrosoftNETCoreAppRefVersion> <MicrosoftNETCoreAppRefVersion>6.0.5</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.4</MicrosoftNETCoreAppRuntimewinx64Version> <MicrosoftNETCoreAppRuntimewinx64Version>6.0.5</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.4</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion> <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.5</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.4</MicrosoftNETRuntimeWebAssemblySdkVersion> <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.5</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.4</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion> <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.5</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.4-servicing.22164.4</MicrosoftNETCoreBrowserDebugHostTransportVersion> <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.5-servicing.22213.9</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion> <MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion> <MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion> <MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
...@@ -103,33 +103,33 @@ ...@@ -103,33 +103,33 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion> <MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion> <MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion> <MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.4-servicing.22164.4</MicrosoftInternalRuntimeAspNetCoreTransportVersion> <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.5-servicing.22213.9</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion> <SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion> <SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion> <SystemDirectoryServicesProtocolsVersion>6.0.1</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>6.0.2</SystemIOPipelinesVersion> <SystemIOPipelinesVersion>6.0.3</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>6.0.0</SystemNetHttpJsonVersion> <SystemNetHttpJsonVersion>6.0.0</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>6.0.1</SystemNetHttpWinHttpHandlerVersion> <SystemNetHttpWinHttpHandlerVersion>6.0.1</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>6.0.1</SystemReflectionMetadataVersion> <SystemReflectionMetadataVersion>6.0.1</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>6.0.0</SystemResourcesExtensionsVersion> <SystemResourcesExtensionsVersion>6.0.0</SystemResourcesExtensionsVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion> <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>6.0.0</SystemSecurityCryptographyPkcsVersion> <SystemSecurityCryptographyPkcsVersion>6.0.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>6.0.0</SystemSecurityCryptographyXmlVersion> <SystemSecurityCryptographyXmlVersion>6.0.0</SystemSecurityCryptographyXmlVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion> <SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion> <SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.3</SystemTextJsonVersion> <SystemTextJsonVersion>6.0.4</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion> <SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>6.0.3</MicrosoftNETCorePlatformsVersion> <MicrosoftNETCorePlatformsVersion>6.0.3</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore --> <!-- Packages from dotnet/efcore -->
<dotnetefVersion>6.0.4</dotnetefVersion> <dotnetefVersion>6.0.5</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.4</MicrosoftEntityFrameworkCoreInMemoryVersion> <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.5</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.4</MicrosoftEntityFrameworkCoreRelationalVersion> <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.5</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.4</MicrosoftEntityFrameworkCoreSqliteVersion> <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.5</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.4</MicrosoftEntityFrameworkCoreSqlServerVersion> <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.5</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.4</MicrosoftEntityFrameworkCoreToolsVersion> <MicrosoftEntityFrameworkCoreToolsVersion>6.0.5</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>6.0.4</MicrosoftEntityFrameworkCoreVersion> <MicrosoftEntityFrameworkCoreVersion>6.0.5</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.4</MicrosoftEntityFrameworkCoreDesignVersion> <MicrosoftEntityFrameworkCoreDesignVersion>6.0.5</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade --> <!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksInstallersVersion> <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksTemplatingVersion> <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22254.3</MicrosoftDotNetBuildTasksTemplatingVersion>
...@@ -214,10 +214,10 @@ ...@@ -214,10 +214,10 @@
<!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. --> <!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.24-servicing-22180-6</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>3.1.25-servicing-22219-10</MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.16-servicing-22167-6</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>5.0.17-servicing-22215-7</MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x64Version>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version> <MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version)</MicrosoftAspNetCoreAzureAppServicesSiteExtension50x86Version>
<!-- 3rd party dependencies --> <!-- 3rd party dependencies -->
......
eng/helix/helix.proj
+ 1
− 1
浏览文件 @ 0ceffe0a
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
not HelixCorrelationPayload. not HelixCorrelationPayload.
--> -->
<PropertyGroup> <PropertyGroup>
<IsPublicRuntime>true</IsPublicRuntime> <IsPublicRuntime>false</IsPublicRuntime>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
......
global.json
+ 3
− 3
浏览文件 @ 0ceffe0a
{ {
"sdk": { "sdk": {
"version": "6.0.104" "version": "6.0.105"
}, },
"tools": { "tools": {
"dotnet": "6.0.104", "dotnet": "6.0.105",
"runtimes": { "runtimes": {
"dotnet/x64": [ "dotnet/x64": [
"2.1.30", "2.1.30",
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
], ],
"aspnetcore/x64": [ "aspnetcore/x64": [
"3.1.24" "3.1.25"
] ]
}, },
"Git": "2.22.0", "Git": "2.22.0",
......
src/Http/Http/src/Features/FormFeature.cs
+ 6
− 1
浏览文件 @ 0ceffe0a
...@@ -184,6 +184,7 @@ namespace Microsoft.AspNetCore.Http.Features ...@@ -184,6 +184,7 @@ namespace Microsoft.AspNetCore.Http.Features
else if (HasMultipartFormContentType(contentType)) else if (HasMultipartFormContentType(contentType))
{ {
var formAccumulator = new KeyValueAccumulator(); var formAccumulator = new KeyValueAccumulator();
var nonFormOrFileContentDispositionCount = 0;
var boundary = GetBoundary(contentType, _options.MultipartBoundaryLengthLimit); var boundary = GetBoundary(contentType, _options.MultipartBoundaryLengthLimit);
var multipartReader = new MultipartReader(boundary, _request.Body) var multipartReader = new MultipartReader(boundary, _request.Body)
...@@ -259,7 +260,11 @@ namespace Microsoft.AspNetCore.Http.Features ...@@ -259,7 +260,11 @@ namespace Microsoft.AspNetCore.Http.Features
} }
else else
{ {
System.Diagnostics.Debug.Assert(false, "Unrecognized content-disposition for this section: " + section.ContentDisposition); if (nonFormOrFileContentDispositionCount++ >= _options.ValueCountLimit)
{
throw new InvalidDataException($"Unrecognized Content-Disposition. Form value count limit {_options.ValueCountLimit} exceeded.");
}
} }
section = await multipartReader.ReadNextSectionAsync(cancellationToken); section = await multipartReader.ReadNextSectionAsync(cancellationToken);
......
src/Http/Http/test/Features/FormFeatureTests.cs
+ 30
− 0
浏览文件 @ 0ceffe0a
...@@ -165,6 +165,12 @@ namespace Microsoft.AspNetCore.Http.Features ...@@ -165,6 +165,12 @@ namespace Microsoft.AspNetCore.Http.Features
InvalidContentDispositionValue + InvalidContentDispositionValue +
"\r\n" + "\r\n" +
"\r\n" + "\r\n" +
"Foo\r\n";
private const string MultipartFormFileNonFormOrFileContentDispositionValue = "--WebKitFormBoundary5pDRpGheQXaM8k3T\r\n" +
"Content-Disposition:x" +
"\r\n" +
"\r\n" +
"Foo\r\n"; "Foo\r\n";
private const string MultipartFormWithField = private const string MultipartFormWithField =
...@@ -468,6 +474,30 @@ InvalidContentDispositionValue + ...@@ -468,6 +474,30 @@ InvalidContentDispositionValue +
Assert.Equal("Form value count limit 2 exceeded.", exception.Message); Assert.Equal("Form value count limit 2 exceeded.", exception.Message);
} }
[Theory]
[InlineData(true)]
[InlineData(false)]
public async Task ReadFormAsync_NonFormOrFieldContentDisposition_ValueCountLimitExceeded_Throw(bool bufferRequest)
{
var formContent = new List<byte>();
formContent.AddRange(Encoding.UTF8.GetBytes(MultipartFormFileNonFormOrFileContentDispositionValue));
formContent.AddRange(Encoding.UTF8.GetBytes(MultipartFormFileNonFormOrFileContentDispositionValue));
formContent.AddRange(Encoding.UTF8.GetBytes(MultipartFormFileNonFormOrFileContentDispositionValue));
formContent.AddRange(Encoding.UTF8.GetBytes(MultipartFormEnd));
var context = new DefaultHttpContext();
var responseFeature = new FakeResponseFeature();
context.Features.Set<IHttpResponseFeature>(responseFeature);
context.Request.ContentType = MultipartContentType;
context.Request.Body = new NonSeekableReadStream(formContent.ToArray());
IFormFeature formFeature = new FormFeature(context.Request, new FormOptions() { BufferBody = bufferRequest, ValueCountLimit = 2 });
context.Features.Set<IFormFeature>(formFeature);
var exception = await Assert.ThrowsAsync<InvalidDataException>(() => context.Request.ReadFormAsync());
Assert.Equal("Unrecognized Content-Disposition. Form value count limit 2 exceeded.", exception.Message);
}
[Theory] [Theory]
[InlineData(true)] [InlineData(true)]
[InlineData(false)] [InlineData(false)]
......
src/Security/CookiePolicy/test/CookieChunkingTests.cs
+ 34
− 1
浏览文件 @ 0ceffe0a
...@@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Internal ...@@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.Internal
public void DeleteChunkedCookieWithOptions_AllDeleted() public void DeleteChunkedCookieWithOptions_AllDeleted()
{ {
HttpContext context = new DefaultHttpContext(); HttpContext context = new DefaultHttpContext();
context.Request.Headers.Append("Cookie", "TestCookie=chunks-7"); context.Request.Headers.Append("Cookie", "TestCookie=chunks-7;TestCookieC1=1;TestCookieC2=2;TestCookieC3=3;TestCookieC4=4;TestCookieC5=5;TestCookieC6=6;TestCookieC7=7");
new ChunkingCookieManager().DeleteCookie(context, "TestCookie", new CookieOptions() { Domain = "foo.com", Secure = true }); new ChunkingCookieManager().DeleteCookie(context, "TestCookie", new CookieOptions() { Domain = "foo.com", Secure = true });
var cookies = context.Response.Headers["Set-Cookie"]; var cookies = context.Response.Headers["Set-Cookie"];
...@@ -147,7 +147,40 @@ namespace Microsoft.AspNetCore.Internal ...@@ -147,7 +147,40 @@ namespace Microsoft.AspNetCore.Internal
}, cookies); }, cookies);
} }
[Fact]
public void DeleteChunkedCookieWithMissingRequestCookies_OnlyPresentCookiesDeleted()
{
HttpContext context = new DefaultHttpContext();
context.Request.Headers.Append("Cookie", "TestCookie=chunks-7;TestCookieC1=1;TestCookieC2=2");
new ChunkingCookieManager().DeleteCookie(context, "TestCookie", new CookieOptions() { Domain = "foo.com", Secure = true });
var cookies = context.Response.Headers["Set-Cookie"];
Assert.Equal(3, cookies.Count);
Assert.Equal(new[]
{
"TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
"TestCookieC1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
"TestCookieC2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
}, cookies);
}
[Fact]
public void DeleteChunkedCookieWithMissingRequestCookies_StopsAtMissingChunk()
{
HttpContext context = new DefaultHttpContext();
// C3 is missing so we don't try to delete C4 either.
context.Request.Headers.Append("Cookie", "TestCookie=chunks-7;TestCookieC1=1;TestCookieC2=2;TestCookieC4=4");
new ChunkingCookieManager().DeleteCookie(context, "TestCookie", new CookieOptions() { Domain = "foo.com", Secure = true });
var cookies = context.Response.Headers["Set-Cookie"];
Assert.Equal(3, cookies.Count);
Assert.Equal(new[]
{
"TestCookie=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
"TestCookieC1=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
"TestCookieC2=; expires=Thu, 01 Jan 1970 00:00:00 GMT; domain=foo.com; path=/; secure",
}, cookies);
}
[Fact] [Fact]
public void DeleteChunkedCookieWithOptionsAndResponseCookies_AllDeleted() public void DeleteChunkedCookieWithOptionsAndResponseCookies_AllDeleted()
......
src/Shared/ChunkingCookieManager/ChunkingCookieManager.cs
+ 13
− 4
浏览文件 @ 0ceffe0a
...@@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Internal ...@@ -103,7 +103,7 @@ namespace Microsoft.AspNetCore.Internal
var chunksCount = ParseChunksCount(value); var chunksCount = ParseChunksCount(value);
if (chunksCount > 0) if (chunksCount > 0)
{ {
var chunks = new string[chunksCount]; var chunks = new List<string>(10); // chunksCount may be wrong, don't trust it.
for (var chunkId = 1; chunkId <= chunksCount; chunkId++) for (var chunkId = 1; chunkId <= chunksCount; chunkId++)
{ {
var chunk = requestCookies[key + ChunkKeySuffix + chunkId.ToString(CultureInfo.InvariantCulture)]; var chunk = requestCookies[key + ChunkKeySuffix + chunkId.ToString(CultureInfo.InvariantCulture)];
...@@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Internal ...@@ -128,7 +128,7 @@ namespace Microsoft.AspNetCore.Internal
return value; return value;
} }
chunks[chunkId - 1] = chunk; chunks.Add(chunk);
} }
return string.Join(string.Empty, chunks); return string.Join(string.Empty, chunks);
...@@ -254,13 +254,22 @@ namespace Microsoft.AspNetCore.Internal ...@@ -254,13 +254,22 @@ namespace Microsoft.AspNetCore.Internal
key + "=" key + "="
}; };
var requestCookie = context.Request.Cookies[key]; var requestCookies = context.Request.Cookies;
var chunks = ParseChunksCount(requestCookie); var requestCookie = requestCookies[key];
long chunks = ParseChunksCount(requestCookie);
if (chunks > 0) if (chunks > 0)
{ {
for (var i = 1; i <= chunks + 1; i++) for (var i = 1; i <= chunks + 1; i++)
{ {
var subkey = key + ChunkKeySuffix + i.ToString(CultureInfo.InvariantCulture); var subkey = key + ChunkKeySuffix + i.ToString(CultureInfo.InvariantCulture);
// Only delete cookies we received. We received the chunk count cookie so we should have received the others too.
if (string.IsNullOrEmpty(requestCookies[subkey]))
{
chunks = i - 1;
break;
}
keys.Add(subkey + "="); keys.Add(subkey + "=");
} }
} }
......
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或