From 984c638b37579a4ecdca4abe48fdf59e1f21ac51 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 10 Sep 2019 13:37:39 -0700 Subject: [PATCH] Integrate Razor LanguageServer (without plugin) into src/Razor. - Added tests for both the language server and the common language server projects. - Updated publish MSBuild bits to publish to `artifacts/LanguageServer/$(Configuration)/TFM` - Updated the language server to be netcoreapp3.0 aspnet/AspNetCore#13494 --- eng/AfterSigning.targets | 20 ++ eng/AfterSolutionBuild.targets | 12 ++ eng/Versions.props | 1 + ...NetCore.Razor.LanguageServer.Common.csproj | 22 -- ...oft.AspNetCore.Razor.LanguageServer.csproj | 42 ---- .../PublishAll.targets | 42 ---- ...rosoft.AspNetCore.Razor.Test.Common.csproj | 15 -- .../TestLanguageServices.cs | 49 ----- .../TestRazorCodeDocument.cs | 28 --- .../TestRazorSourceDocument.cs | 195 ------------------ .../TestServices.cs | 49 ----- .../TestWorkspace.cs | 27 --- .../TestWorkspaceServices.cs | 89 -------- src/Razor/Razor.sln | 59 +++++- ...faultRazorIntermediateNodeLoweringPhase.cs | 2 - .../AdhocLanguageServices.cs | 0 .../AdhocServices.cs | 0 .../AdhocWorkspaceServices.cs | 0 .../DefaultProjectEngineFactory.cs | 0 .../FilePathNormalizer.cs | 0 .../HostDocumentComparer.cs | 0 ...NetCore.Razor.LanguageServer.Common.csproj | 20 ++ .../ProjectEngineFactories.cs | 0 .../ProjectEngineFactory_1_0.cs | 0 .../ProjectEngineFactory_1_1.cs | 0 .../ProjectEngineFactory_2_0.cs | 0 .../ProjectEngineFactory_2_1.cs | 0 .../ProjectEngineFactory_3_0.cs | 0 .../ProjectEngineFactory_Unsupported.cs | 0 .../ProjectSerializationFormat.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RazorCodeDocumentExtensions.cs | 0 .../Serialization/DocumentSnapshotHandle.cs | 0 .../FullProjectSnapshotHandle.cs | 0 .../FullProjectSnapshotHandleJsonConverter.cs | 0 .../JsonConverterCollectionExtensions.cs | 0 .../ProjectSnapshotJsonConverter.cs | 0 .../RazorConfigurationJsonConverter.cs | 0 .../RazorDiagnosticJsonConverter.cs | 0 .../RazorExtensionJsonConverter.cs | 0 .../Serialization/SerializedRazorExtension.cs | 0 .../TagHelperDescriptorJsonConverter.cs | 0 .../UnsupportedCSharpLoweringPhase.cs | 0 .../UnsupportedRazorConfiguration.cs | 0 .../VSCodeForegroundDispatcher.cs | 0 .../BackgroundDocumentGenerator.cs | 0 .../Completion/AttributeDescriptionInfo.cs | 0 .../Completion/CompletionItemExtensions.cs | 0 .../DefaultTagHelperCompletionService.cs | 0 .../DefaultTagHelperDescriptionFactory.cs | 0 ...tributeTransitionCompletionItemProvider.cs | 0 .../Completion/ElementDescriptionInfo.cs | 0 .../Completion/RazorCompletionEndpoint.cs | 0 .../TagHelperAttributeDescriptionInfo.cs | 0 .../Completion/TagHelperCompletionService.cs | 0 .../Completion/TagHelperDescriptionFactory.cs | 0 .../Completion/TagHelperDescriptionInfo.cs | 0 .../DefaultDocumentVersionCache.cs | 0 .../DefaultGeneratedCodeContainerStore.cs | 0 .../DefaultHostDocumentFactory.cs | 0 .../DefaultProjectSnapshotManagerAccessor.cs | 0 .../DefaultRemoteTextLoaderFactory.cs | 0 .../DocumentProcessedListener.cs | 0 .../DocumentSnapshotTextLoader.cs | 0 .../DocumentVersionCache.cs | 0 .../GeneratedCodeContainerStore.cs | 0 .../HostDocumentFactory.cs | 0 .../IRazorLanguageQueryHandler.cs | 0 ...oft.AspNetCore.Razor.LanguageServer.csproj | 59 ++++++ .../Program.cs | 0 .../ProjectSnapshotManagerAccessor.cs | 0 .../ProjectSystem/AddDocumentParams.cs | 0 .../ProjectSystem/DefaultDocumentResolver.cs | 0 .../ProjectSystem/DefaultProjectResolver.cs | 0 .../DefaultRazorProjectService.cs | 0 .../ProjectSystem/DocumentResolver.cs | 0 .../ProjectSystem/IRazorAddDocumentHandler.cs | 0 .../ProjectSystem/IRazorAddProjectHandler.cs | 0 .../IRazorRemoveDocumentHandler.cs | 0 .../IRazorRemoveProjectHandler.cs | 0 .../IRazorUpdateProjectHandler.cs | 0 .../ProjectSystem/ProjectResolver.cs | 0 .../ProjectSystem/RazorAddProjectParams.cs | 0 .../ProjectSystem/RazorProjectService.cs | 0 .../ProjectSystem/RazorRemoveProjectParams.cs | 0 .../ProjectSystem/RazorUpdateProjectParams.cs | 0 .../ProjectSystem/RemoveDocumentParams.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RazorDefaults.cs | 0 .../RazorDiagnosticConverter.cs | 1 + .../RazorDiagnosticsPublisher.cs | 0 .../RazorDocumentSynchronizationEndpoint.cs | 0 .../RazorLanguageEndpoint.cs | 0 .../RazorLanguageKind.cs | 0 .../RazorLanguageQueryParams.cs | 0 .../RazorLanguageQueryResponse.cs | 0 .../RazorProjectEndpoint.cs | 0 .../RemoteProjectItem.cs | 0 ...moteProjectSnapshotProjectEngineFactory.cs | 0 .../RemoteRazorProjectFileSystem.cs | 0 .../RemoteTextLoaderFactory.cs | 0 .../TempDirectory.cs | 0 .../UpdateCSharpBufferRequest.cs | 0 .../Properties/AssemblyInfo.cs | 1 + .../FilePathNormalizerTest.cs | 0 ...re.Razor.LanguageServer.Common.Test.csproj | 4 +- .../ProjectEngineFactory_UnsupportedTest.cs | 1 - .../SerializationTest.cs | 0 .../xunit.runner.json | 0 .../LanguageServerTestBase.cs} | 4 +- ...re.Razor.LanguageServer.Test.Common.csproj | 19 ++ .../Properties/AssemblyInfo.cs | 2 +- .../TestDocumentSnapshot.cs | 0 .../TestProjectSnapshot.cs | 0 .../TestProjectSnapshotManager.cs | 0 ...TestProjectSnapshotProjectEngineFactory.cs | 0 .../BackgroundDocumentGeneratorTest.cs | 2 +- .../DefaultTagHelperCompletionServiceTest.cs | 2 +- .../DefaultTagHelperDescriptionFactoryTest.cs | 0 ...uteTransitionCompletionItemProviderTest.cs | 4 - .../Completion/RazorCompletionEndpointTest.cs | 2 +- .../DefaultDocumentResolverTest.cs | 2 +- .../DefaultDocumentVersionCacheTest.cs | 2 +- .../DefaultGeneratedCodeContainerStoreTest.cs | 2 +- .../DefaultHostDocumentFactoryTest.cs | 2 +- .../DefaultProjectResolverTest.cs | 2 +- .../DefaultRazorProjectServiceTest.cs | 2 +- .../DocumentSnapshotTextLoaderTest.cs | 0 ...spNetCore.Razor.LanguageServer.Test.csproj | 4 +- .../RazorCodeDocumentExtensionsTest.cs | 2 +- .../RazorDiagnosticConverterTest.cs | 0 .../RazorDiagnosticsPublisherTest.cs | 2 +- ...azorDocumentSynchronizationEndpointTest.cs | 2 +- .../RazorLanguageEndpointTest.cs | 2 +- .../RazorProjectEndpointTest.cs | 2 +- .../RemoteRazorProjectFileSystemTest.cs | 0 .../xunit.runner.json | 0 137 files changed, 211 insertions(+), 588 deletions(-) create mode 100644 eng/AfterSolutionBuild.targets delete mode 100644 src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj delete mode 100644 src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj delete mode 100644 src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/PublishAll.targets delete mode 100644 src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj delete mode 100644 src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestLanguageServices.cs delete mode 100644 src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestRazorCodeDocument.cs delete mode 100644 src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestRazorSourceDocument.cs delete mode 100644 src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestServices.cs delete mode 100644 src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestWorkspace.cs delete mode 100644 src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestWorkspaceServices.cs rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocLanguageServices.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocServices.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocWorkspaceServices.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/DefaultProjectEngineFactory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/FilePathNormalizer.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/HostDocumentComparer.cs (100%) create mode 100644 src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactories.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_0.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_1.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_0.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_1.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_3_0.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_Unsupported.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectSerializationFormat.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Properties/AssemblyInfo.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/RazorCodeDocumentExtensions.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/DocumentSnapshotHandle.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandle.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandleJsonConverter.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/JsonConverterCollectionExtensions.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/ProjectSnapshotJsonConverter.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorConfigurationJsonConverter.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorDiagnosticJsonConverter.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorExtensionJsonConverter.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/SerializedRazorExtension.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/TagHelperDescriptorJsonConverter.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedCSharpLoweringPhase.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedRazorConfiguration.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/VSCodeForegroundDispatcher.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/BackgroundDocumentGenerator.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/AttributeDescriptionInfo.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/CompletionItemExtensions.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperCompletionService.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperDescriptionFactory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DirectiveAttributeTransitionCompletionItemProvider.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/ElementDescriptionInfo.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperAttributeDescriptionInfo.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperCompletionService.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionFactory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionInfo.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentVersionCache.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultGeneratedCodeContainerStore.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultHostDocumentFactory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultProjectSnapshotManagerAccessor.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultRemoteTextLoaderFactory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentProcessedListener.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSnapshotTextLoader.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentVersionCache.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedCodeContainerStore.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/HostDocumentFactory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/IRazorLanguageQueryHandler.cs (100%) create mode 100644 src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSnapshotManagerAccessor.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultDocumentResolver.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultProjectResolver.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultRazorProjectService.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DocumentResolver.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddDocumentHandler.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddProjectHandler.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveDocumentHandler.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveProjectHandler.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorUpdateProjectHandler.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/ProjectResolver.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorProjectService.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/Properties/AssemblyInfo.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDefaults.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticConverter.cs (97%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticsPublisher.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageEndpoint.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageKind.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryResponse.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectItem.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectSnapshotProjectEngineFactory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteRazorProjectFileSystem.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteTextLoaderFactory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/TempDirectory.cs (100%) rename src/{Razor.VSCode => Razor}/src/Microsoft.AspNetCore.Razor.LanguageServer/UpdateCSharpBufferRequest.cs (100%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/FilePathNormalizerTest.cs (100%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test.csproj (63%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/ProjectEngineFactory_UnsupportedTest.cs (97%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/SerializationTest.cs (100%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/xunit.runner.json (100%) rename src/{Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestBase.cs => Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/LanguageServerTestBase.cs} (95%) create mode 100644 src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common.csproj rename src/{Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common => Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common}/Properties/AssemblyInfo.cs (97%) rename src/{Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common => Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common}/TestDocumentSnapshot.cs (100%) rename src/{Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common => Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common}/TestProjectSnapshot.cs (100%) rename src/{Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common => Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common}/TestProjectSnapshotManager.cs (100%) rename src/{Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common => Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common}/TestProjectSnapshotProjectEngineFactory.cs (100%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/BackgroundDocumentGeneratorTest.cs (99%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperCompletionServiceTest.cs (99%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperDescriptionFactoryTest.cs (100%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs (97%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs (99%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentResolverTest.cs (98%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentVersionCacheTest.cs (99%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultGeneratedCodeContainerStoreTest.cs (98%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultHostDocumentFactoryTest.cs (96%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultProjectResolverTest.cs (98%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorProjectServiceTest.cs (99%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSnapshotTextLoaderTest.cs (100%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj (63%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorCodeDocumentExtensionsTest.cs (95%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticConverterTest.cs (100%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticsPublisherTest.cs (99%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentSynchronizationEndpointTest.cs (99%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorLanguageEndpointTest.cs (99%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectEndpointTest.cs (93%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RemoteRazorProjectFileSystemTest.cs (100%) rename src/{Razor.VSCode => Razor}/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/xunit.runner.json (100%) diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets index 0f7e3a6821..5f671b3b36 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -8,4 +8,24 @@ Text="$(RazorExtensionVSIXName) was not generated." Condition="!Exists('$(VSSetupDir)$(Configuration)\$(RazorExtensionVSIXName)')" /> + + + + + $(ArtifactsDir)LanguageServer\$(Configuration)\ + $(RidsPublishDir) + + + + + + %(LanguageServiceBinaryDir.Identity) + $(ZipOutputDir)RazorLanguageServer-%(LanguageServiceBinaryDir.Filename)-$(PackageVersion).zip + + + + + + + diff --git a/eng/AfterSolutionBuild.targets b/eng/AfterSolutionBuild.targets new file mode 100644 index 0000000000..1f501b1452 --- /dev/null +++ b/eng/AfterSolutionBuild.targets @@ -0,0 +1,12 @@ + + + + + $(MSBuildThisFileDirectory)..\src\Razor\src\Microsoft.AspNetCore.Razor.LanguageServer\Microsoft.AspNetCore.Razor.LanguageServer.csproj + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index a7f3fc213e..007a4e5703 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,6 +120,7 @@ 4.10.0 9.0.1 + 0.13.1 12.0.1 10.0.3 12.0.1 diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj b/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj deleted file mode 100644 index c9e649d0a1..0000000000 --- a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - netstandard2.0 - Razor is a markup syntax for adding server-side logic to web pages. This package contains common assets that are used in the Razor language server and other assemblies. - false - - - - - - - - - - - - - - - - diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj b/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj deleted file mode 100644 index 0f706f9c8a..0000000000 --- a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - netcoreapp2.2 - Exe - Razor is a markup syntax for adding server-side logic to web pages. This package contains a Razor language server. - false - win-x64;win-x86;linux-x64;osx-x64; - rzls - - - - - - - - - - - - - - - - - $(MSBuildProjectDirectory)\..\Microsoft.AspNetCore.Razor.OmniSharpPlugin\bin\$(Configuration)\net472\publish - $(PublishDir)\OmniSharpPlugin - - - - - - - - - - - - - diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/PublishAll.targets b/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/PublishAll.targets deleted file mode 100644 index a672a97ada..0000000000 --- a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/PublishAll.targets +++ /dev/null @@ -1,42 +0,0 @@ - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - true - - - - - bin\$(Configuration)\$(TargetFramework)\publish\ - - - - - - - - - RuntimeIdentifier=%(RuntimeIdentifierForPublish.Identity);PublishDir=$(RidsPublishDir)%(RuntimeIdentifierForPublish.Identity)\ - - - - - - - diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj b/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj deleted file mode 100644 index 94b27106c9..0000000000 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netstandard2.0 - - - - - - - - - - - diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestLanguageServices.cs b/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestLanguageServices.cs deleted file mode 100644 index ca5cab3e39..0000000000 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestLanguageServices.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.CodeAnalysis.Host; -using Microsoft.CodeAnalysis.Razor; - -namespace Microsoft.AspNetCore.Razor.Test.Common -{ - internal class TestLanguageServices : HostLanguageServices - { - private readonly HostWorkspaceServices _workspaceServices; - private readonly IEnumerable _languageServices; - - public TestLanguageServices(HostWorkspaceServices workspaceServices, IEnumerable languageServices) - { - if (workspaceServices == null) - { - throw new ArgumentNullException(nameof(workspaceServices)); - } - - if (languageServices == null) - { - throw new ArgumentNullException(nameof(languageServices)); - } - - _workspaceServices = workspaceServices; - _languageServices = languageServices; - } - - public override HostWorkspaceServices WorkspaceServices => _workspaceServices; - - public override string Language => RazorLanguage.Name; - - public override TLanguageService GetService() - { - var service = _languageServices.OfType().FirstOrDefault(); - - if (service == null) - { - throw new InvalidOperationException($"Test Razor language services not configured properly, missing language service '{typeof(TLanguageService).FullName}'."); - } - - return service; - } - } -} diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestRazorCodeDocument.cs b/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestRazorCodeDocument.cs deleted file mode 100644 index ec6dde8fad..0000000000 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestRazorCodeDocument.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Collections.Generic; -using Microsoft.AspNetCore.Razor.Language; - -namespace Microsoft.AspNetCore.Razor.Test.Common -{ - public static class TestRazorCodeDocument - { - public static RazorCodeDocument CreateEmpty() - { - var source = TestRazorSourceDocument.Create(content: string.Empty); - return new DefaultRazorCodeDocument(source, imports: null); - } - - public static RazorCodeDocument Create(string content) - { - var source = TestRazorSourceDocument.Create(content); - return new DefaultRazorCodeDocument(source, imports: null); - } - - public static RazorCodeDocument Create(RazorSourceDocument source, IEnumerable imports) - { - return new DefaultRazorCodeDocument(source, imports); - } - } -} diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestRazorSourceDocument.cs b/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestRazorSourceDocument.cs deleted file mode 100644 index f47e9b0d17..0000000000 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestRazorSourceDocument.cs +++ /dev/null @@ -1,195 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Reflection; -using System.Text; -using System.Text.RegularExpressions; -using Microsoft.AspNetCore.Razor.Language; -using Xunit; - -namespace Microsoft.AspNetCore.Razor.Test.Common -{ - public static class TestRazorSourceDocument - { - public static RazorSourceDocument CreateResource(string resourcePath, Type type, Encoding encoding = null, bool normalizeNewLines = false) - { - return CreateResource(resourcePath, type.GetTypeInfo().Assembly, encoding, normalizeNewLines); - } - - public static RazorSourceDocument CreateResource(string resourcePath, Assembly assembly, Encoding encoding = null, bool normalizeNewLines = false) - { - var file = TestFile.Create(resourcePath, assembly); - - using (var input = file.OpenRead()) - using (var reader = new StreamReader(input)) - { - var content = reader.ReadToEnd(); - if (normalizeNewLines) - { - content = NormalizeNewLines(content); - } - - var properties = new RazorSourceDocumentProperties(resourcePath, resourcePath); - return new StringSourceDocument(content, encoding ?? Encoding.UTF8, properties); - } - } - - public static RazorSourceDocument CreateResource( - string path, - Assembly assembly, - Encoding encoding, - RazorSourceDocumentProperties properties, - bool normalizeNewLines = false) - { - var file = TestFile.Create(path, assembly); - - using (var input = file.OpenRead()) - using (var reader = new StreamReader(input)) - { - var content = reader.ReadToEnd(); - if (normalizeNewLines) - { - content = NormalizeNewLines(content); - } - - return new StringSourceDocument(content, encoding ?? Encoding.UTF8, properties); - } - } - - public static MemoryStream CreateStreamContent(string content = "Hello, World!", Encoding encoding = null, bool normalizeNewLines = false) - { - var stream = new MemoryStream(); - encoding = encoding ?? Encoding.UTF8; - using (var writer = new StreamWriter(stream, encoding, bufferSize: 1024, leaveOpen: true)) - { - if (normalizeNewLines) - { - content = NormalizeNewLines(content); - } - - writer.Write(content); - } - - stream.Seek(0L, SeekOrigin.Begin); - - return stream; - } - - public static RazorSourceDocument Create( - string content = "Hello, world!", - Encoding encoding = null, - bool normalizeNewLines = false, - string filePath = "test.cshtml", - string relativePath = "test.cshtml") - { - if (normalizeNewLines) - { - content = NormalizeNewLines(content); - } - - var properties = new RazorSourceDocumentProperties(filePath, relativePath); - return new StringSourceDocument(content, encoding ?? Encoding.UTF8, properties); - } - - public static RazorSourceDocument Create( - string content, - RazorSourceDocumentProperties properties, - Encoding encoding = null, - bool normalizeNewLines = false) - { - if (normalizeNewLines) - { - content = NormalizeNewLines(content); - } - - return new StringSourceDocument(content, encoding ?? Encoding.UTF8, properties); - } - - private static string NormalizeNewLines(string content) - { - return Regex.Replace(content, "(? - /// Saves the file to the specified path. - /// - public void Save(string filePath) - { - var directory = Path.GetDirectoryName(filePath); - if (!Directory.Exists(directory)) - { - Directory.CreateDirectory(directory); - } - - using (var outStream = File.Create(filePath)) - { - using (var inStream = OpenRead()) - { - inStream.CopyTo(outStream); - } - } - } - } - } -} diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestServices.cs b/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestServices.cs deleted file mode 100644 index 3b0c3b916b..0000000000 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestServices.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Host; - -namespace Microsoft.AspNetCore.Razor.Test.Common -{ - public class TestServices : HostServices - { - private readonly IEnumerable _workspaceServices; - private readonly IEnumerable _razorLanguageServices; - - private TestServices(IEnumerable workspaceServices, IEnumerable razorLanguageServices) - { - if (workspaceServices == null) - { - throw new ArgumentNullException(nameof(workspaceServices)); - } - - if (razorLanguageServices == null) - { - throw new ArgumentNullException(nameof(razorLanguageServices)); - } - - _workspaceServices = workspaceServices; - _razorLanguageServices = razorLanguageServices; - } - - protected override HostWorkspaceServices CreateWorkspaceServices(Workspace workspace) - { - if (workspace == null) - { - throw new ArgumentNullException(nameof(workspace)); - } - - return new TestWorkspaceServices(this, _workspaceServices, _razorLanguageServices, workspace); - } - - public static HostServices Create(IEnumerable razorLanguageServices) - => Create(Enumerable.Empty(), razorLanguageServices); - - public static HostServices Create(IEnumerable workspaceServices, IEnumerable razorLanguageServices) - => new TestServices(workspaceServices, razorLanguageServices); - } -} diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestWorkspace.cs b/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestWorkspace.cs deleted file mode 100644 index 74c0a7823a..0000000000 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestWorkspace.cs +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Host; - -namespace Microsoft.AspNetCore.Razor.Test.Common -{ - public static class TestWorkspace - { - private static readonly object WorkspaceLock = new object(); - - public static Workspace Create(Action configure = null) => Create(services: null, configure: configure); - - public static Workspace Create(HostServices services, Action configure = null) - { - lock (WorkspaceLock) - { - var workspace = services == null ? new AdhocWorkspace() : new AdhocWorkspace(services); - configure?.Invoke(workspace); - - return workspace; - } - } - } -} diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestWorkspaceServices.cs b/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestWorkspaceServices.cs deleted file mode 100644 index e497e89e11..0000000000 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestWorkspaceServices.cs +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Host; -using Microsoft.CodeAnalysis.Razor; - -namespace Microsoft.AspNetCore.Razor.Test.Common -{ - internal class TestWorkspaceServices : HostWorkspaceServices - { - private static readonly Workspace DefaultWorkspace = TestWorkspace.Create(); - - private readonly HostServices _hostServices; - private readonly HostLanguageServices _razorLanguageServices; - private readonly IEnumerable _workspaceServices; - private readonly Workspace _workspace; - - public TestWorkspaceServices( - HostServices hostServices, - IEnumerable workspaceServices, - IEnumerable languageServices, - Workspace workspace) - { - if (hostServices == null) - { - throw new ArgumentNullException(nameof(hostServices)); - } - - if (workspaceServices == null) - { - throw new ArgumentNullException(nameof(workspaceServices)); - } - - if (languageServices == null) - { - throw new ArgumentNullException(nameof(languageServices)); - } - - if (workspace == null) - { - throw new ArgumentNullException(nameof(workspace)); - } - - _hostServices = hostServices; - _workspaceServices = workspaceServices; - _workspace = workspace; - - _razorLanguageServices = new TestLanguageServices(this, languageServices); - } - - public override HostServices HostServices => _hostServices; - - public override Workspace Workspace => _workspace; - - public override TWorkspaceService GetService() - { - var service = _workspaceServices.OfType().FirstOrDefault(); - - if (service == null) - { - // Fallback to default host services to resolve roslyn specific features. - service = DefaultWorkspace.Services.GetService(); - } - - return service; - } - - public override HostLanguageServices GetLanguageServices(string languageName) - { - if (languageName == RazorLanguage.Name) - { - return _razorLanguageServices; - } - - // Fallback to default host services to resolve roslyn specific features. - return DefaultWorkspace.Services.GetLanguageServices(languageName); - } - - public override IEnumerable SupportedLanguages => new[] { RazorLanguage.Name }; - - public override bool IsSupported(string languageName) => languageName == RazorLanguage.Name; - - public override IEnumerable FindLanguageServices(MetadataFilter filter) => throw new NotImplementedException(); - } -} diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln index 3b5654c4f1..39b9a2c8c8 100644 --- a/src/Razor/Razor.sln +++ b/src/Razor/Razor.sln @@ -86,9 +86,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Mac. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test.ComponentShim", "test\Microsoft.AspNetCore.Razor.Test.ComponentShim\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj", "{5B232E77-F0D3-4298-9A5D-D965788D7A79}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.LiveShare.Razor", "src\Microsoft.VisualStudio.LiveShare.Razor\Microsoft.VisualStudio.LiveShare.Razor.csproj", "{20193C6A-8981-447F-99B3-120DD3B06279}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LiveShare.Razor", "src\Microsoft.VisualStudio.LiveShare.Razor\Microsoft.VisualStudio.LiveShare.Razor.csproj", "{20193C6A-8981-447F-99B3-120DD3B06279}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.LiveShare.Razor.Test", "test\Microsoft.VisualStudio.LiveShare.Razor.Test\Microsoft.VisualStudio.LiveShare.Razor.Test.csproj", "{9A27DD55-E8CD-4C03-A89B-A7348B787660}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LiveShare.Razor.Test", "test\Microsoft.VisualStudio.LiveShare.Razor.Test\Microsoft.VisualStudio.LiveShare.Razor.Test.csproj", "{9A27DD55-E8CD-4C03-A89B-A7348B787660}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.LanguageServer.Common", "src\Microsoft.AspNetCore.Razor.LanguageServer.Common\Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj", "{F2B59848-345E-4ECB-ADDB-277F3C937B9C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.LanguageServer", "src\Microsoft.AspNetCore.Razor.LanguageServer\Microsoft.AspNetCore.Razor.LanguageServer.csproj", "{1D15867E-E50F-4107-92A4-BBC2EE6B088C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.LanguageServer.Common.Test", "test\Microsoft.AspNetCore.Razor.LanguageServer.Common.Test\Microsoft.AspNetCore.Razor.LanguageServer.Common.Test.csproj", "{6C8A42B5-B41C-4334-959F-684E647A24E1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.LanguageServer.Test", "test\Microsoft.AspNetCore.Razor.LanguageServer.Test\Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj", "{FBAE9975-77BE-411B-A1A3-4790C8A367EF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.LanguageServer.Test.Common", "test\Microsoft.AspNetCore.Razor.LanguageServer.Test.Common\Microsoft.AspNetCore.Razor.LanguageServer.Test.Common.csproj", "{9D300F9A-1F78-45C9-B4BB-476EF12E40F8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -410,6 +420,46 @@ Global {9A27DD55-E8CD-4C03-A89B-A7348B787660}.Release|Any CPU.Build.0 = Release|Any CPU {9A27DD55-E8CD-4C03-A89B-A7348B787660}.ReleaseNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU {9A27DD55-E8CD-4C03-A89B-A7348B787660}.ReleaseNoVSIX|Any CPU.Build.0 = Debug|Any CPU + {F2B59848-345E-4ECB-ADDB-277F3C937B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2B59848-345E-4ECB-ADDB-277F3C937B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2B59848-345E-4ECB-ADDB-277F3C937B9C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU + {F2B59848-345E-4ECB-ADDB-277F3C937B9C}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU + {F2B59848-345E-4ECB-ADDB-277F3C937B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2B59848-345E-4ECB-ADDB-277F3C937B9C}.Release|Any CPU.Build.0 = Release|Any CPU + {F2B59848-345E-4ECB-ADDB-277F3C937B9C}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU + {F2B59848-345E-4ECB-ADDB-277F3C937B9C}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU + {1D15867E-E50F-4107-92A4-BBC2EE6B088C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1D15867E-E50F-4107-92A4-BBC2EE6B088C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D15867E-E50F-4107-92A4-BBC2EE6B088C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU + {1D15867E-E50F-4107-92A4-BBC2EE6B088C}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU + {1D15867E-E50F-4107-92A4-BBC2EE6B088C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1D15867E-E50F-4107-92A4-BBC2EE6B088C}.Release|Any CPU.Build.0 = Release|Any CPU + {1D15867E-E50F-4107-92A4-BBC2EE6B088C}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU + {1D15867E-E50F-4107-92A4-BBC2EE6B088C}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU + {6C8A42B5-B41C-4334-959F-684E647A24E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C8A42B5-B41C-4334-959F-684E647A24E1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C8A42B5-B41C-4334-959F-684E647A24E1}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU + {6C8A42B5-B41C-4334-959F-684E647A24E1}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU + {6C8A42B5-B41C-4334-959F-684E647A24E1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C8A42B5-B41C-4334-959F-684E647A24E1}.Release|Any CPU.Build.0 = Release|Any CPU + {6C8A42B5-B41C-4334-959F-684E647A24E1}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU + {6C8A42B5-B41C-4334-959F-684E647A24E1}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU + {FBAE9975-77BE-411B-A1A3-4790C8A367EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FBAE9975-77BE-411B-A1A3-4790C8A367EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FBAE9975-77BE-411B-A1A3-4790C8A367EF}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU + {FBAE9975-77BE-411B-A1A3-4790C8A367EF}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU + {FBAE9975-77BE-411B-A1A3-4790C8A367EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FBAE9975-77BE-411B-A1A3-4790C8A367EF}.Release|Any CPU.Build.0 = Release|Any CPU + {FBAE9975-77BE-411B-A1A3-4790C8A367EF}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU + {FBAE9975-77BE-411B-A1A3-4790C8A367EF}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8}.Release|Any CPU.Build.0 = Release|Any CPU + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -454,6 +504,11 @@ Global {5B232E77-F0D3-4298-9A5D-D965788D7A79} = {92463391-81BE-462B-AC3C-78C6C760741F} {20193C6A-8981-447F-99B3-120DD3B06279} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} {9A27DD55-E8CD-4C03-A89B-A7348B787660} = {92463391-81BE-462B-AC3C-78C6C760741F} + {F2B59848-345E-4ECB-ADDB-277F3C937B9C} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} + {1D15867E-E50F-4107-92A4-BBC2EE6B088C} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} + {6C8A42B5-B41C-4334-959F-684E647A24E1} = {92463391-81BE-462B-AC3C-78C6C760741F} + {FBAE9975-77BE-411B-A1A3-4790C8A367EF} = {92463391-81BE-462B-AC3C-78C6C760741F} + {9D300F9A-1F78-45C9-B4BB-476EF12E40F8} = {92463391-81BE-462B-AC3C-78C6C760741F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26} diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs index f3180eb618..2e8a0368a7 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorIntermediateNodeLoweringPhase.cs @@ -1099,8 +1099,6 @@ namespace Microsoft.AspNetCore.Razor.Language if (node.Source != null) { - Debug.Assert(node.Source.Value.FilePath != null); - node.Source = new SourceSpan( node.Source.Value.FilePath, node.Source.Value.AbsoluteIndex, diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocLanguageServices.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocLanguageServices.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocLanguageServices.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocLanguageServices.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocServices.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocServices.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocServices.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocServices.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocWorkspaceServices.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocWorkspaceServices.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocWorkspaceServices.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/AdhocWorkspaceServices.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/DefaultProjectEngineFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/DefaultProjectEngineFactory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/DefaultProjectEngineFactory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/DefaultProjectEngineFactory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/FilePathNormalizer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/FilePathNormalizer.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/FilePathNormalizer.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/FilePathNormalizer.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/HostDocumentComparer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/HostDocumentComparer.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/HostDocumentComparer.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/HostDocumentComparer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj new file mode 100644 index 0000000000..44d0ddf004 --- /dev/null +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj @@ -0,0 +1,20 @@ + + + + netstandard2.0 + Razor is a markup syntax for adding server-side logic to web pages. This package contains common assets that are used in the Razor language server and other assemblies. + false + + + + + + + + + + + + + + diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactories.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactories.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactories.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactories.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_0.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_0.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_0.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_0.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_1.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_1.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_1.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_1_1.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_0.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_0.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_0.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_0.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_1.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_1.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_1.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_2_1.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_3_0.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_3_0.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_3_0.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_3_0.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_Unsupported.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_Unsupported.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_Unsupported.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectEngineFactory_Unsupported.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectSerializationFormat.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectSerializationFormat.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectSerializationFormat.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/ProjectSerializationFormat.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Properties/AssemblyInfo.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Properties/AssemblyInfo.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/RazorCodeDocumentExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/RazorCodeDocumentExtensions.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/RazorCodeDocumentExtensions.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/RazorCodeDocumentExtensions.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/DocumentSnapshotHandle.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/DocumentSnapshotHandle.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/DocumentSnapshotHandle.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/DocumentSnapshotHandle.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandle.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandle.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandle.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandle.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandleJsonConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandleJsonConverter.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandleJsonConverter.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/FullProjectSnapshotHandleJsonConverter.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/JsonConverterCollectionExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/JsonConverterCollectionExtensions.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/JsonConverterCollectionExtensions.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/JsonConverterCollectionExtensions.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/ProjectSnapshotJsonConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/ProjectSnapshotJsonConverter.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/ProjectSnapshotJsonConverter.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/ProjectSnapshotJsonConverter.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorConfigurationJsonConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorConfigurationJsonConverter.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorConfigurationJsonConverter.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorConfigurationJsonConverter.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorDiagnosticJsonConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorDiagnosticJsonConverter.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorDiagnosticJsonConverter.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorDiagnosticJsonConverter.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorExtensionJsonConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorExtensionJsonConverter.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorExtensionJsonConverter.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/RazorExtensionJsonConverter.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/SerializedRazorExtension.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/SerializedRazorExtension.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/SerializedRazorExtension.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/SerializedRazorExtension.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/TagHelperDescriptorJsonConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/TagHelperDescriptorJsonConverter.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/TagHelperDescriptorJsonConverter.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Serialization/TagHelperDescriptorJsonConverter.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedCSharpLoweringPhase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedCSharpLoweringPhase.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedCSharpLoweringPhase.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedCSharpLoweringPhase.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedRazorConfiguration.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedRazorConfiguration.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedRazorConfiguration.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/UnsupportedRazorConfiguration.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/VSCodeForegroundDispatcher.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/VSCodeForegroundDispatcher.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/VSCodeForegroundDispatcher.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/VSCodeForegroundDispatcher.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/BackgroundDocumentGenerator.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/BackgroundDocumentGenerator.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/BackgroundDocumentGenerator.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/BackgroundDocumentGenerator.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/AttributeDescriptionInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/AttributeDescriptionInfo.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/AttributeDescriptionInfo.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/AttributeDescriptionInfo.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/CompletionItemExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/CompletionItemExtensions.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/CompletionItemExtensions.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/CompletionItemExtensions.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperCompletionService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperCompletionService.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperCompletionService.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperCompletionService.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperDescriptionFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperDescriptionFactory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperDescriptionFactory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DefaultTagHelperDescriptionFactory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DirectiveAttributeTransitionCompletionItemProvider.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DirectiveAttributeTransitionCompletionItemProvider.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DirectiveAttributeTransitionCompletionItemProvider.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/DirectiveAttributeTransitionCompletionItemProvider.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/ElementDescriptionInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/ElementDescriptionInfo.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/ElementDescriptionInfo.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/ElementDescriptionInfo.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionEndpoint.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperAttributeDescriptionInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperAttributeDescriptionInfo.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperAttributeDescriptionInfo.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperAttributeDescriptionInfo.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperCompletionService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperCompletionService.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperCompletionService.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperCompletionService.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionFactory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionFactory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionFactory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionInfo.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionInfo.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/TagHelperDescriptionInfo.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentVersionCache.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentVersionCache.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentVersionCache.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentVersionCache.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultGeneratedCodeContainerStore.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultGeneratedCodeContainerStore.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultGeneratedCodeContainerStore.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultGeneratedCodeContainerStore.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultHostDocumentFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultHostDocumentFactory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultHostDocumentFactory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultHostDocumentFactory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultProjectSnapshotManagerAccessor.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultProjectSnapshotManagerAccessor.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultProjectSnapshotManagerAccessor.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultProjectSnapshotManagerAccessor.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultRemoteTextLoaderFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultRemoteTextLoaderFactory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultRemoteTextLoaderFactory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultRemoteTextLoaderFactory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentProcessedListener.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentProcessedListener.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentProcessedListener.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentProcessedListener.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSnapshotTextLoader.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSnapshotTextLoader.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSnapshotTextLoader.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSnapshotTextLoader.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentVersionCache.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentVersionCache.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentVersionCache.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentVersionCache.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedCodeContainerStore.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedCodeContainerStore.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedCodeContainerStore.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedCodeContainerStore.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/HostDocumentFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/HostDocumentFactory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/HostDocumentFactory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/HostDocumentFactory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/IRazorLanguageQueryHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IRazorLanguageQueryHandler.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/IRazorLanguageQueryHandler.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IRazorLanguageQueryHandler.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj new file mode 100644 index 0000000000..a1f469bd52 --- /dev/null +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Microsoft.AspNetCore.Razor.LanguageServer.csproj @@ -0,0 +1,59 @@ + + + + netcoreapp3.0 + Exe + Razor is a markup syntax for adding server-side logic to web pages. This package contains a Razor language server. + false + win-x64;win-x86;linux-x64;osx-x64; + rzls + + + + + + + + + + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + true + $(ArtifactsDir)LanguageServer\$(Configuration)\ + + + + + + + + + + + RuntimeIdentifier=%(RuntimeIdentifierForPublish.Identity);PublishDir=$(RidsPublishDir)%(RuntimeIdentifierForPublish.Identity)\ + + + + + + diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Program.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSnapshotManagerAccessor.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSnapshotManagerAccessor.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSnapshotManagerAccessor.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSnapshotManagerAccessor.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/AddDocumentParams.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultDocumentResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultDocumentResolver.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultDocumentResolver.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultDocumentResolver.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultProjectResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultProjectResolver.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultProjectResolver.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultProjectResolver.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultRazorProjectService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultRazorProjectService.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultRazorProjectService.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DefaultRazorProjectService.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DocumentResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DocumentResolver.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DocumentResolver.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/DocumentResolver.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddDocumentHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddDocumentHandler.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddDocumentHandler.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddDocumentHandler.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddProjectHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddProjectHandler.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddProjectHandler.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorAddProjectHandler.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveDocumentHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveDocumentHandler.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveDocumentHandler.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveDocumentHandler.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveProjectHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveProjectHandler.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveProjectHandler.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorRemoveProjectHandler.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorUpdateProjectHandler.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorUpdateProjectHandler.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorUpdateProjectHandler.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IRazorUpdateProjectHandler.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/ProjectResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/ProjectResolver.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/ProjectResolver.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/ProjectResolver.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorAddProjectParams.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorProjectService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorProjectService.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorProjectService.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorProjectService.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorRemoveProjectParams.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RazorUpdateProjectParams.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/RemoveDocumentParams.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/Properties/AssemblyInfo.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Properties/AssemblyInfo.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDefaults.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDefaults.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDefaults.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDefaults.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticConverter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticConverter.cs similarity index 97% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticConverter.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticConverter.cs index 01990d53dc..35f5356090 100644 --- a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticConverter.cs +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticConverter.cs @@ -5,6 +5,7 @@ using System; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.Text; using OmniSharp.Extensions.LanguageServer.Protocol.Models; +using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range; namespace Microsoft.AspNetCore.Razor.LanguageServer { diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticsPublisher.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticsPublisher.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticsPublisher.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDiagnosticsPublisher.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentSynchronizationEndpoint.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageEndpoint.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageEndpoint.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageEndpoint.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageKind.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageKind.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageKind.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageKind.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryParams.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryResponse.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryResponse.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryResponse.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageQueryResponse.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorProjectEndpoint.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectItem.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectItem.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectItem.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectItem.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectSnapshotProjectEngineFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectSnapshotProjectEngineFactory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectSnapshotProjectEngineFactory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteProjectSnapshotProjectEngineFactory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteRazorProjectFileSystem.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteRazorProjectFileSystem.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteRazorProjectFileSystem.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteRazorProjectFileSystem.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteTextLoaderFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteTextLoaderFactory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteTextLoaderFactory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteTextLoaderFactory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/TempDirectory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/TempDirectory.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/TempDirectory.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/TempDirectory.cs diff --git a/src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/UpdateCSharpBufferRequest.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/UpdateCSharpBufferRequest.cs similarity index 100% rename from src/Razor.VSCode/src/Microsoft.AspNetCore.Razor.LanguageServer/UpdateCSharpBufferRequest.cs rename to src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/UpdateCSharpBufferRequest.cs diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs index 90dc688ee8..5c26f2cf7b 100644 --- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs +++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Properties/AssemblyInfo.cs @@ -8,6 +8,7 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LiveShare.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/FilePathNormalizerTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/FilePathNormalizerTest.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/FilePathNormalizerTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/FilePathNormalizerTest.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test.csproj similarity index 63% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test.csproj rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test.csproj index 6dd21fbf07..573daa7dd8 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 @@ -10,7 +10,7 @@ - + diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/ProjectEngineFactory_UnsupportedTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/ProjectEngineFactory_UnsupportedTest.cs similarity index 97% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/ProjectEngineFactory_UnsupportedTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/ProjectEngineFactory_UnsupportedTest.cs index f0714f8dc1..acd6d1f9dc 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/ProjectEngineFactory_UnsupportedTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/ProjectEngineFactory_UnsupportedTest.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Test.Common; using Xunit; using Xunit.Sdk; diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/SerializationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/SerializationTest.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/SerializationTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/SerializationTest.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/xunit.runner.json b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/xunit.runner.json similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/xunit.runner.json rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Common.Test/xunit.runner.json diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/LanguageServerTestBase.cs similarity index 95% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestBase.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/LanguageServerTestBase.cs index a967437c21..1353f59416 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestBase.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/LanguageServerTestBase.cs @@ -12,9 +12,9 @@ using Moq; namespace Microsoft.AspNetCore.Razor.Test.Common { - public abstract class TestBase + public abstract class LanguageServerTestBase { - public TestBase() + public LanguageServerTestBase() { Dispatcher = new SingleThreadedForegroundDispatcher(); LoggerFactory = Mock.Of(factory => factory.CreateLogger(It.IsAny()) == Mock.Of()); diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common.csproj new file mode 100644 index 0000000000..d69011e133 --- /dev/null +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common.csproj @@ -0,0 +1,19 @@ + + + + netstandard2.0 + + + + + + + + + + + + + + + diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/Properties/AssemblyInfo.cs similarity index 97% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/Properties/AssemblyInfo.cs index 76c782744b..f24bf9512a 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/Properties/AssemblyInfo.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/Properties/AssemblyInfo.cs @@ -5,4 +5,4 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer.Common.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestDocumentSnapshot.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/TestDocumentSnapshot.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestDocumentSnapshot.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/TestDocumentSnapshot.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestProjectSnapshot.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/TestProjectSnapshot.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestProjectSnapshot.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/TestProjectSnapshot.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestProjectSnapshotManager.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/TestProjectSnapshotManager.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestProjectSnapshotManager.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/TestProjectSnapshotManager.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestProjectSnapshotProjectEngineFactory.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/TestProjectSnapshotProjectEngineFactory.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.Test.Common/TestProjectSnapshotProjectEngineFactory.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test.Common/TestProjectSnapshotProjectEngineFactory.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/BackgroundDocumentGeneratorTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/BackgroundDocumentGeneratorTest.cs similarity index 99% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/BackgroundDocumentGeneratorTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/BackgroundDocumentGeneratorTest.cs index 811397ceeb..4d03bfa716 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/BackgroundDocumentGeneratorTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/BackgroundDocumentGeneratorTest.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer { // These tests are really integration tests. There isn't a good way to unit test this functionality since // the only thing in here is threading. - public class BackgroundDocumentGeneratorTest : TestBase + public class BackgroundDocumentGeneratorTest : LanguageServerTestBase { public BackgroundDocumentGeneratorTest() { diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperCompletionServiceTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperCompletionServiceTest.cs similarity index 99% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperCompletionServiceTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperCompletionServiceTest.cs index f1b5a7bbe0..b5a668079b 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperCompletionServiceTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperCompletionServiceTest.cs @@ -15,7 +15,7 @@ using RazorTagHelperCompletionService = Microsoft.VisualStudio.Editor.Razor.TagH namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion { - public class DefaultTagHelperCompletionServiceTest : TestBase + public class DefaultTagHelperCompletionServiceTest : LanguageServerTestBase { public DefaultTagHelperCompletionServiceTest() { diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperDescriptionFactoryTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperDescriptionFactoryTest.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperDescriptionFactoryTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultTagHelperDescriptionFactoryTest.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs similarity index 97% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs index 212b645098..49aa4a90df 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DirectiveAttributeTransitionCompletionItemProviderTest.cs @@ -2,11 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using Microsoft.AspNetCore.Razor.Language; -using Microsoft.AspNetCore.Razor.Test.Common; using Microsoft.CodeAnalysis.Razor.Completion; using Xunit; diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs similarity index 99% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs index f7f15fc73f..0b2ce28c1d 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs @@ -20,7 +20,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion { - public class RazorCompletionEndpointTest : TestBase + public class RazorCompletionEndpointTest : LanguageServerTestBase { public RazorCompletionEndpointTest() { diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentResolverTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentResolverTest.cs similarity index 98% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentResolverTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentResolverTest.cs index b2125965fd..c0c3da9554 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentResolverTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentResolverTest.cs @@ -10,7 +10,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class DocumentDocumentResolverTest : TestBase + public class DocumentDocumentResolverTest : LanguageServerTestBase { [Fact] public void TryResolveDocument_AsksPotentialParentProjectForDocumentItsTracking_ReturnsTrue() diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentVersionCacheTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentVersionCacheTest.cs similarity index 99% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentVersionCacheTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentVersionCacheTest.cs index fd77145d56..02d366027a 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentVersionCacheTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultDocumentVersionCacheTest.cs @@ -8,7 +8,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class DefaultDocumentVersionCacheTest : TestBase + public class DefaultDocumentVersionCacheTest : LanguageServerTestBase { [Fact] public void MarkAsLatestVersion_UntrackedDocument_Noops() diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultGeneratedCodeContainerStoreTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultGeneratedCodeContainerStoreTest.cs similarity index 98% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultGeneratedCodeContainerStoreTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultGeneratedCodeContainerStoreTest.cs index 321294e475..a5c9f63344 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultGeneratedCodeContainerStoreTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultGeneratedCodeContainerStoreTest.cs @@ -12,7 +12,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class DefaultGeneratedCodeContainerStoreTest : TestBase + public class DefaultGeneratedCodeContainerStoreTest : LanguageServerTestBase { public DefaultGeneratedCodeContainerStoreTest() { diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultHostDocumentFactoryTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultHostDocumentFactoryTest.cs similarity index 96% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultHostDocumentFactoryTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultHostDocumentFactoryTest.cs index e4e6b1bc78..657d5262ae 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultHostDocumentFactoryTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultHostDocumentFactoryTest.cs @@ -11,7 +11,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class DefaultHostDocumentFactoryTest : TestBase + public class DefaultHostDocumentFactoryTest : LanguageServerTestBase { public DefaultHostDocumentFactoryTest() { diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultProjectResolverTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultProjectResolverTest.cs similarity index 98% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultProjectResolverTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultProjectResolverTest.cs index e6f0f9cd38..58ef8a9764 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultProjectResolverTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultProjectResolverTest.cs @@ -13,7 +13,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class DocumentProjectResolverTest : TestBase + public class DocumentProjectResolverTest : LanguageServerTestBase { [Fact] public void TryResolvePotentialProject_NoProjects_ReturnsFalse() diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorProjectServiceTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorProjectServiceTest.cs similarity index 99% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorProjectServiceTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorProjectServiceTest.cs index 7f87a528cc..6adc48a985 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorProjectServiceTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorProjectServiceTest.cs @@ -19,7 +19,7 @@ using Xunit.Sdk; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class DefaultRazorProjectServiceTest : TestBase + public class DefaultRazorProjectServiceTest : LanguageServerTestBase { private IReadOnlyList EmptyDocuments { get; } = Array.Empty(); diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSnapshotTextLoaderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSnapshotTextLoaderTest.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSnapshotTextLoaderTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSnapshotTextLoaderTest.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj similarity index 63% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj index 6dd21fbf07..573daa7dd8 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.0 @@ -10,7 +10,7 @@ - + diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorCodeDocumentExtensionsTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorCodeDocumentExtensionsTest.cs similarity index 95% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorCodeDocumentExtensionsTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorCodeDocumentExtensionsTest.cs index 52357336a5..2cee10a604 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorCodeDocumentExtensionsTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorCodeDocumentExtensionsTest.cs @@ -1,8 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNetCore.Razor.Language; using Microsoft.AspNetCore.Razor.LanguageServer.Common; -using Microsoft.AspNetCore.Razor.Test.Common; using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticConverterTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticConverterTest.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticConverterTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticConverterTest.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticsPublisherTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticsPublisherTest.cs similarity index 99% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticsPublisherTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticsPublisherTest.cs index 38601636e9..b7f132698f 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticsPublisherTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDiagnosticsPublisherTest.cs @@ -19,7 +19,7 @@ using RazorDiagnosticFactory = Microsoft.AspNetCore.Razor.Language.RazorDiagnost namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class RazorDiagnosticsPublisherTest : TestBase + public class RazorDiagnosticsPublisherTest : LanguageServerTestBase { public RazorDiagnosticsPublisherTest() { diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentSynchronizationEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentSynchronizationEndpointTest.cs similarity index 99% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentSynchronizationEndpointTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentSynchronizationEndpointTest.cs index 6029128bca..1fd4fc6688 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentSynchronizationEndpointTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentSynchronizationEndpointTest.cs @@ -15,7 +15,7 @@ using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class RazorDocumentSynchronizationEndpointTest : TestBase + public class RazorDocumentSynchronizationEndpointTest : LanguageServerTestBase { private DocumentResolver DocumentResolver => Mock.Of(); diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorLanguageEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorLanguageEndpointTest.cs similarity index 99% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorLanguageEndpointTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorLanguageEndpointTest.cs index caf3c08d28..a52cfcff55 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorLanguageEndpointTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorLanguageEndpointTest.cs @@ -19,7 +19,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class RazorLanguageEndpointTest : TestBase + public class RazorLanguageEndpointTest : LanguageServerTestBase { public RazorLanguageEndpointTest() { diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectEndpointTest.cs similarity index 93% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectEndpointTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectEndpointTest.cs index 507831a2b3..9f5088caeb 100644 --- a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectEndpointTest.cs +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorProjectEndpointTest.cs @@ -10,7 +10,7 @@ using Xunit; namespace Microsoft.AspNetCore.Razor.LanguageServer { - public class RazorProjectEndpointTest : TestBase + public class RazorProjectEndpointTest : LanguageServerTestBase { [Fact] public async Task Handle_UpdateProject_NoProjectSnapshotHandle_Noops() diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RemoteRazorProjectFileSystemTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RemoteRazorProjectFileSystemTest.cs similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RemoteRazorProjectFileSystemTest.cs rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RemoteRazorProjectFileSystemTest.cs diff --git a/src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/xunit.runner.json b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/xunit.runner.json similarity index 100% rename from src/Razor.VSCode/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/xunit.runner.json rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/xunit.runner.json