You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I detected changes in the main branch which have not been merged yet to
release/dev17.15. I'm a robot and am configured to help you
automatically keep release/dev17.15 up to date, so I've opened this PR.
This PR merges commits made on main by the following committers:
* dibarbet
* jjonescz
## 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 release/dev17.15
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-release/dev17.15
```
<details>
<summary>or if you are using SSH</summary>
```
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev17.15
```
</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-release/dev17.15'. 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-release/dev17.15 origin/release/dev17.15
git pull https://github.com/dotnet/roslyn merge/main-to-release/dev17.15
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/roslyn HEAD:merge/main-to-release/dev17.15
```
<details>
<summary>or if you are using SSH</summary>
```
git fetch
git checkout -b merge/main-to-release/dev17.15 origin/release/dev17.15
git pull git@github.com:dotnet/roslyn merge/main-to-release/dev17.15
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/roslyn HEAD:merge/main-to-release/dev17.15
```
</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.
Copy file name to clipboardExpand all lines: src/Compilers/CSharp/Portable/Errors/ErrorFacts.cs
+3Lines changed: 3 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -2503,6 +2503,9 @@ or ErrorCode.ERR_InvalidExtensionParameterReference
2503
2503
or ErrorCode.ERR_ValueParameterSameNameAsExtensionTypeParameter
2504
2504
or ErrorCode.ERR_UnderspecifiedExtension
2505
2505
or ErrorCode.ERR_ExpressionTreeContainsExtensionPropertyAccess
2506
+
or ErrorCode.ERR_PPIgnoredFollowsToken
2507
+
or ErrorCode.ERR_PPIgnoredNeedsFileBasedProgram
2508
+
or ErrorCode.ERR_PPIgnoredFollowsIf
2506
2509
=>false,
2507
2510
};
2508
2511
#pragma warning restore CS8524// The switch expression does not handle some values of its input type (it is not exhaustive) involving an unnamed enum value.
Copy file name to clipboardExpand all lines: src/Compilers/CSharp/Portable/Generated/CSharpSyntaxGenerator/CSharpSyntaxGenerator.SourceGenerator/Syntax.xml.Internal.Generated.cs
Copy file name to clipboardExpand all lines: src/Compilers/CSharp/Portable/Generated/CSharpSyntaxGenerator/CSharpSyntaxGenerator.SourceGenerator/Syntax.xml.Main.Generated.cs
+22Lines changed: 22 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -747,6 +747,9 @@ public partial class CSharpSyntaxVisitor<TResult>
747
747
/// <summary>Called when the visitor visits a ShebangDirectiveTriviaSyntax node.</summary>
748
748
public virtual TResult? VisitShebangDirectiveTrivia(ShebangDirectiveTriviaSyntax node) => this.DefaultVisit(node);
749
749
750
+
/// <summary>Called when the visitor visits a IgnoredDirectiveTriviaSyntax node.</summary>
751
+
public virtual TResult? VisitIgnoredDirectiveTrivia(IgnoredDirectiveTriviaSyntax node) => this.DefaultVisit(node);
752
+
750
753
/// <summary>Called when the visitor visits a NullableDirectiveTriviaSyntax node.</summary>
751
754
public virtual TResult? VisitNullableDirectiveTrivia(NullableDirectiveTriviaSyntax node) => this.DefaultVisit(node);
752
755
}
@@ -1485,6 +1488,9 @@ public partial class CSharpSyntaxVisitor
1485
1488
/// <summary>Called when the visitor visits a ShebangDirectiveTriviaSyntax node.</summary>
1486
1489
public virtual void VisitShebangDirectiveTrivia(ShebangDirectiveTriviaSyntax node) => this.DefaultVisit(node);
1487
1490
1491
+
/// <summary>Called when the visitor visits a IgnoredDirectiveTriviaSyntax node.</summary>
1492
+
public virtual void VisitIgnoredDirectiveTrivia(IgnoredDirectiveTriviaSyntax node) => this.DefaultVisit(node);
1493
+
1488
1494
/// <summary>Called when the visitor visits a NullableDirectiveTriviaSyntax node.</summary>
1489
1495
public virtual void VisitNullableDirectiveTrivia(NullableDirectiveTriviaSyntax node) => this.DefaultVisit(node);
1490
1496
}
@@ -2223,6 +2229,9 @@ public partial class CSharpSyntaxRewriter : CSharpSyntaxVisitor<SyntaxNode?>
2223
2229
public override SyntaxNode? VisitShebangDirectiveTrivia(ShebangDirectiveTriviaSyntax node)
0 commit comments