Skip to content

Commit 062fd4e

Browse files
[automated] Merge branch 'main' => 'main-vs-deps' (#77801)
I detected changes in the main branch which have not been merged yet to main-vs-deps. I'm a robot and am configured to help you automatically keep main-vs-deps up to date, so I've opened this PR. This PR merges commits made on main by the following committers: * carlossanlop ## 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. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> 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. ``` sh git fetch git checkout main git pull --ff-only git checkout main-vs-deps git pull --ff-only git merge --no-ff main # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/roslyn HEAD:merge/main-to-main-vs-deps ``` <details> <summary>or if you are using SSH</summary> ``` git push [email protected]:dotnet/roslyn HEAD:merge/main-to-main-vs-deps ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-main-vs-deps'. This can be done to resolve conflicts or make other changes to this pull request before it is merged. The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote. ``` git fetch git checkout -b merge/main-to-main-vs-deps origin/main-vs-deps git pull https://github.com/dotnet/roslyn merge/main-to-main-vs-deps (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/roslyn HEAD:merge/main-to-main-vs-deps ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/main-to-main-vs-deps origin/main-vs-deps git pull [email protected]:dotnet/roslyn merge/main-to-main-vs-deps (make changes) git commit -m "Updated PR with my changes" git push [email protected]:dotnet/roslyn HEAD:merge/main-to-main-vs-deps ``` </details> 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.
2 parents 4140091 + 3382aa6 commit 062fd4e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
https://github.com/dotnet/sdk/issues/45155
2222
-->
2323
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
24-
<MicrosoftIORedistVersion>6.1.0</MicrosoftIORedistVersion>
25-
<SystemBuffersVersion>4.6.0</SystemBuffersVersion>
24+
<MicrosoftIORedistVersion>6.1.2</MicrosoftIORedistVersion>
25+
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
2626
<SystemDataSqlClientVersion>4.9.0</SystemDataSqlClientVersion>
27-
<SystemMemoryVersion>4.6.0</SystemMemoryVersion>
28-
<SystemNumericsVectorsVersion>4.6.0</SystemNumericsVectorsVersion>
29-
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
30-
<SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
27+
<SystemMemoryVersion>4.6.2</SystemMemoryVersion>
28+
<SystemNumericsVectorsVersion>4.6.1</SystemNumericsVectorsVersion>
29+
<SystemRuntimeCompilerServicesUnsafeVersion>6.1.1</SystemRuntimeCompilerServicesUnsafeVersion>
30+
<SystemThreadingTasksExtensionsVersion>4.6.2</SystemThreadingTasksExtensionsVersion>
3131
</PropertyGroup>
3232
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
3333
<MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>

0 commit comments

Comments
 (0)