From 9e89a69a780aecf28f77469b91b464bfe5a8404d Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Thu, 27 Dec 2018 22:08:30 -0800
Subject: [PATCH] Update RazorCompilation.targets for new SDK

---
 .../HostedInAspNet.Server.csproj              |  13 +-
 .../samples/MonoSanity/MonoSanity.csproj      |   1 -
 .../ComponentsApp.Server.csproj               |   1 -
 ...crosoft.AspNetCore.Components.Build.csproj |   4 +-
 .../targets/RazorCompilation.targets          | 438 +-----------------
 ...ft.AspNetCore.Components.Build.Test.csproj |   4 +-
 .../testapps/TestServer/TestServer.csproj     |   1 -
 7 files changed, 36 insertions(+), 426 deletions(-)

diff --git a/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj
index 4fac23c0f5..4a72bd82a7 100644
--- a/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj
+++ b/src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj
@@ -1,7 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+
+    <!--
+      This is a workaround that's needed because Microsoft.AspNetCore.App includes the OLD Razor.Design
+      package and MSBuild support. We don't want those features to be used with the new SDK. Basically
+      combining netcoreapp3.0 and and Razor.Design will result in duplicate assembly attributes.
+
+      See: https://github.com/aspnet/AspNetCore/issues/6182
+
+      This workaround can be removed when this project is converted to the shared framework.
+    -->
+    <GenerateProvideApplicationPartFactoryAttribute>false</GenerateProvideApplicationPartFactoryAttribute>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Components/blazor/samples/MonoSanity/MonoSanity.csproj b/src/Components/blazor/samples/MonoSanity/MonoSanity.csproj
index 503326e547..266f7976ca 100644
--- a/src/Components/blazor/samples/MonoSanity/MonoSanity.csproj
+++ b/src/Components/blazor/samples/MonoSanity/MonoSanity.csproj
@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj b/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj
index 97ac921fe4..40d92c7295 100644
--- a/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj
+++ b/src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj
@@ -6,7 +6,6 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCorePackageVersion)" />
-      <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj
index 322bd288d2..6c244318e0 100644
--- a/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj
+++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <Description>Build mechanism for ASP.NET Core Components.</Description>
     <OutputType>Exe</OutputType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -60,7 +60,7 @@
       repositorycommit=$(RepositoryCommit);</NuspecProperties>
     </PropertyGroup>
     <ItemGroup>
-      <_TargetFramework Include="$(TargetFrameworks)" />
+      <_TargetFramework Include="$(TargetFramework)" />
     </ItemGroup>
     <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" />
   </Target>
diff --git a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets
index 7d06e76551..08386d7de3 100644
--- a/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets
+++ b/src/Components/src/Microsoft.AspNetCore.Components.Build/targets/RazorCompilation.targets
@@ -1,436 +1,36 @@
 <Project>
+  <!-- 
+    All of the core logic for components is now provided by the Razor SDK.
 
-  <!-- Require rebuild if the targets change -->
+    This file now contains some *very temporary* settings to make projects
+    that use components use similar defaults to 2.X-based Blazor projects. 
+  -->
   <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <_EnableAllInclusiveRazorSdk>true</_EnableAllInclusiveRazorSdk>
+    <RazorLangVersion>3.0</RazorLangVersion>
+    <RazorDefaultConfiguration>MVC-3.0</RazorDefaultConfiguration>
+    <GenerateRazorAssemblyInfo>false</GenerateRazorAssemblyInfo>
+    <GenerateRazorHostingAssemblyInfo>false</GenerateRazorHostingAssemblyInfo>
+    <GenerateProvideApplicationPartFactoryAttribute>false</GenerateProvideApplicationPartFactoryAttribute>
   </PropertyGroup>
 
