Revert "Remove ref project from Microsoft.AspNetCore.Testing (#2817)" (#2882)

This reverts commit b624d6b.

Author: wtgodbe

Directory.Build.props

@@ -55,7 +55,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
-    <ProjectReference Include="$(MSBuildThisFileDirectory)src\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Testing" />
     <Reference Include="Moq" />
   </ItemGroup>
 

eng/ProjectReferences.props

@@ -56,6 +56,7 @@
     <ProjectReferenceProvider Include="Microsoft.Extensions.Options.DataAnnotations" ProjectPath="$(RepoRoot)src\Options\DataAnnotations\src\Microsoft.Extensions.Options.DataAnnotations.csproj" RefProjectPath="$(RepoRoot)src\Options\DataAnnotations\ref\Microsoft.Extensions.Options.DataAnnotations.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Options" ProjectPath="$(RepoRoot)src\Options\Options\src\Microsoft.Extensions.Options.csproj" RefProjectPath="$(RepoRoot)src\Options\Options\ref\Microsoft.Extensions.Options.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.Primitives" ProjectPath="$(RepoRoot)src\Primitives\src\Microsoft.Extensions.Primitives.csproj" RefProjectPath="$(RepoRoot)src\Primitives\ref\Microsoft.Extensions.Primitives.csproj" />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" RefProjectPath="$(RepoRoot)src\TestingUtils\Microsoft.AspNetCore.Testing\ref\Microsoft.AspNetCore.Testing.csproj" />
     <ProjectReferenceProvider Include="Microsoft.Extensions.WebEncoders" ProjectPath="$(RepoRoot)src\WebEncoders\src\Microsoft.Extensions.WebEncoders.csproj" RefProjectPath="$(RepoRoot)src\WebEncoders\ref\Microsoft.Extensions.WebEncoders.csproj" />
   </ItemGroup>
 </Project>

src/Hosting/IntegrationTesting/src/Microsoft.Extensions.Hosting.IntegrationTesting.csproj

@@ -15,6 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Testing" />
     <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
     <Reference Include="Microsoft.Extensions.Logging" />

src/Logging/Logging.Testing/src/Microsoft.Extensions.Logging.Testing.csproj

@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" />
+    <Reference Include="Microsoft.AspNetCore.Testing" />
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
     <Reference Include="Microsoft.Extensions.Logging" />

src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.csproj

@@ -0,0 +1,32 @@
+<!-- This file is automatically generated. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+  </PropertyGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <Compile Include="Microsoft.AspNetCore.Testing.netstandard2.0.cs" />
+    <Reference Include="Microsoft.Win32.Registry"  />
+    <Reference Include="System.ValueTuple"  />
+    <Reference Include="xunit.assert"  />
+    <Reference Include="xunit.extensibility.execution"  />
+  </ItemGroup>
+<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
+    <Compile Include="Microsoft.AspNetCore.Testing.net46.cs" />
+    <Reference Include="Microsoft.Win32.Registry"  />
+    <Reference Include="System.ValueTuple"  />
+    <Reference Include="xunit.assert"  />
+    <Reference Include="xunit.extensibility.execution"  />
+    <Reference Include="System.Net.Http"  />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation"  />
+    <Reference Include="System"  />
+    <Reference Include="System.Data"  />
+    <Reference Include="System.Drawing"  />
+    <Reference Include="System.Xml"  />
+    <Reference Include="System.Core"  />
+    <Reference Include="System.Runtime.Serialization"  />
+    <Reference Include="System.Xml.Linq"  />
+    <Reference Include="System.Numerics"  />
+    <Reference Include="System.IO.Compression.FileSystem"  />
+    <Reference Include="mscorlib"  />
+  </ItemGroup>
+</Project>

src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.net46.cs

@@ -9,9 +9,10 @@
     <!-- This is actually a library for test projects, not a test project. -->
     <IsUnitTestProject>false</IsUnitTestProject>
     <IsPackable>true</IsPackable>
+    <HasReferenceAssembly>true</HasReferenceAssembly>
+    <GenerateFrameworkReferenceAssembly>true</GenerateFrameworkReferenceAssembly>
     <!-- This package is internal, so we don't generate a package baseline. Always build against the latest dependencies. -->
     <UseLatestPackageReferences>true</UseLatestPackageReferences>
-    <IsProjectReferenceProvider>false</IsProjectReferenceProvider>
   </PropertyGroup>
 
   <ItemGroup>

src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs

@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Testing" />
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
   </ItemGroup>