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

dotnet · Jan 16, 2020 · b624d6b · b624d6b
1 parent fde2846
commit b624d6b
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 759 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -55,7 +55,7 @@
  </PropertyGroup>
 
  <ItemGroup Condition=" '$(IsUnitTestProject)' == 'true' ">
- <Reference Include="Microsoft.AspNetCore.Testing" />
+ <ProjectReference Include="$(MSBuildThisFileDirectory)src\TestingUtils\Microsoft.AspNetCore.Testing\src\Microsoft.AspNetCore.Testing.csproj" />
  <Reference Include="Moq" />
  </ItemGroup>
 

diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props
@@ -56,7 +56,6 @@
  <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>
diff --git a/src/Hosting/IntegrationTesting/src/Microsoft.Extensions.Hosting.IntegrationTesting.csproj b/src/Hosting/IntegrationTesting/src/Microsoft.Extensions.Hosting.IntegrationTesting.csproj
@@ -15,7 +15,6 @@
  </PropertyGroup>
 
  <ItemGroup>
- <Reference Include="Microsoft.AspNetCore.Testing" />
  <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
  <Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
  <Reference Include="Microsoft.Extensions.Logging" />

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

diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.csproj b/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.csproj
diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.net46.cs b/src/TestingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.net46.cs
diff --git a/...tingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs b/...tingUtils/Microsoft.AspNetCore.Testing/ref/Microsoft.AspNetCore.Testing.netstandard2.0.cs
diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/TestingUtils/Microsoft.AspNetCore.Testing/src/Microsoft.AspNetCore.Testing.csproj
@@ -9,10 +9,9 @@
  <!-- 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>

diff --git a/src/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj b/src/TestingUtils/Microsoft.AspNetCore.Testing/test/Microsoft.AspNetCore.Testing.Tests.csproj
@@ -14,7 +14,6 @@
  </ItemGroup>
 
  <ItemGroup>
- <Reference Include="Microsoft.AspNetCore.Testing" />
  <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
  </ItemGroup>