From fcb5befb79e6ddeacf5ec4dcb946d84a796fb5bf Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 20 Jan 2022 13:22:48 -0800 Subject: [PATCH] Add pipelines for Integration tests on VSMain (#5980) * Add pipelines for Integration tests on VSMain * PR feedback --- azure-pipelines-integration-dartlab.yml | 58 +++++++++++++++++++ azure-pipelines.yml | 1 + eng/pipelines/checkout-windows-task.yml | 11 ++++ eng/pipelines/test-integration-job.yml | 47 +++++++++++++++ eng/targets/Npm.Common.targets | 2 + src/Razor/Razor.sln | 2 +- ...pNetCore.Razor.VSCode.Grammar.Test.npmproj | 1 - .../AbstractEditorTest.cs | 2 +- .../AbstractIntegrationTest.cs | 2 +- .../AbstractRazorEditorTest.cs | 4 +- .../Extensions/IBufferGraphExtensions.cs | 2 +- .../Extensions/ITextViewExtensions.cs | 2 +- .../Extensions/IVsTextManagerExtensions.cs | 2 +- .../Extensions/IVsTextViewExtensions.cs | 2 +- .../InProcess/EditorInProcess.cs | 2 +- .../InProcess/EditorInProcess_Caret.cs | 2 +- .../EditorInProcess_Classification.cs | 0 .../InProcess/EditorInProcess_Completion.cs | 0 .../InProcess/EditorInProcess_LightBulb.cs | 2 +- .../InProcess/EditorInProcess_Text.cs | 2 +- .../InProcess/FeatureAttribute.cs | 2 +- .../InProcess/Helper.cs | 2 +- .../InProcess/LightBulbHelper.cs | 2 +- .../InProcess/MarkupTestFile.cs | 2 +- .../InProcess/SolutionExplorerInProcess.cs | 4 +- .../InProcess/WellKnownCommandNames.cs | 2 +- .../InProcess/WorkspaceInProcess.cs | 2 +- .../IntializeTestFileAttribute.cs | 2 +- .../LanguageNames.cs | 2 +- ...isualStudio.Razor.IntegrationTests.csproj} | 2 +- .../ProjectTests.cs | 2 +- .../RazorCodeActionsTests.cs | 2 +- .../RazorDebug.cs | 2 +- .../Semantic/RazorSemanticTokensTests.cs | 4 +- .../Components_AreColored.txt | 0 .../Directives_AreColored.txt | 0 .../WellKnownProjectTemplates.cs | 2 +- .../XunitAssemblyInfo.cs | 0 .../xunit.runner.json | 0 39 files changed, 149 insertions(+), 31 deletions(-) create mode 100644 azure-pipelines-integration-dartlab.yml create mode 100644 eng/pipelines/checkout-windows-task.yml create mode 100644 eng/pipelines/test-integration-job.yml rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/AbstractEditorTest.cs (96%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/AbstractIntegrationTest.cs (96%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/AbstractRazorEditorTest.cs (93%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/Extensions/IBufferGraphExtensions.cs (92%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/Extensions/ITextViewExtensions.cs (94%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/Extensions/IVsTextManagerExtensions.cs (94%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/Extensions/IVsTextViewExtensions.cs (93%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/EditorInProcess.cs (98%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/EditorInProcess_Caret.cs (98%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/EditorInProcess_Classification.cs (100%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/EditorInProcess_Completion.cs (100%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/EditorInProcess_LightBulb.cs (98%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/EditorInProcess_Text.cs (95%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/FeatureAttribute.cs (98%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/Helper.cs (97%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/LightBulbHelper.cs (98%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/MarkupTestFile.cs (87%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/SolutionExplorerInProcess.cs (99%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/WellKnownCommandNames.cs (84%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/InProcess/WorkspaceInProcess.cs (94%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/IntializeTestFileAttribute.cs (94%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/LanguageNames.cs (84%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test/Microsoft.VisualStudio.Razor.Integration.Test.csproj => Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj} (96%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/ProjectTests.cs (91%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/RazorCodeActionsTests.cs (96%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/RazorDebug.cs (97%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/Semantic/RazorSemanticTokensTests.cs (98%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/Semantic/TestFiles/RazorSemanticTokensTests/Components_AreColored.txt (100%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/Semantic/TestFiles/RazorSemanticTokensTests/Directives_AreColored.txt (100%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/WellKnownProjectTemplates.cs (93%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/XunitAssemblyInfo.cs (100%) rename src/Razor/test/{Microsoft.VisualStudio.Razor.Integration.Test => Microsoft.VisualStudio.Razor.IntegrationTests}/xunit.runner.json (100%) diff --git a/azure-pipelines-integration-dartlab.yml b/azure-pipelines-integration-dartlab.yml new file mode 100644 index 0000000000..a67720338a --- /dev/null +++ b/azure-pipelines-integration-dartlab.yml @@ -0,0 +1,58 @@ +# Razor integration test pipeline for validating against branch builds of VS. + +trigger: none # Manual trigger for now +pr: none + +resources: + pipelines: + - pipeline: VisualStudioBuildUnderTest + source: DD-CB-ReleaseVS + branch: main + - pipeline: DartLab + source: DartLab + branch: main + repositories: + - repository: DartLabTemplates + type: git + name: DartLab.Templates + ref: refs/heads/dev/bradwhit/RemoveCheckoutNone + - repository: RazorMirror + endpoint: dnceng/internal dotnet-razor-tooling + type: git + name: internal/dotnet-razor-tooling + ref: $(Build.SourceBranchName) + trigger: + - main + +variables: +- name: XUNIT_LOGS + value: $(Build.SourcesDirectory)\artifacts\log\$(_configuration) + +stages: +- template: \stages\visual-studio\base.yml@DartLabTemplates + parameters: + displayName: VS Integration + testLabPoolName: VS-Platform2 + visualStudioBootstrapperURI: https://vsdrop.corp.microsoft.com/file/v1/$(VisualStudio.BuildUnderTest.ProductsDropName);bootstrappers/Enterprise/vs_enterprise.exe + visualStudioInstallationParameters: --add Microsoft.VisualStudio.Component.NuGet --add Microsoft.VisualStudio.Component.Roslyn.Compiler --add Microsoft.Component.MSBuild --add Microsoft.NetCore.Component.Runtime.6.0 --add Microsoft.NetCore.Component.SDK --add Microsoft.Net.Component.4.7.2.TargetingPack --add Microsoft.VisualStudio.Component.Roslyn.LanguageServices --add Microsoft.VisualStudio.Component.FSharp --add Microsoft.ComponentGroup.ClickOnce.Publish --add Microsoft.NetCore.Component.DevelopmentTools --add Microsoft.VisualStudio.Component.MSODBC.SQL --add Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils --add Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime --add Microsoft.VisualStudio.Component.SQL.CLR --add Microsoft.VisualStudio.Component.CoreEditor --add Microsoft.VisualStudio.Workload.CoreEditor --add Microsoft.Net.Component.4.8.SDK --add Microsoft.Net.ComponentGroup.DevelopmentPrerequisites --add Microsoft.VisualStudio.Component.TypeScript.TSServer --add Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions --add Microsoft.VisualStudio.Component.JavaScript.TypeScript --add Microsoft.VisualStudio.Component.JavaScript.Diagnostics --add Microsoft.VisualStudio.Component.TextTemplating --add Component.Microsoft.VisualStudio.RazorExtension --add Microsoft.VisualStudio.Component.IISExpress --add Microsoft.VisualStudio.Component.Common.Azure.Tools --add Microsoft.Component.ClickOnce --add Microsoft.VisualStudio.Component.ManagedDesktop.Core --add Microsoft.VisualStudio.Component.SQL.SSDT --add Microsoft.VisualStudio.Component.SQL.DataSources --add Component.Microsoft.Web.LibraryManager --add Component.Microsoft.WebTools.BrowserLink.WebLivePreview --add Microsoft.VisualStudio.ComponentGroup.Web --add Microsoft.VisualStudio.Component.FSharp.WebTemplates --add Microsoft.VisualStudio.Component.DockerTools --add Microsoft.NetCore.Component.Web --add Microsoft.VisualStudio.Component.WebDeploy --add Microsoft.VisualStudio.Component.AppInsights.Tools --add Microsoft.VisualStudio.Component.Web --add Microsoft.Net.Component.4.8.TargetingPack --add Microsoft.Net.ComponentGroup.4.8.DeveloperTools --add Microsoft.VisualStudio.Component.AspNet45 --add Microsoft.VisualStudio.Component.AspNet --add Component.Microsoft.VisualStudio.Web.AzureFunctions --add Microsoft.VisualStudio.ComponentGroup.AzureFunctions --add Microsoft.VisualStudio.Component.Debugger.Snapshot --add Microsoft.VisualStudio.ComponentGroup.Web.CloudTools --add Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd --add Microsoft.VisualStudio.Component.DiagnosticTools --add Microsoft.VisualStudio.Component.EntityFramework --add Microsoft.VisualStudio.Component.LiveUnitTesting --add Microsoft.VisualStudio.Component.Debugger.JustInTime --add Component.Microsoft.VisualStudio.LiveShare.2022 --add Microsoft.VisualStudio.Component.WslDebugging --add Microsoft.VisualStudio.Component.IntelliCode --add Microsoft.VisualStudio.Workload.NetWeb --add Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites --add Microsoft.ComponentGroup.Blend --add Microsoft.VisualStudio.Component.DotNetModelBuilder --add Microsoft.VisualStudio.Component.FSharp.Desktop --add Microsoft.VisualStudio.Component.PortableLibrary --add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.Net.Component.4.6.TargetingPack --add Microsoft.VisualStudio.Component.VSSDK --add Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites --add Microsoft.Component.CodeAnalysis.SDK --add Microsoft.VisualStudio.Workload.VisualStudioExtension --installPath "C:\Test\VisualStudio" --quiet --norestart --wait + testExecutionJobStrategy: + matrix: + debug_32: + _configuration: Debug + testMachineTotalCount: 4 + testAgentElevated: true + preTestMachineConfigurationStepList: + - checkout: none + - download: VisualStudioBuildUnderTest + - task: PowerShell@2 + name: SetProductsDropName + displayName: Set 'VisualStudio.BuildUnderTest.ProductsDropName' + inputs: + filePath: $(DartLab.Path)\Scripts\VisualStudio\Build\Get-VisualStudioDropName.ps1 + arguments: -DropNamePrefix 'Products' -VstsDropUrlsJson '$(Pipeline.Workspace)\VisualStudioBuildUnderTest\BuildArtifacts\VstsDropUrls.json' -OutVariableName 'VisualStudio.BuildUnderTest.ProductsDropName' + deployAndRunTestsStepList: + - checkout: RazorMirror + - template: eng/pipelines/test-integration-job.yml + parameters: + configuration: $(_configuration) + shallowCheckout: false \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 221cf6681a..e60f62f8df 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -186,6 +186,7 @@ stages: -configuration $(_BuildConfig) -msbuildEngine dotnet -prepareMachine + -integrationTest $(_BuildArgs) $(_PublishArgs) $(_InternalRuntimeDownloadArgs) diff --git a/eng/pipelines/checkout-windows-task.yml b/eng/pipelines/checkout-windows-task.yml new file mode 100644 index 0000000000..6d3842a11b --- /dev/null +++ b/eng/pipelines/checkout-windows-task.yml @@ -0,0 +1,11 @@ +# Shallow checkout sources on Windows +steps: + - checkout: none + + - script: | + @echo on + git init + git remote add origin "$(Build.Repository.Uri)" + git fetch --progress --no-tags --depth=1 origin "$(Build.SourceVersion)" + git checkout "$(Build.SourceVersion)" + displayName: Shallow Checkout \ No newline at end of file diff --git a/eng/pipelines/test-integration-job.yml b/eng/pipelines/test-integration-job.yml new file mode 100644 index 0000000000..07b68a11a8 --- /dev/null +++ b/eng/pipelines/test-integration-job.yml @@ -0,0 +1,47 @@ +parameters: + - name: configuration + type: string + default: 'Debug' + - name: shallowCheckout + type: boolean + default: true + +steps: + - ${{ if eq(parameters.shallowCheckout, true) }}: + - template: checkout-windows-task.yml + + - script: eng\common\cibuild.cmd + -configuration ${{ parameters.configuration }} + -msbuildEngine dotnet + -prepareMachine + -integrationTest + name: Build and Test + displayName: Build and Test + condition: succeeded() + + - task: PublishTestResults@2 + displayName: Publish xUnit Test Results + inputs: + testRunner: XUnit + testResultsFiles: $(Build.SourcesDirectory)\artifacts\TestResults\${{ parameters.configuration }}\*.xml + mergeTestResults: true + testRunTitle: '$(System.JobAttempt)-Integration ${{ parameters.configuration }}' + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\${{ parameters.configuration }}' + ArtifactName: '$(System.JobAttempt)-Logs ${{ parameters.configuration }} $(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: not(succeeded()) + + - task: PublishBuildArtifacts@1 + displayName: Publish Screenshots + inputs: + PathtoPublish: '$(Build.SourcesDirectory)\artifacts\bin\Microsoft.VisualStudio.Razor.IntegrationTests\${{ parameters.configuration }}\net472\xUnitResults' + ArtifactName: '$(System.JobAttempt)-Screenshots ${{ parameters.configuration }} $(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: not(succeeded()) \ No newline at end of file diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets index 1fb28657ba..69b96eb966 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -126,4 +126,6 @@ + + diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln index b0e840f7dd..9ec8f5e18d 100644 --- a/src/Razor/Razor.sln +++ b/src/Razor/Razor.sln @@ -93,7 +93,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\..\.editorconfig = ..\..\.editorconfig EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Razor.Integration.Test", "test\Microsoft.VisualStudio.Razor.Integration.Test\Microsoft.VisualStudio.Razor.Integration.Test.csproj", "{8CEC0991-259F-4313-B3EF-E398F2B40E61}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Razor.IntegrationTests", "test\Microsoft.VisualStudio.Razor.IntegrationTests\Microsoft.VisualStudio.Razor.IntegrationTests.csproj", "{8CEC0991-259F-4313-B3EF-E398F2B40E61}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test.npmproj b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test.npmproj index cb5503fe53..a4f33bacac 100644 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test.npmproj +++ b/src/Razor/test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test.npmproj @@ -21,7 +21,6 @@ - diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractEditorTest.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractEditorTest.cs similarity index 96% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractEditorTest.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractEditorTest.cs index 58685b7d5f..591fdef8ac 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractEditorTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractEditorTest.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { public abstract class AbstractEditorTest : AbstractIntegrationTest { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractIntegrationTest.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractIntegrationTest.cs similarity index 96% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractIntegrationTest.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractIntegrationTest.cs index c3f5ab2d04..cb2d3c27c9 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractIntegrationTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractIntegrationTest.cs @@ -7,7 +7,7 @@ using Xunit; using Xunit.Sdk; using Task = System.Threading.Tasks.Task; -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { // TODO: Start collecting LogFiles on failure diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractRazorEditorTest.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractRazorEditorTest.cs similarity index 93% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractRazorEditorTest.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractRazorEditorTest.cs index 1715eddf27..2897919d2f 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/AbstractRazorEditorTest.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractRazorEditorTest.cs @@ -3,9 +3,9 @@ using System.IO; using System.Threading.Tasks; -using Microsoft.VisualStudio.Razor.Integration.Test.InProcess; +using Microsoft.VisualStudio.Razor.IntegrationTests.InProcess; -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { public abstract class AbstractRazorEditorTest : AbstractEditorTest { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IBufferGraphExtensions.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IBufferGraphExtensions.cs similarity index 92% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IBufferGraphExtensions.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IBufferGraphExtensions.cs index c23a2696be..73d71a7712 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IBufferGraphExtensions.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IBufferGraphExtensions.cs @@ -6,7 +6,7 @@ using System.Linq; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Projection; -namespace Microsoft.VisualStudio.Razor.Integration.Test.Extensions +namespace Microsoft.VisualStudio.Razor.IntegrationTests.Extensions { internal static class IBufferGraphExtensions { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/ITextViewExtensions.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/ITextViewExtensions.cs similarity index 94% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/ITextViewExtensions.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/ITextViewExtensions.cs index 654cc1d656..97cc2c99ab 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/ITextViewExtensions.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/ITextViewExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Utilities; -namespace Microsoft.VisualStudio.Razor.Integration.Test.Extensions +namespace Microsoft.VisualStudio.Razor.IntegrationTests.Extensions { internal static class ITextViewExtensions { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IVsTextManagerExtensions.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IVsTextManagerExtensions.cs similarity index 94% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IVsTextManagerExtensions.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IVsTextManagerExtensions.cs index ecf4c2736f..56c9d9841e 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IVsTextManagerExtensions.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IVsTextManagerExtensions.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.TextManager.Interop; using Microsoft.VisualStudio.Threading; -namespace Microsoft.VisualStudio.Razor.Integration.Test.Extensions +namespace Microsoft.VisualStudio.Razor.IntegrationTests.Extensions { internal static class IVsTextManagerExtensions { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IVsTextViewExtensions.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IVsTextViewExtensions.cs similarity index 93% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IVsTextViewExtensions.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IVsTextViewExtensions.cs index b246b91424..fa74b1d17c 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Extensions/IVsTextViewExtensions.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Extensions/IVsTextViewExtensions.cs @@ -8,7 +8,7 @@ using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.TextManager.Interop; using Microsoft.VisualStudio.Threading; -namespace Microsoft.VisualStudio.Razor.Integration.Test.Extensions +namespace Microsoft.VisualStudio.Razor.IntegrationTests.Extensions { internal static class IVsTextViewExtensions { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess.cs similarity index 98% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess.cs index 558ec8904c..6cb139f836 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess.cs @@ -9,7 +9,7 @@ using Microsoft.VisualStudio.OLE.Interop; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; -using Microsoft.VisualStudio.Razor.Integration.Test.Extensions; +using Microsoft.VisualStudio.Razor.IntegrationTests.Extensions; namespace Microsoft.VisualStudio.Extensibility.Testing { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Caret.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Caret.cs similarity index 98% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Caret.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Caret.cs index 143778bb28..2044a515f4 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Caret.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Caret.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Editor; -using Microsoft.VisualStudio.Razor.Integration.Test.Extensions; +using Microsoft.VisualStudio.Razor.IntegrationTests.Extensions; namespace Microsoft.VisualStudio.Extensibility.Testing { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Classification.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Classification.cs similarity index 100% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Classification.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Classification.cs diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Completion.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Completion.cs similarity index 100% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Completion.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Completion.cs diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_LightBulb.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_LightBulb.cs similarity index 98% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_LightBulb.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_LightBulb.cs index 03adda56c2..c9e92afde7 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_LightBulb.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_LightBulb.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.VisualStudio.Language.Intellisense; using Microsoft.VisualStudio.OLE.Interop; -using Microsoft.VisualStudio.Razor.Integration.Test.InProcess; +using Microsoft.VisualStudio.Razor.IntegrationTests.InProcess; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.Threading; diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Text.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Text.cs similarity index 95% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Text.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Text.cs index e9e74108bf..bdef91eea6 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/EditorInProcess_Text.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/EditorInProcess_Text.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.VisualStudio.Razor.Integration.Test.InProcess; +using Microsoft.VisualStudio.Razor.IntegrationTests.InProcess; using Microsoft.VisualStudio.Text; using Xunit; diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/FeatureAttribute.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/FeatureAttribute.cs similarity index 98% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/FeatureAttribute.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/FeatureAttribute.cs index 1bd67b00b3..78277169cb 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/FeatureAttribute.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/FeatureAttribute.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT license. See License.txt in the project root for license information. -namespace Microsoft.VisualStudio.Razor.Integration.Test.InProcess +namespace Microsoft.VisualStudio.Razor.IntegrationTests.InProcess { internal static class FeatureAttribute { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/Helper.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/Helper.cs similarity index 97% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/Helper.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/Helper.cs index 53d2354cf1..ea897a08ec 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/Helper.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/Helper.cs @@ -6,7 +6,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -namespace Microsoft.VisualStudio.Razor.Integration.Test.InProcess +namespace Microsoft.VisualStudio.Razor.IntegrationTests.InProcess { internal static class Helper { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/LightBulbHelper.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/LightBulbHelper.cs similarity index 98% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/LightBulbHelper.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/LightBulbHelper.cs index b4ed88b252..20bd3cf1ac 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/LightBulbHelper.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/LightBulbHelper.cs @@ -10,7 +10,7 @@ using Microsoft.VisualStudio.Language.Intellisense; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Threading; -namespace Microsoft.VisualStudio.Razor.Integration.Test.InProcess +namespace Microsoft.VisualStudio.Razor.IntegrationTests.InProcess { public static class LightBulbHelper { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/MarkupTestFile.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/MarkupTestFile.cs similarity index 87% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/MarkupTestFile.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/MarkupTestFile.cs index 98ca6c43e7..1a19a681f5 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/MarkupTestFile.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/MarkupTestFile.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT license. See License.txt in the project root for license information. -namespace Microsoft.VisualStudio.Razor.Integration.Test.InProcess +namespace Microsoft.VisualStudio.Razor.IntegrationTests.InProcess { internal static class MarkupTestFile { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/SolutionExplorerInProcess.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs similarity index 99% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/SolutionExplorerInProcess.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs index 4923e2318e..4d4cc5d973 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/SolutionExplorerInProcess.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs @@ -8,8 +8,8 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.VisualStudio.Razor.Integration.Test; -using Microsoft.VisualStudio.Razor.Integration.Test.InProcess; +using Microsoft.VisualStudio.Razor.IntegrationTests; +using Microsoft.VisualStudio.Razor.IntegrationTests.InProcess; using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; using Microsoft.VisualStudio.TextManager.Interop; diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/WellKnownCommandNames.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/WellKnownCommandNames.cs similarity index 84% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/WellKnownCommandNames.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/WellKnownCommandNames.cs index 23d38c57ae..e965a2eee2 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/WellKnownCommandNames.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/WellKnownCommandNames.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT license. See License.txt in the project root for license information. -namespace Microsoft.VisualStudio.Razor.Integration.Test.InProcess +namespace Microsoft.VisualStudio.Razor.IntegrationTests.InProcess { public static class WellKnownCommandNames { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/WorkspaceInProcess.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/WorkspaceInProcess.cs similarity index 94% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/WorkspaceInProcess.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/WorkspaceInProcess.cs index 1b38c193b7..171eef489f 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/InProcess/WorkspaceInProcess.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/WorkspaceInProcess.cs @@ -3,7 +3,7 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.VisualStudio.Razor.Integration.Test.InProcess; +using Microsoft.VisualStudio.Razor.IntegrationTests.InProcess; namespace Microsoft.VisualStudio.Extensibility.Testing { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/IntializeTestFileAttribute.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/IntializeTestFileAttribute.cs similarity index 94% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/IntializeTestFileAttribute.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/IntializeTestFileAttribute.cs index 9c37b2344d..a47550cef7 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/IntializeTestFileAttribute.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/IntializeTestFileAttribute.cs @@ -4,7 +4,7 @@ using System.Reflection; using Xunit.Sdk; -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { public class IntializeTestFileAttribute : BeforeAfterTestAttribute { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/LanguageNames.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/LanguageNames.cs similarity index 84% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/LanguageNames.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/LanguageNames.cs index 5b293861d2..0c9f65cdaa 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/LanguageNames.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/LanguageNames.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT license. See License.txt in the project root for license information. -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { public static class LanguageNames { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Microsoft.VisualStudio.Razor.Integration.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj similarity index 96% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Microsoft.VisualStudio.Razor.Integration.Test.csproj rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj index 99317ed16a..855ffbaf1f 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Microsoft.VisualStudio.Razor.Integration.Test.csproj +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj @@ -3,7 +3,7 @@ net472 enable Library - Microsoft.VisualStudio.Razor.Integration.Test + Microsoft.VisualStudio.Razor.IntegrationTests diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/ProjectTests.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/ProjectTests.cs similarity index 91% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/ProjectTests.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/ProjectTests.cs index cad2daa252..36b83dd5e8 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/ProjectTests.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/ProjectTests.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Xunit; -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { public class ProjectTests : AbstractRazorEditorTest { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/RazorCodeActionsTests.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RazorCodeActionsTests.cs similarity index 96% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/RazorCodeActionsTests.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RazorCodeActionsTests.cs index 6756685a67..6bc988a7bd 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/RazorCodeActionsTests.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RazorCodeActionsTests.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Xunit; -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { public class RazorCodeActionsTests : AbstractRazorEditorTest { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/RazorDebug.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RazorDebug.cs similarity index 97% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/RazorDebug.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RazorDebug.cs index 88699d2651..9e8dbd4479 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/RazorDebug.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RazorDebug.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { internal static class RazorDebug { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Semantic/RazorSemanticTokensTests.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/RazorSemanticTokensTests.cs similarity index 98% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Semantic/RazorSemanticTokensTests.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/RazorSemanticTokensTests.cs index 8dcec1ea9a..2ebe6f8f8f 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Semantic/RazorSemanticTokensTests.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/RazorSemanticTokensTests.cs @@ -10,12 +10,12 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Razor.Language; -using Microsoft.VisualStudio.Razor.Integration.Test.InProcess; +using Microsoft.VisualStudio.Razor.IntegrationTests.InProcess; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Text.Classification; using Xunit; -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { [IntializeTestFile] public class RazorSemanticTokensTests : AbstractRazorEditorTest diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Semantic/TestFiles/RazorSemanticTokensTests/Components_AreColored.txt b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/TestFiles/RazorSemanticTokensTests/Components_AreColored.txt similarity index 100% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Semantic/TestFiles/RazorSemanticTokensTests/Components_AreColored.txt rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/TestFiles/RazorSemanticTokensTests/Components_AreColored.txt diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Semantic/TestFiles/RazorSemanticTokensTests/Directives_AreColored.txt b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/TestFiles/RazorSemanticTokensTests/Directives_AreColored.txt similarity index 100% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/Semantic/TestFiles/RazorSemanticTokensTests/Directives_AreColored.txt rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Semantic/TestFiles/RazorSemanticTokensTests/Directives_AreColored.txt diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/WellKnownProjectTemplates.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/WellKnownProjectTemplates.cs similarity index 93% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/WellKnownProjectTemplates.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/WellKnownProjectTemplates.cs index ddec4e27a1..e472146c74 100644 --- a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/WellKnownProjectTemplates.cs +++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/WellKnownProjectTemplates.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT license. See License.txt in the project root for license information. -namespace Microsoft.VisualStudio.Razor.Integration.Test +namespace Microsoft.VisualStudio.Razor.IntegrationTests { public static class WellKnownProjectTemplates { diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/XunitAssemblyInfo.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/XunitAssemblyInfo.cs similarity index 100% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/XunitAssemblyInfo.cs rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/XunitAssemblyInfo.cs diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/xunit.runner.json b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.VisualStudio.Razor.Integration.Test/xunit.runner.json rename to src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/xunit.runner.json