Using <FrameworkReference> in benchmark apps (#7957)

2019-02-27 10:27:01 -08:00 · 2019-02-27 10:27:01 -08:00 · fd83f4dbb9
parent 0d570a2d42
commit fd83f4dbb9
7 changed files with 23 additions and 35 deletions
--- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
+++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
@ -18,7 +18,7 @@
    <PackageReference Include="MySqlConnector" Version="0.43.0" />
    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.1.1" />
    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.1" />
-    <!-- This suppresses errors about using PackageReference instead of Reference. For unclear reasons, this project has pinned dependencies. -->
+
    <PackageReference Update="@(PackageReference)" AllowExplicitReference="true" />
  </ItemGroup>

@ -34,11 +34,9 @@

  <!-- These references are used when building on the Benchmarks Server. -->
  <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
-      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
-      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
+
+    <FrameworkReference Update="Microsoft.AspNetCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
+    <FrameworkReference Update="Microsoft.NETCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />

    <!-- Special-case the JwtBearer package because assembly no longer ships in Microsoft.AspNetCore.App. -->
    <!-- Cannot use <Reference> because it's unsupported when building an isolated project. -->
--- a/src/Mvc/benchmarkapps/BasicApi/benchmarks.json
+++ b/src/Mvc/benchmarkapps/BasicApi/benchmarks.json
@ -19,20 +19,20 @@
  },
  "BasicApi.GetUsingQueryString": {
    "ClientProperties": {
-      "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/master/benchmarkapps/BasicApi/getWithToken.lua"
+      "Scripts": "https://raw.githubusercontent.com/aspnet/AspNetCore/master/src/Mvc/benchmarkapps/BasicApi/getWithToken.lua"
    },
    "Path": "/pet/findByStatus",
    "Query": "?status=available"
  },
  "BasicApi.GetUsingRouteValue": {
    "ClientProperties": {
-      "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/master/benchmarkapps/BasicApi/getWithToken.lua"
+      "Scripts": "https://raw.githubusercontent.com/aspnet/AspNetCore/master/src/Mvc/benchmarkapps/BasicApi/getWithToken.lua"
    },
    "Path": "/pet/-1"
  },
  "BasicApi.GetUsingRouteValueWithoutAuthorization": {
    "ClientProperties": {
-      "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/master/benchmarkapps/BasicApi/getWithToken.lua"
+      "Scripts": "https://raw.githubusercontent.com/aspnet/AspNetCore/master/src/Mvc/benchmarkapps/BasicApi/getWithToken.lua"
    },
    "Path": "/pet/anonymous/-1"
  },
@ -41,14 +41,14 @@
  },
  "BasicApi.Post": {
    "ClientProperties": {
-      "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/master/benchmarkapps/BasicApi/postJsonWithToken.lua"
+      "Scripts": "https://raw.githubusercontent.com/aspnet/AspNetCore/master/src/Mvc/benchmarkapps/BasicApi/postJsonWithToken.lua"
    },
    "Path": "/pet"
  },
  "BasicApi.PostWithoutDb": {
    "Path": "/pet/add-pet",
    "ClientProperties": {
-      "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/master/benchmarkapps/BasicApi/postJsonWithToken.lua"
+      "Scripts": "https://raw.githubusercontent.com/aspnet/AspNetCore/master/src/Mvc/benchmarkapps/BasicApi/postJsonWithToken.lua"
    }
  }
 }
--- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
+++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
@ -18,7 +18,7 @@
    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" PrivateAssets="All" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" />
-    <!-- This suppresses errors about using PackageReference instead of Reference. For unclear reasons, this project has pinned dependencies. -->
+
    <PackageReference Update="@(PackageReference)" AllowExplicitReference="true" />
  </ItemGroup>

@ -36,10 +36,7 @@
    These references are used when running on the Benchmarks Server.
  -->
  <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
-      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
-      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
+    <FrameworkReference Update="Microsoft.AspNetCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
+    <FrameworkReference Update="Microsoft.NETCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
  </ItemGroup>
 </Project>
--- a/src/Mvc/benchmarkapps/BasicViews/benchmarks.json
+++ b/src/Mvc/benchmarkapps/BasicViews/benchmarks.json
@ -20,19 +20,19 @@
  },
  "BasicViews.Post": {
    "ClientProperties": {
-      "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/master/benchmarkapps/BasicViews/postWithToken.lua"
+      "Scripts": "https://raw.githubusercontent.com/aspnet/AspNetCore/master/src/Mvc/benchmarkapps/BasicViews/postWithToken.lua"
    },
    "Path": "/Home/Index"
  },
  "BasicViews.PostIgnoringToken": {
    "ClientProperties": {
-      "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/master/benchmarkapps/BasicViews/postWithToken.lua"
+      "Scripts": "https://raw.githubusercontent.com/aspnet/AspNetCore/master/src/Mvc/benchmarkapps/BasicViews/postWithToken.lua"
    },
    "Path": "/Home/IndexWithoutToken"
  },
  "BasicViews.PostWithoutToken": {
    "ClientProperties": {
-      "Scripts": "https://raw.githubusercontent.com/aspnet/Mvc/master/benchmarkapps/BasicViews/post.lua"
+      "Scripts": "https://raw.githubusercontent.com/aspnet/AspNetCore/master/src/Mvc/benchmarkapps/BasicViews/post.lua"
    },
    "Path": "/Home/IndexWithoutToken"
  }
--- a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
+++ b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
@ -17,11 +17,8 @@
    These references are used when running on the Benchmarks Server.
  -->
  <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
-      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
-      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
+    <FrameworkReference Update="Microsoft.AspNetCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
+    <FrameworkReference Update="Microsoft.NETCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="Properties\" />
--- a/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj
+++ b/src/Servers/Kestrel/perf/PlatformBenchmarks/PlatformBenchmarks.csproj
@ -21,11 +21,9 @@
  <!-- These references are used when running on the Benchmarks Server -->
  <ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
    <PackageReference Include="Utf8Json" Version="1.3.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.2.0" />
-    <KnownFrameworkReference
-      Update="Microsoft.AspNetCore.App"
-      DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
-      LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)"
-      TargetingPackVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="$(BenchmarksAspNetCoreVersion)" />
+
+    <FrameworkReference Update="Microsoft.AspNetCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
+    <FrameworkReference Update="Microsoft.NETCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
  </ItemGroup>
 </Project>
--- a/src/SignalR/perf/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj
+++ b/src/SignalR/perf/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj
@ -23,10 +23,8 @@
    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />

-    <KnownFrameworkReference Update="Microsoft.AspNetCore.App"
-      DefaultRuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)"
-      LatestRuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)"
-      TargetingPackVersion="$(BenchmarksAspNetCoreVersion)" />
+    <FrameworkReference Update="Microsoft.AspNetCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
+    <FrameworkReference Update="Microsoft.NETCore.App" RuntimeFrameworkVersion="$(BenchmarksAspNetCoreVersion)" />
  </ItemGroup>

 </Project>