diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
index 397424ebfd..c5613450e7 100644
--- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
+++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
@@ -16,15 +16,16 @@
   <ItemGroup Condition="'$(TargetFramework)' != 'net461'">
     <PackageReference Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" />
+
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
   </ItemGroup>
 
   <!-- These references are used when running locally -->
   <ItemGroup Condition="'$(BenchmarksTargetFramework)' == ''">
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAuthenticationJwtBearerPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
 
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
@@ -37,6 +38,10 @@
     Use All meta-package and not App to include Microsoft.EntityFrameworkCore.Sqlite.
   -->
   <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
+    <KnownFrameworkReference 
+      Update="Microsoft.AspNetCore.App"
+      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Mvc/benchmarkapps/BasicApi/benchmarks.json b/src/Mvc/benchmarkapps/BasicApi/benchmarks.json
index c1497d0465..a739204862 100644
--- a/src/Mvc/benchmarkapps/BasicApi/benchmarks.json
+++ b/src/Mvc/benchmarkapps/BasicApi/benchmarks.json
@@ -7,9 +7,9 @@
     "PresetHeaders": "Json",
     "ReadyStateText": "Application started.",
     "Source": {
+      "Repository": "https://github.com/aspnet/AspNetCore.git",
       "BranchOrCommit": "master",
-      "Project": "benchmarkapps/BasicApi/BasicApi.csproj",
-      "Repository": "https://github.com/aspnet/mvc.git"
+      "Project": "src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj"
     }
   },
   "BasicApi.GetToken": {
diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
index ba832b8e25..da112f236b 100644
--- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
+++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
@@ -16,6 +16,10 @@
   <ItemGroup Condition="'$(TargetFramework)' != 'net461'">
     <PackageReference Include="MySqlConnector" Version="$(BenchmarksOnlyMySqlConnectorPackageVersion)" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion)" />
+
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
   </ItemGroup>
 
   <!-- These references are used when running locally -->
@@ -23,9 +27,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
     <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" PrivateAssets="All" />
 
@@ -34,10 +35,13 @@
 
   <!--
     These references are used when running on the Benchmarks Server.
-    Use All meta-package and not App to include Microsoft.EntityFrameworkCore.Sqlite.
   -->
   <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
+    <KnownFrameworkReference 
+      Update="Microsoft.AspNetCore.App"
+      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
     <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Mvc/benchmarkapps/BasicViews/benchmarks.json b/src/Mvc/benchmarkapps/BasicViews/benchmarks.json
