Skip to content

Commit d4e6643

Browse files
[automated] Merge branch 'main-vs-deps' => 'release/dev18.0' (#77716)
I detected changes in the main-vs-deps branch which have not been merged yet to release/dev18.0. I'm a robot and am configured to help you automatically keep release/dev18.0 up to date, so I've opened this PR. This PR merges commits made on main-vs-deps by the following committers: * dotnet-policy-service[bot] * CyrusNajmabadi ## 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-vs-deps git pull --ff-only git checkout release/dev18.0 git pull --ff-only git merge --no-ff main-vs-deps # 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-vs-deps-to-release/dev18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` </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-vs-deps-to-release/dev18.0'. 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-vs-deps-to-release/dev18.0 origin/release/dev18.0 git pull https://github.com/dotnet/roslyn merge/main-vs-deps-to-release/dev18.0 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/main-vs-deps-to-release/dev18.0 origin/release/dev18.0 git pull git@github.com:dotnet/roslyn merge/main-vs-deps-to-release/dev18.0 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/roslyn HEAD:merge/main-vs-deps-to-release/dev18.0 ``` </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 53ccb4b + 7190843 commit d4e6643

File tree

10 files changed

+6
-89
lines changed

10 files changed

+6
-89
lines changed

src/LanguageServer/Protocol/ExternalAccess/VSMac/API/VSMacLspLoggerFactory.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/LanguageServer/Protocol/ExternalAccess/VSMac/AnalyzerHelper.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/LanguageServer/Protocol/ExternalAccess/VSMac/CompletionOptionsAccessor.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/LanguageServer/Protocol/ExternalAccess/VSMac/SolutionCrawlerOptionsAccessor.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/Tools/SemanticSearch/ReferenceAssemblies/Apis/Microsoft.CodeAnalysis.CSharp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated, do not update manually
1+
# Generated, do not update manually
22
Microsoft.CodeAnalysis.CSharp.AwaitExpressionInfo
33
Microsoft.CodeAnalysis.CSharp.AwaitExpressionInfo.Equals(Microsoft.CodeAnalysis.CSharp.AwaitExpressionInfo)
44
Microsoft.CodeAnalysis.CSharp.AwaitExpressionInfo.Equals(System.Object)

src/Tools/SemanticSearch/ReferenceAssemblies/Apis/Microsoft.CodeAnalysis.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated, do not update manually
1+
# Generated, do not update manually
22
Microsoft.CodeAnalysis.Accessibility
33
Microsoft.CodeAnalysis.Accessibility.Friend
44
Microsoft.CodeAnalysis.Accessibility.Internal

src/Tools/SemanticSearch/ReferenceAssemblies/Apis/System.Collections.Immutable.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated, do not update manually
1+
# Generated, do not update manually
22
System.Collections.Frozen.FrozenDictionary
33
System.Collections.Frozen.FrozenDictionary.ToFrozenDictionary``2(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{``0,``1}},System.Collections.Generic.IEqualityComparer{``0})
44
System.Collections.Frozen.FrozenDictionary.ToFrozenDictionary``2(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``1},System.Collections.Generic.IEqualityComparer{``1})

src/Tools/SemanticSearch/ReferenceAssemblies/Apis/System.Collections.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated, do not update manually
1+
# Generated, do not update manually
22
System.Collections.BitArray
33
System.Collections.BitArray.#ctor(System.Boolean[])
44
System.Collections.BitArray.#ctor(System.Byte[])

src/Tools/SemanticSearch/ReferenceAssemblies/Apis/System.Linq.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated, do not update manually
1+
# Generated, do not update manually
22
System.Linq.Enumerable
33
System.Linq.Enumerable.Aggregate``1(System.Collections.Generic.IEnumerable{``0},System.Func{``0,``0,``0})
44
System.Linq.Enumerable.Aggregate``2(System.Collections.Generic.IEnumerable{``0},``1,System.Func{``1,``0,``1})

src/Tools/SemanticSearch/ReferenceAssemblies/Apis/System.Runtime.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated, do not update manually
1+
# Generated, do not update manually
22
System.AccessViolationException
33
System.AccessViolationException.#ctor
44
System.AccessViolationException.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)

0 commit comments

Comments
 (0)