Remove Interop build step (#39553)

- remove separate step to restore Interop projects - make Interop test asset projects more "normal" - use usual mechanism to target latest ASP.NET Core bits - remove use of `$(BuildInteropProjects)` - expand FunctionalTestWithAssets.targets to help w/ local testing - still delayed and done only when necessary - handle non-Helix testing e.g. handle `dotnet test` too - build test assets into location `InteropTests` expects on local machine - add FunctionalTestWithAssets.props, providing relevant defaults - expand `FunctionalTestWithAssets` use to Identity.FunctionalTests nits: - rename `@(FunctionalTestAssetProjectReference)` to `@(TestAssetProjectReference)` - cleanup leftover reference to ProjectTemplates/testassets/ in Build.props - should have been removed in 54ff379 - remove `/p:RunTemplateTests=true`; no need to specify the default - clean up other projects that use `$(MvcTestingTargets)` - none need special handling for publish (don't need pages, views, or wwwroot files)
2022-01-31 10:05:08 -08:00 · 2022-01-31 10:05:08 -08:00 · c0575788ec
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@ -684,12 +684,8 @@ stages:
        - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
                  /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
          displayName: Build shared fx
-        - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
-                  /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
-          displayName: Restore interop projects
        - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative
-                  -projects eng\helix\helix.proj /p:IsHelixPRCheck=true
-                  /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
+                  -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
                  /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
          displayName: Run build.cmd helix target
          env:
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@ -33,12 +33,8 @@ jobs:
    - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
      displayName: Build shared fx
-    - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
-              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
-      displayName: Restore interop projects
-    - script: .\eng\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -noBuildNative
-              -projects eng\helix\helix.proj
-              /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
+    - script: .\eng\build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative
+              -projects eng\helix\helix.proj /p:IsHelixJob=true
              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
      displayName: Run build.cmd helix target
      env:
--- a/.azure/pipelines/quarantined-pr.yml
+++ b/.azure/pipelines/quarantined-pr.yml
@ -57,12 +57,8 @@ jobs:
    - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
      displayName: Build shared fx
-    - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
-              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
-      displayName: Restore interop projects
    - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
-              -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:RunQuarantinedTests=true
-              /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
+              -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:RunQuarantinedTests=true /p:IsHelixJob=true
              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
      displayName: Run build.cmd helix target
      continueOnError: true
--- a/.azure/pipelines/quarantined-tests.yml
+++ b/.azure/pipelines/quarantined-tests.yml
@ -28,12 +28,8 @@ jobs:
    - script: ./eng/build.cmd -ci -nobl -all -pack -arch x64
              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
      displayName: Build shared fx
-    - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj
-              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
-      displayName: Restore interop projects
    - script: ./eng/build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildJava -noBuildNative
-              -projects eng\helix\helix.proj /p:RunQuarantinedTests=true
-              /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true
+              -projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsHelixJob=true
              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
      displayName: Run build.cmd helix target
      continueOnError: true
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -244,4 +244,5 @@
  <Import Project="eng\targets\Npm.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
  <Import Project="eng\targets\Java.Common.props"  Condition="'$(MSBuildProjectExtension)' == '.javaproj'" />
  <Import Project="eng\targets\Helix.props" Condition=" $(IsTestProject) " />
+  <Import Project="eng\targets\FunctionalTestWithAssets.props" Condition=" $(IsTestProject) " />
 </Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -192,6 +192,6 @@
  <Import Project="eng\targets\Npm.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
  <Import Project="eng\targets\Java.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.javaproj'" />
  <Import Project="eng\targets\Helix.targets" Condition=" $(IsTestProject) " />
-  <Import Project="eng\targets\FunctionalTestAsset.targets" Condition="'$(IsTestAssetProject)' == 'true'" />
-  <Import Project="eng\targets\FunctionalTestWithAssets.targets" Condition="'$(ContainsFunctionalTestAssets)' == 'true'" />
+  <Import Project="eng\targets\FunctionalTestWithAssets.targets"
+      Condition=" $(IsTestProject) AND $(ContainsFunctionalTestAssets) " />
 </Project>
--- a/eng/Build.props
+++ b/eng/Build.props
@ -107,7 +107,7 @@
        <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=Win32" />
        <NativeProjects Include="$(RepoRoot)src\**\*.vcxproj" Exclude="@(ProjectToExclude)" AdditionalProperties="Platform=arm64" />
      </ItemGroup>
-      
+
      <ItemGroup>
        <ProjectToBuild Condition=" $(BuildNative) " Include="@(NativeProjects)" Exclude="@(ProjectToExclude)" />
        <ProjectToExclude Condition=" !$(BuildNative) " Include="@(NativeProjects)" />
@ -138,13 +138,6 @@
        <ProjectToBuild Condition=" '$(BuildJava)' == 'true'" Include="@(JavaProjects)" Exclude="@(ProjectToExclude)" />
        <ProjectToExclude Condition=" '$(BuildJava)' != 'true'" Include="@(JavaProjects)" />

-        <!-- These interop test projects can only be restored and built after the shared framework is built -->
-        <InteropProjects Include="$(RepoRoot)src\Grpc\**\*.csproj"
-                      Exclude="@(ProjectToExclude)" />
-
-        <ProjectToBuild Condition=" '$(BuildInteropProjects)' == 'true'" Include="@(InteropProjects)" Exclude="@(ProjectToExclude)" />
-        <ProjectToExclude Condition=" '$(BuildInteropProjects)' != 'true'" Include="@(InteropProjects)" />
-
        <!--
          Use caution to avoid deep recursion. If the globbing pattern picks up something which exceeds MAX_PATH,
          the entire pattern will silently fail to evaluate correctly.
@ -186,9 +179,9 @@
                          $(RepoRoot)src\WebEncoders\**\*.csproj;
                          $(RepoRoot)src\HealthChecks\**\*.csproj;
                          $(RepoRoot)src\Testing\**\*.csproj;
+                          $(RepoRoot)src\Grpc\**\*.csproj;
                          $(RepoRoot)src\ProjectTemplates\*\*.csproj;
                          $(RepoRoot)src\submodules\spa-templates\src\*.csproj;
-                          $(RepoRoot)src\ProjectTemplates\testassets\*\*.csproj;
                          $(RepoRoot)src\Extensions\**\*.csproj;
                          "
                        Exclude="
--- a/eng/targets/FunctionalTestAsset.targets
+++ b/eng/targets/FunctionalTestAsset.targets
@ -1,9 +0,0 @@
-<Project>
-  <Target Name="CollectFunctionalTestPayload" DependsOnTargets="Publish" Returns="@(DependencyPayload)" >
-    <ItemGroup>
-      <DependencyPayload Include="@(ResolvedFileToPublish)">
-        <RelativePath>$(MSBuildProjectName)\%(ResolvedFileToPublish.RelativePath)</RelativePath>
-      </DependencyPayload>
-    </ItemGroup>
-  </Target>
-</Project>
--- a/eng/targets/FunctionalTestWithAssets.props
+++ b/eng/targets/FunctionalTestWithAssets.props
@ -0,0 +1,20 @@
+<Project>
+  <!-- Defaults used in FunctionalTestWithAssets.targets. -->
+
+  <PropertyGroup>
+    <!-- Whether FunctionalTestWithAssets.targets should be loaded. -->
+    <ContainsFunctionalTestAssets>false</ContainsFunctionalTestAssets>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <TestAssetProjectReference>
+      <!-- Optional properties to add when restoring, building, and publishing the test asset project. -->
+      <AdditionalProperties/>
+      <!-- Placement of test asset output within the consuming test project's bin/ or publish/ folder. -->
+      <RelativeFolder>%(Filename)</RelativeFolder>
+      <!-- Whether to _only_ publish the test asset into the test project's folders. -->
+      <SkipBuild>false</SkipBuild>
+      <AdditionalProperties Condition=" '%(SkipBuild)' == 'true' ">NoBuild=true</AdditionalProperties>
+    </TestAssetProjectReference>
+  </ItemDefinitionGroup>
+</Project>
--- a/eng/targets/FunctionalTestWithAssets.targets
+++ b/eng/targets/FunctionalTestWithAssets.targets
@ -1,27 +1,29 @@
 <Project>
-
-  <ItemGroup>
-    <ProjectReference Include="@(FunctionalTestAssetProjectReference)" ReferenceOutputAssembly="false" />
-  </ItemGroup>
-
-  <Target Name="CollectTestAssetPayload" BeforeTargets="GetCopyToOutputDirectoryItems" >
-    <MSBuild Targets="CollectFunctionalTestPayload"
-             BuildInParallel="true"
-             SkipNonexistentTargets="true"
-             Projects="%(FunctionalTestAssetProjectReference.Identity)"
-             RebaseOutputs="True">
-      <Output TaskParameter="TargetOutputs" ItemName="DependencyPayload" />
-    </MSBuild>
-
+  <!--
+    Test asset publication support intended for case where an asset is referenced in a single test project.
+    References in more than one or two test projects would slow the build because each restore or publish
+    operation gets unique (per-test project) global properties.
+  -->
+  <Target Name="PublishTestAssets"
+      BeforeTargets="Publish;RunTests;VSTest"
+      Condition=" '@(TestAssetProjectReference->Count())' != 0 ">
+    <!-- Build and Publish test assets into folders relative to test project. -->
    <ItemGroup>
-      <ContentWithTargetPath
-        Include="@(DependencyPayload)"
-        Condition="'@(DependencyPayload->Count())' != '0'">
-        <TargetPath>%(DependencyPayload.RelativePath)</TargetPath>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      </ContentWithTargetPath>
+      <_ProjectsToPublish Include="@(TestAssetProjectReference)" />
+      <_ProjectsToPublish AdditionalProperties="%(_ProjectsToPublish.AdditionalProperties);
+          OutputPath=$(OutputPath)%(RelativeFolder);
+          PublishDir=$(PublishDir)%(RelativeFolder)" />
    </ItemGroup>
-  </Target>

-</Project>
+    <!--
+      These are separate invocations to ensure Publish sees restored setup. Platform and PlatformTarget removals
+      are to fix builds inside VS.
+    -->
+    <MSBuild Projects="@(_ProjectsToPublish->WithMetadataValue('SkipBuild', 'false'))"
+        BuildInParallel="$(BuildInParallel)"
+        Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())"
+        RemoveProperties="Platform;PlatformTarget"
+        Targets="Restore" />
+    <MSBuild Projects="@(_ProjectsToPublish)" Targets="Publish" RemoveProperties="Platform;PlatformTarget" />
+  </Target>
+</Project>
--- a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
+++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
    <!-- This test will be deprecated -->
--- a/src/Grpc/test/InteropTests/InteropTests.csproj
+++ b/src/Grpc/test/InteropTests/InteropTests.csproj
@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@ -10,13 +9,12 @@
    <Compile Include="..\..\..\Shared\Process\ProcessEx.cs" Link="Helpers\ProcessEx.cs" />
    <Compile Include="..\..\..\Shared\Process\ProcessExtensions.cs" Link="Helpers\ProcessExtensions.cs" />

-    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(IsHelixJob)' != 'true'">
-      <_Parameter1>ServerLogPath</_Parameter1>
-      <_Parameter2>$(ArtifactsLogDir)InteropServer.log</_Parameter2>
-    </AssemblyAttribute>
+    <!-- Enforce build order. Need shared Fx before PublishTestAssets runs. -->
+    <ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj"
+      Private="false"
+      ReferenceOutputAssembly="false"
+      SkipGetTargetFrameworkProperties="true" />

-    <FunctionalTestAssetProjectReference Include="..\testassets\InteropClient\InteropClient.csproj" />
-    <FunctionalTestAssetProjectReference Include="..\testassets\InteropWebsite\InteropWebsite.csproj" />
+    <TestAssetProjectReference Include="..\testassets\**\*.csproj" />
  </ItemGroup>
-
 </Project>
--- a/src/Grpc/test/testassets/InteropWebsite/Directory.Build.targets
+++ b/src/Grpc/test/testassets/InteropWebsite/Directory.Build.targets
@ -1,22 +0,0 @@
-<Project>
-  <!-- Skip the parent folder to prevent getting test package references. -->
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\..\, Directory.Build.targets))\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir)</RestoreAdditionalProjectSources>
-  </PropertyGroup>
-
-  <!-- Use the shared framework that was produced -->
-  <ItemGroup>
-    <KnownFrameworkReference
-      Include="Microsoft.AspNetCore.App"
-      TargetFramework="$(DefaultNetCoreTargetFramework)"
-      RuntimeFrameworkName="Microsoft.AspNetCore.App"
-      TargetingPackName="Microsoft.AspNetCore.App.Ref"
-      RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
-      DefaultRuntimeFrameworkVersion="$(SharedFxVersion)"
-      LatestRuntimeFrameworkVersion="$(SharedFxVersion)"
-      TargetingPackVersion="$(TargetingPackVersion)"
-      RuntimePackRuntimeIdentifiers="$(SupportedRuntimeIdentifiers)" />
-  </ItemGroup>
-</Project>
--- a/src/Grpc/test/testassets/InteropWebsite/InteropWebsite.csproj
+++ b/src/Grpc/test/testassets/InteropWebsite/InteropWebsite.csproj
@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
  <PropertyGroup>
    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
    <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
    <GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
    <Nullable>enable</Nullable>
