diff --git a/AspNetCore.sln b/AspNetCore.sln index cd7270b1eb14..e8dc0637471f 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -619,9 +619,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpAbstractions.SampleApp" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities.Tests", "src\Http\WebUtilities\test\Microsoft.AspNetCore.WebUtilities.Tests.csproj", "{F6BE35A7-1D5C-416B-8B32-61CAA2A95FF0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Performance", "src\Http\Http\perf\Microsoft.AspNetCore.Http.Performance.csproj", "{C713DCA1-B36D-44BD-ACFA-F562782AD40E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Microbenchmarks", "src\Http\Http\perf\Microbenchmarks\Microsoft.AspNetCore.Http.Microbenchmarks.csproj", "{C713DCA1-B36D-44BD-ACFA-F562782AD40E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Performance", "src\Http\Routing\perf\Microsoft.AspNetCore.Routing.Performance.csproj", "{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Microbenchmarks", "src\Http\Routing\perf\Microbenchmarks\Microsoft.AspNetCore.Routing.Microbenchmarks.csproj", "{A2701184-BD48-4B72-AA6E-8DD1DE2F217F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{17DD5861-0635-46D0-84BA-6B163150AA4F}" EndProject @@ -633,7 +633,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Ro EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{E7CADFE4-CDD0-4DE3-90ED-7184A969F47B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities.Performance", "src\Http\WebUtilities\perf\Microsoft.AspNetCore.WebUtilities.Performance\Microsoft.AspNetCore.WebUtilities.Performance.csproj", "{822FF16C-A4E0-40A0-AE65-530752575261}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities.Microbenchmarks", "src\Http\WebUtilities\perf\Microbenchmarks\Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj", "{822FF16C-A4E0-40A0-AE65-530752575261}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Metadata", "Metadata", "{71DE18B5-87F9-4D03-89BB-C3E243576F92}" EndProject @@ -801,7 +801,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Locali EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Routing.Tests", "src\Middleware\Localization.Routing\test\Microsoft.AspNetCore.Localization.Routing.Tests.csproj", "{99CB7560-3B6F-447B-880A-C5A53F1E56F9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression.Performance", "src\Middleware\ResponseCompression\perf\Microsoft.AspNetCore.ResponseCompression.Performance.csproj", "{605D0C19-6E99-4A73-B336-1AD700AE93C0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCompression.Microbenchmarks", "src\Middleware\ResponseCompression\perf\Microbenchmarks\Microsoft.AspNetCore.ResponseCompression.Microbenchmarks.csproj", "{605D0C19-6E99-4A73-B336-1AD700AE93C0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConformanceTests", "ConformanceTests", "{73BC406B-4D98-4BE0-A756-19F0F3D2B587}" EndProject @@ -934,7 +934,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesWebSite", "src\Mv EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{CA6DD42B-2DBC-4061-91E8-C91FA8F4C410}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "src\Mvc\benchmarks\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{199639E9-0FAA-49C4-A75F-95EE71F32CC0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Microbenchmarks", "src\Mvc\perf\Microbenchmarks\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.Microbenchmarks.csproj", "{199639E9-0FAA-49C4-A75F-95EE71F32CC0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorBuildWebSite", "src\Mvc\test\WebSites\RazorBuildWebSite\RazorBuildWebSite.csproj", "{F634FAC8-1CE5-4AD2-8A8B-92CFBB127D3A}" EndProject @@ -954,7 +954,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.Api.Analyzers.Test", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Api.Analyzers", "src\Mvc\Mvc.Api.Analyzers\src\Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj", "{72879779-4CAC-4CB0-A052-FF60EB386B7A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance.Views", "src\Mvc\benchmarks\Microsoft.AspNetCore.Mvc.Performance.Views\Microsoft.AspNetCore.Mvc.Performance.Views.csproj", "{5BD69C96-623F-427B-9AAF-67C0817A9A9A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Views.Microbenchmarks", "src\Mvc\perf\Microbenchmarks\Microsoft.AspNetCore.Mvc.Views\Microsoft.AspNetCore.Mvc.Views.Microbenchmarks.csproj", "{5BD69C96-623F-427B-9AAF-67C0817A9A9A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenericHostWebSite", "src\Mvc\test\WebSites\GenericHostWebSite\GenericHostWebSite.csproj", "{D10BA44E-219B-4528-98F5-0CB0FCF17017}" EndProject @@ -1066,7 +1066,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorSyntaxGenerator", "src EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{D510860C-B2DA-41D3-9137-81B029312E71}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Performance", "src\Razor\perf\Microsoft.AspNetCore.Razor.Performance\Microsoft.AspNetCore.Razor.Performance.csproj", "{8ED505A5-A33A-401E-89BA-3AED7B73DD6A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Microbenchmarks", "src\Razor\perf\Microbenchmarks\Microsoft.AspNetCore.Razor.Microbenchmarks.csproj", "{8ED505A5-A33A-401E-89BA-3AED7B73DD6A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{06C916C7-67BF-45DC-9D0B-CEEF0C731451}" EndProject @@ -1144,7 +1144,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{966E6A8A-4D9C-4B9E-92DB-06F5144F5DC8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Security.Performance", "src\Security\benchmarks\Microsoft.AspNetCore.Security.Performance\Microsoft.AspNetCore.Security.Performance.csproj", "{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Security.Microbenchmarks", "src\Security\perf\Microbenchmarks\Microsoft.AspNetCore.Security.Microbenchmarks.csproj", "{9819CE5A-0E8F-42C4-B628-F6B3A1B2550F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Negotiate", "Negotiate", "{3FE077EF-DD37-4652-B71C-3174D4C485E2}" EndProject @@ -1304,7 +1304,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeIISSample", "src\Serv EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{ABC4EF1D-3525-41A9-929D-0FF7CEED4DDB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "src\Servers\IIS\IIS\benchmarks\IIS.Performance\IIS.Performance.csproj", "{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Microbenchmarks", "src\Servers\IIS\IIS\perf\Microbenchmarks\IIS.Microbenchmarks.csproj", "{65EC29AD-91CA-49BA-B1FC-D3DF127BE887}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.FunctionalTests", "src\Servers\IIS\IIS\test\IIS.FunctionalTests\IIS.FunctionalTests.csproj", "{45A023F9-C7E7-42CA-968B-5FCE9EC626BC}" EndProject @@ -1328,7 +1328,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{C69630AA-7BCC-401E-B0EE-AACFCF55F6A8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Performance", "src\Servers\Kestrel\perf\Kestrel.Performance\Microsoft.AspNetCore.Server.Kestrel.Performance.csproj", "{51A02E3E-6932-479C-A287-CC6C3611B715}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks", "src\Servers\Kestrel\perf\Microbenchmarks\Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj", "{51A02E3E-6932-479C-A287-CC6C3611B715}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7B976D8F-EA31-4C0B-97BD-DFD9B3CC86FB}" EndProject @@ -1616,6 +1616,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWinFormsApp", "src\Components\WebView\Samples\BlazorWinFormsApp\BlazorWinFormsApp.csproj", "{CC740832-D268-47A3-9058-B9054F8397E2}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks", "src\Http\Http.Abstractions\perf\Microbenchmarks\Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks.csproj", "{3F752B48-2936-4FCA-B0DC-4AB0F788F897}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -7639,6 +7641,18 @@ Global {CC740832-D268-47A3-9058-B9054F8397E2}.Release|x64.Build.0 = Release|Any CPU {CC740832-D268-47A3-9058-B9054F8397E2}.Release|x86.ActiveCfg = Release|Any CPU {CC740832-D268-47A3-9058-B9054F8397E2}.Release|x86.Build.0 = Release|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|x64.ActiveCfg = Debug|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|x64.Build.0 = Debug|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Debug|x86.Build.0 = Debug|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|Any CPU.Build.0 = Release|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|x64.ActiveCfg = Release|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|x64.Build.0 = Release|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|x86.ActiveCfg = Release|Any CPU + {3F752B48-2936-4FCA-B0DC-4AB0F788F897}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -8437,6 +8451,7 @@ Global {D4E9A2C5-0838-42DF-BC80-C829C4C9137E} = {8B196DE0-F585-43D6-BE72-6F15BB4EB5E5} {3BA297F8-1CA1-492D-AE64-A60B825D8501} = {D4E9A2C5-0838-42DF-BC80-C829C4C9137E} {CC740832-D268-47A3-9058-B9054F8397E2} = {D3B76F4E-A980-45BF-AEA1-EA3175B0B5A1} + {3F752B48-2936-4FCA-B0DC-4AB0F788F897} = {DCBBDB52-4A49-4141-8F4D-81C0FFFB7BD5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F} diff --git a/Directory.Build.props b/Directory.Build.props index f2f54bab5de7..c837ed4c35d9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -20,6 +20,7 @@ true + true true false true + '$(IsSpecificationTestProject)' == 'true' or + '$(IsMicrobenchmarksProject)' == 'true')">true - $(NoWarn);CS1591 + $(NoWarn);CS1591 @@ -60,7 +62,8 @@ $(AssemblyName) false + Condition="'$(IsPackable)' == '' AND ( '$(IsTestProject)' == 'true' OR '$(IsTestAssetProject)' == 'true' OR + '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' OR '$(IsMicrobenchmarksProject)' == 'true') ">false @@ -109,7 +112,8 @@ '$(IsSampleProject)' != 'true' AND '$(IsSpecificationTestProject)' != 'true' AND '$(IsTestAssetProject)' != 'true' AND - '$(IsTestProject)' != 'true' ">true + '$(IsTestProject)' != 'true' AND + '$(IsMicrobenchmarksProject)' != 'true' ">true + + diff --git a/eng/Build.props b/eng/Build.props index 3baf566be996..b7b2d23bd6c5 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -38,7 +38,7 @@ diff --git a/eng/Versions.props b/eng/Versions.props index 22c7e8488d6e..e1e7aa88c309 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ $(MicrosoftAspNetCoreAzureAppServicesSiteExtension50Version) 0.9.9 - 0.12.1 + 0.12.1.1466 4.2.1 2.3.0 4.2.1 diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets index 4692b51b11ee..0f31e10572d1 100644 --- a/eng/targets/CSharp.Common.targets +++ b/eng/targets/CSharp.Common.targets @@ -20,7 +20,8 @@ $(NoWarn);CA1416 + '$(IsSampleProject)' == 'true' OR + '$(IsMicrobenchmarksProject)' == 'true'">$(NoWarn);CA1416 @@ -97,6 +98,17 @@ + + + + + + + + + + diff --git a/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/AssemblyInfo.cs b/src/Http/Http.Abstractions/perf/Microbenchmarks/AssemblyInfo.cs similarity index 100% rename from src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/AssemblyInfo.cs rename to src/Http/Http.Abstractions/perf/Microbenchmarks/AssemblyInfo.cs diff --git a/src/Http/perf/Microbenchmarks/GetHeaderSplitBenchmark.cs b/src/Http/Http.Abstractions/perf/Microbenchmarks/GetHeaderSplitBenchmark.cs similarity index 100% rename from src/Http/perf/Microbenchmarks/GetHeaderSplitBenchmark.cs rename to src/Http/Http.Abstractions/perf/Microbenchmarks/GetHeaderSplitBenchmark.cs diff --git a/src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj b/src/Http/Http.Abstractions/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks.csproj similarity index 100% rename from src/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj rename to src/Http/Http.Abstractions/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks.csproj diff --git a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj index 97b9d0dd6479..9babc9ec30e6 100644 --- a/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj +++ b/src/Http/Http.Abstractions/src/Microsoft.AspNetCore.Http.Abstractions.csproj @@ -26,7 +26,7 @@ Microsoft.AspNetCore.Http.HttpResponse - + diff --git a/src/Http/Http/perf/HeaderUtilitiesBenchmark.cs b/src/Http/Http/perf/Microbenchmarks/HeaderUtilitiesBenchmark.cs similarity index 100% rename from src/Http/Http/perf/HeaderUtilitiesBenchmark.cs rename to src/Http/Http/perf/Microbenchmarks/HeaderUtilitiesBenchmark.cs diff --git a/src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj b/src/Http/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj similarity index 100% rename from src/Http/Http/perf/Microsoft.AspNetCore.Http.Performance.csproj rename to src/Http/Http/perf/Microbenchmarks/Microsoft.AspNetCore.Http.Microbenchmarks.csproj diff --git a/src/Http/Http/perf/Properties/AssemblyInfo.cs b/src/Http/Http/perf/Microbenchmarks/Properties/AssemblyInfo.cs similarity index 100% rename from src/Http/Http/perf/Properties/AssemblyInfo.cs rename to src/Http/Http/perf/Microbenchmarks/Properties/AssemblyInfo.cs diff --git a/src/Http/Http/perf/RouteValueDictionaryBenchmark.cs b/src/Http/Http/perf/Microbenchmarks/RouteValueDictionaryBenchmark.cs similarity index 100% rename from src/Http/Http/perf/RouteValueDictionaryBenchmark.cs rename to src/Http/Http/perf/Microbenchmarks/RouteValueDictionaryBenchmark.cs diff --git a/src/Http/HttpAbstractions.slnf b/src/Http/HttpAbstractions.slnf index 61dd3673f847..58b8f6f80b9d 100644 --- a/src/Http/HttpAbstractions.slnf +++ b/src/Http/HttpAbstractions.slnf @@ -1,4 +1,4 @@ -{ +{ "solution": { "path": "..\\..\\AspNetCore.sln", "projects": [ @@ -25,7 +25,9 @@ "src\\Http\\Owin\\test\\Microsoft.AspNetCore.Owin.Tests.csproj", "src\\Http\\Routing.Abstractions\\src\\Microsoft.AspNetCore.Routing.Abstractions.csproj", "src\\Http\\Routing.Abstractions\\test\\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj", - "src\\Http\\Routing\\perf\\Microsoft.AspNetCore.Routing.Performance.csproj", + "src\\Http\\Http\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Http.Microbenchmarks.csproj", + "src\\Http\\Http.Abstractions\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Http.Abstractions.Microbenchmarks.csproj", + "src\\Http\\Routing\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Routing.Microbenchmarks.csproj", "src\\Http\\Routing\\samples\\MapActionSample\\MapActionSample.csproj", "src\\Http\\Routing\\src\\Microsoft.AspNetCore.Routing.csproj", "src\\Http\\Routing\\test\\FunctionalTests\\Microsoft.AspNetCore.Routing.FunctionalTests.csproj", @@ -33,7 +35,7 @@ "src\\Http\\Routing\\test\\testassets\\Benchmarks\\Benchmarks.csproj", "src\\Http\\Routing\\test\\testassets\\RoutingSandbox\\RoutingSandbox.csproj", "src\\Http\\Routing\\test\\testassets\\RoutingWebSite\\RoutingWebSite.csproj", - "src\\Http\\WebUtilities\\perf\\Microsoft.AspNetCore.WebUtilities.Performance\\Microsoft.AspNetCore.WebUtilities.Performance.csproj", + "src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj", "src\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj", "src\\Http\\WebUtilities\\test\\Microsoft.AspNetCore.WebUtilities.Tests.csproj", "src\\Http\\samples\\SampleApp\\HttpAbstractions.SampleApp.csproj", @@ -48,7 +50,8 @@ "src\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj", "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj", - "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj" + "src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj", + "src\\Http\\WebUtilities\\perf\\Microbenchmarks\\Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj" ] } } \ No newline at end of file diff --git a/src/Http/Routing/perf/EndpointMetadataCollectionBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/EndpointMetadataCollectionBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/EndpointMetadataCollectionBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/EndpointMetadataCollectionBenchmark.cs diff --git a/src/Http/Routing/perf/EndpointRoutingBenchmarkBase.cs b/src/Http/Routing/perf/Microbenchmarks/EndpointRoutingBenchmarkBase.cs similarity index 100% rename from src/Http/Routing/perf/EndpointRoutingBenchmarkBase.cs rename to src/Http/Routing/perf/Microbenchmarks/EndpointRoutingBenchmarkBase.cs diff --git a/src/Http/Routing/perf/LinkGeneration/LinkGenerationGithubBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/LinkGeneration/LinkGenerationGithubBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/LinkGeneration/LinkGenerationGithubBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/LinkGeneration/LinkGenerationGithubBenchmark.cs diff --git a/src/Http/Routing/perf/LinkGeneration/LinkGenerationGithubBenchmark.generated.cs b/src/Http/Routing/perf/Microbenchmarks/LinkGeneration/LinkGenerationGithubBenchmark.generated.cs similarity index 100% rename from src/Http/Routing/perf/LinkGeneration/LinkGenerationGithubBenchmark.generated.cs rename to src/Http/Routing/perf/Microbenchmarks/LinkGeneration/LinkGenerationGithubBenchmark.generated.cs diff --git a/src/Http/Routing/perf/LinkGeneration/SingleRouteRouteValuesAddressSchemeBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/LinkGeneration/SingleRouteRouteValuesAddressSchemeBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/LinkGeneration/SingleRouteRouteValuesAddressSchemeBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/LinkGeneration/SingleRouteRouteValuesAddressSchemeBenchmark.cs diff --git a/src/Http/Routing/perf/LinkGeneration/SingleRouteWithConstraintsBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/LinkGeneration/SingleRouteWithConstraintsBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/LinkGeneration/SingleRouteWithConstraintsBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/LinkGeneration/SingleRouteWithConstraintsBenchmark.cs diff --git a/src/Http/Routing/perf/LinkGeneration/SingleRouteWithNoParametersBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/LinkGeneration/SingleRouteWithNoParametersBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/LinkGeneration/SingleRouteWithNoParametersBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/LinkGeneration/SingleRouteWithNoParametersBenchmark.cs diff --git a/src/Http/Routing/perf/LinkGeneration/SingleRouteWithParametersBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/LinkGeneration/SingleRouteWithParametersBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/LinkGeneration/SingleRouteWithParametersBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/LinkGeneration/SingleRouteWithParametersBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/FastPathTokenizerBenchmarkBase.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerBenchmarkBase.cs similarity index 100% rename from src/Http/Routing/perf/Matching/FastPathTokenizerBenchmarkBase.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerBenchmarkBase.cs diff --git a/src/Http/Routing/perf/Matching/FastPathTokenizerEmptyBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerEmptyBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/FastPathTokenizerEmptyBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerEmptyBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/FastPathTokenizerLargeBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerLargeBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/FastPathTokenizerLargeBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerLargeBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/FastPathTokenizerPlaintextBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerPlaintextBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/FastPathTokenizerPlaintextBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerPlaintextBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/FastPathTokenizerSmallBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerSmallBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/FastPathTokenizerSmallBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/FastPathTokenizerSmallBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/HttpMethodPolicyJumpTableBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/HttpMethodPolicyJumpTableBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/HttpMethodPolicyJumpTableBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/HttpMethodPolicyJumpTableBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/JumpTableMultipleEntryBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableMultipleEntryBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/JumpTableMultipleEntryBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableMultipleEntryBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/JumpTableSingleEntryBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableSingleEntryBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/JumpTableSingleEntryBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableSingleEntryBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/JumpTableZeroEntryBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableZeroEntryBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/JumpTableZeroEntryBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/JumpTableZeroEntryBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/MatcherAzureBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/MatcherAzureBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/MatcherAzureBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/MatcherAzureBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/MatcherAzureBenchmarkBase.generated.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/MatcherAzureBenchmarkBase.generated.cs similarity index 100% rename from src/Http/Routing/perf/Matching/MatcherAzureBenchmarkBase.generated.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/MatcherAzureBenchmarkBase.generated.cs diff --git a/src/Http/Routing/perf/Matching/MatcherBuilderAzureBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/MatcherBuilderAzureBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/MatcherBuilderAzureBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/MatcherBuilderAzureBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/MatcherBuilderGithubBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/MatcherBuilderGithubBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/MatcherBuilderGithubBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/MatcherBuilderGithubBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/MatcherBuilderMultipleEntryBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/MatcherBuilderMultipleEntryBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/MatcherBuilderMultipleEntryBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/MatcherBuilderMultipleEntryBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/MatcherGithubBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/MatcherGithubBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/MatcherGithubBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/MatcherGithubBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/MatcherGithubBenchmarkBase.generated.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/MatcherGithubBenchmarkBase.generated.cs similarity index 100% rename from src/Http/Routing/perf/Matching/MatcherGithubBenchmarkBase.generated.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/MatcherGithubBenchmarkBase.generated.cs diff --git a/src/Http/Routing/perf/Matching/MatcherSingleEntryBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/MatcherSingleEntryBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/MatcherSingleEntryBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/MatcherSingleEntryBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/RouteEndpointAzureBenchmark.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/RouteEndpointAzureBenchmark.cs similarity index 100% rename from src/Http/Routing/perf/Matching/RouteEndpointAzureBenchmark.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/RouteEndpointAzureBenchmark.cs diff --git a/src/Http/Routing/perf/Matching/TrivialMatcher.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/TrivialMatcher.cs similarity index 100% rename from src/Http/Routing/perf/Matching/TrivialMatcher.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/TrivialMatcher.cs diff --git a/src/Http/Routing/perf/Matching/TrivialMatcherBuilder.cs b/src/Http/Routing/perf/Microbenchmarks/Matching/TrivialMatcherBuilder.cs similarity index 100% rename from src/Http/Routing/perf/Matching/TrivialMatcherBuilder.cs rename to src/Http/Routing/perf/Microbenchmarks/Matching/TrivialMatcherBuilder.cs diff --git a/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj b/src/Http/Routing/perf/Microbenchmarks/Microsoft.AspNetCore.Routing.Microbenchmarks.csproj similarity index 69% rename from src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj rename to src/Http/Routing/perf/Microbenchmarks/Microsoft.AspNetCore.Routing.Microbenchmarks.csproj index 4c273bafe4a3..7ad295bd85c0 100644 --- a/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj +++ b/src/Http/Routing/perf/Microbenchmarks/Microsoft.AspNetCore.Routing.Microbenchmarks.csproj @@ -13,25 +13,25 @@ for perf comparisons. --> - + Matching\BarebonesMatcher.cs - + Matching\BarebonesMatcherBuilder.cs - + Matching\RouteMatcher.cs - + Matching\RouteMatcherBuilder.cs - + Matching\TreeRouterMatcher.cs - + Matching\TreeRouterMatcherBuilder.cs - + diff --git a/src/Http/Routing/perf/Properties/AssemblyInfo.cs b/src/Http/Routing/perf/Microbenchmarks/Properties/AssemblyInfo.cs similarity index 100% rename from src/Http/Routing/perf/Properties/AssemblyInfo.cs rename to src/Http/Routing/perf/Microbenchmarks/Properties/AssemblyInfo.cs diff --git a/src/Http/Routing/perf/readme.md b/src/Http/Routing/perf/Microbenchmarks/readme.md similarity index 100% rename from src/Http/Routing/perf/readme.md rename to src/Http/Routing/perf/Microbenchmarks/readme.md diff --git a/src/Http/Routing/src/Properties/AssemblyInfo.cs b/src/Http/Routing/src/Properties/AssemblyInfo.cs index 1da3395469c8..b75cb41eb44c 100644 --- a/src/Http/Routing/src/Properties/AssemblyInfo.cs +++ b/src/Http/Routing/src/Properties/AssemblyInfo.cs @@ -3,6 +3,6 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Routing.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Routing.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Routing.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] diff --git a/src/Http/perf/Microbenchmarks/AssemblyInfo.cs b/src/Http/WebUtilities/perf/Microbenchmarks/AssemblyInfo.cs similarity index 100% rename from src/Http/perf/Microbenchmarks/AssemblyInfo.cs rename to src/Http/WebUtilities/perf/Microbenchmarks/AssemblyInfo.cs diff --git a/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/FormPipeReaderInternalsBenchmark.cs b/src/Http/WebUtilities/perf/Microbenchmarks/FormPipeReaderInternalsBenchmark.cs similarity index 96% rename from src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/FormPipeReaderInternalsBenchmark.cs rename to src/Http/WebUtilities/perf/Microbenchmarks/FormPipeReaderInternalsBenchmark.cs index 02691d1dff14..e82e96da1438 100644 --- a/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/FormPipeReaderInternalsBenchmark.cs +++ b/src/Http/WebUtilities/perf/Microbenchmarks/FormPipeReaderInternalsBenchmark.cs @@ -5,7 +5,7 @@ using System.Text; using BenchmarkDotNet.Attributes; -namespace Microsoft.AspNetCore.WebUtilities.Performance +namespace Microsoft.AspNetCore.WebUtilities.Microbenchmarks { /// /// Test internal parsing speed of FormPipeReader without pipe diff --git a/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/FormReaderBenchmark.cs b/src/Http/WebUtilities/perf/Microbenchmarks/FormReaderBenchmark.cs similarity index 100% rename from src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/FormReaderBenchmark.cs rename to src/Http/WebUtilities/perf/Microbenchmarks/FormReaderBenchmark.cs diff --git a/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/HttpRequestStreamReaderReadLineBenchmark.cs b/src/Http/WebUtilities/perf/Microbenchmarks/HttpRequestStreamReaderReadLineBenchmark.cs similarity index 100% rename from src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/HttpRequestStreamReaderReadLineBenchmark.cs rename to src/Http/WebUtilities/perf/Microbenchmarks/HttpRequestStreamReaderReadLineBenchmark.cs diff --git a/src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/Microsoft.AspNetCore.WebUtilities.Performance.csproj b/src/Http/WebUtilities/perf/Microbenchmarks/Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj similarity index 100% rename from src/Http/WebUtilities/perf/Microsoft.AspNetCore.WebUtilities.Performance/Microsoft.AspNetCore.WebUtilities.Performance.csproj rename to src/Http/WebUtilities/perf/Microbenchmarks/Microsoft.AspNetCore.WebUtilities.Microbenchmarks.csproj diff --git a/src/Http/WebUtilities/src/Properties/AssemblyInfo.cs b/src/Http/WebUtilities/src/Properties/AssemblyInfo.cs index 6888ff886d23..d3d16acba171 100644 --- a/src/Http/WebUtilities/src/Properties/AssemblyInfo.cs +++ b/src/Http/WebUtilities/src/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.AspNetCore.WebUtilities.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.WebUtilities.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.WebUtilities.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Middleware/Middleware.slnf b/src/Middleware/Middleware.slnf index b2feb33f9548..1f00c3f04d74 100644 --- a/src/Middleware/Middleware.slnf +++ b/src/Middleware/Middleware.slnf @@ -52,7 +52,7 @@ "src\\Middleware\\Localization\\testassets\\ResourcesClassLibraryWithAttribute\\ResourcesClassLibraryWithAttribute.csproj", "src\\Middleware\\Localization.Routing\\src\\Microsoft.AspNetCore.Localization.Routing.csproj", "src\\Middleware\\Localization.Routing\\test\\Microsoft.AspNetCore.Localization.Routing.Tests.csproj", - "src\\Middleware\\ResponseCompression\\perf\\Microsoft.AspNetCore.ResponseCompression.Performance.csproj", + "src\\Middleware\\ResponseCompression\\perf\\Microbenchmarks\\Microsoft.AspNetCore.ResponseCompression.Microbenchmarks.csproj", "src\\Middleware\\WebSockets\\test\\ConformanceTests\\AutobahnTestApp\\AutobahnTestApp.csproj", "src\\Middleware\\CORS\\src\\Microsoft.AspNetCore.Cors.csproj", "src\\Middleware\\CORS\\test\\UnitTests\\Microsoft.AspNetCore.Cors.Test.csproj", diff --git a/src/Middleware/ResponseCompression/perf/AssemblyInfo.cs b/src/Middleware/ResponseCompression/perf/Microbenchmarks/AssemblyInfo.cs similarity index 100% rename from src/Middleware/ResponseCompression/perf/AssemblyInfo.cs rename to src/Middleware/ResponseCompression/perf/Microbenchmarks/AssemblyInfo.cs diff --git a/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj b/src/Middleware/ResponseCompression/perf/Microbenchmarks/Microsoft.AspNetCore.ResponseCompression.Microbenchmarks.csproj similarity index 90% rename from src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj rename to src/Middleware/ResponseCompression/perf/Microbenchmarks/Microsoft.AspNetCore.ResponseCompression.Microbenchmarks.csproj index 5b01d1103395..fc3755689b03 100644 --- a/src/Middleware/ResponseCompression/perf/Microsoft.AspNetCore.ResponseCompression.Performance.csproj +++ b/src/Middleware/ResponseCompression/perf/Microbenchmarks/Microsoft.AspNetCore.ResponseCompression.Microbenchmarks.csproj @@ -8,6 +8,7 @@ + diff --git a/src/Middleware/ResponseCompression/perf/ResponseCompressionProviderBenchmark.cs b/src/Middleware/ResponseCompression/perf/Microbenchmarks/ResponseCompressionProviderBenchmark.cs similarity index 98% rename from src/Middleware/ResponseCompression/perf/ResponseCompressionProviderBenchmark.cs rename to src/Middleware/ResponseCompression/perf/Microbenchmarks/ResponseCompressionProviderBenchmark.cs index 4e4b78fcb74d..2b1273fabe9e 100644 --- a/src/Middleware/ResponseCompression/perf/ResponseCompressionProviderBenchmark.cs +++ b/src/Middleware/ResponseCompression/perf/Microbenchmarks/ResponseCompressionProviderBenchmark.cs @@ -19,6 +19,7 @@ public void GlobalSetup() var services = new ServiceCollection() .AddOptions() .AddResponseCompression() + .AddLogging() .BuildServiceProvider(); var options = new ResponseCompressionOptions(); diff --git a/src/Mvc/Mvc.Core/src/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.Core/src/Properties/AssemblyInfo.cs index c217d6411aad..9aa488d48d43 100644 --- a/src/Mvc/Mvc.Core/src/Properties/AssemblyInfo.cs +++ b/src/Mvc/Mvc.Core/src/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Views.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] diff --git a/src/Mvc/Mvc.DataAnnotations/src/Properties/AssemblyInfo.cs b/src/Mvc/Mvc.DataAnnotations/src/Properties/AssemblyInfo.cs index 06956dcef011..b1079a1e57b3 100644 --- a/src/Mvc/Mvc.DataAnnotations/src/Properties/AssemblyInfo.cs +++ b/src/Mvc/Mvc.DataAnnotations/src/Properties/AssemblyInfo.cs @@ -12,4 +12,4 @@ [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] \ No newline at end of file diff --git a/src/Mvc/Mvc.slnf b/src/Mvc/Mvc.slnf index 26363dc5d1db..a534f7236189 100644 --- a/src/Mvc/Mvc.slnf +++ b/src/Mvc/Mvc.slnf @@ -81,8 +81,8 @@ "src\\Mvc\\Mvc.ViewFeatures\\test\\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", "src\\Mvc\\Mvc\\src\\Microsoft.AspNetCore.Mvc.csproj", "src\\Mvc\\Mvc\\test\\Microsoft.AspNetCore.Mvc.Test.csproj", - "src\\Mvc\\benchmarks\\Microsoft.AspNetCore.Mvc.Performance.Views\\Microsoft.AspNetCore.Mvc.Performance.Views.csproj", - "src\\Mvc\\benchmarks\\Microsoft.AspNetCore.Mvc.Performance\\Microsoft.AspNetCore.Mvc.Performance.csproj", + "src\\Mvc\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Mvc.Views\\Microsoft.AspNetCore.Mvc.Views.Microbenchmarks.csproj", + "src\\Mvc\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Mvc\\Microsoft.AspNetCore.Mvc.Microbenchmarks.csproj", "src\\Mvc\\samples\\MvcSandbox\\MvcSandbox.csproj", "src\\Mvc\\shared\\Mvc.Core.TestCommon\\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj", "src\\Mvc\\shared\\Mvc.TestDiagnosticListener\\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", diff --git a/src/Mvc/MvcNoDeps.slnf b/src/Mvc/MvcNoDeps.slnf index 6160127d9ed6..69cc78d12ad3 100644 --- a/src/Mvc/MvcNoDeps.slnf +++ b/src/Mvc/MvcNoDeps.slnf @@ -37,7 +37,7 @@ "src\\Mvc\\Mvc.ViewFeatures\\test\\Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj", "src\\Mvc\\Mvc\\src\\Microsoft.AspNetCore.Mvc.csproj", "src\\Mvc\\Mvc\\test\\Microsoft.AspNetCore.Mvc.Test.csproj", - "src\\Mvc\\benchmarks\\Microsoft.AspNetCore.Mvc.Performance\\Microsoft.AspNetCore.Mvc.Performance.csproj", + "src\\Mvc\\perf\Microbenchmarks\\Microsoft.AspNetCore.Mvc\\Microsoft.AspNetCore.Mvc.Microbenchmarks.csproj", "src\\Mvc\\samples\\MvcSandbox\\MvcSandbox.csproj", "src\\Mvc\\shared\\Mvc.Core.TestCommon\\Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj", "src\\Mvc\\shared\\Mvc.TestDiagnosticListener\\Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj", diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/HelperExtensions.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/HelperExtensions.cs similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/HelperExtensions.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/HelperExtensions.cs diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Microsoft.AspNetCore.Mvc.Views.Microbenchmarks.csproj similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Microsoft.AspNetCore.Mvc.Views.Microbenchmarks.csproj diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/ViewAssemblyMarker.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/ViewAssemblyMarker.cs similarity index 50% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/ViewAssemblyMarker.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/ViewAssemblyMarker.cs index bf2dfcd02d13..e71b37cb6b02 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/ViewAssemblyMarker.cs +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/ViewAssemblyMarker.cs @@ -1,4 +1,4 @@ -namespace Microsoft.AspNetCore.Mvc.Performance +namespace Microsoft.AspNetCore.Mvc.Microbenchmarks { public class ViewAssemblyMarker { diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelloWorld.cshtml similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelloWorld.cshtml diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperDynamic.cshtml similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperDynamic.cshtml diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperExtensions.cshtml similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperExtensions.cshtml diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperPartialAsync.cshtml similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperPartialAsync.cshtml diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperPartialSync.cshtml similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperPartialSync.cshtml diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperPartialTagHelper.cshtml similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperPartialTagHelper.cshtml diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperPartial_Partial.cshtml similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperPartial_Partial.cshtml diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperTyped.cshtml similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc.Views/Views/HelperTyped.cshtml diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ActionSelectorBenchmark.cs similarity index 99% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ActionSelectorBenchmark.cs index 38d363e9c015..cfa605aaecac 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ActionSelectorBenchmark.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging.Abstractions; -namespace Microsoft.AspNetCore.Mvc.Performance +namespace Microsoft.AspNetCore.Mvc.Microbenchmarks { public class ActionSelectorBenchmark { diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/AssemblyInfo.cs similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/AssemblyInfo.cs diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ControllerActionEndpointDatasourceBenchmark.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ControllerActionEndpointDatasourceBenchmark.cs similarity index 99% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ControllerActionEndpointDatasourceBenchmark.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ControllerActionEndpointDatasourceBenchmark.cs index 0fbceee7fc59..81063bef8edc 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ControllerActionEndpointDatasourceBenchmark.cs +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ControllerActionEndpointDatasourceBenchmark.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing.Patterns; -namespace Microsoft.AspNetCore.Mvc.Performance +namespace Microsoft.AspNetCore.Mvc.Microbenchmarks { public class ControllerActionEndpointDataSourceBenchmark { diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/HelperPerformanceBenchmark.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/HelperPerformanceBenchmark.cs similarity index 97% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/HelperPerformanceBenchmark.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/HelperPerformanceBenchmark.cs index 81763d7549ff..833eeca3cb5b 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/HelperPerformanceBenchmark.cs +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/HelperPerformanceBenchmark.cs @@ -30,7 +30,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.ObjectPool; -namespace Microsoft.AspNetCore.Mvc.Performance +namespace Microsoft.AspNetCore.Mvc.Microbenchmarks { public class HelperPerformanceBenchmark : RuntimePerformanceBenchmarkBase { diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.Microbenchmarks.csproj similarity index 78% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.Microbenchmarks.csproj index 2c40984a452c..385603662e59 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.Microbenchmarks.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/RuntimePerformanceBenchmarkBase.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/RuntimePerformanceBenchmarkBase.cs similarity index 99% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/RuntimePerformanceBenchmarkBase.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/RuntimePerformanceBenchmarkBase.cs index 7d1d2a516986..05288a1a1c2b 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/RuntimePerformanceBenchmarkBase.cs +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/RuntimePerformanceBenchmarkBase.cs @@ -33,7 +33,7 @@ using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Mvc.Performance +namespace Microsoft.AspNetCore.Mvc.Microbenchmarks { public class RuntimePerformanceBenchmarkBase { diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorBenchmarkBase.cs similarity index 98% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorBenchmarkBase.cs index 8d66120fd26f..d722dea68767 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorBenchmarkBase.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Mvc.Performance +namespace Microsoft.AspNetCore.Mvc.Microbenchmarks { public abstract class ValidationVisitorBenchmarkBase { diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorByteArrayBenchmark.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorByteArrayBenchmark.cs similarity index 97% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorByteArrayBenchmark.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorByteArrayBenchmark.cs index 8880aa5a0566..b392fcc48242 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorByteArrayBenchmark.cs +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorByteArrayBenchmark.cs @@ -4,7 +4,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; -namespace Microsoft.AspNetCore.Mvc.Performance +namespace Microsoft.AspNetCore.Mvc.Microbenchmarks { public class ValidationVisitorByteArrayBenchmark : ValidationVisitorBenchmarkBase { diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorModelWithValidatedProperties.cs b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorModelWithValidatedProperties.cs similarity index 98% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorModelWithValidatedProperties.cs rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorModelWithValidatedProperties.cs index 58c412723257..4a06bd80766f 100644 --- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorModelWithValidatedProperties.cs +++ b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/ValidationVisitorModelWithValidatedProperties.cs @@ -6,7 +6,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; -namespace Microsoft.AspNetCore.Mvc.Performance +namespace Microsoft.AspNetCore.Mvc.Microbenchmarks { public class ValidationVisitorModelWithValidatedProperties : ValidationVisitorBenchmarkBase { diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md b/src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/readme.md similarity index 100% rename from src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md rename to src/Mvc/perf/Microbenchmarks/Microsoft.AspNetCore.Mvc/readme.md diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj rename to src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj diff --git a/src/Mvc/benchmarkapps/BasicApi/Controllers/PetController.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Controllers/PetController.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Controllers/PetController.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Controllers/PetController.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Controllers/TokenController.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Controllers/TokenController.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Controllers/TokenController.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Controllers/TokenController.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.Designer.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.Designer.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.Designer.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.Designer.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Migrations/BasicApiContextModelSnapshot.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Migrations/BasicApiContextModelSnapshot.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Migrations/BasicApiContextModelSnapshot.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Migrations/BasicApiContextModelSnapshot.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Models/BasicApiContext.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Models/BasicApiContext.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Models/BasicApiContext.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Models/BasicApiContext.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Models/Category.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Models/Category.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Models/Category.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Models/Category.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Models/Image.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Models/Image.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Models/Image.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Models/Image.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Models/Pet.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Models/Pet.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Models/Pet.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Models/Pet.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Models/Tag.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Models/Tag.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Models/Tag.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Models/Tag.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/Startup.cs b/src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/Startup.cs rename to src/Mvc/perf/benchmarkapps/BasicApi/Startup.cs diff --git a/src/Mvc/benchmarkapps/BasicApi/benchmarks.json b/src/Mvc/perf/benchmarkapps/BasicApi/benchmarks.json similarity index 77% rename from src/Mvc/benchmarkapps/BasicApi/benchmarks.json rename to src/Mvc/perf/benchmarkapps/BasicApi/benchmarks.json index 7567136dd03a..5fe92246e46d 100644 --- a/src/Mvc/benchmarkapps/BasicApi/benchmarks.json +++ b/src/Mvc/perf/benchmarkapps/BasicApi/benchmarks.json @@ -9,7 +9,7 @@ "Source": { "Repository": "https://github.com/dotnet/aspnetcore.git", "BranchOrCommit": "main", - "Project": "src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj" + "Project": "src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj" } }, "BasicApi.GetToken": { @@ -19,20 +19,20 @@ }, "BasicApi.GetUsingQueryString": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/benchmarkapps/BasicApi/getWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/perf/benchmarkapps/BasicApi/getWithToken.lua" }, "Path": "/pet/findByStatus", "Query": "?status=available" }, "BasicApi.GetUsingRouteValue": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/benchmarkapps/BasicApi/getWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/perf/benchmarkapps/BasicApi/getWithToken.lua" }, "Path": "/pet/-1" }, "BasicApi.GetUsingRouteValueWithoutAuthorization": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/benchmarkapps/BasicApi/getWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/perf/benchmarkapps/BasicApi/getWithToken.lua" }, "Path": "/pet/anonymous/-1" }, @@ -41,14 +41,14 @@ }, "BasicApi.Post": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/benchmarkapps/BasicApi/postJsonWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/perf/benchmarkapps/BasicApi/postJsonWithToken.lua" }, "Path": "/pet" }, "BasicApi.PostWithoutDb": { "Path": "/pet/add-pet", "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/benchmarkapps/BasicApi/postJsonWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/perf/benchmarkapps/BasicApi/postJsonWithToken.lua" } } } diff --git a/src/Mvc/benchmarkapps/BasicApi/getWithToken.lua b/src/Mvc/perf/benchmarkapps/BasicApi/getWithToken.lua similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/getWithToken.lua rename to src/Mvc/perf/benchmarkapps/BasicApi/getWithToken.lua diff --git a/src/Mvc/benchmarkapps/BasicApi/postJsonWithToken.lua b/src/Mvc/perf/benchmarkapps/BasicApi/postJsonWithToken.lua similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/postJsonWithToken.lua rename to src/Mvc/perf/benchmarkapps/BasicApi/postJsonWithToken.lua diff --git a/src/Mvc/benchmarkapps/BasicApi/runtimeconfig.template.json b/src/Mvc/perf/benchmarkapps/BasicApi/runtimeconfig.template.json similarity index 100% rename from src/Mvc/benchmarkapps/BasicApi/runtimeconfig.template.json rename to src/Mvc/perf/benchmarkapps/BasicApi/runtimeconfig.template.json diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj rename to src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViewsContext.cs b/src/Mvc/perf/benchmarkapps/BasicViews/BasicViewsContext.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/BasicViewsContext.cs rename to src/Mvc/perf/benchmarkapps/BasicViews/BasicViewsContext.cs diff --git a/src/Mvc/benchmarkapps/BasicViews/Components/CurrentUser.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Components/CurrentUser.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Components/CurrentUser.cs rename to src/Mvc/perf/benchmarkapps/BasicViews/Components/CurrentUser.cs diff --git a/src/Mvc/benchmarkapps/BasicViews/Controllers/HomeController.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Controllers/HomeController.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Controllers/HomeController.cs rename to src/Mvc/perf/benchmarkapps/BasicViews/Controllers/HomeController.cs diff --git a/src/Mvc/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.Designer.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.Designer.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.Designer.cs rename to src/Mvc/perf/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.Designer.cs diff --git a/src/Mvc/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs rename to src/Mvc/perf/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs diff --git a/src/Mvc/benchmarkapps/BasicViews/Migrations/BasicViewsContextModelSnapshot.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Migrations/BasicViewsContextModelSnapshot.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Migrations/BasicViewsContextModelSnapshot.cs rename to src/Mvc/perf/benchmarkapps/BasicViews/Migrations/BasicViewsContextModelSnapshot.cs diff --git a/src/Mvc/benchmarkapps/BasicViews/Person.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Person.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Person.cs rename to src/Mvc/perf/benchmarkapps/BasicViews/Person.cs diff --git a/src/Mvc/benchmarkapps/BasicViews/Startup.cs b/src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Startup.cs rename to src/Mvc/perf/benchmarkapps/BasicViews/Startup.cs diff --git a/src/Mvc/benchmarkapps/BasicViews/Views/Home/HtmlHelpers.cshtml b/src/Mvc/perf/benchmarkapps/BasicViews/Views/Home/HtmlHelpers.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Views/Home/HtmlHelpers.cshtml rename to src/Mvc/perf/benchmarkapps/BasicViews/Views/Home/HtmlHelpers.cshtml diff --git a/src/Mvc/benchmarkapps/BasicViews/Views/Home/Index.cshtml b/src/Mvc/perf/benchmarkapps/BasicViews/Views/Home/Index.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Views/Home/Index.cshtml rename to src/Mvc/perf/benchmarkapps/BasicViews/Views/Home/Index.cshtml diff --git a/src/Mvc/benchmarkapps/BasicViews/Views/Shared/_Layout.cshtml b/src/Mvc/perf/benchmarkapps/BasicViews/Views/Shared/_Layout.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Views/Shared/_Layout.cshtml rename to src/Mvc/perf/benchmarkapps/BasicViews/Views/Shared/_Layout.cshtml diff --git a/src/Mvc/benchmarkapps/BasicViews/Views/_ViewImports.cshtml b/src/Mvc/perf/benchmarkapps/BasicViews/Views/_ViewImports.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Views/_ViewImports.cshtml rename to src/Mvc/perf/benchmarkapps/BasicViews/Views/_ViewImports.cshtml diff --git a/src/Mvc/benchmarkapps/BasicViews/Views/_ViewStart.cshtml b/src/Mvc/perf/benchmarkapps/BasicViews/Views/_ViewStart.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/Views/_ViewStart.cshtml rename to src/Mvc/perf/benchmarkapps/BasicViews/Views/_ViewStart.cshtml diff --git a/src/Mvc/benchmarkapps/BasicViews/benchmarks.json b/src/Mvc/perf/benchmarkapps/BasicViews/benchmarks.json similarity index 77% rename from src/Mvc/benchmarkapps/BasicViews/benchmarks.json rename to src/Mvc/perf/benchmarkapps/BasicViews/benchmarks.json index 5bbd67b6bfb1..4eb6bb5ed460 100644 --- a/src/Mvc/benchmarkapps/BasicViews/benchmarks.json +++ b/src/Mvc/perf/benchmarkapps/BasicViews/benchmarks.json @@ -9,7 +9,7 @@ "Source": { "Repository": "https://github.com/dotnet/aspnetcore.git", "BranchOrCommit": "main", - "Project": "src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj" + "Project": "src/Mvc/perf/benchmarkapps/BasicViews/BasicViews.csproj" } }, "BasicViews.GetHtmlHelpers": { @@ -20,19 +20,19 @@ }, "BasicViews.Post": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/benchmarkapps/BasicViews/postWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/perf/benchmarkapps/BasicViews/postWithToken.lua" }, "Path": "/Home/Index" }, "BasicViews.PostIgnoringToken": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/benchmarkapps/BasicViews/postWithToken.lua" + "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/perf/benchmarkapps/BasicViews/postWithToken.lua" }, "Path": "/Home/IndexWithoutToken" }, "BasicViews.PostWithoutToken": { "ClientProperties": { - "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/benchmarkapps/BasicViews/post.lua" + "Scripts": "https://raw.githubusercontent.com/dotnet/aspnetcore/main/src/Mvc/perf/benchmarkapps/BasicViews/post.lua" }, "Path": "/Home/IndexWithoutToken" } diff --git a/src/Mvc/benchmarkapps/BasicViews/post.lua b/src/Mvc/perf/benchmarkapps/BasicViews/post.lua similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/post.lua rename to src/Mvc/perf/benchmarkapps/BasicViews/post.lua diff --git a/src/Mvc/benchmarkapps/BasicViews/postWithToken.lua b/src/Mvc/perf/benchmarkapps/BasicViews/postWithToken.lua similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/postWithToken.lua rename to src/Mvc/perf/benchmarkapps/BasicViews/postWithToken.lua diff --git a/src/Mvc/benchmarkapps/BasicViews/runtimeconfig.template.json b/src/Mvc/perf/benchmarkapps/BasicViews/runtimeconfig.template.json similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/runtimeconfig.template.json rename to src/Mvc/perf/benchmarkapps/BasicViews/runtimeconfig.template.json diff --git a/src/Mvc/benchmarkapps/BasicViews/wwwroot/css/site.css b/src/Mvc/perf/benchmarkapps/BasicViews/wwwroot/css/site.css similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/wwwroot/css/site.css rename to src/Mvc/perf/benchmarkapps/BasicViews/wwwroot/css/site.css diff --git a/src/Mvc/benchmarkapps/BasicViews/wwwroot/css/site.min.css b/src/Mvc/perf/benchmarkapps/BasicViews/wwwroot/css/site.min.css similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/wwwroot/css/site.min.css rename to src/Mvc/perf/benchmarkapps/BasicViews/wwwroot/css/site.min.css diff --git a/src/Mvc/benchmarkapps/BasicViews/wwwroot/js/site.js b/src/Mvc/perf/benchmarkapps/BasicViews/wwwroot/js/site.js similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/wwwroot/js/site.js rename to src/Mvc/perf/benchmarkapps/BasicViews/wwwroot/js/site.js diff --git a/src/Mvc/benchmarkapps/BasicViews/wwwroot/js/site.min.js b/src/Mvc/perf/benchmarkapps/BasicViews/wwwroot/js/site.min.js similarity index 100% rename from src/Mvc/benchmarkapps/BasicViews/wwwroot/js/site.min.js rename to src/Mvc/perf/benchmarkapps/BasicViews/wwwroot/js/site.min.js diff --git a/src/Mvc/benchmarkapps/Directory.Build.props b/src/Mvc/perf/benchmarkapps/Directory.Build.props similarity index 100% rename from src/Mvc/benchmarkapps/Directory.Build.props rename to src/Mvc/perf/benchmarkapps/Directory.Build.props diff --git a/src/Mvc/benchmarkapps/Directory.Build.targets b/src/Mvc/perf/benchmarkapps/Directory.Build.targets similarity index 100% rename from src/Mvc/benchmarkapps/Directory.Build.targets rename to src/Mvc/perf/benchmarkapps/Directory.Build.targets diff --git a/src/Mvc/benchmarkapps/NuGet.config b/src/Mvc/perf/benchmarkapps/NuGet.config similarity index 100% rename from src/Mvc/benchmarkapps/NuGet.config rename to src/Mvc/perf/benchmarkapps/NuGet.config diff --git a/src/Mvc/benchmarkapps/README.md b/src/Mvc/perf/benchmarkapps/README.md similarity index 100% rename from src/Mvc/benchmarkapps/README.md rename to src/Mvc/perf/benchmarkapps/README.md diff --git a/src/Mvc/benchmarkapps/RazorRendering/Data/DataA.cs b/src/Mvc/perf/benchmarkapps/RazorRendering/Data/DataA.cs similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Data/DataA.cs rename to src/Mvc/perf/benchmarkapps/RazorRendering/Data/DataA.cs diff --git a/src/Mvc/benchmarkapps/RazorRendering/Data/DataB.cs b/src/Mvc/perf/benchmarkapps/RazorRendering/Data/DataB.cs similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Data/DataB.cs rename to src/Mvc/perf/benchmarkapps/RazorRendering/Data/DataB.cs diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml b/src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml rename to src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml.cs b/src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml.cs similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml.cs rename to src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml.cs diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/Category/_Subcategories.cshtml b/src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Category/_Subcategories.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Pages/Category/_Subcategories.cshtml rename to src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Category/_Subcategories.cshtml diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/Page.cs b/src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Page.cs similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Pages/Page.cs rename to src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Page.cs diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml b/src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml rename to src/Mvc/perf/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml b/src/Mvc/perf/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml rename to src/Mvc/perf/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml b/src/Mvc/perf/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml rename to src/Mvc/perf/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml diff --git a/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj rename to src/Mvc/perf/benchmarkapps/RazorRendering/RazorRendering.csproj diff --git a/src/Mvc/benchmarkapps/RazorRendering/Readme.md b/src/Mvc/perf/benchmarkapps/RazorRendering/Readme.md similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Readme.md rename to src/Mvc/perf/benchmarkapps/RazorRendering/Readme.md diff --git a/src/Mvc/benchmarkapps/RazorRendering/Startup.cs b/src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs similarity index 100% rename from src/Mvc/benchmarkapps/RazorRendering/Startup.cs rename to src/Mvc/perf/benchmarkapps/RazorRendering/Startup.cs diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs index 16c52d793703..0f27c052779b 100644 --- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs +++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Properties/AssemblyInfo.cs @@ -34,4 +34,4 @@ [assembly: InternalsVisibleTo("Microsoft.VisualStudio.LanguageServerClient.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Razor/Razor.slnf b/src/Razor/Razor.slnf index c9da58a83ef1..c31faa5be319 100644 --- a/src/Razor/Razor.slnf +++ b/src/Razor/Razor.slnf @@ -18,7 +18,7 @@ "src\\Razor\\Microsoft.CodeAnalysis.Razor\\test\\Microsoft.CodeAnalysis.Razor.Test.csproj", "src\\Razor\\tools\\Microsoft.AspNetCore.Razor.Internal.Transport\\Microsoft.AspNetCore.Razor.Internal.Transport.csproj", "src\\Razor\\tools\\RazorSyntaxGenerator\\RazorSyntaxGenerator.csproj", - "src\\Razor\\perf\\Microsoft.AspNetCore.Razor.Performance\\Microsoft.AspNetCore.Razor.Performance.csproj", + "src\\Razor\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Razor.Microbenchmarks.csproj", "src\\Razor\\test\\Microsoft.AspNetCore.Razor.Test.Common\\Microsoft.AspNetCore.Razor.Test.Common.csproj", "src\\Razor\\test\\Microsoft.AspNetCore.Razor.Test.ComponentShim\\Microsoft.AspNetCore.Razor.Test.ComponentShim.csproj", "src\\Razor\\test\\Microsoft.AspNetCore.Razor.Test.MvcShim\\Microsoft.AspNetCore.Razor.Test.MvcShim.csproj", diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/AssemblyInfo.cs b/src/Razor/perf/Microbenchmarks/AssemblyInfo.cs similarity index 100% rename from src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/AssemblyInfo.cs rename to src/Razor/perf/Microbenchmarks/AssemblyInfo.cs diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/BlazorServerTagHelpers.razor b/src/Razor/perf/Microbenchmarks/BlazorServerTagHelpers.razor similarity index 100% rename from src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/BlazorServerTagHelpers.razor rename to src/Razor/perf/Microbenchmarks/BlazorServerTagHelpers.razor diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/CodeGenerationBenchmark.cs b/src/Razor/perf/Microbenchmarks/CodeGenerationBenchmark.cs similarity index 97% rename from src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/CodeGenerationBenchmark.cs rename to src/Razor/perf/Microbenchmarks/CodeGenerationBenchmark.cs index 0748ccf4efde..914ab54644a1 100644 --- a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/CodeGenerationBenchmark.cs +++ b/src/Razor/perf/Microbenchmarks/CodeGenerationBenchmark.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.Razor.Extensions; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.AspNetCore.Razor.Performance +namespace Microsoft.AspNetCore.Razor.Microbenchmarks { public class CodeGenerationBenchmark { @@ -21,7 +21,7 @@ public CodeGenerationBenchmark() var root = current; var fileSystem = RazorProjectFileSystem.Create(root.FullName); - + ProjectEngine = RazorProjectEngine.Create(RazorConfiguration.Default, fileSystem, b => RazorExtensions.Register(b)); ; MSN = fileSystem.GetItem(Path.Combine(root.FullName, "MSN.cshtml"), FileKinds.Legacy); diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml b/src/Razor/perf/Microbenchmarks/MSN.cshtml similarity index 100% rename from src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml rename to src/Razor/perf/Microbenchmarks/MSN.cshtml diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj b/src/Razor/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj similarity index 100% rename from src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/Microsoft.AspNetCore.Razor.Performance.csproj rename to src/Razor/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/RazorTagHelperParsingBenchmark.cs b/src/Razor/perf/Microbenchmarks/RazorTagHelperParsingBenchmark.cs similarity index 98% rename from src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/RazorTagHelperParsingBenchmark.cs rename to src/Razor/perf/Microbenchmarks/RazorTagHelperParsingBenchmark.cs index 89e3c291f765..3d050591dbda 100644 --- a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/RazorTagHelperParsingBenchmark.cs +++ b/src/Razor/perf/Microbenchmarks/RazorTagHelperParsingBenchmark.cs @@ -11,7 +11,7 @@ using Newtonsoft.Json; using static Microsoft.AspNetCore.Razor.Language.DefaultRazorTagHelperBinderPhase; -namespace Microsoft.AspNetCore.Razor.Performance +namespace Microsoft.AspNetCore.Razor.Microbenchmarks { public class RazorTagHelperParsingBenchmark { diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/SyntaxTreeGenerationBenckmark.cs b/src/Razor/perf/Microbenchmarks/SyntaxTreeGenerationBenckmark.cs similarity index 98% rename from src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/SyntaxTreeGenerationBenckmark.cs rename to src/Razor/perf/Microbenchmarks/SyntaxTreeGenerationBenckmark.cs index fa1e1c2e6438..20f1128cca51 100644 --- a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/SyntaxTreeGenerationBenckmark.cs +++ b/src/Razor/perf/Microbenchmarks/SyntaxTreeGenerationBenckmark.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc.Razor.Extensions; using Microsoft.AspNetCore.Razor.Language; -namespace Microsoft.AspNetCore.Razor.Performance +namespace Microsoft.AspNetCore.Razor.Microbenchmarks { public class SyntaxTreeGenerationBenchmark { diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/readme.md b/src/Razor/perf/Microbenchmarks/readme.md similarity index 100% rename from src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/readme.md rename to src/Razor/perf/Microbenchmarks/readme.md diff --git a/src/Security/Security.slnf b/src/Security/Security.slnf index 7b6afc73191a..1ba70042036a 100644 --- a/src/Security/Security.slnf +++ b/src/Security/Security.slnf @@ -58,7 +58,7 @@ "src\\Security\\CookiePolicy\\samples\\CookiePolicySample\\CookiePolicySample.csproj", "src\\Security\\CookiePolicy\\src\\Microsoft.AspNetCore.CookiePolicy.csproj", "src\\Security\\CookiePolicy\\test\\Microsoft.AspNetCore.CookiePolicy.Test.csproj", - "src\\Security\\benchmarks\\Microsoft.AspNetCore.Security.Performance\\Microsoft.AspNetCore.Security.Performance.csproj", + "src\\Security\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Security.Microbenchmarks.csproj", "src\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj", "src\\Servers\\HttpSys\\src\\Microsoft.AspNetCore.Server.HttpSys.csproj", "src\\Servers\\IIS\\IISIntegration\\src\\Microsoft.AspNetCore.Server.IISIntegration.csproj", diff --git a/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/AuthorizationMiddlewareBenchmark.cs b/src/Security/perf/Microbenchmarks/AuthorizationMiddlewareBenchmark.cs similarity index 100% rename from src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/AuthorizationMiddlewareBenchmark.cs rename to src/Security/perf/Microbenchmarks/AuthorizationMiddlewareBenchmark.cs diff --git a/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/AuthorizationPolicyBenchmark.cs b/src/Security/perf/Microbenchmarks/AuthorizationPolicyBenchmark.cs similarity index 100% rename from src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/AuthorizationPolicyBenchmark.cs rename to src/Security/perf/Microbenchmarks/AuthorizationPolicyBenchmark.cs diff --git a/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj b/src/Security/perf/Microbenchmarks/Microsoft.AspNetCore.Security.Microbenchmarks.csproj similarity index 100% rename from src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj rename to src/Security/perf/Microbenchmarks/Microsoft.AspNetCore.Security.Microbenchmarks.csproj diff --git a/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/Properties/AssemblyInfo.cs b/src/Security/perf/Microbenchmarks/Properties/AssemblyInfo.cs similarity index 100% rename from src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/Properties/AssemblyInfo.cs rename to src/Security/perf/Microbenchmarks/Properties/AssemblyInfo.cs diff --git a/src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/readme.md b/src/Security/perf/Microbenchmarks/readme.md similarity index 100% rename from src/Security/benchmarks/Microsoft.AspNetCore.Security.Performance/readme.md rename to src/Security/perf/Microbenchmarks/readme.md diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/FirstRequestConfig.cs b/src/Servers/IIS/IIS/perf/Microbenchmarks/FirstRequestConfig.cs similarity index 100% rename from src/Servers/IIS/IIS/benchmarks/IIS.Performance/FirstRequestConfig.cs rename to src/Servers/IIS/IIS/perf/Microbenchmarks/FirstRequestConfig.cs diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj b/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj similarity index 87% rename from src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj rename to src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj index a7f14be39f55..9117a645b1ee 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/IIS.Performance.csproj +++ b/src/Servers/IIS/IIS/perf/Microbenchmarks/IIS.Microbenchmarks.csproj @@ -3,13 +3,14 @@ - - IIS.Performance - Microsoft.AspNetCore.Server.IIS.Performance + + IIS.Microbenchmarks + Microsoft.AspNetCore.Server.IIS.Microbenchmarks $(DefaultNetCoreTargetFramework) Exe true true + true diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs b/src/Servers/IIS/IIS/perf/Microbenchmarks/PlaintextBenchmark.cs similarity index 97% rename from src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs rename to src/Servers/IIS/IIS/perf/Microbenchmarks/PlaintextBenchmark.cs index 32ed007c7312..3294547f01a8 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/PlaintextBenchmark.cs +++ b/src/Servers/IIS/IIS/perf/Microbenchmarks/PlaintextBenchmark.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.IIS.FunctionalTests; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.IIS.Performance +namespace Microsoft.AspNetCore.Server.IIS.Microbenchmarks { [AspNetCoreBenchmark] public class PlaintextBenchmark diff --git a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs b/src/Servers/IIS/IIS/perf/Microbenchmarks/StartupTimeBenchmark.cs similarity index 93% rename from src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs rename to src/Servers/IIS/IIS/perf/Microbenchmarks/StartupTimeBenchmark.cs index dd561126d632..2f80afe8015d 100644 --- a/src/Servers/IIS/IIS/benchmarks/IIS.Performance/StartupTimeBenchmark.cs +++ b/src/Servers/IIS/IIS/perf/Microbenchmarks/StartupTimeBenchmark.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging.Abstractions; -namespace Microsoft.AspNetCore.Server.IIS.Performance +namespace Microsoft.AspNetCore.Server.IIS.Microbenchmarks { [AspNetCoreBenchmark(typeof(FirstRequestConfig))] public class StartupTimeBenchmark @@ -23,13 +23,13 @@ public void Setup() // Deployers do not work in distributed environments // see https://github.com/dotnet/aspnetcore/issues/10268 and https://github.com/dotnet/extensions/issues/1697 #pragma warning disable 0618 - var deploymentParameters = new DeploymentParameters(Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "test/testassets/InProcessWebSite"), + var deploymentParameters = new DeploymentParameters(Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "IIS/test/testassets/InProcessWebSite"), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { #pragma warning restore 0618 - ServerConfigTemplateContent = File.ReadAllText("IISExpress.config"), + ServerConfigTemplateContent = File.ReadAllText("IIS.config"), SiteName = "HttpTestSite", TargetFramework = "netcoreapp2.1", ApplicationType = ApplicationType.Portable diff --git a/src/Servers/IIS/IISIntegration.slnf b/src/Servers/IIS/IISIntegration.slnf index 5485116d442e..e8ce42f08921 100644 --- a/src/Servers/IIS/IISIntegration.slnf +++ b/src/Servers/IIS/IISIntegration.slnf @@ -33,7 +33,7 @@ "src\\Servers\\IIS\\IISIntegration\\samples\\IISSample\\IISSample.csproj", "src\\Servers\\IIS\\IISIntegration\\src\\Microsoft.AspNetCore.Server.IISIntegration.csproj", "src\\Servers\\IIS\\IISIntegration\\test\\Tests\\Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj", - "src\\Servers\\IIS\\IIS\\benchmarks\\IIS.Performance\\IIS.Performance.csproj", + "src\\Servers\\IIS\\IIS\\perf\\Microbenchmarks\\IIS.Microbenchmarks.csproj", "src\\Servers\\IIS\\IIS\\samples\\NativeIISSample\\NativeIISSample.csproj", "src\\Servers\\IIS\\IIS\\src\\Microsoft.AspNetCore.Server.IIS.csproj", "src\\Servers\\IIS\\IIS\\test\\IIS.FunctionalTests\\IIS.FunctionalTests.csproj", diff --git a/src/Servers/Kestrel/Core/src/Properties/AssemblyInfo.cs b/src/Servers/Kestrel/Core/src/Properties/AssemblyInfo.cs index 706d5176fb0e..e2e2c0cb8b8d 100644 --- a/src/Servers/Kestrel/Core/src/Properties/AssemblyInfo.cs +++ b/src/Servers/Kestrel/Core/src/Properties/AssemblyInfo.cs @@ -11,6 +11,6 @@ [assembly: InternalsVisibleTo("Libuv.BindTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Core.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] diff --git a/src/Servers/Kestrel/Kestrel.slnf b/src/Servers/Kestrel/Kestrel.slnf index 14be661c19a9..269e4b6de330 100644 --- a/src/Servers/Kestrel/Kestrel.slnf +++ b/src/Servers/Kestrel/Kestrel.slnf @@ -20,7 +20,7 @@ "src\\Servers\\Kestrel\\Transport.Libuv\\test\\Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv.Tests.csproj", "src\\Servers\\Kestrel\\Transport.Quic\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Experimental.Quic.csproj", "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj", - "src\\Servers\\Kestrel\\perf\\Kestrel.Performance\\Microsoft.AspNetCore.Server.Kestrel.Performance.csproj", + "src\\Servers\\Kestrel\\perf\\Microbenchmarks\\Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj", "src\\Servers\\Kestrel\\samples\\Http2SampleApp\\Http2SampleApp.csproj", "src\\Servers\\Kestrel\\samples\\Http3SampleApp\\Http3SampleApp.csproj", "src\\Servers\\Kestrel\\samples\\LargeResponseApp\\LargeResponseApp.csproj", diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/AssemblyInfo.cs b/src/Servers/Kestrel/perf/Microbenchmarks/AssemblyInfo.cs similarity index 100% rename from src/Servers/Kestrel/perf/Kestrel.Performance/AssemblyInfo.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/AssemblyInfo.cs diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/BinaryPrimitivesBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/BinaryPrimitivesBenchmark.cs similarity index 94% rename from src/Servers/Kestrel/perf/Kestrel.Performance/BinaryPrimitivesBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/BinaryPrimitivesBenchmark.cs index 17611789916b..3513d63703a7 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/BinaryPrimitivesBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/BinaryPrimitivesBenchmark.cs @@ -5,14 +5,14 @@ using System.Buffers.Binary; using BenchmarkDotNet.Attributes; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class BinaryPrimitivesBenchmark { private const int Iterations = 100; private byte[] _data; - + [GlobalSetup] public void Setup() { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/BytesToStringBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/BytesToStringBenchmark.cs similarity index 99% rename from src/Servers/Kestrel/perf/Kestrel.Performance/BytesToStringBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/BytesToStringBenchmark.cs index a38bf2dc48aa..0258e902ee79 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/BytesToStringBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/BytesToStringBenchmark.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class BytesToStringBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/ChunkWriterBenchmark.cs similarity index 96% rename from src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/ChunkWriterBenchmark.cs index c1aeaf8efa5a..d1df2cd0cbc5 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/ChunkWriterBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/ChunkWriterBenchmark.cs @@ -7,7 +7,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class ChunkWriterBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/DotSegmentRemovalBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/DotSegmentRemovalBenchmark.cs similarity index 97% rename from src/Servers/Kestrel/perf/Kestrel.Performance/DotSegmentRemovalBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/DotSegmentRemovalBenchmark.cs index 5f943d97de45..35e82c8d73c6 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/DotSegmentRemovalBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/DotSegmentRemovalBenchmark.cs @@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class DotSegmentRemovalBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/ErrorUtilities.cs b/src/Servers/Kestrel/perf/Microbenchmarks/ErrorUtilities.cs similarity index 89% rename from src/Servers/Kestrel/perf/Kestrel.Performance/ErrorUtilities.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/ErrorUtilities.cs index 89377f06aeb8..0375bc4122d7 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/ErrorUtilities.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/ErrorUtilities.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public static class ErrorUtilities { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/HPackDecoderBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/HPackDecoderBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/HPackDecoderBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/HPackDecoderBenchmark.cs index 31382bbf5e59..204609d69d1b 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/HPackDecoderBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/HPackDecoderBenchmark.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class HPackDecoderBenchmark { @@ -43,7 +43,7 @@ public class HPackDecoderBenchmark private static readonly byte[] _literalHeaderFieldNeverIndexed_NewName_Large; private static readonly byte[] _literalHeaderFieldNeverIndexed_NewName_Multiple; private static readonly byte[] _indexedHeaderDynamic_Multiple; - + static HPackDecoderBenchmark() { string string8193 = new string('a', 8193); diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/HPackHeaderWriterBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/HPackHeaderWriterBenchmark.cs similarity index 97% rename from src/Servers/Kestrel/perf/Kestrel.Performance/HPackHeaderWriterBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/HPackHeaderWriterBenchmark.cs index fcca5b58aa1b..3a18915982c1 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/HPackHeaderWriterBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/HPackHeaderWriterBenchmark.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class HPackHeaderWriterBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionBenchmark.cs index 3f5016aca719..230c6a664208 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionBenchmark.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Testing; using HttpMethod = Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http1ConnectionBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionParsingOverheadBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionParsingOverheadBenchmark.cs similarity index 96% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionParsingOverheadBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionParsingOverheadBenchmark.cs index 231f118eca9d..79f5518740ef 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ConnectionParsingOverheadBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ConnectionParsingOverheadBenchmark.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http1ConnectionParsingOverheadBenchmark { @@ -29,7 +29,7 @@ public void Setup() var serviceContext = TestContextFactory.CreateServiceContext( serverOptions: new KestrelServerOptions(), - httpParser: new HttpParser()); + httpParser: NullParser.Instance); var connectionContext = TestContextFactory.CreateHttpConnectionContext( serviceContext: serviceContext, diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1LargeWritingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1LargeWritingBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http1LargeWritingBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http1LargeWritingBenchmark.cs index 13d04f28037c..abcfc6e07d80 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1LargeWritingBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1LargeWritingBenchmark.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http1LargeWritingBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ReadingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ReadingBenchmark.cs similarity index 94% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http1ReadingBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http1ReadingBenchmark.cs index 1281be758dbf..227c853a3062 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1ReadingBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1ReadingBenchmark.cs @@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http1ReadingBenchmark { @@ -61,6 +61,8 @@ public void Setup() } ResetState(); + + _pair.Application.Output.WriteAsync(_readData).GetAwaiter().GetResult(); } private void ResetState() @@ -86,7 +88,7 @@ public Task ReadAsync() { ResetState(); - return _http1Connection.ResponseBody.ReadAsync(new byte[100], default(CancellationToken)).AsTask(); + return _http1Connection.RequestBody.ReadAsync(new byte[100], default(CancellationToken)).AsTask(); } private TestHttp1Connection MakeHttp1Connection() diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1WritingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http1WritingBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http1WritingBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http1WritingBenchmark.cs index d3ca5591f882..cbcf63f3b212 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http1WritingBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http1WritingBenchmark.cs @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http1WritingBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionBenchmarkBase.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionBenchmarkBase.cs similarity index 99% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionBenchmarkBase.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionBenchmarkBase.cs index 5e2fa8247c67..f6f101b758d5 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionBenchmarkBase.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionBenchmarkBase.cs @@ -23,7 +23,7 @@ using Microsoft.Extensions.Primitives; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public abstract class Http2ConnectionBenchmarkBase { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionEmptyBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionEmptyBenchmark.cs similarity index 93% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionEmptyBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionEmptyBenchmark.cs index 6859b5b675dc..2418929a6cac 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionEmptyBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionEmptyBenchmark.cs @@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http2ConnectionBenchmark : Http2ConnectionBenchmarkBase { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionHeadersBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionHeadersBenchmark.cs similarity index 95% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionHeadersBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionHeadersBenchmark.cs index 5ac19dd0b9ce..6b4f4113d04a 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2ConnectionHeadersBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http2ConnectionHeadersBenchmark.cs @@ -5,7 +5,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http2ConnectionHeadersBenchmark : Http2ConnectionBenchmarkBase { @@ -41,7 +41,7 @@ protected override Task ProcessRequest(HttpContext httpContext) _headerIndex++; } } - + return Task.CompletedTask; } } diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2FrameWriterBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2FrameWriterBenchmark.cs similarity index 79% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http2FrameWriterBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http2FrameWriterBenchmark.cs index ff58ed573d27..19b69c55d538 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2FrameWriterBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http2FrameWriterBenchmark.cs @@ -4,13 +4,15 @@ using System.Buffers; using System.IO.Pipelines; using BenchmarkDotNet.Attributes; +using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; +using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging.Abstractions; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http2FrameWriterBenchmark { @@ -27,16 +29,22 @@ public void GlobalSetup() var options = new PipeOptions(_memoryPool, readerScheduler: PipeScheduler.Inline, writerScheduler: PipeScheduler.Inline, useSynchronizationContext: false); _pipe = new Pipe(options); + var serviceContext = TestContextFactory.CreateServiceContext( + serverOptions: new KestrelServerOptions(), + httpParser: new HttpParser(), + dateHeaderValueManager: new DateHeaderValueManager(), + log: new MockTrace()); + _frameWriter = new Http2FrameWriter( new NullPipeWriter(), connectionContext: null, http2Connection: null, - new OutputFlowControl(new SingleAwaitableProvider(), initialWindowSize: uint.MaxValue), + new OutputFlowControl(new SingleAwaitableProvider(), initialWindowSize: int.MaxValue), timeoutControl: null, minResponseDataRate: null, "TestConnectionId", _memoryPool, - new Core.Internal.ServiceContext()); + serviceContext); _responseHeaders = new HttpResponseHeaders(); _responseHeaders.HeaderContentType = "application/json"; diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2HeadersEnumeratorBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Http2HeadersEnumeratorBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Http2HeadersEnumeratorBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Http2HeadersEnumeratorBenchmark.cs index 9bcf7e63c0bb..bd44e5bd4398 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Http2HeadersEnumeratorBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Http2HeadersEnumeratorBenchmark.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class Http2HeadersEnumeratorBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/HttpParserBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/HttpParserBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/HttpParserBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/HttpParserBenchmark.cs index b332b3958c7b..757fab1ef832 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/HttpParserBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/HttpParserBenchmark.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using HttpMethod = Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class HttpParserBenchmark : IHttpRequestLineHandler, IHttpHeadersHandler { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/HttpProtocolFeatureCollection.cs b/src/Servers/Kestrel/perf/Microbenchmarks/HttpProtocolFeatureCollection.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/HttpProtocolFeatureCollection.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/HttpProtocolFeatureCollection.cs index 6bf63ccd1035..00463d9f31cf 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/HttpProtocolFeatureCollection.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/HttpProtocolFeatureCollection.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Testing; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class HttpProtocolFeatureCollection { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/InMemoryTransportBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/InMemoryTransportBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/InMemoryTransportBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/InMemoryTransportBenchmark.cs index 760356c25c9c..32a6d5c320ce 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/InMemoryTransportBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/InMemoryTransportBenchmark.cs @@ -18,7 +18,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class InMemoryTransportBenchmark { @@ -41,7 +41,7 @@ public class InMemoryTransportBenchmark public void GlobalSetupPlaintext() { var transportFactory = new InMemoryTransportFactory(connectionsPerEndPoint: 1); - + _host = new HostBuilder() .ConfigureWebHost(webHostBuilder => { @@ -52,7 +52,7 @@ public void GlobalSetupPlaintext() // Bind to a single non-HTTPS endpoint .UseUrls("http://127.0.0.1:5000") .Configure(app => app.UseMiddleware()); - }) + }) .ConfigureServices(services => services.AddSingleton(transportFactory)) .Build(); @@ -149,7 +149,7 @@ public ValueTask AcceptAsync(CancellationToken cancellationTo { return new ValueTask(_connections[_acceptedConnections++]); } - return new ValueTask(_tcs.Task); + return new ValueTask(_tcs.Task); } public ValueTask DisposeAsync() diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/IntegerDecoderBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/IntegerDecoderBenchmark.cs similarity index 95% rename from src/Servers/Kestrel/perf/Kestrel.Performance/IntegerDecoderBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/IntegerDecoderBenchmark.cs index e41d076ec69a..6f84706b7fe2 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/IntegerDecoderBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/IntegerDecoderBenchmark.cs @@ -4,7 +4,7 @@ using System.Net.Http.HPack; using BenchmarkDotNet.Attributes; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class IntegerDecoderBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/KnownStringsBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/KnownStringsBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/KnownStringsBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/KnownStringsBenchmark.cs index cefde8b71cae..daa8bc37385e 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/KnownStringsBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/KnownStringsBenchmark.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class KnownStringsBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj similarity index 100% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj rename to src/Servers/Kestrel/perf/Microbenchmarks/Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks.csproj diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockDuplexPipe.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockDuplexPipe.cs similarity index 88% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockDuplexPipe.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockDuplexPipe.cs index 86f6dc311210..77375b79628b 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockDuplexPipe.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockDuplexPipe.cs @@ -3,7 +3,7 @@ using System.IO.Pipelines; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { internal class MockDuplexPipe : IDuplexPipe { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockHttpContextFactory.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockHttpContextFactory.cs similarity index 95% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockHttpContextFactory.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockHttpContextFactory.cs index e89076aba26a..3045f99deb52 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockHttpContextFactory.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockHttpContextFactory.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class MockHttpContextFactory : IHttpContextFactory { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockSystemClock.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockSystemClock.cs similarity index 88% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockSystemClock.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockSystemClock.cs index 960d2cba950d..5f2c361ea0b5 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockSystemClock.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockSystemClock.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { internal class MockSystemClock : ISystemClock { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockTimeoutControl.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockTimeoutControl.cs similarity index 95% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockTimeoutControl.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockTimeoutControl.cs index 54865db3c3d3..115ba593ef38 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockTimeoutControl.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockTimeoutControl.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2.FlowControl; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { internal class MockTimeoutControl : ITimeoutControl { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockTrace.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockTrace.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockTrace.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockTrace.cs index bd086add2196..887980770300 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/MockTrace.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockTrace.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { internal class MockTrace : IKestrelTrace { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullParser.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/NullParser.cs similarity index 94% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullParser.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Mocks/NullParser.cs index 279fb965cee5..659d32a13c47 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullParser.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/NullParser.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; using HttpMethod = Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http.HttpMethod; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { internal class NullParser : IHttpParser where TRequestHandler : struct, IHttpHeadersHandler, IHttpRequestLineHandler { @@ -37,7 +37,7 @@ public bool ParseRequestLine(TRequestHandler handler, ref SequenceReader r handler.OnStartLine( new HttpVersionAndMethod(HttpMethod.Get, 3) { Version = HttpVersion.Http11 }, - new TargetOffsetPathLength(3, startLine.Length - 3, false), + new TargetOffsetPathLength(4, startLine.Length - 4, false), startLine); return true; diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullPipeWriter.cs b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/NullPipeWriter.cs similarity index 94% rename from src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullPipeWriter.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/Mocks/NullPipeWriter.cs index c982ec490292..b7524a1b8974 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/Mocks/NullPipeWriter.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/Mocks/NullPipeWriter.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { internal class NullPipeWriter : PipeWriter { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/PipeThroughputBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/PipeThroughputBenchmark.cs similarity index 97% rename from src/Servers/Kestrel/perf/Kestrel.Performance/PipeThroughputBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/PipeThroughputBenchmark.cs index c6b0da1cd073..720730c53867 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/PipeThroughputBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/PipeThroughputBenchmark.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using BenchmarkDotNet.Attributes; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class PipeThroughputBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/README.md b/src/Servers/Kestrel/perf/Microbenchmarks/README.md similarity index 100% rename from src/Servers/Kestrel/perf/Kestrel.Performance/README.md rename to src/Servers/Kestrel/perf/Microbenchmarks/README.md diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingBenchmark.cs similarity index 99% rename from src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingBenchmark.cs index f86c2447f2b5..5efb68844f51 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingBenchmark.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Testing; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class RequestParsingBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingData.cs b/src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingData.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingData.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingData.cs index 7b50a6fba067..0c00ee101fbb 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/RequestParsingData.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/RequestParsingData.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class RequestParsingData { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeaderCollectionBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeaderCollectionBenchmark.cs index d8e42fc1abf2..856e8c6f4bb2 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeaderCollectionBenchmark.cs @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Testing; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class ResponseHeaderCollectionBenchmark { @@ -179,7 +179,7 @@ public void Setup() var serviceContext = TestContextFactory.CreateServiceContext( serverOptions: new KestrelServerOptions(), httpParser: new HttpParser(), - dateHeaderValueManager: new DateHeaderValueManager(), + dateHeaderValueManager: _dateHeaderValueManager, log: new MockTrace()); var connectionContext = TestContextFactory.CreateHttpConnectionContext( diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeadersWritingBenchmark.cs similarity index 99% rename from src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeadersWritingBenchmark.cs index 627a9cc07052..5c476a03cf8f 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/ResponseHeadersWritingBenchmark.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class ResponseHeadersWritingBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/SchedulerBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/SchedulerBenchmark.cs similarity index 98% rename from src/Servers/Kestrel/perf/Kestrel.Performance/SchedulerBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/SchedulerBenchmark.cs index df109a172e04..bed2e9211671 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/SchedulerBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/SchedulerBenchmark.cs @@ -9,7 +9,7 @@ using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class SchedulerBenchmark { diff --git a/src/Servers/Kestrel/perf/Kestrel.Performance/StringUtilitiesBenchmark.cs b/src/Servers/Kestrel/perf/Microbenchmarks/StringUtilitiesBenchmark.cs similarity index 94% rename from src/Servers/Kestrel/perf/Kestrel.Performance/StringUtilitiesBenchmark.cs rename to src/Servers/Kestrel/perf/Microbenchmarks/StringUtilitiesBenchmark.cs index 0d09130a34b3..49850263ec86 100644 --- a/src/Servers/Kestrel/perf/Kestrel.Performance/StringUtilitiesBenchmark.cs +++ b/src/Servers/Kestrel/perf/Microbenchmarks/StringUtilitiesBenchmark.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; -namespace Microsoft.AspNetCore.Server.Kestrel.Performance +namespace Microsoft.AspNetCore.Server.Kestrel.Microbenchmarks { public class StringUtilitiesBenchmark { diff --git a/src/Shared/BenchmarkRunner/Program.cs b/src/Shared/BenchmarkRunner/Program.cs index 920bd18876f5..73ea4e4d2ab4 100644 --- a/src/Shared/BenchmarkRunner/Program.cs +++ b/src/Shared/BenchmarkRunner/Program.cs @@ -29,7 +29,7 @@ private static int Main(string[] args) AssignConfiguration(ref args); var summaries = BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly) - .Run(args, GetConfig()); + .Run(args, ManualConfig.CreateEmpty()); foreach (var summary in summaries) { @@ -60,24 +60,6 @@ private static int Main(string[] args) return 0; } - private static IConfig GetConfig() - { -#if NET5_0 || NET6_0 - return ManualConfig.CreateEmpty() - .AddJob(Job.Default - .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings - ( - // not using "net6.0", a workaround for https://github.com/dotnet/BenchmarkDotNet/pull/1479 - targetFrameworkMoniker: "netcoreapp5.0", - runtimeFrameworkVersion: default, - name: ".NET Core 5.0" - ))) - .AsDefault()); -#else - return ManualConfig.CreateEmpty(); -#endif - } - private static int Fail(object o, string message) { _standardOutput?.WriteLine(_standardOutputText.ToString()); diff --git a/src/SignalR/perf/Microbenchmarks/HandshakeProtocolBenchmark.cs b/src/SignalR/perf/Microbenchmarks/HandshakeProtocolBenchmark.cs index 07df0b633fe3..b88e3fe1b778 100644 --- a/src/SignalR/perf/Microbenchmarks/HandshakeProtocolBenchmark.cs +++ b/src/SignalR/perf/Microbenchmarks/HandshakeProtocolBenchmark.cs @@ -119,7 +119,7 @@ public void ParsingHandshakeRequestMessage_ValidMessage3() public void ParsingHandshakeRequestMessage_NotComplete1() { var message = _requestMessage4; - if (!HandshakeProtocol.TryParseRequestMessage(ref message, out var deserializedMessage)) + if (HandshakeProtocol.TryParseRequestMessage(ref message, out var deserializedMessage)) { throw new Exception(); } @@ -166,7 +166,7 @@ public void ParsingHandshakeResponseMessage_ValidMessages3() } [Benchmark] - public void ParsingHandshakeResponseMessage_ValidMessages4() + public void ParsingHandshakeResponseMessage_ValidMessages4() { var message = _responseMessage4; if (!HandshakeProtocol.TryParseResponseMessage(ref message, out var deserializedMessage)) diff --git a/src/SignalR/perf/Microbenchmarks/HubConnectionReceiveBenchmark.cs b/src/SignalR/perf/Microbenchmarks/HubConnectionReceiveBenchmark.cs index 41944f26ef9b..a5481a7aa0f9 100644 --- a/src/SignalR/perf/Microbenchmarks/HubConnectionReceiveBenchmark.cs +++ b/src/SignalR/perf/Microbenchmarks/HubConnectionReceiveBenchmark.cs @@ -74,6 +74,7 @@ public void GlobalSetup() } hubConnectionBuilder.Services.TryAddEnumerable(ServiceDescriptor.Singleton(typeof(IHubProtocol), hubProtocol)); + hubConnectionBuilder.WithUrl("http://doesntmatter"); _invocationMessageBytes = hubProtocol.GetMessageBytes(new InvocationMessage(MethodName, arguments)); diff --git a/src/SignalR/perf/Microbenchmarks/HubConnectionSendBenchmark.cs b/src/SignalR/perf/Microbenchmarks/HubConnectionSendBenchmark.cs index 5f2d39161265..3f0df595bf47 100644 --- a/src/SignalR/perf/Microbenchmarks/HubConnectionSendBenchmark.cs +++ b/src/SignalR/perf/Microbenchmarks/HubConnectionSendBenchmark.cs @@ -55,6 +55,8 @@ public void GlobalSetup() hubConnectionBuilder.AddMessagePackProtocol(); } + hubConnectionBuilder.WithUrl("http://doesntmatter"); + var delegateConnectionFactory = new DelegateConnectionFactory(endPoint => { var connection = new DefaultConnectionContext(); diff --git a/src/SignalR/perf/Microbenchmarks/HubConnectionStartBenchmark.cs b/src/SignalR/perf/Microbenchmarks/HubConnectionStartBenchmark.cs index e4c2b6747f02..3b1b8950fe1f 100644 --- a/src/SignalR/perf/Microbenchmarks/HubConnectionStartBenchmark.cs +++ b/src/SignalR/perf/Microbenchmarks/HubConnectionStartBenchmark.cs @@ -40,6 +40,8 @@ public void GlobalSetup() _pipe = new TestDuplexPipe(); var hubConnectionBuilder = new HubConnectionBuilder(); + hubConnectionBuilder.WithUrl("http://doesntmatter"); + var delegateConnectionFactory = new DelegateConnectionFactory(endPoint => { var connection = new DefaultConnectionContext();