Skip to content

#848 Tweak dependencies #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtmk merged 7 commits into from
May 29, 2025
Merged

#848 Tweak dependencies #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5307a55
#848 Tweak dependencies
thompson-tomo May 12, 2025
99fb4c8
Update NATS.Client.Core.csproj
thompson-tomo May 12, 2025
6ea1eb1
Update NATS.Client.Core.csproj
thompson-tomo May 12, 2025
1616a26
Make STJ explicit dependency for JetStream
thompson-tomo May 13, 2025
b17cefa
Update NATS.Client.JetStream.csproj
thompson-tomo May 13, 2025
3eea2f2
Force sdk to 8.0.0
thompson-tomo May 17, 2025
2050d60
Add newer stj for net 6
thompson-tomo May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.0",
"version": "8.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
}
Expand Down
15 changes: 9 additions & 6 deletions src/NATS.Client.Core/NATS.Client.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,10 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
</ItemGroup>

<!-- Dependencies for netstandard only -->
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="System.Text.Json" Version="8.0.5"/>
<!-- Dependencies for prior to net5.0-->
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))">
<PackageReference Include="System.Threading.Channels" Version="8.0.0"/>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1"/>
<PackageReference Include="Nullable" Version="1.3.1">
Expand All @@ -61,9 +59,14 @@
<PackageReference Include="IndexRange" Version="1.0.3"/>
</ItemGroup>

<!-- Dependencies for net6.0 and net8.0 only -->
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net8.0'">
<!-- Dependencies for prior to net8.0-->
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<PackageReference Include="System.Text.Json" Version="8.0.5"/>
</ItemGroup>

<!-- Dependencies for prior to net9.0-->
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
<PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 7 additions & 2 deletions src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,16 @@
<NoWarn>$(NoWarn);CS8774</NoWarn>
</PropertyGroup>

<!-- Dependencies for netstandard only -->
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
<!-- Dependencies for prior to net5.0-->
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))">
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>

<!-- Dependencies for net6.0 only -->
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<PackageReference Include="System.Text.Json" Version="8.0.5"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\NATS.Client.Core\NATS.Client.Core.csproj"/>
<InternalsVisibleTo Include="$(AssemblyName).Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db7da1f2f89089327b47d26d69666fad20861f24e9acdb13965fb6c64dfee8da589b495df37a75e934ddbacb0752a42c40f3dbc79614eec9bb2a0b6741f9e2ad2876f95e74d54c23eef0063eb4efb1e7d824ee8a695b647c113c92834f04a3a83fb60f435814ddf5c4e5f66a168139c4c1b1a50a3e60c164d180e265b1f000cd"/>
Expand Down