From 6bc2c7ff0b83b9df5b72a9ec5721a2d95ee8f78b Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sun, 19 Sep 2021 11:36:08 -0700 Subject: [PATCH 1/6] `` -> `` - avoid useless transitions to inner builds --- ....AspNetCore.AzureAppServices.HostingStartup.csproj | 2 +- .../AzureAppServicesSample.csproj | 2 +- ...osoft.AspNetCore.Components.WebView.Photino.csproj | 2 +- ...ft.AspNetCore.Hosting.WindowsServices.Tests.csproj | 4 ++-- ...oft.AspNetCore.Identity.EntityFrameworkCore.csproj | 2 +- .../sample/ConcurrencyLimiterSample.csproj | 11 +---------- ....AspNetCore.Diagnostics.EntityFrameworkCore.csproj | 2 +- ...icrosoft.AspNetCore.HeaderPropagation.Tests.csproj | 2 +- src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj | 4 ++-- .../perf/benchmarkapps/BasicViews/BasicViews.csproj | 4 ++-- .../RazorRendering/RazorRendering.csproj | 4 ++-- .../Microsoft.AspNetCore.Razor.Runtime.Test.csproj | 2 +- .../Razor/test/Microsoft.AspNetCore.Razor.Test.csproj | 2 +- .../Cookies/samples/CookieSample/CookieSample.csproj | 2 +- .../CookieSessionSample/CookieSessionSample.csproj | 2 +- ...ft.AspNetCore.Authentication.Negotiate.Test.csproj | 2 +- .../samples/WsFedSample/WsFedSample.csproj | 2 +- .../samples/SocialSample/SocialSample.csproj | 2 +- .../Microsoft.AspNetCore.Authentication.Test.csproj | 2 +- .../Microsoft.AspNetCore.Authorization.Test.csproj | 2 +- .../CookiePolicySample/CookiePolicySample.csproj | 2 +- .../Microsoft.AspNetCore.CookiePolicy.Test.csproj | 2 +- .../ServerComparison.TestSites.csproj | 2 +- .../Microsoft.AspNetCore.Shared.Tests.csproj | 2 +- .../samples/JwtClientSample/JwtClientSample.csproj | 2 +- .../Microsoft.Extensions.ApiDescription.Client.csproj | 2 +- .../test/UserSecretsTestFixture.cs | 2 +- 27 files changed, 31 insertions(+), 40 deletions(-) diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj index b46745869241..1a393a6ea0d6 100644 --- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj +++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj @@ -4,7 +4,7 @@ ASP.NET Core lightup integration with Azure AppServices. - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true aspnetcore;azure;appservices enable diff --git a/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj b/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj index 2e75ddaed446..f83608da7977 100644 --- a/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj +++ b/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj @@ -1,7 +1,7 @@  - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Components/WebView/Samples/PhotinoPlatform/src/Microsoft.AspNetCore.Components.WebView.Photino.csproj b/src/Components/WebView/Samples/PhotinoPlatform/src/Microsoft.AspNetCore.Components.WebView.Photino.csproj index e1875e893510..c5fc79877ba5 100644 --- a/src/Components/WebView/Samples/PhotinoPlatform/src/Microsoft.AspNetCore.Components.WebView.Photino.csproj +++ b/src/Components/WebView/Samples/PhotinoPlatform/src/Microsoft.AspNetCore.Components.WebView.Photino.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) Intended for internal testing use only. false false diff --git a/src/Hosting/WindowsServices/test/Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj b/src/Hosting/WindowsServices/test/Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj index aa4d901e77e8..431869c11222 100644 --- a/src/Hosting/WindowsServices/test/Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj +++ b/src/Hosting/WindowsServices/test/Microsoft.AspNetCore.Hosting.WindowsServices.Tests.csproj @@ -1,7 +1,7 @@  - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj index f9e167bdc23e..4becc1cd4ccc 100644 --- a/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj +++ b/src/Identity/EntityFrameworkCore/src/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj @@ -2,7 +2,7 @@ ASP.NET Core Identity provider that uses Entity Framework Core. - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true aspnetcore;entityframeworkcore;identity;membership disable diff --git a/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj b/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj index 6a6eaa1d0444..62d0f0485342 100644 --- a/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj +++ b/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj @@ -1,21 +1,12 @@  - $(DefaultNetCoreTargetFramework) - + - - - - - - - - diff --git a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj index 9250215e0648..741861605894 100644 --- a/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj +++ b/src/Middleware/Diagnostics.EntityFrameworkCore/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj @@ -2,7 +2,7 @@ ASP.NET Core middleware for Entity Framework Core error pages. Use this middleware to detect and diagnose errors with Entity Framework Core migrations. - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) true aspnetcore;diagnostics;entityframeworkcore enable diff --git a/src/Middleware/HeaderPropagation/test/Microsoft.AspNetCore.HeaderPropagation.Tests.csproj b/src/Middleware/HeaderPropagation/test/Microsoft.AspNetCore.HeaderPropagation.Tests.csproj index e570da7e7d79..ccf0fc72694f 100644 --- a/src/Middleware/HeaderPropagation/test/Microsoft.AspNetCore.HeaderPropagation.Tests.csproj +++ b/src/Middleware/HeaderPropagation/test/Microsoft.AspNetCore.HeaderPropagation.Tests.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj index 637877b42c38..dd4bf8c8b82e 100644 --- a/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) - $(BenchmarksTargetFramework) + $(DefaultNetCoreTargetFramework) + $(BenchmarksTargetFramework) $(DefineConstants);GENERATE_SQL_SCRIPTS $(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS diff --git a/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj index b7d9ae3d2bfa..7c28cb27da1f 100644 --- a/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj @@ -1,7 +1,7 @@  - $(DefaultNetCoreTargetFramework) - $(BenchmarksTargetFramework) + $(DefaultNetCoreTargetFramework) + $(BenchmarksTargetFramework) $(DefineConstants);GENERATE_SQL_SCRIPTS $(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS diff --git a/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj index 7382f24fbe16..f45c3489e3ce 100644 --- a/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj +++ b/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj @@ -1,7 +1,7 @@  - $(DefaultNetCoreTargetFramework) - $(BenchmarksTargetFramework) + $(DefaultNetCoreTargetFramework) + $(BenchmarksTargetFramework) true diff --git a/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj b/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj index c5785368ee63..2e296ed96afb 100644 --- a/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj +++ b/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(DefaultItemExcludes);TestFiles\**\* diff --git a/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj b/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj index fa16707e2ee5..af803f1ef07b 100644 --- a/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj +++ b/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) $(DefaultItemExcludes);TestFiles\**\* diff --git a/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj b/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj index 575f1d843953..412e23ab7103 100644 --- a/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj +++ b/src/Security/Authentication/Cookies/samples/CookieSample/CookieSample.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) OutOfProcess diff --git a/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj b/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj index 4a0030683844..518454d9a1d1 100644 --- a/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj +++ b/src/Security/Authentication/Cookies/samples/CookieSessionSample/CookieSessionSample.csproj @@ -1,7 +1,7 @@  - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) OutOfProcess diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj b/src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj index b14d633eabbf..7a9830171c58 100644 --- a/src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj +++ b/src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj b/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj index ec061d36935e..da15b377db33 100644 --- a/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj +++ b/src/Security/Authentication/WsFederation/samples/WsFedSample/WsFedSample.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) OutOfProcess diff --git a/src/Security/Authentication/samples/SocialSample/SocialSample.csproj b/src/Security/Authentication/samples/SocialSample/SocialSample.csproj index 21f6f1b17f3a..4027f168ad95 100644 --- a/src/Security/Authentication/samples/SocialSample/SocialSample.csproj +++ b/src/Security/Authentication/samples/SocialSample/SocialSample.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) aspnet5-SocialSample-20151210111056 OutOfProcess diff --git a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj index 738515b336a0..bd8e2eaa3b03 100644 --- a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj +++ b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj index c0f0e508b6d4..c89f347b2ab6 100644 --- a/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj +++ b/src/Security/Authorization/test/Microsoft.AspNetCore.Authorization.Test.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj b/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj index 9afabc0b4a27..836518fbbd32 100644 --- a/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj +++ b/src/Security/CookiePolicy/samples/CookiePolicySample/CookiePolicySample.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj b/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj index 7f09e2758dcd..4bdc80afa01a 100644 --- a/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj +++ b/src/Security/CookiePolicy/test/Microsoft.AspNetCore.CookiePolicy.Test.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) diff --git a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj index 22affe2f74e3..a5a54f6c9d80 100644 --- a/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj +++ b/src/Servers/testassets/ServerComparison.TestSites/ServerComparison.TestSites.csproj @@ -3,7 +3,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) win-x86;win-x64;linux-x64;osx-x64 true diff --git a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj index 92179c81c6b9..dbe67cee8b77 100644 --- a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj +++ b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) portable true $(NoWarn);CS0649;CS0436 diff --git a/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj b/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj index 916907b46c48..3a0601ee63e2 100644 --- a/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj +++ b/src/SignalR/samples/JwtClientSample/JwtClientSample.csproj @@ -1,7 +1,7 @@ - $(DefaultNetCoreTargetFramework) + $(DefaultNetCoreTargetFramework) Exe diff --git a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj index 5e8a85b1a528..87d483f9254d 100644 --- a/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj +++ b/src/Tools/Extensions.ApiDescription.Client/src/Microsoft.Extensions.ApiDescription.Client.csproj @@ -8,7 +8,7 @@ $(MSBuildProjectName).nuspec $(MSBuildProjectName) Build Tasks;MSBuild;Swagger;OpenAPI;code generation;Web API client;service reference - netstandard2.0 + netstandard2.0 true diff --git a/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs b/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs index 7259c47a5e54..84327dac091d 100644 --- a/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs +++ b/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs @@ -36,7 +36,7 @@ public string GetTempSecretProject() private const string ProjectTemplate = @" Exe - net6.0 + net6.0 {0} false From db84a6129e9243574315f7896ca720c78501eb6c Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sun, 19 Sep 2021 12:22:14 -0700 Subject: [PATCH 2/6] Remove unnecessary `Condition` - project builds only w/ `$(DefaultNetCoreTargetFramework)` --- .../test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj index ce2dd9d90cff..4422ca990946 100644 --- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj +++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj @@ -18,13 +18,8 @@ - - - - - From 81c5c1fc1e728561bc342f6f942d8231f2f460bf Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 20 Sep 2021 13:13:35 -0700 Subject: [PATCH 3/6] Remove most `$(BenchmarksTargetFramework)` use --- .../BlazingPizza.Server/BlazingPizza.Server.csproj | 10 ---------- .../test/testassets/Benchmarks/Benchmarks.csproj | 12 ------------ .../perf/benchmarkapps/BasicApi/BasicApi.csproj | 14 +------------- .../benchmarkapps/BasicViews/BasicViews.csproj | 11 +---------- .../RazorRendering/RazorRendering.csproj | 11 +---------- 5 files changed, 3 insertions(+), 55 deletions(-) diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj b/src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj index 5446337063ef..08d32e924989 100644 --- a/src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj +++ b/src/Components/benchmarkapps/BlazingPizza.Server/BlazingPizza.Server.csproj @@ -1,16 +1,6 @@  - $(DefaultNetCoreTargetFramework) - $(BenchmarksTargetFramework) true - - - - - - - - diff --git a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj index d387bdc912aa..b9de65bc9930 100644 --- a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj +++ b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj @@ -1,8 +1,6 @@  - $(DefaultNetCoreTargetFramework) - $(BenchmarksTargetFramework) true @@ -14,14 +12,4 @@ - - - - - - diff --git a/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj index dd4bf8c8b82e..24e1ac70bb6d 100644 --- a/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj @@ -1,7 +1,6 @@ $(DefaultNetCoreTargetFramework) - $(BenchmarksTargetFramework) $(DefineConstants);GENERATE_SQL_SCRIPTS $(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS @@ -23,7 +22,7 @@ - + @@ -31,15 +30,4 @@ - - - - - - - - - - - diff --git a/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj index 7c28cb27da1f..a2986bc8d04d 100644 --- a/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj @@ -1,7 +1,6 @@  $(DefaultNetCoreTargetFramework) - $(BenchmarksTargetFramework) $(DefineConstants);GENERATE_SQL_SCRIPTS $(DefineConstants);__RemoveThisBitTo__GENERATE_SQL_SCRIPTS @@ -23,7 +22,7 @@ - + @@ -31,12 +30,4 @@ - - - - - - diff --git a/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj index f45c3489e3ce..065a3087469a 100644 --- a/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj +++ b/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj @@ -1,25 +1,16 @@  $(DefaultNetCoreTargetFramework) - $(BenchmarksTargetFramework) true - + - - - - - - From c96125cd900794238417ddd7251cb1e40b34c708 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 20 Sep 2021 13:32:24 -0700 Subject: [PATCH 4/6] !fixup! Restore some `$(BenchmarksTargetFramework)` use - but remove one more line --- .../Routing/test/testassets/Benchmarks/Benchmarks.csproj | 1 - .../sample/ConcurrencyLimiterSample.csproj | 7 ++++++- src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj | 9 ++++++++- src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj | 3 +-- .../benchmarkapps/RazorRendering/RazorRendering.csproj | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj index b9de65bc9930..7a999b2b29a1 100644 --- a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj +++ b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj @@ -1,7 +1,6 @@  $(DefaultNetCoreTargetFramework) - true diff --git a/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj b/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj index 62d0f0485342..94dfd9b47f31 100644 --- a/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj +++ b/src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj @@ -3,10 +3,15 @@ $(DefaultNetCoreTargetFramework) - + + + + + + diff --git a/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj index 24e1ac70bb6d..b61abeb404b4 100644 --- a/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj @@ -22,7 +22,7 @@ - + @@ -30,4 +30,11 @@ + + + + + + + diff --git a/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj index a2986bc8d04d..c9b383962212 100644 --- a/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj @@ -22,12 +22,11 @@ - + - diff --git a/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj index 065a3087469a..2a406ff38e2b 100644 --- a/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj +++ b/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj @@ -5,7 +5,7 @@ - + From 3303b90b3d9f161d781067c868a1c5616ab6895b Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 20 Sep 2021 14:42:14 -0700 Subject: [PATCH 5/6] Update src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj - take alternate fix --- src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj index 7a999b2b29a1..25112ae3b666 100644 --- a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj +++ b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj @@ -1,6 +1,7 @@  $(DefaultNetCoreTargetFramework) + true From 2c5926b3e0054ed3d1da74a60dcd88adab45e4a8 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Mon, 20 Sep 2021 16:44:30 -0700 Subject: [PATCH 6/6] Update src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - thanx Co-authored-by: Sébastien Ros --- src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj index 25112ae3b666..b9de65bc9930 100644 --- a/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj +++ b/src/Http/Routing/test/testassets/Benchmarks/Benchmarks.csproj @@ -1,7 +1,7 @@  $(DefaultNetCoreTargetFramework) - true + true