Skip to content

Packaging cleanup #6939

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 18 commits into from
Feb 28, 2024
Merged

Packaging cleanup #6939

merged 18 commits into from
Feb 28, 2024

Conversation

ericstj
Copy link
Member

@ericstj ericstj commented Jan 5, 2024

Originally I was just trying to remove mentions of snupkg, but then things got a bit carried away. :)

This is trying to remove as much duplication and dead code related to packaging that I can.

I'll be validating these changes with diffs and refining a bit more but wanted to get this up and see if CI is happy.

Originally I was just trying to remove mentions of snupkg, but then
things got a bit carried away. :)

This is trying to remove as much duplication and dead code related to
packaging that I can.
@ghost ghost assigned ericstj Jan 5, 2024
Copy link

codecov bot commented Jan 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.79%. Comparing base (0d2fd60) to head (59f414d).
Report is 4 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6939      +/-   ##
==========================================
- Coverage   68.83%   68.79%   -0.05%     
==========================================
  Files        1258     1254       -4     
  Lines      250674   250204     -470     
  Branches    25615    25529      -86     
==========================================
- Hits       172557   172128     -429     
+ Misses      71486    71466      -20     
+ Partials     6631     6610      -21     
Flag Coverage Δ
Debug 68.79% <ø> (-0.05%) ⬇️
production 63.22% <ø> (-0.06%) ⬇️
test 88.50% <ø> (-0.07%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 29 files with indirect coverage changes

@ericstj
Copy link
Member Author

ericstj commented Jan 8, 2024

Still something wonky happening with the build of the analyzer that I haven't quite determined. Looks to me like it's building concurrently in two separate processes.

Here's the nuspec diff of the current changes. ericstj/diffs@ecf911b

@ericstj
Copy link
Member Author

ericstj commented Jan 26, 2024

/azp run MachineLearning-CI

Copy link

Pull request contains merge conflicts.

@ericstj ericstj marked this pull request as ready for review February 7, 2024 19:38
@ericstj
Copy link
Member Author

ericstj commented Feb 13, 2024

/azp run MachineLearning-CI

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ericstj
Copy link
Member Author

ericstj commented Feb 13, 2024

I'm going to rename the projects to CSProj and put everything in the sln to make this work better with fewer custom steps.

I'd like to ensure all our projects are included in the SLN and don't
rely on separate build steps.

VS prefers *.csproj in the sln so I renamed things back to csproj.
@ericstj
Copy link
Member Author

ericstj commented Feb 22, 2024

@michaelgsharp/@ViktorHofer can you take another look at this? I'm going to stop short of pipeline refactoring on this and do that in a separate PR.

@ericstj
Copy link
Member Author

ericstj commented Feb 22, 2024

Here's an updated diff of NuSpecs, comparing the latest from main with the updates in this PR: ericstj/diffs@26178c0

Copy link
Member

@michaelgsharp michaelgsharp left a comment

Choose a reason for hiding this comment

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

It looks good to me.

Comment on lines 20 to 21
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"
Copy link
Member

Choose a reason for hiding this comment

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

For a later clean-up round, these can be removed as sourcelink is now part of the .NET SDK.

Copy link
Member

@ViktorHofer ViktorHofer left a comment

Choose a reason for hiding this comment

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

Honestly, I only glanced through the changes but LGTM

@ericstj ericstj merged commit f22b60a into dotnet:main Feb 28, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Mar 30, 2024
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.

4 participants