Skip to content

Commit 7db351a

Browse files
MattParkerDevMattParkerDev
committed
Update roslyn + MSBuild packages
1 parent b679cbe commit 7db351a

5 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@
2121
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView" Version="10.0.8" />
2222
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.12" />
2323

24-
<PackageVersion Include="Microsoft.Build" Version="18.8.0-preview-26269-119" />
25-
<PackageVersion Include="Microsoft.Build.Framework" Version="18.8.0-preview-26269-119" />
26-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.8.0-preview-26269-119" />
27-
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.8.0-preview-26269-119" />
24+
<PackageVersion Include="Microsoft.Build" Version="18.9.0-preview-26325-102" />
25+
<PackageVersion Include="Microsoft.Build.Framework" Version="18.9.0-preview-26325-102" />
26+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.9.0-preview-26325-102" />
27+
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.9.0-preview-26325-102" />
2828

29-
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="5.8.0-1.26269.119" />
30-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.8.0-1.26269.119" />
31-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.8.0-1.26269.119" />
32-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="5.8.0-1.26269.119" />
33-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.8.0-1.26269.119" />
34-
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="5.8.0-1.26269.119" />
35-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.8.0-1.26269.119" />
29+
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="5.9.0-1.26325.102" />
30+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.9.0-1.26325.102" />
31+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.9.0-1.26325.102" />
32+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="5.9.0-1.26325.102" />
33+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.9.0-1.26325.102" />
34+
<PackageVersion Include="Microsoft.CodeAnalysis.Features" Version="5.9.0-1.26325.102" />
35+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.9.0-1.26325.102" />
3636

37-
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Compiler" Version="10.4.0-preview.26269.119" />
38-
<PackageVersion Include="Microsoft.AspNetCore.Razor.Utilities.Shared" Version="10.4.0-preview.26269.119" />
39-
<PackageVersion Include="Microsoft.CodeAnalysis.Remote.Razor" Version="10.4.0-preview.26269.119" />
40-
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Workspaces" Version="10.4.0-preview.26269.119" />
41-
<PackageVersion Include="Microsoft.Net.Compilers.Razor.Toolset" Version="10.4.0-preview.26269.119" />
42-
<PackageVersion Include="Microsoft.VisualStudioCode.RazorExtension" Version="10.4.0-preview.26269.119" />
37+
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Compiler" Version="10.4.0-preview.26325.102" />
38+
<PackageVersion Include="Microsoft.AspNetCore.Razor.Utilities.Shared" Version="10.4.0-preview.26325.102" />
39+
<PackageVersion Include="Microsoft.CodeAnalysis.Remote.Razor" Version="10.4.0-preview.26325.102" />
40+
<PackageVersion Include="Microsoft.CodeAnalysis.Razor.Workspaces" Version="10.4.0-preview.26325.102" />
41+
<PackageVersion Include="Microsoft.Net.Compilers.Razor.Toolset" Version="10.4.0-preview.26325.102" />
42+
<PackageVersion Include="Microsoft.VisualStudioCode.RazorExtension" Version="10.4.0-preview.26325.102" />
4343