+    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir)</RestoreAdditionalProjectSources>
+    <UseAspNetCoreSharedRuntime>true</UseAspNetCoreSharedRuntime>
  </PropertyGroup>

  <ItemGroup>
@ -14,5 +15,4 @@

    <Reference Include="Grpc.AspNetCore" />
  </ItemGroup>
-
 </Project>
--- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
+++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
+    <ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
  </PropertyGroup>

@ -8,63 +8,24 @@
    <Compile Include="..\..\Extensions.Core\src\Base32.cs" Link="Infrastructure\Base32.cs" />
    <Compile Include="..\..\Extensions.Core\src\Rfc6238AuthenticationService.cs" Link="Infrastructure\Rfc6238AuthenticationService.cs" />
    <Compile Include="..\..\UI\src\UIFramework.cs" Link="Infrastructure\UIFramework.cs" />
-  </ItemGroup>

-  <ItemGroup>
    <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>

-  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
-
  <ItemGroup>
-    <ProjectReference Include="..\..\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj" />
+    <TestAssetProjectReference Include="..\..\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj"
+        RelativeFolder=""
+        SkipBuild="true" />
+    <ProjectReference Include="@(TestAssetProjectReference)" />

    <Reference Include="Microsoft.AspNetCore.Mvc.Testing" />
    <Reference Include="Microsoft.EntityFrameworkCore.Sqlite" />
    <Reference Include="AngleSharp" />
    <Reference Include="System.Net.Http" />
