Skip to content
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

Ingest extensions packages from dotnet/runtime #3091

Merged
merged 13 commits into from
Apr 1, 2020

Conversation

JunTaoLuo
Copy link

@ericstj @maryamariyan Here's a draft PR that illustrate what ingesting packages from dotnet/runtime would look like. It would look similar in dotnet/aspnetcore as well.

FYI for all those who aren't familiar with the overall plan, I don't think we'll be merging this change since we decided not to do this piecemeal and wait for all packages to be brought up in dotnet/runtime.

@ericstj
Copy link
Member

ericstj commented Mar 19, 2020

Looks like we also need to update the SLN.

Thanks for giving this sample, @JunTaoLuo. This gives us the recipe to follow.

@JunTaoLuo
Copy link
Author

Ah yes, pesky codecheck.

@maryamariyan
Copy link
Member

maryamariyan commented Mar 31, 2020

I rebased @JunTaoLuo 's commits on latest master.
This 1b598f2 is the main commit that can be reviewed, the next one just deletes the files

@ghost
Copy link

ghost commented Mar 31, 2020

As per aspnet/Announcements#411, we are currently migrating components from this repository to other repositories (dotnet/runtime, dotnet/aspnetcore). We recommend waiting until that process is complete and opening your PR against the appropriate repository. See the original announcement for a list mapping packages to the new repository.

@maryamariyan
Copy link
Member

Thanks for removing them from Solution @JunTaoLuo :)

@JunTaoLuo
Copy link
Author

@maryamariyan shouldn't extensions.options be removed as well? Also, it seems like there are functional tests left over that should probably be moved to dotnet/runtime instead. For example, Configuration.FunctionalTests and Hosting.FunctionalTests.

@maryamariyan
Copy link
Member

I was being conservative with moving tests out. but yes. I'll push up a commit for those next.
I noticed you removed Primitives perf tests as well. Http, DI, and Logging have perf tests that I should move to performance repo after this.
it's OK let's remove them here and I'll move them over myself.

You're right I missed Options deletion. I'll push up a commit for that.

@maryamariyan
Copy link
Member

maryamariyan commented Apr 1, 2020

Keeps Logging.Testing and DI.Specification even though they have dupes in runtime repo.
I see them both needed in "eng\ProjectReferences.props" but in order to delete them here,

  • They need to be shipped from runtime repo first. (planned for another PR)

Another note. We're removing perf tests here for Primitives, DI, Http, and Logging.

  • I'm going to move them and their history to performance repo.

One more item:

eng/Versions.props Outdated Show resolved Hide resolved
@JunTaoLuo JunTaoLuo changed the title Ingest primitives from dotnet/runtime Ingest extensions packages from dotnet/runtime Apr 1, 2020
@JunTaoLuo JunTaoLuo marked this pull request as ready for review April 1, 2020 17:05
@JunTaoLuo
Copy link
Author

There are some merge conflicts between this branch and master, can you resolve them @maryamariyan or would you like help?

@maryamariyan
Copy link
Member

sure thing. I'll fix them

John Luo and others added 10 commits April 1, 2020 10:12
- Options
- Perf: DI, Http, and Logging
    - Config.FunctionalTests
    - Hosting/IntegrationTesting
    - Hosting.FunctionalTests
    - Hosting.TestApp
    - Logging tests
    (Keeping Logging.Testing and DI.Specification eventhough dupes in runtime repo)
@ericstj
Copy link
Member

ericstj commented Apr 1, 2020

Changes look good, looks like SLN needs some more cleanup.

@JunTaoLuo
Copy link
Author

I can't approve my own PR but LGTM :shipit:

@maryamariyan
Copy link
Member

I dont have permission to merge :)

@JunTaoLuo
Copy link
Author

JunTaoLuo commented Apr 1, 2020

@dotnet/aspnet-build Care to review so I can merge?

@JunTaoLuo JunTaoLuo requested a review from a team April 1, 2020 20:53
Copy link
Member

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

One fix then :shipit:

<Compile Include="..\..\Config\test\ConfigurationProviderTestBase.cs">
<Link>test\ConfigurationProviderTestBase.cs</Link>
</Compile>
<Compile Include="..\..\Config\testassets\Test.Common\ConfigurationProviderExtensions.cs">
Copy link
Member

Choose a reason for hiding this comment

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

Again, please move these out of testassets/ since they're now used as shared source

Copy link
Author

Choose a reason for hiding this comment

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

I have a feeling we'll be cleaning up a bunch of these things in a follow-up especially since I'll be removing a bunch of the shared sources that's already been duplicated in aspnetcore as well. I wouldn't block this PR on this.

Copy link
Author

Choose a reason for hiding this comment

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

FYI I added an item to dotnet/aspnetcore#19254 to make sure this isn't lost.

@JunTaoLuo JunTaoLuo merged commit c2cca85 into master Apr 1, 2020
@JunTaoLuo JunTaoLuo deleted the johluo/ingest-primitives branch April 1, 2020 21:35
JunTaoLuo pushed a commit to dotnet/aspnetcore that referenced this pull request Nov 17, 2020
* Ingest primitives from dotnet/runtime

* Remove primitives project from sln

* using extensions libraries from runtime repo next commit deletes files

* deleting files

* Remove references from sln

* Removes
- Options
- Perf: DI, Http, and Logging

* Removes
    - Config.FunctionalTests
    - Hosting/IntegrationTesting
    - Hosting.FunctionalTests
    - Hosting.TestApp
    - Logging tests
    (Keeping Logging.Testing and DI.Specification eventhough dupes in runtime repo)

* Rename property

* Clean up sln file

* coorrect Automated PropertyGroup

* Also update other sln files

* nit cleanup

* move common files into one place

Co-authored-by: Maryam Ariyan <[email protected]>\n\nCommit migrated from dotnet/extensions@c2cca85
@ghost ghost locked as resolved and limited conversation to collaborators May 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants