Merge release/dev17.8 to release/dev17.10 #73954
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
…425.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24225.1
…516.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24204.3 -> To Version 8.0.0-beta.24266.3
…520.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.23168.1 -> To Version 8.0.0-beta.24270.4
Cannot be fixed easily since it depends on the target framework.
…b44-4792-8e68-08eee6b44422 [release/dev17.8] Update dependencies from dotnet/arcade
…73841) * change version * update version + other fixes * wip * revert * workaround for build logger * update to 1ES template * Revert "update to 1ES template" This reverts commit fc40703. * remove colon * update to net472 * log version * change path * Update BuildBoss.csproj * Use version 2.2.155 of MSBuild.StructuredLogger --------- Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
…se/dev17.6-f1969d28-bf05-4aad-988c-dc5bd3651ad8
The EndToEnd OverflowOnFluentCall test is fixed in #67913, but would be a significant change to backport.
SDK 8.0.101 requires VS 17.7 or higher.
Collaborator
Author
|
⚠ This PR has merge conflicts. @Cosifne |
![dotnet-policy-service[bot]](https://avatars.githubusercontent.com/in/285228?s=60&v=4){kind=small}
…f05-4aad-988c-dc5bd3651ad8 [release/dev17.6] Update dependencies from dotnet/arcade
…se/dev17.8 Merge release/dev17.6 to release/dev17.8
…73840) * update codeanalysistestingversion * undo * fix errors * update build log version * wip
Move builds to 1ES PT
* update version for system.data.sqlclient * Update eng/Versions.props Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com> --------- Co-authored-by: Joey Robichaud <joseph.robichaud@microsoft.com>
…se/dev17.8 Merge release/dev17.6 to release/dev17.8
jjonescz
force-pushed
the
merges/release/dev17.8-to-release/dev17.10
branch
2 times, most recently
from
a89238d to
8553fcb
Compare
jjonescz
force-pushed
the
merges/release/dev17.8-to-release/dev17.10
branch
from
8553fcb to
adcf614
Compare
Member
|
@akhera99 @JoeRobich for reviews |
Member
|
Changes from my end look good, waiting on @JoeRobich approval |
akhera99
approved these changes
Jun 13, 2024
JoeRobich
reviewed
Jun 13, 2024
JoeRobich
approved these changes
Jun 13, 2024
Open
3 tasks
This was referenced Jun 18, 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.
This is an automatically generated pull request from release/dev17.8 into release/dev17.10.
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.8-to-release/dev17.10 git reset --hard upstream/release/dev17.10 git merge upstream/release/dev17.8 # Fix merge conflicts git commit git push upstream merges/release/dev17.8-to-release/dev17.10 --force