4444
<PackageVersion Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.661903" />
4545
<PackageVersion Include="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24372.7" />
@@ -75,8 +75,7 @@
7575
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
7676
</ItemGroup>
7777
<ItemGroup Label="Pinned Transitive Dependencies">
78-
<PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.8.0-1.26269.119" />
79-
<PackageVersion Include="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.8.0-1.26269.119" />
78+
<PackageVersion Include="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.9.0-1.26325.102" />
8079
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.8" />
8180
<PackageVersion Include="MessagePack" Version="2.5.302" />
8281
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public partial class CustomMsBuildProjectLoader(Workspace workspace, ImmutableDi
9393
IBinLogPathProvider binLogPathProvider = null!; // TODO: Fix
9494

9595
var knownCommandLineParserLanguages = _solutionServices.GetSupportedLanguages<ICommandLineParserService>();
96-
var buildHostProcessManager = new BuildHostProcessManager(knownCommandLineParserLanguages, Properties, binLogPathProvider, _loggerFactory);
96+
var buildHostProcessManager = new BuildHostProcessManager(knownCommandLineParserLanguages, Properties, binLogPathProvider, null, _loggerFactory);
9797
await using var _ = buildHostProcessManager.ConfigureAwait(false);
9898

9999
var worker = new CustomWorker(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Microsoft.AspNetCore.Razor.Language;
22
using Microsoft.AspNetCore.Razor.Language.Syntax;
33
using Microsoft.CodeAnalysis.Razor.SemanticTokens;
4+
using Microsoft.CodeAnalysis.Remote.Razor.SemanticTokens;
45
using Microsoft.CodeAnalysis.Text;
56

67
namespace SharpIDE.Application.Features.Analysis.Razor;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Immutable;
22
using System.Reflection;
3-
using Microsoft.CodeAnalysis.ExternalAccess.Razor;
3+
using Microsoft.CodeAnalysis.LanguageServer.Handler.SemanticTokens;
44
using Microsoft.CodeAnalysis.Razor.SemanticTokens;
55

66
namespace SharpIDE.Application.Features.Analysis.Razor;
@@ -9,14 +9,14 @@ public static class TokenTypeProvider
99
{
1010
public static string[] ConstructTokenTypes(bool supportsVsExtensions)
1111
{
12-
string[] types = [.. RazorSemanticTokensAccessor.GetTokenTypes(supportsVsExtensions), .. GetStaticFieldValues(typeof(SemanticTokenTypes))];
12+
string[] types = [.. SemanticTokensSchema.GetSchema(supportsVsExtensions).AllTokenTypes, ..GetStaticFieldValues(typeof(SemanticTokenTypes))];
1313
//return new SemanticTokenTypes(types);
1414
return types;
1515
}
1616

1717
public static string[] ConstructTokenModifiers()
1818
{
19-
string[] types = [ .. RazorSemanticTokensAccessor.GetTokenModifiers(), .. GetStaticFieldValues(typeof(SemanticTokenModifiers))];
19+
string[] types = [.. SemanticTokensSchema.TokenModifiers, ..GetStaticFieldValues(typeof(SemanticTokenModifiers))];
2020
//return new SemanticTokenModifiers(types);
2121
return types;
2222
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.CodeAnalysis.CSharp.Features" />
2727
<Publicize IncludeCompilerGeneratedMembers="false" Include="Microsoft.Build" MemberPattern="^Microsoft\.Build\.Logging\.(TerminalLogger|Terminal)\..*" />
2828
<DoNotPublicize Include="Microsoft.CodeAnalysis.Workspaces:System.Linq.RoslynEnumerableExtensions" />
29+
<DoNotPublicize Include="Microsoft.CodeAnalysis.Razor.Workspaces:System.Collections.Immutable.ImmutableArrayExtensions" />
2930
<DoNotPublicize Include="Microsoft.CodeAnalysis.Workspaces.MSBuild.Contracts:Microsoft.CodeAnalysis.ErrorReporting.FatalError" />
3031
<DoNotPublicize Include="Microsoft.CodeAnalysis.Workspaces.MSBuild.Contracts:Microsoft.CodeAnalysis.ErrorReporting.ErrorSeverity" />
3132
<DoNotPublicize Include="Microsoft.CodeAnalysis.Workspaces.MSBuild.Contracts:Microsoft.CodeAnalysis.Contract" />
@@ -62,7 +63,6 @@
6263
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
6364
<!-- <PackageReference Include="Microsoft.VisualStudioCode.RazorExtension" />--> <!-- Either this or Microsoft.CodeAnalysis.Remote.Razor supplies RemoteSnapshotManager -->
6465
<PackageReference Include="Microsoft.CodeAnalysis.Remote.Razor" />
65-
<PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
6666
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
6767
<PackageReference Include="Microsoft.CodeAnalysis.Features" />
6868
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" PrivateAssets="all" />

0 commit comments

Comments
 (0)