-  </ItemGroup>

-  <ItemGroup>
    <None Update="Testing.DefaultWebSite.StaticWebAssets.V4.xml" CopyToOutputDirectory="PreserveNewest" />
    <None Update="Testing.DefaultWebSite.StaticWebAssets.V5.xml" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>

-  <Target Name="AddProjectReferenceAssemblyInfo" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="ResolveAssemblyReferences">
-    <ItemGroup>
-      <_IdentitUIDefaultWebSite Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' == 'Identity.DefaultUI.WebSite'" />
-      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-        <_Parameter1>Microsoft.AspNetCore.Testing.DefaultWebSiteProjectPath</_Parameter1>
-        <_Parameter2>$([System.IO.Path]::GetDirectoryName('%(_IdentitUIDefaultWebSite.MSBuildSourceProjectFile)'))</_Parameter2>
-      </AssemblyAttribute>
-
-      <_IdentitUIProjectPath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' == 'Microsoft.AspNetCore.Identity.UI'" />
-      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
-        <_Parameter1>Microsoft.AspNetCore.Testing.IdentityUIProjectPath</_Parameter1>
-        <_Parameter2>$([System.IO.Path]::GetDirectoryName('%(_IdentitUIProjectPath.MSBuildSourceProjectFile)'))</_Parameter2>
-      </AssemblyAttribute>
-
-      <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(HelixType)' == 'ci'">
-        <_Parameter1>Microsoft.AspNetCore.Testing.IsHelixCI</_Parameter1>
-        <_Parameter2>true</_Parameter2>
-      </AssemblyAttribute>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="PublishAssets" AfterTargets="Publish">	
-    <ItemGroup>	
-      <_PublishFiles Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Identity.UI\$(Configuration)\$(DefaultNetCoreTargetFramework)\Microsoft.AspNetCore.Identity.UI.Views.*.dll" />	
-      <_wwwrootFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\wwwroot\**\*.*" />	
-      <_PagesFiles Include="$(MSBuildThisFileDirectory)..\..\testassets\Identity.DefaultUI.WebSite\Pages\**\*.*" />	
-      <_IdentityUIContent Include="$(MSBuildThisFileDirectory)..\..\UI\src\wwwroot\**\*" />	
-      <_IdentityUIPages Include="$(MSBuildThisFileDirectory)..\..\UI\src\Areas\Identity\Pages\**\*" />	
-    </ItemGroup>	
-    <Copy SourceFiles="@(_PublishFiles)" DestinationFolder="$(PublishDir)" />	
-    <Copy SourceFiles="@(_PagesFiles)" DestinationFolder="$(PublishDir)\Identity.DefaultUI.WebSite\Pages" />	
-    <Copy SourceFiles="@(_wwwrootFiles)" DestinationFolder="$(PublishDir)\Identity.DefaultUI.WebSite\wwwroot" />	
-    <Copy SourceFiles="@(_IdentityUIContent)" DestinationFiles="$(PublishDir)\UI\wwwroot\%(_IdentityUIContent.RecursiveDir)\%(_IdentityUIContent.FileName)%(_IdentityUIContent.Extension)" />	
-    <Copy SourceFiles="@(_IdentityUIPages)" DestinationFiles="$(PublishDir)UI\Areas\Identity\Pages\%(_IdentityUIPages.RecursiveDir)\%(_IdentityUIPages.FileName)%(_IdentityUIPages.Extension)" />	
-    <!-- Drop a dummy sln to specify content root location -->
-    <WriteLinesToFile File="$(PublishDir)\contentroot.sln" Lines="Ignored" Overwrite="true" Encoding="Unicode" />
-  </Target>
+  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
 </Project>
