Skip to content

Make HttpSys use ProjectReference and move HttpSys into Servers folder #4335

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.

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 1 commit into from
Dec 5, 2018

Conversation

jkotalik
Copy link
Contributor

For #4246. Future PRs will contain more than one project.

Copy link
Contributor

@natemcmaster natemcmaster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Awesomesauce, thanks for helping with this. This is a good start. There are few more things to do:

  1. You should now be able to completely delete https://github.com/aspnet/AspNetCore/tree/jkotalik/more21/src/Servers/HttpSysServer/build
  2. To avoid MAX_PATH issues, move src/Servers/HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys/**/* to src/Servers/HttpSysServer/src/**/*
  3. Same for tests. Move src/Servers/HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests to src/Servers/HttpSysServer/test/FunctionalTests and likewise for Microsoft.AspNetCore.Server.HttpSys.Tests
  4. Update the .sln for the new .csproj locations

FYI the spec on source code layout: https://github.com/aspnet/specs/blob/master/runtime/design-notes/2018-10-03-mondo-source-org.md

@natemcmaster
Copy link
Contributor

After thought: what do you think about changing the root to src/Servers/HttpSys/? src/Servers/HttpSysServer seems redundant..but I don't super care either way.

@Tratcher
Copy link
Member

Yes, moving the code makes sense, but still give it its own sln.

@Tratcher
Copy link
Member

Tratcher commented Nov 30, 2018

And while you're shortening folder names, should that become src/Servers/HttpSys/src/HttpSys/.... instaed of src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys/....??
The same goes for the test project dir.

@natemcmaster
Copy link
Contributor

@Tratcher I agree. If we're following the patterns we picked for a few other projects, the layout would be

src/Servers/HttpSys/
   HttpSys.sln
   src/
      *.cs
      Microsoft.AspNetCore.Server.HttpSys.csproj
   test/
      UnitTests/
         *.cs
         Microsoft.AspNetCore.Server.HttpSys.Tests.csproj 
      FunctionalTests/
         *.cs
         Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj 

@jkotalik
Copy link
Contributor Author

🆙 📅

@natemcmaster
Copy link
Contributor

Almost looks ready to go. Just a few more things:

I'm still seeing src/Servers/HttpSys/src/HttpSys/*.cs. Can you move this up into src/Servers/HttpSys/src/? The extra nesting isn't really needed.

Btw, as long as we're cleaning this up, here are somethings you can delete:

@natemcmaster
Copy link
Contributor

CI check failures:

2018-11-30T23:02:36.0852642Z D:\a\1\s\build\repo.targets(271,5): error : Undeclared package artifacts. Add these to artifacts.props: [D:\a\.dotnet\buildtools\korebuild\2.1.3-rtm-15847\KoreBuild.proj]
2018-11-30T23:02:36.0853180Z D:\a\1\s\build\repo.targets(271,5): error :   - Microsoft.Extensions.Buffers.Testing.Sources [D:\a\.dotnet\buildtools\korebuild\2.1.3-rtm-15847\KoreBuild.proj]
2018-11-30T23:02:36.0853456Z D:\a\1\s\build\repo.targets(271,5): error :   - Diagnostics [D:\a\.dotnet\buildtools\korebuild\2.1.3-rtm-15847\KoreBuild.proj]
2018-11-30T23:02:36.0853710Z D:\a\1\s\build\repo.targets(271,5): error :   - Internal.WebHostBuilderFactory.Sources [D:\a\.dotnet\buildtools\korebuild\2.1.3-rtm-15847\KoreBuild.proj]
2018-11-30T23:02:36.0853965Z D:\a\1\s\build\repo.targets(271,5): error :   - HttpSys [D:\a\.dotnet\buildtools\korebuild\2.1.3-rtm-15847\KoreBuild.proj]

@jkotalik
Copy link
Contributor Author

jkotalik commented Dec 3, 2018

@natemcmaster looks like we don't need to fix IsPackable here: https://github.com/aspnet/BuildTools/blob/master/files/KoreBuild/modules/sharedsources/sharedsources.csproj#L30 as ComputeGraph depends on ResolveSharedSourcesPackageInfo.

Copy link
Contributor

@natemcmaster natemcmaster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved from a "build" perspective.

It looks like there is a failing HttpSys test. Is this a known flaky test?

Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.Microsoft.AspNetCore.Server.HttpSys.Listener.ResponseCachingTests.Caching_SendFileWithFullContentLength_Cached
System.Threading.Tasks.TaskCanceledException : A task was canceled.

@Tratcher
Copy link
Member

Tratcher commented Dec 4, 2018

2.1 had more flaky tests in this area. We've re-written or consolidated many of them.

@jkotalik jkotalik closed this Dec 4, 2018
@jkotalik jkotalik reopened this Dec 4, 2018
@jkotalik
Copy link
Contributor Author

jkotalik commented Dec 4, 2018

@Tratcher and I chatted about the flaky tests. If they persist, we may disable/port test changes from 2.2 into HttpSys.

@jkotalik jkotalik merged commit 736083c into release/2.1 Dec 5, 2018
@jkotalik jkotalik deleted the jkotalik/more21 branch December 5, 2018 00:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants