diff --git a/src/Microsoft.AspNetCore.Mvc.Testing.Xunit/Microsoft.AspNetCore.Mvc.Testing.Xunit.csproj b/src/Microsoft.AspNetCore.Mvc.Testing.Xunit/Microsoft.AspNetCore.Mvc.Testing.Xunit.csproj
index bf45538e3f..0aaf02b86f 100644
--- a/src/Microsoft.AspNetCore.Mvc.Testing.Xunit/Microsoft.AspNetCore.Mvc.Testing.Xunit.csproj
+++ b/src/Microsoft.AspNetCore.Mvc.Testing.Xunit/Microsoft.AspNetCore.Mvc.Testing.Xunit.csproj
@@ -6,6 +6,7 @@
     <Description>XUnit convenience fixture for creating functional tests for MVC applications.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;aspnetcoremvc;aspnetcoremvctesting</PackageTags>
   </PropertyGroup>
 
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing.Xunit/build/Microsoft.AspNetCore.Mvc.Testing.Xunit.targets b/src/Microsoft.AspNetCore.Mvc.Testing.Xunit/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.Xunit.targets
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing.Xunit/build/Microsoft.AspNetCore.Mvc.Testing.Xunit.targets
rename to src/Microsoft.AspNetCore.Mvc.Testing.Xunit/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.Xunit.targets
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing.Xunit/build/xunit.runner.json b/src/Microsoft.AspNetCore.Mvc.Testing.Xunit/build/netstandard2.0/xunit.runner.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing.Xunit/build/xunit.runner.json
rename to src/Microsoft.AspNetCore.Mvc.Testing.Xunit/build/netstandard2.0/xunit.runner.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
index 6c0201d8c9..490ff527f3 100644
--- a/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
+++ b/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
@@ -6,6 +6,7 @@
     <Description>Support for writing functional tests for MVC applications.</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;aspnetcoremvc;aspnetcoremvctesting</PackageTags>
   </PropertyGroup>
 
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/MvcWebApplicationBuilder.cs b/src/Microsoft.AspNetCore.Mvc.Testing/MvcWebApplicationBuilder.cs
index 04753a5260..b06729601e 100644
--- a/src/Microsoft.AspNetCore.Mvc.Testing/MvcWebApplicationBuilder.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Testing/MvcWebApplicationBuilder.cs
@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing
         public List<Assembly> ApplicationAssemblies { get; set; } = new List<Assembly>();
 
         /// <summary>
-        /// Configures services before <see cref="TStartup.ConfigureServices"/> runs.
+        /// Configures services before TStartup.ConfigureServices runs.
         /// </summary>
         /// <param name="configure">The <see cref="Action{IServiceCollection}"/> to configure the services with.</param>
         /// <returns>An instance of this <see cref="MvcWebApplicationBuilder{TStartup}"/></returns>
@@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing
         }
 
         /// <summary>
-        /// Configures services after <see cref="TStartup.ConfigureServices"/> runs.
+        /// Configures services after TStartup.ConfigureServices runs.
         /// </summary>
         /// <param name="configure">The <see cref="Action{IServiceCollection}"/> to configure the services with.</param>
         /// <returns>An instance of this <see cref="MvcWebApplicationBuilder{TStartup}"/></returns>
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/build/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/build/Microsoft.AspNetCore.Mvc.Testing.targets
rename to src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
index 34bc035c86..c2a91030ac 100644
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\build\common.props" />
-  <Import Project="..\..\src\Microsoft.AspNetCore.Mvc.Testing\build\Microsoft.AspNetCore.Mvc.Testing.targets" />
-  <Import Project="..\..\src\Microsoft.AspNetCore.Mvc.Testing.Xunit\build\Microsoft.AspNetCore.Mvc.Testing.Xunit.targets" />
+  <Import Project="..\..\src\Microsoft.AspNetCore.Mvc.Testing\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.targets" />
+  <Import Project="..\..\src\Microsoft.AspNetCore.Mvc.Testing.Xunit\build\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.Xunit.targets" />
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>