Skip to content

Commit 93f12de

Browse files
Bump NUnit3TestAdapter from 6.0.0 to 6.1.0 (#504)
* Bump NUnit3TestAdapter from 6.0.0 to 6.1.0 --- updated-dependencies: - dependency-name: NUnit3TestAdapter dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fix versioning conflicts. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Theodore Tsirpanis <[email protected]>
1 parent f12fc4d commit 93f12de

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Directory.Packages.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@
2626
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
2727
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.2" />
2828
<PackageVersion Include="Microsoft.Build" Version="17.3.2" />
29+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(SystemOobVersion)" />
2930
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3031
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.3.2" />
3132
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="2.0.2" />
3233
<PackageVersion Include="Microsoft.Testing.Platform.MSBuild" Version="2.0.2" />
3334
<PackageVersion Include="MSBuild.StructuredLogger" Version="2.3.113" />
3435
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
3536
<PackageVersion Include="NUnit" Version="4.4.0" />
36-
<PackageVersion Include="NUnit3TestAdapter" Version="6.0.0" />
37+
<PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
3738
<PackageVersion Include="PolySharp" Version="1.15.0" />
3839
<PackageVersion Include="Pidgin" Version="3.5.1" />
3940
<PackageVersion Include="Scriban" Version="6.5.2" />

tests/Farkle.Tests.CSharp/Farkle.Tests.CSharp.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<Content Include="../resources/**" LinkBase="resources" CopyToOutputDirectory="PreserveNewest" />
1515
</ItemGroup>
1616
<ItemGroup>
17+
<!-- NUnit3TestAdapter bundles its own copy of M.E.DependencyModel, which causes version conflicts.
18+
Force using a recent version. -->
19+
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
1720
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1821
<PackageReference Include="Microsoft.Testing.Extensions.VSTestBridge" />
1922
<PackageReference Include="Microsoft.Testing.Platform.MSBuild" />

0 commit comments

Comments
 (0)