Skip to content

Commit

Permalink
Merge tag '5.0.1' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Orc.SystemInfo/Orc.SystemInfo.csproj
  • Loading branch information
GeertvanHorrik committed Oct 9, 2024
2 parents f8199e9 + 176f225 commit 1ff744a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Orc.SystemInfo/Orc.SystemInfo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0')) ">
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('net8.0')) ">
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 1ff744a

Please sign in to comment.