-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Packaging cleanup #6939
Conversation
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.
Codecov ReportAll modified and coverable lines are covered by tests ✅
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
Flags with carried forward coverage won't be shown. Click here to find out more. |
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 |
… cleanupSnupkg
/azp run MachineLearning-CI |
Pull request contains merge conflicts. |
… cleanupSnupkg # Conflicts: # global.json
/azp run MachineLearning-CI |
Azure Pipelines successfully started running 1 pipeline(s). |
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.
@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. |
Here's an updated diff of NuSpecs, comparing the latest from main with the updates in this PR: ericstj/diffs@26178c0 |
There was a problem hiding this 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.
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02", | ||
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02" |
There was a problem hiding this comment.
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.
...crosoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj
Show resolved
Hide resolved
...crosoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.csproj
Show resolved
Hide resolved
There was a problem hiding this 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
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.