--- a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
+++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
@ -1,6 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
-
  <PropertyGroup>
    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
    <TestGroupName>Mvc.FunctionalTests</TestGroupName>
@ -16,31 +14,12 @@

  <ItemGroup>
    <Reference Include="Microsoft.AspNetCore.Mvc.Testing" />
+
    <ProjectReference Include="..\..\samples\MvcSandbox\MvcSandbox.csproj" />
-
    <ProjectReference Include="..\..\shared\Mvc.Core.TestCommon\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj" />
-
-    <ProjectReference Include="..\WebSites\ApiExplorerWebSite\ApiExplorerWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\ApplicationModelWebSite\ApplicationModelWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\BasicWebSite\BasicWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\ControllersFromServicesWebSite\ControllersFromServicesWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\CorsWebSite\CorsWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\ErrorPageMiddlewareWebSite\ErrorPageMiddlewareWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\FilesWebSite\FilesWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\FormatterWebSite\FormatterWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\GenericHostWebSite\GenericHostWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\HtmlGenerationWebSite\HtmlGenerationWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\RazorBuildWebSite\RazorBuildWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\RazorPagesWebSite\RazorPagesWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\RazorWebSite\RazorWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\RoutingWebSite\Mvc.RoutingWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\SecurityWebSite\SecurityWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\SimpleWebSite\SimpleWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\SimpleWebSiteWithWebApplicationBuilder\SimpleWebSiteWithWebApplicationBuilder.csproj" />
-    <ProjectReference Include="..\WebSites\SimpleWebSiteWithWebApplicationBuilderException\SimpleWebSiteWithWebApplicationBuilderException.csproj" />
-    <ProjectReference Include="..\WebSites\TagHelpersWebSite\TagHelpersWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\VersioningWebSite\VersioningWebSite.csproj" />
-    <ProjectReference Include="..\WebSites\XmlFormattersWebSite\XmlFormattersWebSite.csproj" />
+    <ProjectReference Include="..\WebSites\*\*.csproj"
+        Exclude="..\WebSites\ControllersFromServicesClassLibrary\ControllersFromServicesClassLibrary.csproj;
+          ..\WebSites\RazorBuildWebSite.*\RazorBuildWebSite.*.csproj" />

    <Reference Include="AngleSharp" />
    <Reference Include="System.Net.Http" />
