Skip to content

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jul 9, 2025

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:

  • AndriySvyryd
  • vseanreesermsft
  • dotnet-bot
  • cincuranet

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.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.

git fetch
git checkout -b merge/release/9.0-to-main origin/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 fetch
git checkout -b merge/release/9.0-to-main origin/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.

Maurycy Markowski and others added 25 commits April 29, 2025 19:12
#### AI description  (iteration 1)
#### PR Classification
Code cleanup and dependency updates.

#### PR Summary
This pull request merges updates from `release/9.0` into `internal/release/9.0`, primarily focusing on updating dependencies and configuration files.
- Updated versions and SHAs for `Microsoft.DotNet.Arcade.Sdk`, `Microsoft.DotNet.Build.Tasks.Templating`, and `Microsoft.DotNet.Helix.Sdk` in `/eng/Version.Details.xml`, `/global.json`, and `/eng/Versions.props`.
- Updated package versions in `/eng/common/core-templates/job/source-index-stage1.yml`.
- Added `buildArguments` parameter in `/eng/common/core-templates/job/source-build.yml` and `/eng/common/core-templates/steps/source-build.yml`.
- Removed a package source from `/NuGet.config`.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-runtime build 20250516.5

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.5 -> To Version 9.0.6
…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](https://maestro.dot.net/subscriptions?search=9dd82232-9947-4c91-873c-a50d5007af96)
- **Build**: [20250516.5](https://dev.azure.com/dnceng/internal/_build/results?buildId=2710543)
- **Date Produced**: May 16, 2025 2:10:15 PM UTC
- **Commit**: [ee65eb43cd4028e5ec18877f3d9c997faf4671f0](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GCee65eb43cd4028e5ec18877f3d9c997faf4671f0)
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
…otnet-runtime build 20250516.13

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.6 -> To Version 9.0.6
…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](https://maestro.dot.net/subscriptions?search=9dd82232-9947-4c91-873c-a50d5007af96)
- **Build**: [20250516.13](https://dev.azure.com/dnceng/internal/_build/results?buildId=2710918)
- **Date Produced**: May 16, 2025 10:54:51 PM UTC
- **Commit**: [3875b54e7b10b10606b105340199946d0b877754](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC3875b54e7b10b10606b105340199946d0b877754)
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
#### AI description  (iteration 1)
#### PR Classification
Dependency update and cleanup for the internal release merge.

#### PR Summary
This PR merges public release changes by updating dependency versions and cleaning up internal package source configurations. The changes include:
- **`eng/Version.Details.xml`**: Updated versions for Arcade, Build Tasks Templating, and Helix SDK from 9.0.0-beta.25266.2 to 9.0.0-beta.25271.1 with corresponding SHA changes.
- **`global.json`**: Adjusted versions for Microsoft.DotNet.Arcade.Sdk and Microsoft.DotNet.Helix.Sdk to 9.0.0-beta.25271.1.
- **`eng/Versions.props`**: Upgraded MicrosoftDotNetBuildTasksTemplatingVersion to 9.0.0-beta.25271.1.
- **`NuGet.config`**: Removed internal package source entries related to dotnet-runtime.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
…otnet-runtime build 20250610.29

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.6 -> To Version 9.0.7
…otnet-runtime build 20250611.18

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.6 -> To Version 9.0.7
…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](https://maestro.dot.net/subscriptions?search=9dd82232-9947-4c91-873c-a50d5007af96)
- **Build**: [20250611.18](https://dev.azure.com/dnceng/internal/_build/results?buildId=2728344)
- **Date Produced**: June 12, 2025 11:29:01 AM UTC
- **Commit**: [1bafa9761541b20cded99398ce1a8630d09f43fd](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC1bafa9761541b20cded99398ce1a8630d09f43fd)
- **Branch**: refs/heads/internal/release/9.0

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96)
…5-07-08-1444

Merging internal commits for release/9.0
@cincuranet cincuranet enabled auto-merge July 9, 2025 10:51
@cincuranet cincuranet merged commit 3e2333f into main Jul 9, 2025
7 checks passed
@cincuranet cincuranet deleted the merge/release/9.0-to-main branch July 9, 2025 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants