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

Fix path for Microsoft.Extensions.DependencyModel in nuspec #1406

Closed
wants to merge 1 commit into from

Conversation

veleek
Copy link
Member

@veleek veleek commented May 29, 2024

As part of PR #1376, 3f854b2 was integrated into the version3X branch. The main branch only includes net6.0 in the package so it copies all dependencies into the root folder and references them from there (including Microsoft.Extensions.DependencyModel.dll).

In version3X the package includes both net6.0 and net8.0 dependencies so the binaries are referenced from sub-folders, so when the change was merged, it was referencing Microsoft.Extensions.DependencyModel.dll when it should have been looking in net6.0/Microsoft.Extensions.DependencyModel.dll.

This also includes two whitespace changes that were automatically fixed by VSCode when I saved the file. They're harmless and match the style of the rest of the file, so I figured I'd just keep them.

As part of PR nunit#1376, 3f854b2 was integrated into the `version3X` branch.  The `main` branch only includes net6.0 in the package so it copies all dependencies into the root folder and references them from there (including Microsoft.Extensions.DependencyModel.dll).

In `version3X` the package includes both net6.0 and net8.0 dependencies so the binaries are referenced from sub-folders, so when the change was merged, it was referencing `Microsoft.Extensions.DependencyModel.dll` when it should have been looking in `net6.0/Microsoft.Extensions.DependencyModel.dll`.
@CharliePoole
Copy link
Member

@veleek This looks good to me but the change is also incorporated in my PR #1407 with a number of other changes needed to make the version3X head build. Could you review that PR? Also #1405, which applies to main.

@veleek
Copy link
Member Author

veleek commented Jun 3, 2024

Closing as it's fixed elsewhere.

@veleek veleek closed this Jun 3, 2024
@veleek veleek deleted the veleek/package-build branch July 6, 2024 03:15
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.

2 participants