@ -51,4 +30,5 @@
    <Reference Include="Microsoft.AspNetCore.TestHost" />
  </ItemGroup>

+  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
 </Project>
--- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
+++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
@ -1,23 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
  <PropertyGroup>
    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
    <IsSampleProject>false</IsSampleProject>
    <PlatformTarget>AnyCPU</PlatformTarget>
  </PropertyGroup>

-  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
-
  <ItemGroup>
    <ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />
-    <ProjectReference Include="..\..\samples\Cookies\Cookies.csproj" />
-    <ProjectReference Include="..\..\samples\ClaimsTransformation\ClaimsTransformation.csproj" />
-    <ProjectReference Include="..\..\samples\CustomAuthorizationFailureResponse\CustomAuthorizationFailureResponse.csproj" />
-    <ProjectReference Include="..\..\samples\CustomPolicyProvider\CustomPolicyProvider.csproj" />
-    <ProjectReference Include="..\..\samples\DynamicSchemes\DynamicSchemes.csproj" />
-    <ProjectReference Include="..\..\samples\Identity.ExternalClaims\Identity.ExternalClaims.csproj" />
-    <ProjectReference Include="..\..\samples\PathSchemeSelection\PathSchemeSelection.csproj" />
-    <ProjectReference Include="..\..\samples\StaticFilesAuth\StaticFilesAuth.csproj" />
+    <ProjectReference Include="..\..\samples\*\*.csproj" />
  </ItemGroup>

  <ItemGroup>
@ -28,4 +18,6 @@
    <Reference Include="AngleSharp" />
    <Reference Include="System.Net.Http" />
  </ItemGroup>
+
+  <Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
 </Project>