index 75e77df4c5..c7c598bd08 100644
--- a/src/Mvc/benchmarkapps/BasicViews/benchmarks.json
+++ b/src/Mvc/benchmarkapps/BasicViews/benchmarks.json
@@ -7,9 +7,9 @@
     "PresetHeaders": "Html",
     "ReadyStateText": "Application started.",
     "Source": {
+      "Repository": "https://github.com/aspnet/AspNetCore.git",
       "BranchOrCommit": "master",
-      "Project": "benchmarkapps/BasicViews/BasicViews.csproj",
-      "Repository": "https://github.com/aspnet/mvc.git"
+      "Project": "src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj"
     }
   },
   "BasicViews.GetHtmlHelpers": {
diff --git a/src/Mvc/benchmarkapps/BasicViews/web.config b/src/Mvc/benchmarkapps/BasicViews/web.config
deleted file mode 100644
index be088b9ef4..0000000000
--- a/src/Mvc/benchmarkapps/BasicViews/web.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <system.webServer>
-    <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
-    </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" forwardWindowsAuthToken="false" stdoutLogEnabled="false" />
-  </system.webServer>
-</configuration>
diff --git a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
index c599280493..93debc2c00 100644
--- a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
+++ b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
@@ -17,7 +17,11 @@
     These references are used when running on the Benchmarks Server.
   -->
   <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
+    <KnownFrameworkReference 
+      Update="Microsoft.AspNetCore.App"
+      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
     <PackageReference Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Mvc/build/dependencies.props b/src/Mvc/build/dependencies.props
index be72c12e5b..2bbab0de4a 100644
--- a/src/Mvc/build/dependencies.props
+++ b/src/Mvc/build/dependencies.props
@@ -10,12 +10,12 @@
   
     <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
     <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
-    <BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>
-    <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <BenchmarksOnlyMySqlConnectorPackageVersion>0.43.0</BenchmarksOnlyMySqlConnectorPackageVersion>
+    <BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>3.0.0-preview.18572.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>
+    <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview.18572.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview.18572.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <BenchmarksOnlyMySqlConnectorPackageVersion>0.47.1</BenchmarksOnlyMySqlConnectorPackageVersion>
     <BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>2.1.1.1</BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>
-    <BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>2.1.1</BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>
+    <BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>2.1.4</BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>
     <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview.18572.1</InternalAspNetCoreAnalyzersPackageVersion>
     <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview.18572.1</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
     <MicrosoftAspNetCoreAntiforgeryPackageVersion>3.0.0-preview-18604-0074</MicrosoftAspNetCoreAntiforgeryPackageVersion>
diff --git a/src/Routing/benchmarkapps/Benchmarks/Benchmarks.csproj b/src/Routing/benchmarkapps/Benchmarks/Benchmarks.csproj
index 0db37a19dd..eacd72f704 100644
--- a/src/Routing/benchmarkapps/Benchmarks/Benchmarks.csproj
+++ b/src/Routing/benchmarkapps/Benchmarks/Benchmarks.csproj
@@ -15,8 +15,12 @@
   </ItemGroup>
 
    <!--These references are used when running on the Benchmarks Server--> 
-  <ItemGroup Condition="'$(UseP2PReferences)'!='true'">
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
+  <ItemGroup Condition="'$(BenchmarksTargetFramework)'!=''">
+    <KnownFrameworkReference 
+      Update="Microsoft.AspNetCore.App"
+      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Routing/benchmarkapps/Benchmarks/benchmarks.json b/src/Routing/benchmarkapps/Benchmarks/benchmarks.json
index d69ee7afce..c0735fa032 100644
--- a/src/Routing/benchmarkapps/Benchmarks/benchmarks.json
+++ b/src/Routing/benchmarkapps/Benchmarks/benchmarks.json
@@ -7,9 +7,9 @@
       "PipelineDepth": 16
     },
     "Source": {
-      "Repository": "https://github.com/aspnet/routing.git",
+      "Repository": "https://github.com/aspnet/AspNetCore.git",
       "BranchOrCommit": "master",
-      "Project": "benchmarkapps/Benchmarks/Benchmarks.csproj"
+      "Project": "src/Routing/benchmarkapps/Benchmarks/Benchmarks.csproj"
     },
     "Port": 8080
   },
diff --git a/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj b/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj
index cd56cb01ca..4460a67388 100644
--- a/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj
+++ b/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <TargetFramework Condition="'$(BenchmarksTargetFramework)' != ''">$(BenchmarksTargetFramework)</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>latest</LangVersion>
@@ -23,6 +23,11 @@
 
   <!-- These references are used when running on the Benchmarks Server -->
   <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <Reference Include="Microsoft.AspNetCore.All" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" version="2.2.0" />
+    <KnownFrameworkReference 
+      Update="Microsoft.AspNetCore.App"
+      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
+      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.json.json b/src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.json.json
index 157cee28dc..8313f994bd 100644
--- a/src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.json.json
+++ b/src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.json.json
@@ -4,9 +4,9 @@
     "PresetHeaders": "Json",
 
     "Source": {
-      "Repository": "https://github.com/aspnet/KestrelHttpServer.git",
-      "BranchOrCommit": "dev",
-      "Project": "benchmarkapps/PlatformBenchmarks/PlatformBenchmarks.csproj"
+      "Repository": "https://github.com/aspnet/AspNetCore.git",
+      "BranchOrCommit": "master",
+      "Project": "src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj"
     }
   },
   "JsonPlatform": {
diff --git a/src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.plaintext.json b/src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.plaintext.json
index 5ad58aee15..6cfe040ea4 100644
--- a/src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.plaintext.json
+++ b/src/Servers/Kestrel/perf/PlatformBenchmarks/benchmarks.plaintext.json
@@ -7,9 +7,9 @@
       "PipelineDepth": 16
     },
     "Source": {
-      "Repository": "https://github.com/aspnet/KestrelHttpServer.git",
-      "BranchOrCommit": "dev",
-      "Project": "benchmarkapps/PlatformBenchmarks/PlatformBenchmarks.csproj"
+      "Repository": "https://github.com/aspnet/AspNetCore.git",
+      "BranchOrCommit": "master",
+      "Project": "src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj"
     },
     "Port": 8080
   },