-
-  <PropertyGroup>
-    <!-- Passed to Razor tasks and loaded as a plugin -->
-    <_AngleSharpAssemblyPath>$(BlazorToolsDir)AngleSharp.dll</_AngleSharpAssemblyPath>
-    <_BlazorExtensionAssemblyPath>$(BlazorToolsDir)Microsoft.AspNetCore.Components.Razor.Extensions.dll</_BlazorExtensionAssemblyPath>
-
-    <!-- Deactivates the Razor SDK's build-time compilation. We do our own -->
-    <RazorCompileOnBuild>false</RazorCompileOnBuild>
-
-    <RazorLangVersion>Experimental</RazorLangVersion>
-
-    <!--
-      This version is used to build our RazorConfiguration, and is hardcoded into the tools in VS. If you change
-      This to a value that doesn't match VS, then the Blazor Razor experience won't work for those documents.
-    -->
-    <BlazorLanguageVersion>0.1</BlazorLanguageVersion>
-    <BlazorDefinitionConfiguration>Blazor-$(BlazorLanguageVersion)</BlazorDefinitionConfiguration>
-    <BlazorDeclarationConfiguration>BlazorDeclaration-$(BlazorLanguageVersion)</BlazorDeclarationConfiguration>
-    <RazorDefaultConfiguration>$(BlazorDefinitionConfiguration)</RazorDefaultConfiguration>
-
-  </PropertyGroup>
-
-  <!-- Something quick for input/output tracking - the assumptions here should match what the CLI does -->
   <ItemGroup>
-    <_BlazorGenerateDeclarationContent Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
-    <Content Update="@(_BlazorGenerateDeclarationContent)">
-      <Generator>MSBuild:BlazorGenerateDeclaration</Generator>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </Content>
-
-    <ProjectCapability Include="Blazor" />
-    <ProjectCapability Include="DotNetCoreRazorConfiguration" />
-
-    <RazorConfiguration Include="$(BlazorDefinitionConfiguration)">
-      <Extensions>Blazor-$(BlazorLanguageVersion);Blazor.AngleSharp-$(BlazorLanguageVersion);$(CustomRazorExtension)</Extensions>
+    <RazorConfiguration Include="MVC-3.0" Condition="'$(DesignTimeBuild)'=='true'">
+      <Extensions>MVC-3.0;$(CustomRazorExtension)</Extensions>
     </RazorConfiguration>
-    <RazorConfiguration Include="$(BlazorDeclarationConfiguration)">
-      <Extensions>Blazor-$(BlazorLanguageVersion)Blazor.AngleSharp-$(BlazorLanguageVersion);$(CustomRazorExtension)</Extensions>
-    </RazorConfiguration>
-
-    <RazorExtension Include="Blazor.AngleSharp-$(BlazorLanguageVersion)">
-      <AssemblyName>AngleSharp</AssemblyName>
-      <AssemblyFilePath>$(_AngleSharpAssemblyPath)</AssemblyFilePath>
+    <RazorExtension Include="MVC-3.0" Condition="'$(DesignTimeBuild)'=='true'">
+      <AssemblyName>Microsoft.AspNetCore.Mvc.Razor.Extensions</AssemblyName>
+      <AssemblyFilePath>$(RazorSdkDirectoryRoot)extensions\mvc-3-0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll</AssemblyFilePath>
     </RazorExtension>
