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

[automated] Merge branch 'release/9.0' => 'main' #35054

Merged
merged 29 commits into from
Nov 14, 2024
Merged

[automated] Merge branch 'release/9.0' => 'main' #35054

merged 29 commits into from
Nov 14, 2024

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Nov 6, 2024

I detected changes in the release/9.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/9.0 by the following committers:

  • vseanreesermsft
  • maumar

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/9.0
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/efcore HEAD:merge/release/9.0-to-main
or if you are using SSH 
git push [email protected]:dotnet/efcore HEAD:merge/release/9.0-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/9.0-to-main main
git pull https://github.com/dotnet/efcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/efcore HEAD:merge/release/9.0-to-main
or if you are using SSH 
git checkout -b merge/release/9.0-to-main main
git pull [email protected]:dotnet/efcore merge/release/9.0-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/efcore HEAD:merge/release/9.0-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

maumar and others added 18 commits October 17, 2024 18:18
@maumar
reenable stable package warning (#34932)
a2f51ed
@mmitche
Merged PR 43833: [internal/release/9.0] Update dependencies from dnce…
6761562 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:9dd82232-9947-4c91-873c-a50d5007af96)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 9dd82232-9947-4c91-873c-a50d5007af96
- **Build**: 20241016.9
- **Date Produced**: October 17, 2024 1:00:24 AM UTC
- **Commit**: 64edceb090bcd73e7f842a47b31b4fc865f48b08
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Caching.Memory**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.Json**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.Extensions.DependencyInjection**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.0-rtm.24516.5 to 9.0.0-rtm.24516.9][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **System.Formats.Asn1**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **System.Text.Encodings.Web**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]
  - **System.Text.Json**: [from 9.0.0-rtm.24516.5 to 9.0.0][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC9305d7f71d73c1d1edeb2a06478c998e40deda8d&targetVersion=GC64edceb090bcd73e7f842a47b31b4fc865f48b08&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
[internal/release/9.0] Update dependencies from dnceng/internal/dotne…
bb8107e 
…t-runtime
@mmitche
Merged PR 44018: [internal/release/9.0] Update dependencies from dnce…
6eaad1b 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:9dd82232-9947-4c91-873c-a50d5007af96)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 9dd82232-9947-4c91-873c-a50d5007af96
- **Build**: 20241018.5
- **Date Produced**: October 18, 2024 9:34:51 PM UTC
- **Commit**: e8d255286ddb19ea56ba86bd81429cf90dbd00e7
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Caching.Memory**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.Json**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.DependencyInjection**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.0-rtm.24517.18 to 9.0.0-rtm.24518.5][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 9.0.0-rtm.24517.18 to 9.0.0-rtm.24518.5][1]
  - **System.Formats.Asn1**: [from 9.0.0 to 9.0.0][1]
  - **System.Text.Encodings.Web**: [from 9.0.0 to 9.0.0][1]
  - **System.Text.Json**: [from 9.0.0 to 9.0.0][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC26f329604f8e2255105f273a82de369fbd17e5cb&targetVersion=GCe8d255286ddb19ea56ba86bd81429cf90dbd00e7&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
6220979 
…otnet-runtime build 20241018.14

Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json
 From Version 9.0.0 -> To Version 9.0.0
@dkurepa
Merged PR 44026: [internal/release/9.0] Update dependencies from dnce…
2247e40 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:9dd82232-9947-4c91-873c-a50d5007af96)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 9dd82232-9947-4c91-873c-a50d5007af96
- **Build**: 20241018.14
- **Date Produced**: October 19, 2024 5:07:58 AM UTC
- **Commit**: 9c52987919f0223531191d4cfaa6487647bbf52c
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Caching.Memory**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.Json**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.DependencyInjection**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.0-rtm.24518.5 to 9.0.0-rtm.24518.14][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 9.0.0-rtm.24518.5 to 9.0.0-rtm.24518.14][1]
  - **System.Formats.Asn1**: [from 9.0.0 to 9.0.0][1]
  - **System.Text.Encodings.Web**: [from 9.0.0 to 9.0.0][1]
  - **System.Text.Json**: [from 9.0.0 to 9.0.0][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe8d255286ddb19ea56ba86bd81429cf90dbd00e7&targetVersion=GC9c52987919f0223531191d4cfaa6487647bbf52c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
[internal/release/9.0] Update dependencies from dnceng/internal/dotne…
85574dc 
…t-runtime
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
065cb94 
…otnet-runtime build 20241022.16

Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json
 From Version 9.0.0 -> To Version 9.0.0
@dkurepa
Merged PR 44182: [internal/release/9.0] Update dependencies from dnce…
2d64559 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:9dd82232-9947-4c91-873c-a50d5007af96)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 9dd82232-9947-4c91-873c-a50d5007af96
- **Build**: 20241022.16
- **Date Produced**: October 23, 2024 10:25:46 AM UTC
- **Commit**: 0456c7e91c34003f26acf8606ba9d20e29f518bd
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Caching.Memory**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.Configuration.Json**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.DependencyInjection**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.0-rtm.24522.12 to 9.0.0-rtm.24522.16][1]
  - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][1]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 9.0.0-rtm.24522.12 to 9.0.0-rtm.24522.16][1]
  - **System.Formats.Asn1**: [from 9.0.0 to 9.0.0][1]
  - **System.Text.Encodings.Web**: [from 9.0.0 to 9.0.0][1]
  - **System.Text.Json**: [from 9.0.0 to 9.0.0][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2df113716c90ff0228dab915ce6daffc9789847a&targetVersion=GC0456c7e91c34003f26acf8606ba9d20e29f518bd&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
51d0837 
…otnet-runtime build 20241028.4

Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json
 From Version 9.0.0 -> To Version 9.0.0
@dotnet-bot
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
7b36e86 
…otnet-runtime build 20241028.9

Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json
 From Version 9.0.0 -> To Version 9.0.0
@dkurepa
Merged PR 44450: [internal/release/9.0] Update dependencies from dnce…
645f313 
…ng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:9dd82232-9947-4c91-873c-a50d5007af96)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 9dd82232-9947-4c91-873c-a50d5007af96
- **Build**: 20241028.9
- **Date Produced**: October 29, 2024 7:12:06 AM UTC
- **Commit**: 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Extensions.Caching.Memory**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.Extensions.Configuration**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.Extensions.Configuration.Json**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.Extensions.DependencyInjection**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.Extensions.DependencyModel**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.0-rtm.24522.16 to 9.0.0-rtm.24528.9][2]
  - **Microsoft.Extensions.Logging**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.NETCore.App.Ref**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.0 to 9.0.0][2]
  - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 9.0.0-rtm.24522.16 to 9.0.0-rtm.24528.9][2]
  - **System.Formats.Asn1**: [from 9.0.0 to 9.0.0][2]
  - **System.Text.Encodings.Web**: [from 9.0.0 to 9.0.0][2]
  - **System.Text.Json**: [from 9.0.0 to 9.0.0][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC0456c7e91c34003f26acf8606ba9d20e29f518bd&targetVersion=GC9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
@AndriySvyryd
[release/9.0-staging] Update macOS images to 13 (#35004)
919e5dd
@AndriySvyryd
[release/8.0-staging] Update macOS images to 13 (#35005)
9669fe1
@maumar
adjusting some migration tests so that baselines dont depend on the p…
b7fc500 
…roduct version (#34977)
@vseanreesermsft
Update branding to 8.0.12 (#35048)
c12cf80
@vseanreesermsft @maumar
Update branding to 9.0.1 (#35049)
01ccb27 
Co-authored-by: maumar <[email protected]>
@AndriySvyryd
Merge branch 'release/8.0' into release-8.0-staging
7e40e04
@AndriySvyryd AndriySvyryd merged commit 8935072 into main Nov 14, 2024
7 checks passed
@AndriySvyryd AndriySvyryd deleted the merge/release/9.0-to-main branch November 14, 2024 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndriySvyryd AndriySvyryd AndriySvyryd approved these changes

@maumar maumar Awaiting requested review from maumar maumar is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@AndriySvyryd @maumar @dotnet-bot @vseanreesermsft