Remove code migrated to aspnetcore (#1933)

Co-authored-by: N. Taylor Mullen <nimullen@microsoft.com>
dotnet · May 30, 2020 · f2fab7a · f2fab7a
2 parents 1f4b1be + 8e6dad0
commit f2fab7a
Show file tree

Hide file tree

Showing 6,053 changed files with 101 additions and 333,595 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -8,5 +8,3 @@
 /eng/Versions.props                            @dotnet-maestro-bot @dougbu
 /eng/Version.Details.xml                       @dotnet-maestro-bot @dougbu
 /src/Razor/                                    @ajaybhargavb @NTaylorMullen @ryanbrandenburg @TanayParikh @noahbkim
-/src/Razor/src/Microsoft.NET.Sdk.Razor/        @ajaybhargavb @NTaylorMullen @pranavkm @javiercn
-/src/Razor/test/Microsoft.NET.Sdk.Razor.Test/  @ajaybhargavb @NTaylorMullen @pranavkm @javiercn
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -81,61 +81,6 @@ stages:
           - powershell: ./restore.cmd -msbuildEngine dotnet -ci $(_InternalRuntimeDownloadArgs); ./eng/scripts/CodeCheck.ps1 -ci
             displayName: Run eng/scripts/CodeCheck.ps1
 
-      - job: Source_Build
-        jobName: Source_Build
-        displayName: 'Test: Linux Source Build'
-        container:
-          image: centos:7
-          options: --init # This ensures all the stray defunct processes are reaped.
-        pool:
-          vmImage: ubuntu-16.04
-        variables:
-        - DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
-        - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
-        - _BuildConfig: Release
-        steps:
-        - task: NodeTool@0
-          displayName: Install Node 10.x
-          inputs:
-            versionSpec: 10.x
-        - script: |
-            source eng/common/native/common-library.sh
-            mkdir -p $HOME/bin
-            GetFile https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 $HOME/bin/jq
-            chmod +x $HOME/bin/jq
-            echo "##vso[task.prependpath]$HOME/bin"
-          displayName: Install jq
-        - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-          - task: Bash@3
-            displayName: Setup Private Feeds Credentials
-            inputs:
-              filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
-              arguments: $(Build.SourcesDirectory)/NuGet.config $Token
-            env:
-              Token: $(dn-bot-dnceng-artifact-feeds-rw)
-        - script: ./eng/scripts/ci-source-build.sh --ci --configuration $(_BuildConfig) /p:BuildNodeJs=false
-          displayName: Run ci-source-build.sh
-
-        - task: PublishBuildArtifacts@1
-          displayName: Upload package artifacts
-          # Only capture source build artifacts in PRs for the sake of inspecting
-          # changes that impact source-build. The artifacts from this build pipeline are never actually used.
-          condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
-          inputs:
-            pathtoPublish: artifacts/packages/
-            artifactName: Source_Build_Packages
-            artifactType: Container
-            parallel: true
-
-        - task: PublishBuildArtifacts@1
-          displayName: Publish Logs
-          inputs:
-            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
-            PublishLocation: Container
-            ArtifactName: Source_Build_Logs
-          continueOnError: true
-          condition: always()
-
   # Three jobs for each of the three OSes we want to run on
   - template: /eng/common/templates/jobs/jobs.yml
     parameters:

diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets
@@ -11,7 +11,7 @@
 
   <Target Name="_ZipLanguageServerBinaries" AfterTargets="Pack"  Condition=" '$(OS)' == 'Windows_NT' ">
     <!-- This target is defined in eng/targets/Packaging.targets and included in every project. -->
-    <MSBuild Projects="$(RepoRoot)src\Razor\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj"
+    <MSBuild Projects="$(RepoRoot)src\Razor\src\Microsoft.AspNetCore.Razor.LanguageServer\Microsoft.AspNetCore.Razor.LanguageServer.csproj"
         Targets="_GetPackageVersionInfo"
         SkipNonexistentProjects="false">
       <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />

diff --git a/eng/Build.props b/eng/Build.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectToBuild Condition="'$(OS)'=='WINDOWS_NT' and '$(SdkTaskProjects)'=='' And '$(BuildVsix)' != 'true'" Include="$(MSBuildThisFileDirectory)..\src\Razor\Razor.NoVsix.sln" />
+    <ProjectToBuild Condition="'$(OS)'=='WINDOWS_NT' and '$(SdkTaskProjects)'=='' And '$(BuildVsix)' != 'true'" Include="$(MSBuildThisFileDirectory)..\src\Razor\Razor.sln" />
     <ProjectToBuild Condition="'$(OS)'=='WINDOWS_NT' and '$(SdkTaskProjects)'=='' And '$(BuildVsix)' == 'true'" Include="$(MSBuildThisFileDirectory)..\src\Razor\src\Microsoft.VisualStudio.RazorExtension\Microsoft.VisualStudio.RazorExtension.csproj" />
 
     <!-- Exclude VSIX projects on non-Windows -->

diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -18,7 +18,7 @@
 
 <Target Name="_PublishingBlobItems">
     <!-- This target is defined in eng/targets/Packaging.targets and included in every project. -->
-    <MSBuild Projects="$(RepoRoot)src\Razor\src\Microsoft.AspNetCore.Razor.Language\Microsoft.AspNetCore.Razor.Language.csproj"
+    <MSBuild Projects="$(RepoRoot)src\Razor\src\Microsoft.AspNetCore.Razor.LanguageServer\Microsoft.AspNetCore.Razor.LanguageServer.csproj"
         Targets="_GetPackageVersionInfo"
         SkipNonexistentProjects="false">
       <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageVersionInfo" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,62 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-preview.6.20278.9">
-      <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
+    <Dependency Name="Microsoft.CodeAnalysis.Razor" Version="5.0.0-preview.6.20279.12">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>5c155d41477d0e79819fcba5af498fbee92fbe97</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.AspNetCore.Razor.Internal.Transport" Version="5.0.0-preview.6.20279.12">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>5c155d41477d0e79819fcba5af498fbee92fbe97</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="5.0.0-preview.6.20279.12">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>5c155d41477d0e79819fcba5af498fbee92fbe97</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview.6.20279.12">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>5c155d41477d0e79819fcba5af498fbee92fbe97</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="5.0.0-preview.6.20279.12">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>5c155d41477d0e79819fcba5af498fbee92fbe97</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X" Version="5.0.0-preview.6.20279.12">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>5c155d41477d0e79819fcba5af498fbee92fbe97</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="5.0.0-preview.6.20279.12">
+      <Uri>https://github.com/dotnet/aspnetcore</Uri>
+      <Sha>5c155d41477d0e79819fcba5af498fbee92fbe97</Sha>
+    </Dependency>
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="System.Resources.Extensions" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
     <!--
       Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
       All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed as a dependency to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.6.20278.9">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.6.20278.9" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>567a7a2bb62e180ddb224ba820297e48b1879df1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20261.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>898e51ed5fdcc4871087ac5754ca9056e58e575d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.7.0-3.20271.4">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.7.0-3.20271.4" CoherentParentDependency="Microsoft.CodeAnalysis.Razor">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>f598328fb99345233f52a67f5a65cd39affa9fd4</Sha>
     </Dependency>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -48,17 +48,23 @@
 
   -->
   <PropertyGroup Label="Automated">
+    <MicrosoftCodeAnalysisRazorPackageVersion>5.0.0-preview.6.20279.12</MicrosoftCodeAnalysisRazorPackageVersion>
+    <MicrosoftAspNetCoreRazorInternalTransportPackageVersion>5.0.0-preview.6.20279.12</MicrosoftAspNetCoreRazorInternalTransportPackageVersion>
+    <MicrosoftAspNetCoreRazorLanguagePackageVersion>5.0.0-preview.6.20279.12</MicrosoftAspNetCoreRazorLanguagePackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>5.0.0-preview.6.20279.12</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>5.0.0-preview.6.20279.12</MicrosoftAspNetCoreMvcRazorExtensionsVersion1_XPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>5.0.0-preview.6.20279.12</MicrosoftAspNetCoreMvcRazorExtensionsVersion2_XPackageVersion>
     <MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.6.20278.9</MicrosoftExtensionsConfigurationJsonPackageVersion>
     <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.6.20278.9</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.6.20278.9</MicrosoftExtensionsLoggingPackageVersion>
     <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.6.20278.9</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.6.20278.9</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.6.20278.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCorePlatformsPackageVersion>5.0.0-preview.6.20278.9</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.6.20279.12</MicrosoftNETSdkRazorPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-preview.6.20278.9</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemResourcesExtensionsPackageVersion>5.0.0-preview.6.20278.9</SystemResourcesExtensionsPackageVersion>
     <SystemTextEncodingsWebPackageVersion>5.0.0-preview.6.20278.9</SystemTextEncodingsWebPackageVersion>
-    <SystemReflectionMetadataPackageVersion>5.0.0-preview.6.20278.9</SystemReflectionMetadataPackageVersion>
     <!-- Packages from dotnet/roslyn -->
     <MicrosoftNetCompilersToolsetPackageVersion>3.7.0-3.20271.4</MicrosoftNetCompilersToolsetPackageVersion>
   </PropertyGroup>
@@ -82,17 +88,13 @@
     <!-- We are temporarily pinning sources packages and M.AspNetCore.Testing until we migrate this repo to aspnetcore -->
     <MicrosoftAspNetCoreTestingPackageVersion>5.0.0-preview.2.20121.3</MicrosoftAspNetCoreTestingPackageVersion>
     <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>5.0.0-preview.2.20121.3</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
-    <MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>5.0.0-preview.2.20121.3</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
-    <MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>5.0.0-preview.2.20121.3</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
     <MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>5.0.0-preview.2.20121.3</MicrosoftExtensionsNonCapturingTimerSourcesPackageVersion>
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildLocatorPackageVersion>1.2.6</MicrosoftBuildLocatorPackageVersion>
     <MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>14.3.25407-alpha</MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion>
     <MicrosoftNETCoreApp50PackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreApp50PackageVersion>
-    <MicrosoftNETFrameworkReferenceAssemblies>1.0.0-alpha-5</MicrosoftNETFrameworkReferenceAssemblies>
     <MicrosoftNetRoslynDiagnosticsPackageVersion>2.6.3</MicrosoftNetRoslynDiagnosticsPackageVersion>
     <MicrosoftVisualStudioCoreUtilityPackageVersion>16.4.280</MicrosoftVisualStudioCoreUtilityPackageVersion>
     <MicrosoftVisualStudioComponentModelHostPackageVersion>16.0.467</MicrosoftVisualStudioComponentModelHostPackageVersion>
@@ -105,7 +107,6 @@
     <MicrosoftVisualStudioPackageLanguageService150PackageVersion>16.4.29519.181</MicrosoftVisualStudioPackageLanguageService150PackageVersion>
     <MicrosoftVisualStudioLiveSharePackageVersion>0.3.1074</MicrosoftVisualStudioLiveSharePackageVersion>
     <MicrosoftVisualStudioOLEInteropPackageVersion>7.10.6071</MicrosoftVisualStudioOLEInteropPackageVersion>
-    <MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemAnalyzersPackageVersion>
     <MicrosoftVisualStudioProjectSystemManagedVSPackageVersion>3.0.0-beta1-63607-01</MicrosoftVisualStudioProjectSystemManagedVSPackageVersion>
     <MicrosoftVisualStudioProjectSystemSDKPackageVersion>16.0.201-pre-g7d366164d0</MicrosoftVisualStudioProjectSystemSDKPackageVersion>
     <MicrosoftVisualStudioSDKAnalyzersVersion>16.3.14</MicrosoftVisualStudioSDKAnalyzersVersion>
@@ -130,11 +131,8 @@
     <SystemPrivateUriPackageVersion>4.3.2</SystemPrivateUriPackageVersion>
     <VS_NewtonsoftJsonPackageVersion>12.0.2</VS_NewtonsoftJsonPackageVersion>
     <VSMAC_NewtonsoftJsonPackageVersion>12.0.2</VSMAC_NewtonsoftJsonPackageVersion>
-    <Runtime_MicrosoftCodeAnalysisCommonPackageVersion>3.4.0</Runtime_MicrosoftCodeAnalysisCommonPackageVersion>
-    <Runtime_MicrosoftCodeAnalysisCSharpPackageVersion>3.4.0</Runtime_MicrosoftCodeAnalysisCSharpPackageVersion>
     <StreamJsonRpcPackageVersion>2.3.103</StreamJsonRpcPackageVersion>
     <Tooling_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>3.7.0-2.20257.6</Tooling_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
-    <Tooling_MicrosoftVisualStudioTelemetryPackageVersion>16.0.4-master</Tooling_MicrosoftVisualStudioTelemetryPackageVersion>
     <Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.0.0</Tooling_MicrosoftCodeAnalysisAnalyzersPackageVersion>
     <Tooling_MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>3.7.0-2.20257.6</Tooling_MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
     <Tooling_MicrosoftCodeAnalysisPackageVersion>3.7.0-2.20257.6</Tooling_MicrosoftCodeAnalysisPackageVersion>