-    <RazorExtension Include="Blazor-$(BlazorLanguageVersion)">
-      <AssemblyName>Microsoft.AspNetCore.Components.Razor.Extensions</AssemblyName>
-      <AssemblyFilePath>$(_BlazorExtensionAssemblyPath)</AssemblyFilePath>
-    </RazorExtension>
-
-    <!-- Path used for the temporary compilation we produce for component discovery -->
-    <_BlazorTempAssembly Include="$(IntermediateOutputPath)BlazorTemp\$(TargetName).dll" />
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Instruct VS to include html/cshtml files in its "fast up-to-date check". If we didn't, then
-         it will skip the build entirely if you only changed html/cshtml files. -->
-    <UpToDateCheckInput Include="$(ProjectDir)**\*.cshtml" />
-    <UpToDateCheckInput Include="$(ProjectDir)**\*.html" />
+    <RazorComponent Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <BlazorGenerateDeclarationDependsOn>
-    _DefineBlazorPaths;
-    _ResolveBlazorInputs;
-    _AssignBlazorGenerateTargetPaths;
-    _HashBlazorGenerateInputs;
-    </BlazorGenerateDeclarationDependsOn>
-    <BlazorGenerateDefinitionDependsOn>
-    BlazorGenerateDeclaration;
-    BlazorResolveComponents;
-    </BlazorGenerateDefinitionDependsOn>
-  </PropertyGroup>
-
-  <!-- Defining properties that depend on import order in a target for resilience -->
-  <Target Name="_DefineBlazorPaths">
-    <PropertyGroup>
-      <!--
-        The Razor tasks require you to pass a tag helper manifest file. We don't need tag helpers for declarations
-        so that one is just a placeholder.
-      -->
-      <_BlazorGenerateDeclarationComponentManifest>$(IntermediateOutputPath)Blazor.declaration.components.json</_BlazorGenerateDeclarationComponentManifest>
-      <_BlazorGenerateDefinitionComponentManifest>$(IntermediateOutputPath)Blazor.definition.components.json</_BlazorGenerateDefinitionComponentManifest>
-      <_BlazorComponentInputCache>$(IntermediateOutputPath)Blazor.components.input.cache</_BlazorComponentInputCache>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="_ResolveBlazorInputs">
+  <Target Name="_RemoveFilesFromRazorGenerate" AfterTargets="ResolveRazorGenerateInputs">
     <ItemGroup>
-      <BlazorGenerate Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
+      <RazorGenerate Remove="@(RazorGenerate)" />
     </ItemGroup>
   </Target>
