Skip to content

Commit 6785dd3

Browse files
thompson-tomothompson-tomo
authored
#6870 Remove packages provided as dependency when part of framework (#6934)
1 parent e587eda commit 6785dd3

File tree

4 files changed

+31
-22
lines changed

4 files changed

+31
-22
lines changed

‎src/StrawberryShake/Client/src/Core/StrawberryShake.Core.csproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@
1414

1515
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
1616
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
17-
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
18-
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
19-
<PackageReference Include="System.Text.Json" Version="8.0.0" />
2017
</ItemGroup>
2118

2219
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
2320
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
24-
<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
25-
<PackageReference Include="System.Threading.Channels" Version="7.0.0" />
26-
<PackageReference Include="System.Text.Json" Version="7.0.0" />
2721
</ItemGroup>
2822

29-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
23+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
24+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
3028
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
3129
<PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
3230
<PackageReference Include="System.Threading.Channels" Version="6.0.0" />

‎src/StrawberryShake/Client/src/Persistence.SQLite/StrawberryShake.Persistence.SQLite.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="7.0.0" />
2222
</ItemGroup>
2323

24-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
24+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
25+
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.0" />
26+
</ItemGroup>
27+
28+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
2529
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="6.0.0" />
2630
<PackageReference Include="System.Threading.Channels" Version="6.0.0" />
2731
<PackageReference Include="System.Text.Json" Version="6.0.7" />

‎src/StrawberryShake/Client/src/Transport.Http/StrawberryShake.Transport.Http.csproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,22 @@
1212
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.0" />
1313
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
1414
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
15-
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
1615
</ItemGroup>
1716

1817
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
19-
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
2019
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
2120
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
22-
<PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
2321
</ItemGroup>
2422

25-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
26-
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
23+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
24+
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
25+
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
27+
</ItemGroup>
28+
29+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
30+
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" />
2731
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
2832
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
2933
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />

‎src/StrawberryShake/Client/src/Transport.WebSockets/StrawberryShake.Transport.WebSockets.csproj

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,25 @@
1212
<InternalsVisibleTo Include="HotChocolate.Stitching.Tests" />
1313
</ItemGroup>
1414

15-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
16-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
17-
<PackageReference Include="System.Threading.Channels" Version="6.0.0" />
18-
<PackageReference Include="System.IO.Pipelines" Version="6.0.0" />
15+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
16+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
17+
<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
1918
</ItemGroup>
2019

2120
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
2221
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
23-
<PackageReference Include="System.Threading.Channels" Version="7.0.0" />
2422
<PackageReference Include="System.IO.Pipelines" Version="7.0.0" />
2523
</ItemGroup>
2624

27-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
28-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
29-
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
30-
<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
25+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
26+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
27+
<PackageReference Include="System.IO.Pipelines" Version="6.0.0" />
28+
</ItemGroup>
29+
30+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netstandard2.0'">
31+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
32+
<PackageReference Include="System.Threading.Channels" Version="6.0.0" />
33+
<PackageReference Include="System.IO.Pipelines" Version="6.0.0" />
3134
</ItemGroup>
3235

3336
<ItemGroup>

0 commit comments

Comments
 (0)