Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Merging internal commits for release/6.0 #51265

Merged
merged 15 commits into from
Oct 10, 2023
Merged

Merging internal commits for release/6.0 #51265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ace21f3
Merged PR 33979: [internal/release/frameshift/6.0] Update dependencie…
dotnet-bot Sep 27, 2023
b0468b9
Track indicators of excessive stream resets
amcasey Sep 23, 2023
2a8a47b
Address PR feedback
amcasey Sep 27, 2023
7d6aec8
Address PR feedback
amcasey Sep 27, 2023
95bb0b8
Increase the min max queue size to match 7 and 8
amcasey Sep 27, 2023
90338b1
Merged PR 33981: Track indicators of excessive stream resets
vseanreesermsft Sep 27, 2023
1d49c49
Merged PR 33993: [internal/release/frameshift/6.0] Update dependencie…
dotnet-bot Sep 28, 2023
b1eee58
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-bot Sep 30, 2023
2a991f9
Merged PR 34064: [internal/release/frameshift/6.0] Update dependencie…
dotnet-bot Sep 30, 2023
fc82f0d
Update jquery-validation to v1.19.5 (#50484)
MackinnonBuck Sep 6, 2023
5e314b8
Merged PR 34071: Update jquery-validation to v1.19.5
vseanreesermsft Sep 30, 2023
4343840
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 30, 2023
bc25dd5
Merged PR 34133: [internal/release/frameshift/6.0] Update dependencie…
dotnet-bot Sep 30, 2023
5cdfe29
Merge commit 'bc25dd5d39fd057f7cb28acb5ad4d9e925a375de' into internal…
vseanreesermsft Oct 10, 2023
97956e1
Update baseline, SDK
wtgodbe Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-4bb6dc1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4bb6dc19/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-e0f0de8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-687fc8f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-687fc8f9/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-687fc8f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-687fc8f9-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-50a6896" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-50a6896c/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-50a6896-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-50a6896c-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-efcore-50a6896-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-50a6896c-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -26,11 +27,12 @@
<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-687fc8f-1" value="true" />
<add key="darc-int-dotnet-efcore-687fc8f" value="true" />
<add key="darc-int-dotnet-efcore-50a6896-1" value="true" />
<add key="darc-int-dotnet-efcore-50a6896-2" value="true" />
<add key="darc-int-dotnet-efcore-50a6896" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-4bb6dc1" value="true" />
<add key="darc-int-dotnet-runtime-e0f0de8" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
444 changes: 222 additions & 222 deletions eng/Baseline.Designer.props
View file
Open in desktop

Large diffs are not rendered by default.

214 changes: 107 additions & 107 deletions eng/Baseline.xml
View file
Open in desktop

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="dotnet-ef" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
<Dependency Name="dotnet-ef" Version="6.0.23">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.23">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.23">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.23">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.23">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.23">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.23">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.22">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>687fc8f9a538592b2b1494f6353293aac5da74a5</Sha>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.23">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -177,9 +177,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.22-servicing.23424.25">
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.23-servicing.23480.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -245,33 +245,33 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.22">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.23">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.22">
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.23">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.22">
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.23">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<!--
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="6.0.22">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.23">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.22">
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.23">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.22-servicing.23424.25">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.23-servicing.23480.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd</Sha>
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>24</AspNetCorePatchVersion>
<ValidateBaseline>false</ValidateBaseline>
<ValidateBaseline>true</ValidateBaseline>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
Expand Down Expand Up @@ -63,12 +63,12 @@
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.22</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.22</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.22</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.22</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.22</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.22-servicing.23424.25</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftNETCoreAppRefVersion>6.0.23</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.23</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.23</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.23</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.23</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.23-servicing.23480.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
Expand Down Expand Up @@ -103,7 +103,7 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.22-servicing.23424.25</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.23-servicing.23480.2</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.2</SystemDirectoryServicesProtocolsVersion>
Expand All @@ -122,14 +122,14 @@
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>6.0.22</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.22</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.22</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.22</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.22</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.22</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>6.0.22</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.22</MicrosoftEntityFrameworkCoreDesignVersion>
<dotnetefVersion>6.0.23</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.23</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.23</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.23</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.23</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.23</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>6.0.23</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.23</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23408.5</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "6.0.122"
"version": "6.0.123"
},
"tools": {
"dotnet": "6.0.122",
"dotnet": "6.0.123",
"runtimes": {
"dotnet/x64": [
"2.1.30",
Expand Down
Loading
Loading