Merge release/dev17.2 to release/dev17.4 #68066
Merged
Conversation
This file contains hidden or 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
MSRC fix for 17.2. I create a feature branch for the fix to check from release/dev17.2 According to the table in the email, We should update to 16.4.67  Verification locally:  From the kusto: 
The package becomes public accidentally so we don't need to add the nuget feeds
Update VS telemetry version according to the table for the MSRC  Would do the validation work in the insertion PR
Backport #67430 further
…411.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.22524.5 -> To Version 7.0.0-beta.23211.2
… darc-release/dev17.0-vs-deps-aa698329-9cc5-493d-a240-5ac8bfeee6c1
* Don't overwrite binary logs Several of our legs were calling `build.ps1 -binaryLog` in a row and that re-uses the binary log file name which causes an overwrite. This change allows us to specify the name and adds a warning if we do accidentally overwrite in the future. * enable trace for diff issue * Work around NuGet static graph restore bug NuGet/Home#12373
* Don't overwrite binary logs in CI This will make it an error whenever we overwrite a binary log during CI. Doing so means we've lost one of our main tools for investigating build failures. Turning this into an error so we don't make the mistake again. * actually fail * fixup
* Disable static restore in more locations * Run compilers CI when build scripts change * Include compiler generators in compilers code change check * Remove separate restore in bootstrap build
Fix 17.5 CI build
Fix servicing builds
…dev/dibarbet/merge_17_0
This reverts commit 1f28c59.
Merge 17.0-vs-deps into 17.2
…421.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23221.2
Flow the telemetry update change from feature branch to 17.0 release branch
Flow the telemetry update change from feature branch to 17.2 release branch
…merges/release/dev17.0-vs-deps-to-release/dev17.2
…to-release/dev17.2 Merge release/dev17.0-vs-deps to release/dev17.2
…428.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23228.7
…bb63bd-fbd3-47b4-a7e5-66a0c9d57d18 [release/dev17.0-vs-deps] Update dependencies from dotnet/arcade
Cosifne
removed
the
Merge Conflicts
Cosifne
force-pushed
the
merges/release/dev17.2-to-release/dev17.4
branch
from
d53ccc2 to
cd103c2
Compare
Member
|
The two failing integration tests are passed locally on my machine. And I think later they are rewritten in the new test framework in main. |
dibarbet
approved these changes
May 9, 2023
ghost
merged commit
This pull request was closed.
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.
This is an automatically generated pull request from release/dev17.2 into release/dev17.4.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/release/dev17.2-to-release/dev17.4 git reset --hard upstream/release/dev17.4 git merge upstream/release/dev17.2 # Fix merge conflicts git commit git push upstream merges/release/dev17.2-to-release/dev17.4 --force