[Rollout] Production rollout 2025-02-05 #4417
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I detected changes in the production 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 production by the following committers: * @oleksandr-didyk ## 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. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> 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. ``` sh git fetch git checkout production git pull --ff-only git checkout main git pull --ff-only git merge --no-ff production # 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/arcade-services HEAD:merge/production-to-main ``` <details> <summary>or if you are using SSH</summary> ``` git push [email protected]:dotnet/arcade-services HEAD:merge/production-to-main ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-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/production-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/production-to-main origin/main git pull https://github.com/dotnet/arcade-services merge/production-to-main (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/arcade-services HEAD:merge/production-to-main ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/production-to-main origin/main git pull [email protected]:dotnet/arcade-services merge/production-to-main (make changes) git commit -m "Updated PR with my changes" git push [email protected]:dotnet/arcade-services HEAD:merge/production-to-main ``` </details> 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.
<!-- Link the GitHub or AzDO issue this pull request is associated with. Please copy and paste the full URL rather than using the dotnet/arcade-services# syntax --> dotnet#4410
This pull request updates the following dependencies [marker]: <> (Begin:00000000-1533-4a4b-b054-3229a7f54e8c) ## From https://github.com/dotnet/arcade - **Subscription**: 00000000-1533-4a4b-b054-3229a7f54e8c - **Build**: 20250129.1 - **Date Produced**: January 29, 2025 10:36:22 AM UTC - **Commit**: cae548d41ddb92922d78f3d9737635d104f650a5 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.25066.6 to 8.0.0-beta.25079.1][1] - **Microsoft.DotNet.Build.Tasks.Feed**: [from 8.0.0-beta.25066.6 to 8.0.0-beta.25079.1][1] - **Microsoft.DotNet.Git.IssueManager**: [from 8.0.0-beta.25066.6 to 8.0.0-beta.25079.1][1] - **Microsoft.DotNet.SignTool**: [from 8.0.0-beta.25066.6 to 8.0.0-beta.25079.1][1] - **Microsoft.DotNet.SwaggerGenerator.MSBuild**: [from 8.0.0-beta.25066.6 to 8.0.0-beta.25079.1][1] - **Microsoft.DotNet.VersionTools**: [from 8.0.0-beta.25066.6 to 8.0.0-beta.25079.1][1] [1]: dotnet/arcade@4db7252...cae548d [DependencyUpdate]: <> (End) [marker]: <> (End:00000000-1533-4a4b-b054-3229a7f54e8c) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This pull request updates the following dependencies [marker]: <> (Begin:00000000-d81a-43a9-ad8c-86b6fa5394ca) ## From https://github.com/dotnet/dnceng - **Subscription**: 00000000-d81a-43a9-ad8c-86b6fa5394ca - **Build**: 20250129.1 - **Date Produced**: January 29, 2025 5:36:14 PM UTC - **Commit**: a2f07fa3c2454f47998e7c48652ea91982362a74 - **Branch**: refs/heads/production [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DncEng.Configuration.Bootstrap**: [from 1.1.0-beta.25071.2 to 1.1.0-beta.25079.1][1] - **Microsoft.DncEng.SecretManager**: [from 1.1.0-beta.25071.2 to 1.1.0-beta.25079.1][1] [1]: dotnet/dnceng@919c3cb...a2f07fa [DependencyUpdate]: <> (End) [marker]: <> (End:00000000-d81a-43a9-ad8c-86b6fa5394ca) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
<!-- Link the GitHub or AzDO issue this pull request is associated with. Please copy and paste the full URL rather than using the dotnet/arcade-services# syntax --> dotnet#4390 Adds a `RemoveDependencyAsync` method with the same API as `AddDependencyAsync`
Token is no longer supported (dotnet#4312) `darc` will - stop reading/storing the BAR token from the local settings - stop using it if it's supplied as an argument (but not fail yet) - warn if it's supplied - stop giving a warning when the user has not called `darc authenticate` yet
dkurepa
approved these changes
Feb 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#4416