Skip to content

Commit

Permalink
Merge branches 'dependabot/nuget/Microsoft.NET.Test.Sdk-16.11.0' and …
Browse files Browse the repository at this point in the history
…'dependabot/nuget/FluentAssertions-6.1.0'

# Conflicts:
#	test/Abioc.Tests.Internal/Abioc.Tests.Internal.csproj
#	test/Abioc.Tests/Abioc.Tests.csproj
  • Loading branch information
JSkimming committed Aug 24, 2021
3 parents d02eaae + 2c500fe + 35dc4ef commit 07e3ab9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions test/Abioc.Tests.Internal/Abioc.Tests.Internal.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
Expand Down
4 changes: 2 additions & 2 deletions test/Abioc.Tests/Abioc.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="FluentAssertions" Version="6.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
Expand Down

0 comments on commit 07e3ab9

Please sign in to comment.