Skip to content

Commit 8d654e9

Browse files
authored
Merge pull request #90 from lahma/harmonize-deps
2 parents 3ad8eda + 68243b7 commit 8d654e9

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

.github/workflows/dotnetcore.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17+
18+
- uses: actions/setup-dotnet@v4
19+
with:
20+
dotnet-version: |
21+
9.0
22+
1723
- uses: actions/checkout@v4
1824

1925
- name: Restore

DeviceDetector.NET/DeviceDetector.NET.csproj

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net462;net6.0;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net462;net8.0;net9.0</TargetFrameworks>
55
<RootNamespace>DeviceDetectorNET</RootNamespace>
66
<Version>6.4.1</Version>
77
<Authors>totpero</Authors>
@@ -216,24 +216,18 @@
216216

217217
<ItemGroup>
218218
<PackageReference Include="LiteDB" Version="5.0.21" />
219-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
220-
<PackageReference Include="System.Text.Json" Version="9.0.0" />
219+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
221220
<PackageReference Include="YamlDotNet" Version="16.2.1" />
222221
</ItemGroup>
223222

223+
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
224+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
225+
</ItemGroup>
226+
224227
<ItemGroup>
225-
<None Include="..\LICENSE">
226-
<Pack>True</Pack>
227-
<PackagePath></PackagePath>
228-
</None>
229-
<None Include="..\logo.jpg">
230-
<Pack>True</Pack>
231-
<PackagePath>\</PackagePath>
232-
</None>
233-
<None Include="..\README.md">
234-
<Pack>True</Pack>
235-
<PackagePath>\</PackagePath>
236-
</None>
228+
<None Include="..\LICENSE" Pack="True" PackagePath="" />
229+
<None Include="..\logo.jpg" Pack="True" PackagePath="" />
230+
<None Include="..\README.md" Pack="True" PackagePath="" />
237231
</ItemGroup>
238232

239233
</Project>

0 commit comments

Comments
 (0)