[automated] Merge branch 'vs16.11' => 'main' #6795
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
Context Non static graph builds using the project cache didn't set the ProjectInstance on the cache request, leading to crashes in the cache. Changes Made Recreate the BuildRequestData for the cache request after the cache service evaluates projects. I was initially using the original BuildSubmission.BuildRequestData which does not contain the project instance.
To allow asserting service state transition
Ensure project cache initialization happens only once Context Turns out the VS workaround was initializing the plugin on every project query, thus crashing the cache. Changes Made Initialization is happening only once now. ProjectCacheService is now asserting that it's always in expected states.
* Update dependencies from https://github.com/dotnet/arcade build 20210628.3 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.21315.2 -> To Version 5.0.0-beta.21328.3
…y built on oop nodes (dotnet#6635) Fixes a bug in proxy build scheduling introduced by dotnet#6386. If a the BuildRequestConfiguration associated with a proxy request has been built before on an out of proc (oop) node then the scheduler will fail with either one of: - affinity mismatch error. This happens when the proxy build is assigned to the inproc (inp) node but its configuration is already assigned to an oop node `AND` serving other existing requests, either blocked or running. - unscheduled requests remain even if there's free oop nodes that can serve them. This happens (as far as I can tell) when the proxy's configuration is already assigned to an oop node (because a previously built non proxy request was assigned there) `AND` there's no other existing requests for that configuration The fix in this PR is to not assign a proxy build to the inproc node if its configuration was previously assigned to another node.
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20210810.2 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.21328.3 -> To Version 5.0.0-beta.21410.2
|
Looks like #6626 did have almost all of this content but squashed instead of merging. I'll remerge. |
Conflicts: documentation/Changelog.md eng/Version.Details.xml eng/Versions.props eng/common/sdl/execute-all-sdl-tools.ps1 eng/common/sdl/push-gdn.ps1 global.json src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs src/Samples/ProjectCachePlugin/AssemblyMockCache.cs
rainersigwald
force-pushed
the
merge/vs16.11-to-main
branch
from
15609dd to
e65d1ae
Compare
rainersigwald
approved these changes
Aug 30, 2021
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 vs16.11 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 vs16.11 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/vs16.11-to-main'. 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 if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.