[automated] Merge branch 'release/8.0' => 'release/9.0' #34572
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Merge from public release/8.0 to internal/release/8.0 and resolve conflicts if necessary
…otnet-runtime build 20240520.14 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json From Version 8.0.1 -> To Version 8.0.1
…ng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce - **Build**: 20240520.14 - **Date Produced**: May 21, 2024 1:28:40 AM UTC - **Commit**: 63d80966a9f0d15e057d0d146702405b19c82533 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.DependencyModel**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.7-servicing.24270.7 to 8.0.7-servicing.24270.14][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.7-servicing.24270.7 to 8.0.7-servicing.24270.14][1] - **System.Text.Json**: [from 8.0.4 to 8.0.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC6d230cdb65dee13db6779749580d02bcd413af70&targetVersion=GC63d80966a9f0d15e057d0d146702405b19c82533&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
…ng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce - **Build**: 20240612.14 - **Date Produced**: June 13, 2024 1:29:09 PM UTC - **Commit**: cc6880ce36d783678284d36e8397fc30fda93c8a - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.DependencyModel**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.7-servicing.24311.13 to 8.0.7-servicing.24312.14][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.7-servicing.24311.13 to 8.0.7-servicing.24312.14][1] - **System.Text.Json**: [from 8.0.4 to 8.0.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d&targetVersion=GCcc6880ce36d783678284d36e8397fc30fda93c8a&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
…otnet-runtime build 20240613.11 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json From Version 8.0.1 -> To Version 8.0.1
…ng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce - **Build**: 20240613.11 - **Date Produced**: June 14, 2024 12:03:48 AM UTC - **Commit**: 2aade6beb02ea367fd97c4070a4198802fe61c03 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.DependencyModel**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.7-servicing.24312.14 to 8.0.7-servicing.24313.11][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.7-servicing.24312.14 to 8.0.7-servicing.24313.11][1] - **System.Text.Json**: [from 8.0.4 to 8.0.4][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCcc6880ce36d783678284d36e8397fc30fda93c8a&targetVersion=GC2aade6beb02ea367fd97c4070a4198802fe61c03&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
…-merge-8.0-2024-07-09-1040-bfcfe8ff-bc59-4584-8765-5c81b03ac6e0
…4-07-09-1040-bfcfe8ff-bc59-4584-8765-5c81b03ac6e0 Merging internal commits for release/8.0
…710.5 (#34209) [release/8.0] Update dependencies from dotnet/arcade
…otnet-runtime build 20240716.12 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport From Version 8.0.7-servicing.24313.11 -> To Version 8.0.8-servicing.24366.12
…ng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce - **Build**: 20240716.12 - **Date Produced**: July 16, 2024 10:31:44 PM UTC - **Commit**: 08338fcaa5c9b9a8190abb99222fed12aaba956c - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.7-servicing.24313.11 to 8.0.8-servicing.24366.12][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.8][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.8][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.7-servicing.24313.11 to 8.0.8-servicing.24366.12][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2aade6beb02ea367fd97c4070a4198802fe61c03&targetVersion=GC08338fcaa5c9b9a8190abb99222fed12aaba956c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce)
Temporarily work around '/' in dSAS When dSAS tokens contain a forward /, helix will incorrectly name the file target for a correlation payload, and then fail to unpack it. ---- #### AI description (iteration 1) #### PR Classification Bug fix to address an issue with SAS tokens containing '/' causing incorrect downloads. #### PR Summary This pull request implements a workaround for a Helix issue where SAS tokens with '/' result in incorrect downloads of correlation payloads. - `eng/common/templates/steps/get-delegation-sas.yml`: Added a loop to regenerate the SAS token if it contains a '/' character, ensuring valid tokens are generated.
Temporarily work around '/' in dSAS When dSAS tokens contain a forward /, helix will incorrectly name the file target for a correlation payload, and then fail to unpack it. ---- #### AI description (iteration 1) #### PR Classification Bug fix to address an issue with SAS tokens containing '/' causing incorrect downloads. #### PR Summary This pull request implements a workaround for a Helix issue where SAS tokens with '/' result in incorrect downloads of correlation payloads. - `eng/common/templates-official/steps/get-delegation-sas.yml`: Added a loop to regenerate SAS tokens until one without '/' is obtained.
We can use the special value `PLACEHOLDER` to tell CredScan these credentials are fake ones. Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
…-merge-8.0-2024-08-13-1057-dda3cfbb-439d-49b9-80ee-fe43cf6f662f
…4-08-13-1057-dda3cfbb-439d-49b9-80ee-fe43cf6f662f Merging internal commits for release/8.0
github-actions
bot
requested review from
AndriySvyryd and
maumar
as code owners
AndriySvyryd
approved these changes
Sep 4, 2024
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.
I detected changes in the release/8.0 branch which have not been merged yet to release/9.0. I'm a robot and am configured to help you automatically keep release/9.0 up to date, so I've opened this PR.
This PR merges commits made on release/8.0 by the following committers:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0-to-release/9.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
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.