Skip to content

Commit 554fe0e

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

File tree

3,779 files changed

+230840
-239935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,779 files changed

+230840
-239935
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ f125c2664d3bffb59536f4d3dfee7fa5323c7721
1515
32e21b64138876a065081ab4bbe15b1fbea12316
1616
8ab847ca4cbe30baeb0e5d1cbd68ba40385b01ae
1717
077012c5bc43649fc705698859143226e48686cf
18+
# Converting to file scoped namespaces on 3/26/2025.
19+
98d41b80f6a192230c045a6576e2a283a407980b
1820

‎.github/workflows/main-merge.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
name: Inter-branch merge
44
on:
5-
schedule:
6-
# Create a merge every 3 hours (works only for merges from `main`, others would need a `push` trigger).
7-
- cron: '0 */3 * * *'
5+
# schedule:
6+
# # Create a merge every 3 hours (works only for merges from `main`, others would need a `push` trigger).
7+
# - cron: '0 */3 * * *'
88
workflow_dispatch:
99
inputs:
1010
configuration_file_branch:

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
Roslyn version
66
-->
77
<PropertyGroup>
8-
<MajorVersion>4</MajorVersion>
9-
<MinorVersion>15</MinorVersion>
8+
<MajorVersion>5</MajorVersion>
9+
<MinorVersion>0</MinorVersion>
1010
<PatchVersion>0</PatchVersion>
1111
<PreReleaseVersionLabel>1</PreReleaseVersionLabel>
1212
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>

‎eng/config/BannedSymbols.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ M:Microsoft.CodeAnalysis.Document.GetOptionsAsync(System.Threading.CancellationT
2626
T:Microsoft.CodeAnalysis.Options.DocumentOptionSet; Use AnalyzerConfigOptions instead
2727
M:Microsoft.VisualStudio.Shell.ServiceExtensions.GetService``2(System.IServiceProvider); Use RoslynServiceExtensions instead. This extension internally relies on ThreadHelper, which is incompatible with testing.
2828
M:Microsoft.VisualStudio.Shell.ServiceExtensions.GetService``2(System.IServiceProvider,System.Boolean); Use RoslynServiceExtensions instead. This extension internally relies on ThreadHelper, which is incompatible with testing
29-
M:Microsoft.VisualStudio.Shell.ServiceExtensions.GetServiceAsync``2(Microsoft.VisualStudio.Shell.IAsyncServiceProvider); Use RoslynServiceExtensions instead. This extension internally relies on ThreadHelper, which is incompatible with testing
30-
M:Microsoft.VisualStudio.Shell.ServiceExtensions.GetServiceAsync``2(Microsoft.VisualStudio.Shell.IAsyncServiceProvider,System.Boolean); Use RoslynServiceExtensions instead. This extension internally relies on ThreadHelper, which is incompatible with testing
3129
P:Microsoft.VisualStudio.Shell.ThreadHelper.JoinableTaskFactory; Use IThreadingContext.JoinableTaskFactory instead.
3230
M:Microsoft.CodeAnalysis.Formatting.Formatter.FormatAsync(Microsoft.CodeAnalysis.Document,Microsoft.CodeAnalysis.Options.OptionSet,System.Threading.CancellationToken); Use internal overload instead
3331
M:Microsoft.CodeAnalysis.Formatting.Formatter.FormatAsync(Microsoft.CodeAnalysis.Document,Microsoft.CodeAnalysis.Text.TextSpan,Microsoft.CodeAnalysis.Options.OptionSet,System.Threading.CancellationToken); Use overload with SyntaxFormattingOptions instead

‎eng/config/PublishData.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,6 @@
178178
"insertionTitlePrefix": "[d17.14 P3]",
179179
"insertionCreateDraftPR": false
180180
},
181-
"release/dev17.15": {
182-
"nugetKind": [
183-
"Shipping",
184-
"NonShipping"
185-
],
186-
"vsBranch": "feature/d18initial",
187-
"vsMajorVersion": 17,
188-
"insertionTitlePrefix": "[d17.15 P1 initial]",
189-
"insertionCreateDraftPR": false
190-
},
191181
"main": {
192182
"nugetKind": [
193183
"Shipping",

‎eng/config/branch-merge.jsonc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Used by .github/workflows/main-merge.yml
22
{
33
"merge-flow-configurations": {
4-
"main": {
5-
"MergeToBranch": "release/dev17.15",
6-
"ExtraSwitches": "-QuietComments"
7-
}
4+
// "main": {
5+
// "MergeToBranch": "release/dev17.15",
6+
// "ExtraSwitches": "-QuietComments"
7+
// }
88
}
99
}

‎src/Analyzers/CSharp/Analyzers/AddRequiredParentheses/CSharpAddRequiredExpressionParenthesesDiagnosticAnalyzer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Microsoft.CodeAnalysis.CSharp.AddRequiredParentheses;
1414

1515
[DiagnosticAnalyzer(LanguageNames.CSharp)]
16-
internal class CSharpAddRequiredExpressionParenthesesDiagnosticAnalyzer :
16+
internal sealed class CSharpAddRequiredExpressionParenthesesDiagnosticAnalyzer :
1717
AbstractAddRequiredParenthesesDiagnosticAnalyzer<
1818
ExpressionSyntax, ExpressionSyntax, SyntaxKind>
1919
{

‎src/Analyzers/CSharp/Analyzers/AddRequiredParentheses/CSharpAddRequiredPatternParenthesesDiagnosticAnalyzer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace Microsoft.CodeAnalysis.CSharp.AddRequiredParentheses;
1414

1515
[DiagnosticAnalyzer(LanguageNames.CSharp)]
16-
internal class CSharpAddRequiredPatternParenthesesDiagnosticAnalyzer :
16+
internal sealed class CSharpAddRequiredPatternParenthesesDiagnosticAnalyzer :
1717
AbstractAddRequiredParenthesesDiagnosticAnalyzer<
1818
PatternSyntax, BinaryPatternSyntax, SyntaxKind>
1919
{

‎src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToBlockScopedNamespaceDiagnosticAnalyzer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Microsoft.CodeAnalysis.CSharp.ConvertNamespace;
1313

1414
[DiagnosticAnalyzer(LanguageNames.CSharp)]
15-
internal class ConvertToBlockScopedNamespaceDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer
15+
internal sealed class ConvertToBlockScopedNamespaceDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer
1616
{
1717
public ConvertToBlockScopedNamespaceDiagnosticAnalyzer()
1818
: base(IDEDiagnosticIds.UseBlockScopedNamespaceDiagnosticId,

‎src/Analyzers/CSharp/Analyzers/ConvertNamespace/ConvertToFileScopedNamespaceDiagnosticAnalyzer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Microsoft.CodeAnalysis.CSharp.ConvertNamespace;
1313

1414
[DiagnosticAnalyzer(LanguageNames.CSharp)]
15-
internal class ConvertToFileScopedNamespaceDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer
15+
internal sealed class ConvertToFileScopedNamespaceDiagnosticAnalyzer : AbstractBuiltInCodeStyleDiagnosticAnalyzer
1616
{
1717
public ConvertToFileScopedNamespaceDiagnosticAnalyzer()
1818
: base(IDEDiagnosticIds.UseFileScopedNamespaceDiagnosticId,

0 commit comments

Comments
 (0)