Skip to content

Commit 4965b59

Browse files
dotnet-maestro[bot]jjonescz
dotnet-maestro[bot]
and
jjonescz
authored
[main] Update dependencies from dotnet/roslyn (#48392)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jan Jones <[email protected]>
1 parent b2e3848 commit 4965b59

File tree

3 files changed

+34
-36
lines changed

3 files changed

+34
-36
lines changed

‎eng/Version.Details.xml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -125,47 +125,47 @@
125125
<Sha>4ba36db1f42f33a66d9677f0b9d589d39b204a9c</Sha>
126126
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
127127
</Dependency>
128-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25210.7">
128+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25211.1">
129129
<Uri>https://github.com/dotnet/roslyn</Uri>
130-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
130+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
131131
</Dependency>
132132
<!-- Intermediate is necessary for source build. -->
133-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25210.7">
133+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25211.1">
134134
<Uri>https://github.com/dotnet/roslyn</Uri>
135-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
135+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
136136
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
137137
</Dependency>
138-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25210.7">
138+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25211.1">
139139
<Uri>https://github.com/dotnet/roslyn</Uri>
140-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
140+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
141141
</Dependency>
142-
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25210.7">
142+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25211.1">
143143
<Uri>https://github.com/dotnet/roslyn</Uri>
144-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
144+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
145145
</Dependency>
146-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25210.7">
146+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25211.1">
147147
<Uri>https://github.com/dotnet/roslyn</Uri>
148-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
148+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
149149
</Dependency>
150-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25210.7">
150+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25211.1">
151151
<Uri>https://github.com/dotnet/roslyn</Uri>
152-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
152+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
153153
</Dependency>
154-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25210.7">
154+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25211.1">
155155
<Uri>https://github.com/dotnet/roslyn</Uri>
156-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
156+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25210.7">
158+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25211.1">
159159
<Uri>https://github.com/dotnet/roslyn</Uri>
160-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
160+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25210.7">
162+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25211.1">
163163
<Uri>https://github.com/dotnet/roslyn</Uri>
164-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
164+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25210.7">
166+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25211.1">
167167
<Uri>https://github.com/dotnet/roslyn</Uri>
168-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
168+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
169169
</Dependency>
170170
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.102">
171171
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -467,9 +467,9 @@
467467
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
468468
<Sha>d98c60c0da655de406d3c45d0c82bfd82cc15a66</Sha>
469469
</Dependency>
470-
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25210.7">
470+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25211.1">
471471
<Uri>https://github.com/dotnet/roslyn</Uri>
472-
<Sha>e6d795f44518f93f3ae13a096f0fd296cd76a69b</Sha>
472+
<Sha>6a1833332064ba3569b488cab144490ddcb727c2</Sha>
473473
</Dependency>
474474
<!-- Intermediate is necessary for source build. -->
475475
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.12.0-beta1.25177.1">

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<PropertyGroup>
178178
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
179179
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25177.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
180-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25210.7</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
180+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25211.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
181181
</PropertyGroup>
182182
<PropertyGroup>
183183
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -222,15 +222,15 @@
222222
</PropertyGroup>
223223
<PropertyGroup>
224224
<!-- Dependencies from https://github.com/dotnet/roslyn -->
225-
<MicrosoftNetCompilersToolsetVersion>5.0.0-1.25210.7</MicrosoftNetCompilersToolsetVersion>
226-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-1.25210.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
227-
<MicrosoftCodeAnalysisPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisPackageVersion>
228-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisCSharpPackageVersion>
229-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
230-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
231-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
232-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
233-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25210.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
225+
<MicrosoftNetCompilersToolsetVersion>5.0.0-1.25211.1</MicrosoftNetCompilersToolsetVersion>
226+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-1.25211.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
227+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-1.25211.1</MicrosoftCodeAnalysisPackageVersion>
228+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25211.1</MicrosoftCodeAnalysisCSharpPackageVersion>
229+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-1.25211.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
230+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25211.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
231+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25211.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
232+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25211.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
233+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25211.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
234234
</PropertyGroup>
235235
<PropertyGroup>
236236
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

‎src/Cli/dotnet/Commands/Run/VirtualProjectBuildingCommand.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ public static ImmutableArray<CSharpDirective> FindDirectivesForConversion(Source
432432
}
433433

434434
#pragma warning disable RSEXPERIMENTAL003 // 'SyntaxTokenParser' is experimental
435-
#pragma warning disable RSEXPERIMENTAL005 // 'IgnoredDirectiveTriviaSyntax' is experimental
436435
private static ImmutableArray<CSharpDirective> FindDirectives(SourceFile sourceFile, bool reportErrors)
437436
{
438437
var builder = ImmutableArray.CreateBuilder<CSharpDirective>();
@@ -466,8 +465,8 @@ private static ImmutableArray<CSharpDirective> FindDirectives(SourceFile sourceF
466465
{
467466
TextSpan span = getFullSpan(previousWhiteSpaceSpan, trivia);
468467

469-
var message = trivia.GetStructure() is IgnoredDirectiveTriviaSyntax { EndOfDirectiveToken.LeadingTrivia: [{ RawKind: (int)SyntaxKind.PreprocessingMessageTrivia } messageTrivia] }
470-
? messageTrivia.ToString().AsSpan().Trim()
468+
var message = trivia.GetStructure() is IgnoredDirectiveTriviaSyntax { Content: { RawKind: (int)SyntaxKind.StringLiteralToken } content }
469+
? content.Text.AsSpan().Trim()
471470
: "";
472471
var parts = Patterns.Whitespace.EnumerateSplits(message, 2);
473472
var name = parts.MoveNext() ? message[parts.Current] : default;
@@ -519,7 +518,6 @@ static void reportErrorFor(SourceFile sourceFile, SyntaxTrivia trivia)
519518
}
520519
}
521520
}
522-
#pragma warning restore RSEXPERIMENTAL005 // 'IgnoredDirectiveTriviaSyntax' is experimental
523521
#pragma warning restore RSEXPERIMENTAL003 // 'SyntaxTokenParser' is experimental
524522

525523
public static SourceFile LoadSourceFile(string filePath)

0 commit comments

Comments
 (0)