Skip to content

Commit

Permalink
Fix path for Microsoft.Extensions.DependencyModel in nuspec
Browse files Browse the repository at this point in the history
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`.
  • Loading branch information
veleek committed May 29, 2024
1 parent a0e18d3 commit ca9c52d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions nuget/runners/nunit.console-runner.netcore.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<tags>nunit test testing tdd runner</tags>
<copyright>Copyright (c) 2021 Charlie Poole, Rob Prouse</copyright>
<packageTypes>
<packageType name="DotnetTool" />
<packageType name="DotnetTool" />
</packageTypes>
</metadata>
<files>
Expand All @@ -43,7 +43,7 @@
<file src="net6.0/nunit.engine.api.pdb" target="tools/net6.0/any" />
<file src="net6.0/nunit.engine.api.xml" target="tools/net6.0/any" />
<file src="net6.0/testcentric.engine.metadata.dll" target="tools/net6.0/any" />
<file src="Microsoft.Extensions.DependencyModel.dll" target="tools/net6.0/any" />
<file src="net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net6.0/any" />
<file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net6.0/any"/>
<file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net6.0/any"/>

Expand All @@ -63,7 +63,7 @@
<file src="net8.0/testcentric.engine.metadata.dll" target="tools/net8.0/any" />
<file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net8.0/any"/>
<file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net8.0/any"/>

<file src="../../nunit_256.png" target="images"/>
</files>
</package>

0 comments on commit ca9c52d

Please sign in to comment.