Skip to content

Bump Roslyn version for integration test fix #8835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jun 21, 2023
Merged

Bump Roslyn version for integration test fix #8835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
010db3b
Update Roslyn version and dependencies
allisonchou Jun 15, 2023
869e11a
Add file
allisonchou Jun 15, 2023
67947ff
Bump more versions
allisonchou Jun 15, 2023
d0aaaf6
Fix merge conflicts
allisonchou Jun 15, 2023
8ddefec
Remove added pipeline param
allisonchou Jun 16, 2023
669efcc
Test fixes
allisonchou Jun 16, 2023
f024585
Update Version.Details.xml
allisonchou Jun 17, 2023
c6f3bbc
Try to include Roslyn deps in integration test runs
allisonchou Jun 19, 2023
034ba42
Set BuildDependencyVsix to true
allisonchou Jun 19, 2023
6e46b09
Bump VS Extension testing just in case
davidwengier Jun 20, 2023
d91ff3e
Deploy VS Threading dependency too
davidwengier Jun 20, 2023
f8028be
Try referencing MS.VS.LanguageServer.Client libraries
davidwengier Jun 20, 2023
48494ef
Revert "Merge pull request #8818 from davidwengier/FixGoof"
davidwengier Jun 20, 2023
ee17e61
Revert "Merge pull request #8813 from davidwengier/SemanticTokensLegend"
davidwengier Jun 20, 2023
880bf7e
Try without deploying RoslynDeps
davidwengier Jun 20, 2023
eac7662
Merge branch 'main' into dev/allichou/UpdateRoslyn
davidwengier Jun 20, 2023
b65b830
Fix build
davidwengier Jun 20, 2023
2520d8e
FIx build
davidwengier Jun 20, 2023
1acac2f
Merge branch 'main' into dev/allichou/UpdateRoslyn
allisonchou Jun 20, 2023
edfc585
Update Versions.props
allisonchou Jun 20, 2023
4de94e4
Revert the revert
davidwengier Jun 20, 2023
ed5084f
Minimal revert
davidwengier Jun 20, 2023
e48e6b9
Clean up dependencies package
davidwengier Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,80 +10,80 @@
<Sha>3e92e7cead1e08476973f637007bb22cde7843ca</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.7.0-2.23301.2">
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.7.0-3.23314.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f6725f6f04ce03574fcf89faa4b20b72ef83e4dd</Sha>
</Dependency>
Expand Down
58 changes: 29 additions & 29 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,25 @@
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>6.0.2-servicing.22064.6</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>8.0.0-alpha.1.23316.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-2.23301.2</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.7.0-2.23301.2</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>
<MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.7.0-2.23301.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.7.0-2.23301.2</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-3.23314.5</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.7.0-3.23314.5</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
<MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisExternalAccessRazorCompilerPackageVersion>
<MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisExternalAccessOmniSharpCSharpPackageVersion>
<MicrosoftCodeAnalysisCommonPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisCommonPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.7.0-3.23314.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftVisualStudioLanguageServicesPackageVersion>4.7.0-3.23314.5</MicrosoftVisualStudioLanguageServicesPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23252.2</MicrosoftSourceLinkGitHubPackageVersion>
<MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23266.1</MicrosoftDotNetXliffTasksPackageVersion>
<!--
Expand All @@ -94,9 +94,9 @@
<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.6.35829</MicrosoftVisualStudioShellPackagesVersion>
<MicrosoftVisualStudioPackagesVersion>17.6.252</MicrosoftVisualStudioPackagesVersion>
<VisualStudioLanguageServerProtocolVersion>17.6.22</VisualStudioLanguageServerProtocolVersion>
<MicrosoftVisualStudioShellPackagesVersion>17.7.35047-preview.1</MicrosoftVisualStudioShellPackagesVersion>
<MicrosoftVisualStudioPackagesVersion>17.7.38-preview</MicrosoftVisualStudioPackagesVersion>
<VisualStudioLanguageServerProtocolVersion>17.7.8-preview-g8c33dc3a76</VisualStudioLanguageServerProtocolVersion>
<!-- dotnet/runtime packages -->
<MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
<SystemCompositionPackageVersion>7.0.0</SystemCompositionPackageVersion>
Expand All @@ -115,11 +115,11 @@
<MicrosoftCodeAnalysisAnalyzerTestingPackageVersion>$(Tooling_MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisAnalyzerTestingPackageVersion>
<MicrosoftCodeAnalysisTestingVerifiersXunitPackageVersion>$(Tooling_MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisTestingVerifiersXunitPackageVersion>
<MicrosoftVisualStudioEditorPackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioEditorPackageVersion>
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>0.1.149-beta</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>0.1.169-beta</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingXunitVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
<MicrosoftVisualStudioLanguagePackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioLanguagePackageVersion>
<MicrosoftVisualStudioLanguageIntellisensePackageVersion>$(MicrosoftVisualStudioPackagesVersion)</MicrosoftVisualStudioLanguageIntellisensePackageVersion>
<MicrosoftVisualStudioLanguageServerClientImplementationPackageVersion>17.6.26-preview</MicrosoftVisualStudioLanguageServerClientImplementationPackageVersion>
<MicrosoftVisualStudioLanguageServerClientImplementationPackageVersion>17.7.4-preview</MicrosoftVisualStudioLanguageServerClientImplementationPackageVersion>
<MicrosoftVisualStudioLanguageServerProtocolPackageVersion>$(VisualStudioLanguageServerProtocolVersion)</MicrosoftVisualStudioLanguageServerProtocolPackageVersion>
<MicrosoftVisualStudioLanguageServerProtocolExtensionsPackageVersion>$(VisualStudioLanguageServerProtocolVersion)</MicrosoftVisualStudioLanguageServerProtocolExtensionsPackageVersion>
<MicrosoftVisualStudioLanguageServerProtocolInternalPackageVersion>$(VisualStudioLanguageServerProtocolVersion)</MicrosoftVisualStudioLanguageServerProtocolInternalPackageVersion>
Expand All @@ -128,14 +128,14 @@
<MicrosoftVisualStudioShell150PackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150PackageVersion>
<MicrosoftVisualStudioInteropPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropPackageVersion>
<MicrosoftInternalVisualStudioInteropPackageVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropPackageVersion>
<MicrosoftVisualStudioRpcContractsPackageVersion>17.6.10-preview</MicrosoftVisualStudioRpcContractsPackageVersion>
<MicrosoftVisualStudioTelemetryVersion>17.6.46</MicrosoftVisualStudioTelemetryVersion>
<MicrosoftVisualStudioRpcContractsPackageVersion>17.7.1-preview</MicrosoftVisualStudioRpcContractsPackageVersion>
<MicrosoftVisualStudioTelemetryVersion>17.7.8</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.6.40</MicrosoftVisualStudioThreadingPackageVersion>
<MicrosoftVisualStudioThreadingPackageVersion>17.7.1-preview</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 @@ -149,12 +149,12 @@
<MonoDevelopSdkPackageVersion>1.0.15</MonoDevelopSdkPackageVersion>
<MoqPackageVersion>4.16.0</MoqPackageVersion>
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
<NerdbankStreamsPackageVersion>2.9.112</NerdbankStreamsPackageVersion>
<NerdbankStreamsPackageVersion>2.9.116</NerdbankStreamsPackageVersion>
<NuGetSolutionRestoreManagerInteropVersion>4.8.0</NuGetSolutionRestoreManagerInteropVersion>
<OmniSharpExtensionsLanguageServerPackageVersion>0.19.7</OmniSharpExtensionsLanguageServerPackageVersion>
<OmniSharpExtensionsLanguageProtocolPackageVersion>$(OmniSharpExtensionsLanguageServerPackageVersion)</OmniSharpExtensionsLanguageProtocolPackageVersion>
<OmniSharpMSBuildPackageVersion>1.39.1</OmniSharpMSBuildPackageVersion>
<StreamJsonRpcPackageVersion>2.15.26</StreamJsonRpcPackageVersion>
<StreamJsonRpcPackageVersion>2.15.29</StreamJsonRpcPackageVersion>
<SystemRuntimeInteropServicesRuntimePackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimePackageVersion>
<Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.3.4</Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>
<Tooling_MicrosoftCodeAnalysisBannedApiAnalyzersPackageVersion>$(Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion)</Tooling_MicrosoftCodeAnalysisBannedApiAnalyzersPackageVersion>
Expand Down
26 changes: 18 additions & 8 deletions ....AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionItemResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT license. See License.txt in the project root for license information.

using System;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -102,14 +103,23 @@ private async Task<VSInternalCompletionItem> PostProcessCompletionItemAsync(

if (resolvedCompletionItem.TextEdit is not null)
{
var formattedTextEdit = await _formattingService.FormatSnippetAsync(
documentContext,
RazorLanguageKind.CSharp,
new[] { resolvedCompletionItem.TextEdit },
formattingOptions,
cancellationToken).ConfigureAwait(false);

resolvedCompletionItem.TextEdit = formattedTextEdit.FirstOrDefault();
if (resolvedCompletionItem.TextEdit.Value.TryGetFirst(out var textEdit))
{
var formattedTextEdit = await _formattingService.FormatSnippetAsync(
documentContext,
RazorLanguageKind.CSharp,
new[] { textEdit },
formattingOptions,
cancellationToken).ConfigureAwait(false);

resolvedCompletionItem.TextEdit = formattedTextEdit.FirstOrDefault();
}
else
{
// TO-DO: Handle InsertReplaceEdit type
// https://github.com/dotnet/razor/issues/8829
Debug.Fail("Unsupported edit type.");
}
}

if (resolvedCompletionItem.AdditionalTextEdits is not null)
Expand Down
Loading