Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/dev17.8 to main #16042

Merged
merged 314 commits into from
Sep 26, 2023
Merged

Merge release/dev17.8 to main #16042

merged 314 commits into from
Sep 26, 2023

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from release/dev17.8 into main.

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-main
git reset --hard upstream/main
git merge upstream/release/dev17.8
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.8-to-main --force

vzarytovskii and others added 30 commits June 19, 2023 13:12
…619.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23309.8 -> To Version 8.0.0-beta.23319.3

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.xliff-tasks,Microsoft.SourceLink.GitHub
 From Version 1.0.0-beta.23305.1 -> To Version 1.0.0-beta.23312.2 (parent: Microsoft.DotNet.Arcade.Sdk
…620.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23309.8 -> To Version 8.0.0-beta.23320.3

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.xliff-tasks,Microsoft.SourceLink.GitHub
 From Version 1.0.0-beta.23305.1 -> To Version 1.0.0-beta.23312.2 (parent: Microsoft.DotNet.Arcade.Sdk
…620.3

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23309.8 -> To Version 8.0.0-beta.23320.3
* Improve error recovery of union case definitions
…622.2

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23309.8 -> To Version 8.0.0-beta.23322.2

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.xliff-tasks,Microsoft.SourceLink.GitHub
 From Version 1.0.0-beta.23305.1 -> To Version 1.0.0-beta.23312.2 (parent: Microsoft.DotNet.Arcade.Sdk
Co-authored-by: Ayrat Hudaygulov <szer.penguin@gmail.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
…-packages (#15460)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
vzarytovskii and others added 18 commits September 20, 2023 10:23
…otnet-optimization build 20230915.3

optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime
 From Version 1.0.0-prerelease.23462.6 -> To Version 1.0.0-prerelease.23465.3
…otnet-optimization build 20230915.3

optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime
 From Version 1.0.0-prerelease.23462.6 -> To Version 1.0.0-prerelease.23465.3
Co-authored-by: Petr <psfinaki@users.noreply.github.com>
Co-authored-by: Eugene Auduchinok <eugene.auduchinok@jetbrains.com>
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
…otnet-optimization build 20230921.3

optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime
 From Version 1.0.0-prerelease.23462.6 -> To Version 1.0.0-prerelease.23471.3
…otnet-optimization build 20230921.3

optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime
 From Version 1.0.0-prerelease.23462.6 -> To Version 1.0.0-prerelease.23471.3
…otnet-optimization build 20230921.3

optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime
 From Version 1.0.0-prerelease.23462.6 -> To Version 1.0.0-prerelease.23471.3
…se/dev17.8

Merge release/dev17.7 to release/dev17.8
…d37-4308-8405-935e3d2ab7ff

[release/dev17.8] Update dependencies from dnceng/internal/dotnet-optimization
@vzarytovskii
Copy link
Member

I am moderately surprised that majority of the checks (as for now) are passing. I expected it to be worse.

Alright then, less work for me.

@vzarytovskii
Copy link
Member

@dotnet/source-build-internal this is just a back-merge of release branch to main, since we branching off the 17.9, so, no real changes here.

@vzarytovskii vzarytovskii merged commit fb39b94 into main Sep 26, 2023
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants