Skip to content

Commit 7461615

Browse files
MattParkerDevMattParkerDev
committed
Update roslyn packages
1 parent f01d791 commit 7461615

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

‎Directory.Packages.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@
2424
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.1.0-preview-25521-106" />
2525
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25521-106" />
2626
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.11.0-beta1.24508.2" />
27-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0-1.25521.106" />
28-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0-1.25521.106" />
29-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="5.3.0-1.25521.106" />
30-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0-1.25521.106" />
27+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.5.0-2.26120.116" />
28+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.5.0-2.26120.116" />
29+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="5.5.0-2.26120.116" />
30+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.5.0-2.26120.116" />
3131
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0" />
3232
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0" />
3333
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
3434
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
35-
<PackageVersion Include="Microsoft.AspNetCore.Razor.Utilities.Shared" Version="10.0.0-preview.25521.106" />
36-
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="5.3.0-1.25521.106" />
35+
<PackageVersion Include="Microsoft.AspNetCore.Razor.Utilities.Shared" Version="10.0.0-preview.26120.116" />
36+
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="5.5.0-2.26120.116" />
3737
<PackageVersion Include="IgnoresAccessChecksToGenerator" Version="0.8.0" />
38-
<PackageVersion Include="Microsoft.VisualStudioCode.RazorExtension" Version="10.0.0-preview.25521.106" />
39-
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Compiler" Version="10.0.0-preview.25521.106" />
40-
<PackageVersion Include="Microsoft.CodeAnalysis.Remote.Razor" Version="10.0.0-preview.25521.106" />
41-
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Workspaces" Version="10.0.0-preview.25521.106" />
42-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.3.0-1.25521.106" />
38+
<PackageVersion Include="Microsoft.VisualStudioCode.RazorExtension" Version="10.0.0-preview.26120.116" />
39+
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Compiler" Version="10.0.0-preview.26120.116" />
40+
<PackageVersion Include="Microsoft.CodeAnalysis.Remote.Razor" Version="10.0.0-preview.26120.116" />
41+
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Workspaces" Version="10.0.0-preview.26120.116" />
42+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.5.0-2.26120.116" />
4343
<PackageVersion Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.652701" />
4444
<PackageVersion Include="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24372.7" />
45-
<PackageVersion Include="Microsoft.Net.Compilers.Razor.Toolset" Version="10.0.0-preview.25521.106" />
45+
<PackageVersion Include="Microsoft.Net.Compilers.Razor.Toolset" Version="10.0.0-preview.26120.116" />
4646
<PackageVersion Include="Microsoft.VisualStudio.Shared.VSCodeDebugProtocol" Version="18.0.10427.1" />
4747
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
4848
<PackageVersion Include="MudBlazor" Version="8.15.0" />
@@ -66,7 +66,7 @@
6666
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
6767
</ItemGroup>
6868
<ItemGroup Label="Pinned Transitive Dependencies">
69-
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.3.0-1.25521.106" />
70-
<PackageVersion Include="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.3.0-1.25521.106" />
69+
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.5.0-2.26120.116" />
70+
<PackageVersion Include="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.5.0-2.26120.116" />
7171
</ItemGroup>
72-
</Project>
72+
</Project>

‎src/SharpIDE.Application/Features/Analysis/ProjectLoader/CustomMsBuildProjectLoader.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public partial class CustomMsBuildProjectLoader(Workspace workspace, ImmutableDi
3535
onPathFailure: reportingMode,
3636
onLoaderFailure: reportingMode);
3737

38-
var buildHostProcessManager = new BuildHostProcessManager(Properties, loggerFactory: _loggerFactory);
38+
var knownCommandLineParserLanguages = _solutionServices.GetSupportedLanguages<ICommandLineParserService>();
39+
var buildHostProcessManager = new BuildHostProcessManager(knownCommandLineParserLanguages, Properties, loggerFactory: _loggerFactory);
3940
await using var _ = buildHostProcessManager.ConfigureAwait(false);
4041

