Skip to content

Make IIS benchmarks work again #1415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Sep 19, 2019
Merged

Make IIS benchmarks work again #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c12a970
Fixing IIS
jkotalik Sep 18, 2019
3baf99f
temp
jkotalik Sep 18, 2019
e8f629b
temp
jkotalik Sep 18, 2019
05a3f48
temp
jkotalik Sep 18, 2019
5800ff7
Remove line temporarily
jkotalik Sep 18, 2019
5839aab
Old version to test
jkotalik Sep 18, 2019
0049fe5
Log ancm version
jkotalik Sep 18, 2019
fc91839
path
jkotalik Sep 18, 2019
1db38e2
nit
jkotalik Sep 18, 2019
5ac94a3
Remove logs
jkotalik Sep 18, 2019
24afddd
Fix IIS benchmarks
jkotalik Sep 18, 2019
30603be
Hardcode a version for now.
jkotalik Sep 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Benchmarks/Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />

<!--<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />-->
<PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="5.0.0-alpha1.19468.7" />

<FrameworkReference Update="Microsoft.AspNetCore.App" RuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppPackageVersion)" />

Expand Down
20 changes: 10 additions & 10 deletions src/Benchmarks/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,16 @@ public static void Main(string[] args)
{
webHostBuilder = webHostBuilder.UseHttpSys();
}
//#if NETCOREAPP2_2 || NETCOREAPP3_0
// else if (String.Equals(Server, "IISInProcess", StringComparison.OrdinalIgnoreCase))
// {
// webHostBuilder = webHostBuilder.UseIIS();
// }
//#endif
// else if (String.Equals(Server, "IISOutOfProcess", StringComparison.OrdinalIgnoreCase))
// {
// webHostBuilder = webHostBuilder.UseKestrel().UseIISIntegration();
// }
#if NETCOREAPP2_2 || NETCOREAPP3_0
else if (String.Equals(Server, "IISInProcess", StringComparison.OrdinalIgnoreCase))
{
webHostBuilder = webHostBuilder.UseIIS();
}
#endif
else if (String.Equals(Server, "IISOutOfProcess", StringComparison.OrdinalIgnoreCase))
{
webHostBuilder = webHostBuilder.UseKestrel().UseIISIntegration();
}
else
{
throw new InvalidOperationException($"Unknown server value: {Server}");
Expand Down