-
-  <!--
-    Assigns each BlazorGenerate item a relative path based on where the directory structure. This accounts
-    for <Link> and also for files outside of the project's folder hierarchy. So this is needed to support
-    linked files.
-
-    This step also assigns each item an output path for both stages of code generation.
-  -->
-  <Target Name="_AssignBlazorGenerateTargetPaths">
-    <AssignTargetPath Files="@(BlazorGenerate)" RootFolder="$(MSBuildProjectDirectory)">
-      <Output TaskParameter="AssignedFiles" ItemName="BlazorGenerateWithTargetPath" />
-    </AssignTargetPath>
-
-    <ItemGroup>
-      <BlazorGenerateWithTargetPath Condition="'%(BlazorGenerateWithTargetPath.GeneratedDeclaration)' == ''">
-        <GeneratedDeclaration>$(IntermediateOutputPath)$([System.IO.Path]::ChangeExtension('%(BlazorGenerateWithTargetPath.TargetPath)', 'g.i.cs'))</GeneratedDeclaration>
-      </BlazorGenerateWithTargetPath>
-      <BlazorGenerateWithTargetPath Condition="'%(BlazorGenerateWithTargetPath.GeneratedDefinition)' == ''">
-        <GeneratedDefinition>$(IntermediateOutputPath)$([System.IO.Path]::ChangeExtension('%(BlazorGenerateWithTargetPath.TargetPath)', 'g.cs'))</GeneratedDefinition>
-      </BlazorGenerateWithTargetPath>
-    </ItemGroup>
-
-    <!--
-      Instruct VS to re-run the target when input files change. Other IDEs may not honor this
-      and therefore developers may need to rebuild after changing cshtml files.
-    -->
-    <ItemGroup>
-      <BlazorDeclaration Include="@(BlazorGenerateWithTargetPath->'%(GeneratedDeclaration)')">
-        <DependentUpon>%(Identity)</DependentUpon>
-      </BlazorDeclaration>
-    </ItemGroup>
-    <ItemGroup>
-      <BlazorDefinition Include="@(BlazorGenerateWithTargetPath->'%(GeneratedDefinition)')" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_HashBlazorGenerateInputs">
-
-    <PropertyGroup>
-      <!-- Used for input tracking -->
-      <_BlazorGenerateInputsHash></_BlazorGenerateInputsHash>
-      <_BlazorGenerateInputsHashFile>$(IntermediateOutputPath)Blazor.inputs.txt</_BlazorGenerateInputsHashFile>
-    </PropertyGroup>
-
-    <Hash ItemsToHash="@(BlazorGenerateWithTargetPath)">
-      <Output TaskParameter="HashResult" PropertyName="_BlazorGenerateInputsHash" />
-    </Hash>
-
-    <MakeDir
-      Directories="$(IntermediateOutputPath)"
-      Condition="!Exists('$(IntermediateOutputPath)')" />
-
-    <WriteLinesToFile
-      Lines="$(_BlazorGenerateInputsHash)"
-      File="$(_BlazorGenerateInputsHashFile)"
-      Overwrite="True"
-      WriteOnlyWhenDifferent="True" />
-
-    <ItemGroup>
-      <FileWrites Include="$(_BlazorGenerateInputsHashFile)" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Generates 'declaration' files for each component, that only have that class and member declarations.
-
-    These files participate in the design-time-build for intellisense, and are used at build-time
-    when discovering components for a 'real' build.
-  -->
-  <Target
-    Name="BlazorGenerateDeclaration"
-    BeforeTargets="CoreCompile"
-    DependsOnTargets="$(BlazorGenerateDeclarationDependsOn)"
-    Inputs="$(MSBuildAllProjects);$(_BlazorExtensionAssemblyPath);$(_BlazorGenerateInputsHashFile);@(BlazorGenerate)"
-    Outputs="@(BlazorDeclaration)">
-
-    <ItemGroup>
-      <_BlazorGenerateDeclarationWithTargetPath Include="@(BlazorGenerateWithTargetPath)">
-        <GeneratedOutput>%(GeneratedDeclaration)</GeneratedOutput>
-      </_BlazorGenerateDeclarationWithTargetPath>
-      <_BlazorDeclarationConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDeclarationConfiguration)'))" />
-    </ItemGroup>
-
-    <MakeDir Directories="%(BlazorDeclaration.RelativeDir)" />
-
-    <RazorGenerate
-      Debug="$(_RazorDebugGenerateCodeTask)"
-      DebugTool="$(_RazorDebugGenerateCodeTool)"
-      ToolAssembly="$(_RazorToolAssembly)"
-      UseServer="$(UseRazorBuildServer)"
-      ForceServer="$(_RazorForceBuildServer)"
-      PipeName="$(_RazorBuildServerPipeName)"
-      Version="$(RazorLangVersion)"
-      Configuration="@(_BlazorDeclarationConfiguration)"
-      Extensions="@(RazorExtension)"
-      Sources="@(_BlazorGenerateDeclarationWithTargetPath)"
-      ProjectRoot="$(MSBuildProjectDirectory)"
-      TagHelperManifest="$(_BlazorGenerateDeclarationComponentManifest)" />
-
-    <ItemGroup>
-      <FileWrites Include="@(BlazorDeclaration)" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(DesignTimeBuild)'=='true'">
-      <Compile Include="@(BlazorDeclaration)" />
-    </ItemGroup>
-  </Target>
-
-  <Target
-    Name="BlazorResolveComponents"
-    Inputs="$(MSBuildAllProjects);$(_BlazorExtensionAssemblyPath);@(ReferencePathWithRefAssemblies);@(_BlazorTempAssembly)"
-    Outputs="$(_RazorTagHelperInputCache)"
-    DependsOnTargets="_BlazorTempCompile">
-
-    <!-- Include the temp assembly as a reference so we can discover components from the app.-->
-    <ItemGroup>
-      <_BlazorReferencePathWithRefAssemblies Include="@(ReferencePathWithRefAssemblies)" />
-      <_BlazorReferencePathWithRefAssemblies Include="%(_BlazorTempAssembly.FullPath)" Condition="Exists('%(_BlazorTempAssembly.FullPath)')" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <_BlazorDeclarationConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDeclarationConfiguration)'))" />
-    </ItemGroup>
-
-    <!--
-      We're manipulating our output directly here because we want to separate the actual up-to-date check
-      of BlazorGenerateDefinition from the output of this target. Many times the set of components doesn't change
-      so we don't need to regenerate the code.
-    -->
-    <Touch
-      Files="$(_BlazorComponentInputCache)"
-      AlwaysCreate="true" />
-
-    <ItemGroup>
-      <FileWrites Include="$(_BlazorComponentInputCache)" />
-    </ItemGroup>
-
-    <RazorTagHelper
-      Debug="$(_RazorDebugTagHelperTask)"
-      DebugTool="$(_RazorDebugTagHelperTool)"
-      ToolAssembly="$(_RazorToolAssembly)"
-      UseServer="$(UseRazorBuildServer)"
-      ForceServer="$(_RazorForceBuildServer)"
-      PipeName="$(_RazorBuildServerPipeName)"
-      Version="$(RazorLangVersion)"
-      Configuration="@(_BlazorDeclarationConfiguration)"
-      Extensions="@(RazorExtension)"
-      Assemblies="@(_BlazorReferencePathWithRefAssemblies)"
-      ProjectRoot="$(MSBuildProjectDirectory)"
-      TagHelperManifest="$(_BlazorGenerateDefinitionComponentManifest)">
-      <Output
-        TaskParameter="TagHelperManifest"
-        ItemName="FileWrites"/>
-    </RazorTagHelper>
-
-  </Target>
-
-  <!--
-    Generates 'definition' files for each component, using the temp-compiled assembly as an input.
-
-    These files are used in the real build and don't participate in design time builds.
-  -->
-  <Target
-    Name="BlazorGenerateDefinition"
-    BeforeTargets="CoreCompile"
-    DependsOnTargets="$(BlazorGenerateDefinitionDependsOn)"
-    Inputs="$(MSBuildAllProjects);$(_BlazorExtensionAssemblyPath);$(_BlazorGenerateInputsHashFile);$(_BlazorGenerateDefinitionComponentManifest);@(BlazorGenerate)"
-    Outputs="@(BlazorDefinition)"
-    Condition="'$(DesignTimeBuild)'!='true'">
-
-    <ItemGroup>
-      <_BlazorGenerateDefinitionWithTargetPath Include="@(BlazorGenerateWithTargetPath)">
-        <GeneratedOutput>%(GeneratedDefinition)</GeneratedOutput>
-      </_BlazorGenerateDefinitionWithTargetPath>
-      <_BlazorDefinitionConfiguration Include="@(RazorConfiguration->WithMetadataValue('Identity', '$(BlazorDefinitionConfiguration)'))" />
-    </ItemGroup>
-
-    <MakeDir Directories="%(BlazorDefinition.RelativeDir)" />
-
-    <RazorGenerate
-      Debug="$(_RazorDebugGenerateCodeTask)"
-      DebugTool="$(_RazorDebugGenerateCodeTool)"
-      ToolAssembly="$(_RazorToolAssembly)"
-      UseServer="$(UseRazorBuildServer)"
-      ForceServer="$(_RazorForceBuildServer)"
-      PipeName="$(_RazorBuildServerPipeName)"
-      Version="$(RazorLangVersion)"
-      Configuration="@(_BlazorDefinitionConfiguration)"
-      Extensions="@(RazorExtension)"
-      Sources="@(_BlazorGenerateDefinitionWithTargetPath)"
-      ProjectRoot="$(MSBuildProjectDirectory)"
-      TagHelperManifest="$(_BlazorGenerateDefinitionComponentManifest)" />
-
-    <ItemGroup>
-      <FileWrites Include="@(BlazorDefinition)" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(DesignTimeBuild)'!='true'">
-      <Compile Include="@(BlazorDefinition)" />
-    </ItemGroup>
-  </Target>
-
-  <!--
-    Taken from the Razor SDK targets
-  -->
- <Target
-    Name="_BlazorTempCompile"
-    DependsOnTargets="BlazorGenerateDeclaration;FindReferenceAssembliesForReferences"
-    Inputs="
-      $(MSBuildAllProjects);
-      @(BlazorDeclaration);
-      @(Compile);
-      $(AssemblyOriginatorKeyFile);
-      @(ReferencePathWithRefAssemblies);
-      @(CompiledLicenseFile);
-      @(LinkResource);
-      $(ResolvedCodeAnalysisRuleSet);
-      @(AdditionalFiles)"
-    Outputs="@(_BlazorTempAssembly);$(NonExistentFile)"
-    Condition="'$(DesignTimeBuild)'!='true' AND '$(Language)'=='C#' AND '@(BlazorDeclaration)' != ''">
-
-    <MakeDir Directories="%(_BlazorTempAssembly.RelativeDir)" />
-
-    <!-- These two compiler warnings are raised when a reference is bound to a different version
-             than specified in the assembly reference version number.  MSBuild raises the same warning in this case,
-             so the compiler warning would be redundant. -->
-    <PropertyGroup Condition="('$(TargetFrameworkVersion)' != 'v1.0') and ('$(TargetFrameworkVersion)' != 'v1.1')">
-      <NoWarn>$(NoWarn);1701;1702</NoWarn>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <!-- To match historical behavior, when inside VS11+ disable the warning from csc.exe indicating that no sources were passed in-->
-      <NoWarn Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(VisualStudioVersion)' != '' AND '$(VisualStudioVersion)' &gt; '10.0'">$(NoWarn);2008</NoWarn>
-    </PropertyGroup>
-
-    <ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
-      <ReferencePathWithRefAssemblies>
-        <EmbedInteropTypes />
-      </ReferencePathWithRefAssemblies>
-    </ItemGroup>
-
-    <PropertyGroup>
-      <!-- If the user has specified AppConfigForCompiler, we'll use it. If they have not, but they set UseAppConfigForCompiler,
-                 then we'll use AppConfig -->
-      <AppConfigForCompiler Condition="'$(AppConfigForCompiler)' == '' AND '$(UseAppConfigForCompiler)' == 'true'">$(AppConfig)</AppConfigForCompiler>
-    </PropertyGroup>
-
-    <!-- Prefer32Bit was introduced in .NET 4.5. Set it to false if we are targeting 4.0 -->
-    <PropertyGroup Condition="('$(TargetFrameworkVersion)' == 'v4.0')">
-      <Prefer32Bit>false</Prefer32Bit>
-    </PropertyGroup>
-
-    <!-- TODO: Remove this ItemGroup once it has been moved to "_GenerateCompileInputs" target in Microsoft.Common.CurrentVersion.targets.
-         https://github.com/dotnet/roslyn/issues/12223 -->
-    <ItemGroup Condition="('$(AdditionalFileItemNames)' != '')">
-      <AdditionalFileItems Include="$(AdditionalFileItemNames)" />
-      <AdditionalFiles Include="@(%(AdditionalFileItems.Identity))" />
-    </ItemGroup>
-
-    <PropertyGroup Condition="'$(UseSharedCompilation)' == ''">
-      <UseSharedCompilation>true</UseSharedCompilation>
-    </PropertyGroup>
-
-    <Csc
-         AdditionalLibPaths="$(AdditionalLibPaths)"
-         AddModules="@(AddModules)"
-         AdditionalFiles="@(AdditionalFiles)"
-         AllowUnsafeBlocks="$(AllowUnsafeBlocks)"
-         Analyzers="@(Analyzer)"
-         ApplicationConfiguration="$(AppConfigForCompiler)"
-         BaseAddress="$(BaseAddress)"
-         CheckForOverflowUnderflow="$(CheckForOverflowUnderflow)"
-         ChecksumAlgorithm="$(ChecksumAlgorithm)"
-         CodeAnalysisRuleSet="$(ResolvedCodeAnalysisRuleSet)"
-         CodePage="$(CodePage)"
-         DebugType="$(DebugType)"
-         DefineConstants="$(DefineConstants)"
-         DelaySign="$(DelaySign)"
-         DisabledWarnings="$(NoWarn)"
-         EmitDebugInformation="$(DebugSymbols)"
-         EnvironmentVariables="$(CscEnvironment)"
-         ErrorEndLocation="$(ErrorEndLocation)"
-         ErrorLog="$(ErrorLog)"
-         ErrorReport="$(ErrorReport)"
-         Features="$(Features)"
-         FileAlignment="$(FileAlignment)"
-         GenerateFullPaths="$(GenerateFullPaths)"
-         HighEntropyVA="$(HighEntropyVA)"
-         Instrument="$(Instrument)"
-         KeyContainer="$(KeyContainerName)"
-         KeyFile="$(KeyOriginatorFile)"
-         LangVersion="$(LangVersion)"
-         LinkResources="@(LinkResource)"
-         MainEntryPoint="$(StartupObject)"
-         ModuleAssemblyName="$(ModuleAssemblyName)"
-         NoConfig="true"
-         NoLogo="$(NoLogo)"
-         NoStandardLib="$(NoCompilerStandardLib)"
-         NoWin32Manifest="$(NoWin32Manifest)"
-         Optimize="$(Optimize)"
-         Deterministic="$(Deterministic)"
-         PublicSign="$(PublicSign)"
-         OutputAssembly="@(_BlazorTempAssembly)"
-         Platform="$(PlatformTarget)"
-         Prefer32Bit="$(Prefer32Bit)"
-         PreferredUILang="$(PreferredUILang)"
-         ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
-         References="@(ReferencePathWithRefAssemblies)"
-         ReportAnalyzer="$(ReportAnalyzer)"
-         Resources="@(CompiledLicenseFile)"
-         ResponseFiles="$(CompilerResponseFile)"
-         RuntimeMetadataVersion="$(RuntimeMetadataVersion)"
-         SharedCompilationId="$(SharedCompilationId)"
-         SkipCompilerExecution="$(SkipCompilerExecution)"
-         Sources="@(BlazorDeclaration);@(Compile)"
-         SubsystemVersion="$(SubsystemVersion)"
-         TargetType="$(OutputType)"
-         ToolExe="$(CscToolExe)"
-         ToolPath="$(CscToolPath)"
-         TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
-         UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
-         UseSharedCompilation="$(UseSharedCompilation)"
-         Utf8Output="$(Utf8Output)"
-         VsSessionGuid="$(VsSessionGuid)"
-         WarningLevel="$(WarningLevel)"
-         WarningsAsErrors="$(WarningsAsErrors)"
-         WarningsNotAsErrors="$(WarningsNotAsErrors)"
-         PathMap="$(PathMap)"
-         SourceLink="$(SourceLink)">
-      <Output TaskParameter="CommandLineArgs" ItemName="CscCommandLineArgs" />
-    </Csc>
-
-    <ItemGroup>
-      <FileWrites Include="@(_BlazorTempAssembly)" Condition="Exists('@(_BlazorTempAssembly)')" />
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj
index 6999589921..ebeec16b7c 100644
--- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj
+++ b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Microsoft.AspNetCore.Components.Build.Test.csproj
@@ -23,12 +23,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.8.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="Mono.Cecil" Version="0.10.0-beta7" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.Mono" Version="$(MicrosoftAspNetCoreBlazorMonoPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Components/test/testapps/TestServer/TestServer.csproj b/src/Components/test/testapps/TestServer/TestServer.csproj
index c30ffa69ea..abce454f2d 100644
--- a/src/Components/test/testapps/TestServer/TestServer.csproj
+++ b/src/Components/test/testapps/TestServer/TestServer.csproj
@@ -8,7 +8,6 @@
     <PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCorePackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Cors" Version="$(AspNetCorePackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCorePackageVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>