4142
var worker = new CustomWorker(
@@ -91,7 +92,8 @@ public partial class CustomMsBuildProjectLoader(Workspace workspace, ImmutableDi
9192

9293
IBinLogPathProvider binLogPathProvider = null!; // TODO: Fix
9394

94-
var buildHostProcessManager = new BuildHostProcessManager(Properties, binLogPathProvider, _loggerFactory);
95+
var knownCommandLineParserLanguages = _solutionServices.GetSupportedLanguages<ICommandLineParserService>();
96+
var buildHostProcessManager = new BuildHostProcessManager(knownCommandLineParserLanguages, Properties, binLogPathProvider, _loggerFactory);
9597
await using var _ = buildHostProcessManager.ConfigureAwait(false);
9698

9799
var worker = new CustomWorker(

‎src/SharpIDE.Application/Features/Analysis/Razor/CustomSemanticTokensVisitor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal sealed class CustomSemanticTokensVisitor : SyntaxWalker
1414
private readonly ISemanticTokensLegendService _semanticTokensLegend;
1515
private readonly bool _colorCodeBackground;
1616

17-
private bool _addRazorCodeModifier = false;
17+
private bool _addRazorCodeModifier;
1818

1919
private CustomSemanticTokensVisitor(List<SemanticRange> semanticRanges, RazorCodeDocument razorCodeDocument, TextSpan range, ISemanticTokensLegendService semanticTokensLegend, bool colorCodeBackground)
2020
{
@@ -429,7 +429,7 @@ public override void VisitMarkupMinimizedTagHelperDirectiveAttribute(MarkupMinim
429429

430430
public override void VisitCSharpTransition(CSharpTransitionSyntax node)
431431
{
432-
if (node.Parent is not RazorDirectiveSyntax)
432+
if (node.Parent is not BaseRazorDirectiveSyntax)
433433
{
434434
AddSemanticRange(node, _semanticTokensLegend.TokenTypes.RazorTransition);
435435
}
@@ -466,7 +466,7 @@ private static bool IsComponent(SyntaxNode node)
466466
{
467467
if (node is MarkupTagHelperElementSyntax { TagHelperInfo.BindingResult: var binding })
468468
{
469-
var componentDescriptor = binding.Descriptors.FirstOrDefault(static d => d.Kind == TagHelperKind.Component);
469+
var componentDescriptor = binding.TagHelpers.FirstOrDefault(static d => d.Kind == TagHelperKind.Component);
470470
return componentDescriptor is not null;
471471
}
472472
else if (node is MarkupTagHelperStartTagSyntax startTag)

‎src/SharpIDE.Application/Features/Analysis/RoslynAnalysis.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ public async Task<ImmutableArray<SharpIdeRazorClassifiedSpan>> GetRazorDocumentS
536536
// return span;
537537
// }).ToList();
538538
//var test = _semanticTokensLegendService.TokenTypes.All;
539-
var sourceMappings = razorCSharpDocument.SourceMappings.Select(s => s.ToSharpIdeSourceMapping()).ToImmutableArray();
539+
var sourceMappings = razorCSharpDocument.SourceMappingsSortedByOriginal.Select(s => s.ToSharpIdeSourceMapping()).ToImmutableArray();
540540
List<SharpIdeRazorClassifiedSpan> sharpIdeRazorSpans = [];
541541

542542
var classifiedSpans = await Classifier.GetClassifiedSpansAsync(generatedDocument, generatedDocSyntaxRoot!.FullSpan, cancellationToken);

‎src/SharpIDE.Application/SharpIDE.Application.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.CodeAnalysis.Razor.Compiler" />
1515
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.VisualStudioCode.RazorExtension" />
1616
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.CodeAnalysis.LanguageServer.Protocol" />
17+
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.CodeAnalysis.Workspaces.MSBuild.Contracts" />
1718
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
1819
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.CodeAnalysis.Razor.SemanticTokens" />
1920
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.CodeAnalysis.Workspaces" />

0 commit comments

Comments
 (0)
⚡