Skip to content

Commit a67c6a7

Browse files
davidwengierdavidwengier
authored
[Cohost] Fix rename and unskip test (#11952)
Fixes #11831 This needs dotnet/roslyn#78984 to go in first, or the test will fail. Which you should see in this PR!
2 parents dd265d9 + e0240cf commit a67c6a7

File tree

10 files changed

+133
-83
lines changed

10 files changed

+133
-83
lines changed

‎Directory.Packages.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
-->
77
<PropertyGroup>
88
<_MicrosoftWebToolsPackageVersion>17.11.11-preview-0001</_MicrosoftWebToolsPackageVersion>
9-
<_MicrosoftVisualStudioShellPackagesVersion>18.0.1306-preview.1</_MicrosoftVisualStudioShellPackagesVersion>
10-
<_MicrosoftVisualStudioPackagesVersion>18.0.255-preview</_MicrosoftVisualStudioPackagesVersion>
9+
<_MicrosoftVisualStudioShellPackagesVersion>18.0.2101-preview.1</_MicrosoftVisualStudioShellPackagesVersion>
10+
<_MicrosoftVisualStudioPackagesVersion>18.0.332-preview</_MicrosoftVisualStudioPackagesVersion>
1111
<_VisualStudioLanguageServerProtocolVersion>17.12.1-preview</_VisualStudioLanguageServerProtocolVersion>
1212
<_MicrosoftExtensionsPackageVersion>9.0.0</_MicrosoftExtensionsPackageVersion>
1313
<_BasicReferenceAssembliesVersion>1.7.2</_BasicReferenceAssembliesVersion>
@@ -16,7 +16,7 @@
1616
<_RoslynDiagnosticAnalyzersPackageVersion>3.11.0-beta1.24508.2</_RoslynDiagnosticAnalyzersPackageVersion>
1717
<_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</_MicrosoftVisualStudioLanguageServicesPackageVersion>
1818
<_XunitPackageVersion>2.9.2</_XunitPackageVersion>
19-
<_MicrosoftBuildPackageVersion>17.15.0-preview-25279-04</_MicrosoftBuildPackageVersion>
19+
<_MicrosoftBuildPackageVersion>17.15.0-preview-25353-11</_MicrosoftBuildPackageVersion>
2020
</PropertyGroup>
2121

2222
<ItemGroup>
@@ -79,14 +79,14 @@
7979
<PackageVersion Include="Microsoft.VisualStudio.LanguageServices.Implementation.Symbols" Version="$(_MicrosoftVisualStudioLanguageServicesPackageVersion)" />
8080
<PackageVersion Include="Microsoft.VisualStudio.LiveShare" Version="0.3.1074" />
8181
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.SDK" Version="17.7.294-pre" />
82-
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.15.10-pre" />
82+
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.15.25-pre" />
8383
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="$(_MicrosoftVisualStudioShellPackagesVersion)" />
8484
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="$(_MicrosoftVisualStudioShellPackagesVersion)" />
85-
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.18" />
85+
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="18.0.22" />
8686
<PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
8787
<PackageVersion Include="Microsoft.VisualStudio.Text.Implementation" Version="$(_MicrosoftVisualStudioPackagesVersion)" NoWarn="NU1701" />
8888
<PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
89-
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.15.3-alpha" />
89+
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.15.20-alpha" />
9090
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
9191
<PackageVersion Include="Microsoft.VisualStudio.Web" Version="16.10.0-preview-1-31008-014" />
9292
<PackageVersion Include="Microsoft.WebTools.Languages.Html" Version="$(_MicrosoftWebToolsPackageVersion)" />

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,89 @@
22
<Dependencies>
33
<Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="f5705c8f4c5079bba77bae8698ba1583bde0388c" BarId="269610" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25358.2">
5+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25365.1">
66
<Uri>https://github.com/dotnet/roslyn</Uri>
7-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
7+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25358.2">
9+
<Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25365.1">
1010
<Uri>https://github.com/dotnet/roslyn</Uri>
11-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
11+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25358.2">
13+
<Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25365.1">
1414
<Uri>https://github.com/dotnet/roslyn</Uri>
15-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
15+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25358.2">
17+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25365.1">
1818
<Uri>https://github.com/dotnet/roslyn</Uri>
19-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
19+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25358.2">
21+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25365.1">
2222
<Uri>https://github.com/dotnet/roslyn</Uri>
23-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
23+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25358.2">
25+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25365.1">
2626
<Uri>https://github.com/dotnet/roslyn</Uri>
27-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
27+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25358.2">
29+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25365.1">
3030
<Uri>https://github.com/dotnet/roslyn</Uri>
31-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
31+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25358.2">
33+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25365.1">
3434
<Uri>https://github.com/dotnet/roslyn</Uri>
35-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
35+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25358.2">
37+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25365.1">
3838
<Uri>https://github.com/dotnet/roslyn</Uri>
39-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
39+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25358.2">
41+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25365.1">
4242
<Uri>https://github.com/dotnet/roslyn</Uri>
43-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
43+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25358.2">
45+
<Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25365.1">
4646
<Uri>https://github.com/dotnet/roslyn</Uri>
47-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
47+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25358.2">
49+
<Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25365.1">
5050
<Uri>https://github.com/dotnet/roslyn</Uri>
51-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
51+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25358.2">
53+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25365.1">
5454
<Uri>https://github.com/dotnet/roslyn</Uri>
55-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
55+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25358.2">
57+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25365.1">
5858
<Uri>https://github.com/dotnet/roslyn</Uri>
59-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
59+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25358.2">
61+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25365.1">
6262
<Uri>https://github.com/dotnet/roslyn</Uri>
63-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
63+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25358.2">
65+
<Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25365.1">
6666
<Uri>https://github.com/dotnet/roslyn</Uri>
67-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
67+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25358.2">
69+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25365.1">
7070
<Uri>https://github.com/dotnet/roslyn</Uri>
71-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
71+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25358.2">
73+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25365.1">
7474
<Uri>https://github.com/dotnet/roslyn</Uri>
75-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
75+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25358.2">
77+
<Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25365.1">
7878
<Uri>https://github.com/dotnet/roslyn</Uri>
79-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
79+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25358.2">
81+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25365.1">
8282
<Uri>https://github.com/dotnet/roslyn</Uri>
83-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
83+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25358.2">
85+
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25365.1">
8686
<Uri>https://github.com/dotnet/roslyn</Uri>
87-
<Sha>c60bb333a43a1f74d1bbf180ba86e7f153a9bdbc</Sha>
87+
<Sha>123f4d5241af2e9b4e82d770ebbea5060324ce02</Sha>
8888
</Dependency>
8989
</ProductDependencies>
9090
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,27 @@
4747
4848
-->
4949
<PropertyGroup Label="Automated">
50-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisAnalyzersPackageVersion>
51-
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25358.2</MicrosoftNetCompilersToolsetPackageVersion>
52-
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
53-
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25358.2</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
54-
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
55-
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
56-
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisCommonPackageVersion>
57-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisCSharpPackageVersion>
58-
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
59-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
60-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
61-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
62-
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
63-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
64-
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
65-
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
66-
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
67-
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
68-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
69-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25358.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
70-
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25358.2</MicrosoftVisualStudioLanguageServicesPackageVersion>
50+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisAnalyzersPackageVersion>
51+
<MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25365.1</MicrosoftNetCompilersToolsetPackageVersion>
52+
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
53+
<MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25365.1</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
54+
<MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
55+
<MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
56+
<MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCommonPackageVersion>
57+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCSharpPackageVersion>
58+
<MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
59+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
60+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
61+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
62+
<MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
63+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
64+
<MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
65+
<MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
66+
<MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
67+
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
68+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
69+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25365.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
70+
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25365.1</MicrosoftVisualStudioLanguageServicesPackageVersion>
7171
<!--
7272
Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
7373
but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.

‎src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspEditMappingService.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515

1616
namespace Microsoft.AspNetCore.Razor.LanguageServer;
1717

18-
internal class LspEditMappingService(
18+
internal sealed class LspEditMappingService(
1919
IDocumentMappingService documentMappingService,
2020
IFilePathService filePathService,
2121
IDocumentContextFactory documentContextFactory) : AbstractEditMappingService(documentMappingService, filePathService)
2222
{
23+
private readonly IFilePathService _filePathService = filePathService;
2324
private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory;
2425

2526
protected override bool TryGetDocumentContext(IDocumentSnapshot contextDocumentSnapshot, Uri razorDocumentUri, VSProjectContext? projectContext, [NotNullWhen(true)] out DocumentContext? documentContext)
@@ -31,4 +32,9 @@ protected override bool TryGetDocumentContext(IDocumentSnapshot contextDocumentS
3132

3233
return true;
3334
}
35+
36+
protected override Task<Uri?> GetRazorDocumentUriAsync(IDocumentSnapshot contextDocumentSnapshot, Uri uri, CancellationToken cancellationToken)
37+
{
38+
return Task.FromResult<Uri?>(_filePathService.GetRazorDocumentUri(uri));
39+
}
3440
}

‎src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractEditMappingService.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ private async Task<Dictionary<string, TextEdit[]>> RemapDocumentEditsAsync(IDocu
6969
continue;
7070
}
7171

72-
var razorDocumentUri = _filePathService.GetRazorDocumentUri(generatedDocumentUri);
72+
var razorDocumentUri = await GetRazorDocumentUriAsync(contextDocumentSnapshot, generatedDocumentUri, cancellationToken).ConfigureAwait(false);
73+
if (razorDocumentUri is null)
74+
{
75+
continue;
76+
}
7377

7478
if (!TryGetDocumentContext(contextDocumentSnapshot, razorDocumentUri, projectContext: null, out var documentContext))
7579
{
@@ -138,7 +142,11 @@ private async Task<TextDocumentEdit[]> RemapTextDocumentEditsAsync(IDocumentSnap
138142
continue;
139143
}
140144

141-
var razorDocumentUri = _filePathService.GetRazorDocumentUri(generatedDocumentUri);
145+
var razorDocumentUri = await GetRazorDocumentUriAsync(contextDocumentSnapshot, generatedDocumentUri, cancellationToken).ConfigureAwait(false);
146+
if (razorDocumentUri is null)
147+
{
148+
continue;
149+
}
142150

143151
if (!TryGetDocumentContext(contextDocumentSnapshot, razorDocumentUri, entry.TextDocument.GetProjectContext(), out var documentContext))
144152
{
@@ -169,4 +177,6 @@ private async Task<TextDocumentEdit[]> RemapTextDocumentEditsAsync(IDocumentSnap
169177
}
170178

171179
protected abstract bool TryGetDocumentContext(IDocumentSnapshot contextDocumentSnapshot, Uri razorDocumentUri, VSProjectContext? projectContext, [NotNullWhen(true)] out DocumentContext? documentContext);
180+
181+
protected abstract Task<Uri?> GetRazorDocumentUriAsync(IDocumentSnapshot contextDocumentSnapshot, Uri uri, CancellationToken cancellationToken);
172182
}

0 commit comments

Comments
 (0)