merge: Fixed conflits

TechNobre · Mar 29, 2024 · 6240682 · 6240682
1 parent ed2cc75
commit 6240682
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/tests/PowerUtils.xUnit.Extensions.Tests.csproj b/tests/PowerUtils.xUnit.Extensions.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+ <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 
  <RootNamespace>PowerUtils.xUnit.Extensions.Tests</RootNamespace>
  <AssemblyName>PowerUtils.xUnit.Extensions.Tests</AssemblyName>
@@ -19,10 +19,6 @@
  <PackageReference Include="FluentAssertions" Version="6.12.0" />
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
  <PackageReference Include="xunit" Version="2.7.0" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
- <PrivateAssets>all</PrivateAssets>
- </PackageReference>
  <PackageReference Include="coverlet.collector" Version="6.0.1">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
@@ -33,6 +29,19 @@
  </PackageReference>
  </ItemGroup>
 
+ <ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp3.1' And '$(TargetFramework)' != 'net5.0'">
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
+ </ItemGroup>
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0' ">
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
+ </ItemGroup>
+
 
  <ItemGroup>
  <ProjectReference Include="..\src\PowerUtils.xUnit.Extensions.csproj" />
@@ -45,4 +54,4 @@
  </PropertyGroup>
 
 
-</Project>
+</Project>