Skip to content

Merging internal commits for release/7.0 #48779

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.

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

Merged

Conversation

vseanreesermsft
Copy link
Contributor

No description provided.

dotnet-bot and others added 28 commits April 4, 2023 19:09
Merge from public release/7.0 to internal/release/7.0 and resolve conflicts if necessary
…ng/internal/dotnet-efcore

This pull request updates the following dependencies

[marker]: <> (Begin:10156ce0-bf6e-4dac-1399-08da7ef5fa55)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- **Subscription**: 10156ce0-bf6e-4dac-1399-08da7ef5fa55
- **Build**: 20230414.6
- **Date Produced**: April 14, 2023 7:18:36 PM UTC
- **Commit**: 9ffcbcfef0ba4fb2fc947974b097f15126cae25a
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-ef**: [from 7.0.5 to 7.0.6][1]
  - **Microsoft.EntityFrameworkCore**: [from 7.0.5 to 7.0.6][1]
  - **Microsoft.EntityFrameworkCore.Design**: [from 7.0.5 to 7.0.6][1]
  - **Microsoft.EntityFrameworkCore.InMemory**: [from 7.0.5 to 7.0.6][1]
  - **Microsoft.EntityFrameworkCore.Relational**: [from 7.0.5 to 7.0.6][1]
  - **Microsoft.EntityFrameworkCore.Sqlite**: [from 7.0.5 to 7.0.6][1]
  - **Microsoft.EntityFrameworkCore.SqlServer**: [from 7.0.5 to 7.0.6][1]
  - **Microsoft.EntityFrameworkCore.Tools**: [from 7.0.5 to 7.0.6][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-efcore/branches?baseVersion=GC5c6be2458d&targetVersion=GC9ffcbcfef0&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:10156ce0-bf6e-4dac-1399-08da7ef5fa55)
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:2802be6f-a6f7-477e-8165-08da7ef6284d)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 2802be6f-a6f7-477e-8165-08da7ef6284d
- **Build**: 20230524.4
- **Date Produced**: May 24, 2023 7:21:00 PM UTC
- **Commit**: 5b20af47d99620150c53eaf5db8636fdf730b126
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Logging.Abstractions**: [from 7.0.1 to 7.0.1][1]
  - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][1]
  - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 7.0.7 to 7.0.7][1]
  - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 7.0.7 to 7.0.7][1]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][1]
  - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 7.0.7 to 7.0.7][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][1]
  - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.3][2]
  - **System.DirectoryServices.Protocols**: [from 7.0.1 to 7.0.1][1]
  - **System.Reflection.Metadata**: [from 7.0.2 to 7.0.2][1]
  - **System.Security.Cryptography.Pkcs**: [from 7.0.2 to 7.0.2][1]
  - **System.ServiceProcess.ServiceController**: [from 7.0.0 to 7.0.1][3]
  - **System.Text.Json**: [from 7.0.3 to 7.0.3][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8e3442dd52&targetVersion=GC5b20af47d9&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCf5f7b34502&targetVersion=GC5b20af47d9&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCd099f075e4&targetVersion=GC5b20af47d9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:2802be6f-a6f7-477e-8165-08da7ef6284d)
@vseanreesermsft vseanreesermsft requested review from a team and wtgodbe as code owners June 13, 2023 17:20
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Jun 13, 2023
@ghost ghost added this to the 7.0.x milestone Jun 13, 2023
@ghost
Copy link

ghost commented Jun 13, 2023

Hi @vseanreesermsft. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the servicing process document.
Otherwise, please add tell-mode label.

@ghost
Copy link

ghost commented Jun 13, 2023

Hey @dotnet/aspnet-build, looks like this PR is something you want to take a look at.

@wtgodbe
Copy link
Member

wtgodbe commented Jun 13, 2023

Test failure in Interop.FunctionalTests.HttpClientHttp2InteropTests.ServerReset_BeforeRequestBody_ClientBodyThrows(scheme: "http")

Assert.Throws() Failure
Expected: typeof(System.Net.Http.HttpProtocolException)
Actual: typeof(System.TimeoutException): The operation has timed out.
---- System.TimeoutException : The operation has timed out.
at Microsoft.AspNetCore.Testing.TaskExtensions.TimeoutAfter(Task task, TimeSpan timeout, String filePath, Int32 lineNumber) in //src/Shared/TaskExtensions.cs:line 123
----- Inner Stack Trace -----
at Microsoft.AspNetCore.Testing.TaskExtensions.TimeoutAfter(Task task, TimeSpan timeout, String filePath, Int32 lineNumber) in /
/src/Shared/TaskExtensions.cs:line 123

Retrying for now

@wtgodbe wtgodbe merged commit 611243f into dotnet:release/7.0 Jun 13, 2023
@ghost ghost modified the milestones: 7.0.x, 7.0.8 Jun 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants