Skip to content

Commit

Permalink
Update Roslyn to 4.7.0-2.23227.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@jjonescz
jjonescz committed Apr 28, 2023
1 parent e21f462 commit 3cda258
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 45 deletions.
38 changes: 19 additions & 19 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,80 +10,80 @@
<Sha>05b4fdac346e01716abda4c92fcf0b7880e73792</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.6.0-3.23164.6">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.7.0-2.23227.6">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>3fc97de0f151e67a0b8ee2840edb04b49fbc623f</Sha>
</Dependency>
Expand Down
52 changes: 26 additions & 26 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.2-servicing.22064.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>8.0.0-alpha.1.23214.4</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.6.0-3.23164.6</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.6.0-3.23164.6</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>
<MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.6.0-3.23164.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.6.0-3.23164.6</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-2.23227.6</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.7.0-2.23227.6</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>
<MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.7.0-2.23227.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.7.0-2.23227.6</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23218.3</MicrosoftSourceLinkGitHubPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23218.1</MicrosoftDotNetXliffTasksPackageVersion>
</PropertyGroup>
Expand All @@ -92,13 +92,13 @@
<Tooling_HtmlEditorPackageVersion>17.5.101-preview-0002</Tooling_HtmlEditorPackageVersion>
<!-- Several packages share the MS.CA.Testing version -->
<Tooling_MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</Tooling_MicrosoftCodeAnalysisTestingVersion>
<MicrosoftVisualStudioShellPackagesVersion>17.5.0-preview-2-33117-317</MicrosoftVisualStudioShellPackagesVersion>
<MicrosoftVisualStudioPackagesVersion>17.5.274-preview</MicrosoftVisualStudioPackagesVersion>
<VisualStudioLanguageServerProtocolVersion>17.6.4-preview</VisualStudioLanguageServerProtocolVersion>
<MicrosoftVisualStudioShellPackagesVersion>17.5.33422.76</MicrosoftVisualStudioShellPackagesVersion>
<MicrosoftVisualStudioPackagesVersion>17.6.76-preview</MicrosoftVisualStudioPackagesVersion>
<VisualStudioLanguageServerProtocolVersion>17.6.15-preview</VisualStudioLanguageServerProtocolVersion>
<!-- dotnet/runtime packages -->
<MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
<SystemCollectionsImmutablePackageVersion>6.0.0</SystemCollectionsImmutablePackageVersion>
<SystemCompositionPackageVersion>6.0.0</SystemCompositionPackageVersion>
<SystemCompositionPackageVersion>7.0.0</SystemCompositionPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>6.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemResourcesExtensionsPackageVersion>6.0.0</SystemResourcesExtensionsPackageVersion>
<SystemTextEncodingsWebPackageVersion>6.0.0</SystemTextEncodingsWebPackageVersion>
Expand Down Expand Up @@ -126,14 +126,14 @@
<MicrosoftVisualStudioShell150PackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150PackageVersion>
<MicrosoftVisualStudioInteropPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropPackageVersion>
<MicrosoftInternalVisualStudioInteropPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropPackageVersion>
<MicrosoftVisualStudioRpcContractsPackageVersion>17.5.17-alpha</MicrosoftVisualStudioRpcContractsPackageVersion>
<MicrosoftVisualStudioRpcContractsPackageVersion>17.5.21</MicrosoftVisualStudioRpcContractsPackageVersion>
<MicrosoftVisualStudioTelemetryVersion>16.6.15</MicrosoftVisualStudioTelemetryVersion>
<MicrosoftVisualStudioTextDataPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextDataPackageVersion>
<MicrosoftVisualStudioTextImplementationPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextImplementationPackageVersion>
<MicrosoftVisualStudioTextLogicPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioTextLogicPackageVersion>
<!-- NOTE: Keep O#-Roslyn's Microsoft.VisualStudio.Threading version in sync with the version below:
https://github.com/OmniSharp/omnisharp-roslyn/blob/d7555ebfb6c4d7c6811c58370322d3b092c0abf6/build/Packages.props#L65 -->
<MicrosoftVisualStudioThreadingPackageVersion>17.5.10-alpha</MicrosoftVisualStudioThreadingPackageVersion>
<MicrosoftVisualStudioThreadingPackageVersion>17.5.21</MicrosoftVisualStudioThreadingPackageVersion>
<MicrosoftVisualStudioWebPackageVersion>16.10.0-preview-1-31008-014</MicrosoftVisualStudioWebPackageVersion>
<!-- NOTE: Keep O#-Roslyn's Microsoft.VisualStudio.Validation version in sync with the version below:
https://github.com/OmniSharp/omnisharp-roslyn/blob/d7555ebfb6c4d7c6811c58370322d3b092c0abf6/build/Packages.props#L66 -->
Expand All @@ -152,7 +152,7 @@
<OmniSharpExtensionsLanguageServerPackageVersion>0.19.5</OmniSharpExtensionsLanguageServerPackageVersion>
<OmniSharpExtensionsLanguageProtocolPackageVersion>$(OmniSharpExtensionsLanguageServerPackageVersion)</OmniSharpExtensionsLanguageProtocolPackageVersion>
<OmniSharpMSBuildPackageVersion>1.39.1</OmniSharpMSBuildPackageVersion>
<StreamJsonRpcPackageVersion>2.14.20</StreamJsonRpcPackageVersion>
<StreamJsonRpcPackageVersion>2.14.24</StreamJsonRpcPackageVersion>
<SystemRuntimeInteropServicesRuntimePackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimePackageVersion>
<Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.3.4</Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>
<Tooling_MicrosoftCodeAnalysisBannedApiAnalyzersPackageVersion>$(Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion)</Tooling_MicrosoftCodeAnalysisBannedApiAnalyzersPackageVersion>
Expand Down
2 changes: 2 additions & 0 deletions ...rc/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Models/RazorSemanticTokensLegend.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ private static ImmutableArray<string> GetTokenTypes()
{
var builder = ImmutableArray.CreateBuilder<string>();

#pragma warning disable CS0618 // RoslynTokenTypes is obsolete
builder.AddRange(RazorSemanticTokensAccessor.RoslynTokenTypes);
#pragma warning restore CS0618

foreach (var field in typeof(RazorSemanticTokensLegend).GetFields(BindingFlags.NonPublic | BindingFlags.Static))
{
Expand Down

0 comments on commit 3cda258

Please # to comment.