Skip to content

Commit 7bb800e

Browse files
committed
NCBC-4121: Upgrade all Microsoft dependencies to net10 latest
Motivation ---------- This commit is to update the MS dependencies. This should be done periodically so that we can address potential vulns in older versions and to modernize the SDK. Change-Id: I9ef75c826141d323b002e023098e5264566d737a Reviewed-on: https://review.couchbase.org/c/couchbase-net-client/+/237807 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: David Kelly <davidmichaelkelly@gmail.com>
1 parent 7c750b8 commit 7bb800e

20 files changed

Lines changed: 82 additions & 46 deletions

File tree

Directory.Packages.props

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,31 @@
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageVersion>
1515
<PackageVersion Include="DnsClient" Version="1.8.0" />
16-
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
17-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="3.1.21" />
18-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.21" />
19-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
20-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
21-
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="6.0.0" />
22-
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
16+
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="10.0.1" />
17+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
18+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
19+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
20+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
21+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
22+
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.1" />
23+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.1" />
24+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
2325
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
2426
<PackageVersion Include="OpenTelemetry" Version="1.2.0" />
2527
<PackageVersion Include="OpenTelemetry.Api" Version="1.2.0" />
2628
<PackageVersion Include="Snappier" Version="1.2.0" />
27-
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
28-
<PackageVersion Include="System.IO.Pipelines" Version="5.0.1" />
29+
<PackageVersion Include="System.IO.Hashing" Version="10.0.1" />
30+
<PackageVersion Include="System.IO.Pipelines" Version="10.0.1" />
2931
<PackageVersion Include="System.Memory" Version="4.6.3" />
3032
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
31-
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
32-
<PackageVersion Include="System.Threading.Channels" Version="9.0.9" />
33-
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
34-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
33+
<PackageVersion Include="System.Text.Json" Version="10.0.1" />
34+
<PackageVersion Include="System.Threading.Channels" Version="10.0.1" />
35+
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="10.0.1" />
36+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.1" />
3537
</ItemGroup>
3638
<!-- Dependencies for System.Linq -->
3739
<ItemGroup>
38-
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.0" Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net10.0'" />
40+
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.1" Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net10.0'" />
3941
<PackageVersion Include="System.Linq.Async" Version="6.0.1" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' " />
4042
</ItemGroup>
4143
<!-- Dependencies only allowed for .NET Standard 2.0 -->
@@ -48,11 +50,11 @@
4850
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
4951
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
5052
<PackageVersion Include="CommandLineParser" Version="2.8.0" />
51-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="3.1.21" />
52-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
53-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
54-
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.8.0" />
55-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
53+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
54+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
55+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
56+
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.1.0" />
57+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
5658
<PackageVersion Include="Moq" Version="4.17.2" />
5759
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
5860
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.9.0" />
@@ -67,4 +69,4 @@
6769
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
6870
<PackageVersion Include="coverlet.collector" Version="3.1.0" />
6971
</ItemGroup>
70-
</Project>
72+
</Project>

src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<PackageReference Include="OpenTelemetry" />
1414
<PackageReference Include="OpenTelemetry.Api" />
1515
<PackageReference Include="System.Threading.Tasks.Dataflow" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
18+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
19+
<PackageReference Include="Microsoft.Extensions.Logging" />
20+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
1621
</ItemGroup>
1722

1823
<ItemGroup>

src/Couchbase.Stellar.CodeGen/Couchbase.Stellar.CodeGen.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
1717
<PackageReference Include="System.Threading.Tasks.Dataflow" />
18+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
19+
<PackageReference Include="Microsoft.Extensions.Logging" />
20+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
1821
</ItemGroup>
1922

2023
<ItemGroup>
2124
<ProjectReference Include="..\Couchbase\Couchbase.csproj" />
2225
</ItemGroup>
2326

24-
2527
<PropertyGroup>
2628
<ProtostellarRepoBase>..\..\..\protostellar</ProtostellarRepoBase>
2729
<ProtoAdditionalImports>$(NuGetPackageRoot)google.api.commonprotos\2.16.0\content\protos</ProtoAdditionalImports>

src/Couchbase/Client/Transactions/LogUtil/TransactionsLogger.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal TransactionsLogger(ILogger otherLogger, TransactionContext overallConte
1919
}
2020

2121
/// <inheritdoc />
22-
public IDisposable BeginScope<TState>(TState state)
22+
public IDisposable? BeginScope<TState>(TState state) where TState : notnull
2323
{
2424
return _otherLogger.BeginScope(state);
2525
}

src/Couchbase/Couchbase.csproj

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,15 @@
6262
<PackageReference Include="System.Text.Json" />
6363
<PackageReference Include="System.Threading.Channels" />
6464
<PackageReference Include="System.Threading.Tasks.Dataflow" />
65+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
66+
<PackageReference Include="Microsoft.Extensions.Logging" />
67+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
6568
</ItemGroup>
6669

6770
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
6871
<PackageReference Include="Microsoft.Bcl.TimeProvider" />
6972
</ItemGroup>
7073

71-
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
72-
<PackageReference Include="System.IO.Hashing" />
73-
</ItemGroup>
74-
7574
<ItemGroup>
7675
<PackageReference Include="System.Linq.AsyncEnumerable" Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net10.0'"/>
7776
<PackageReference Include="System.Linq.Async" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' "/>
@@ -82,4 +81,12 @@
8281
<PackageReference Include="System.Memory" />
8382
</ItemGroup>
8483

84+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
85+
<PackageReference Include="System.IO.Hashing" />
86+
</ItemGroup>
87+
88+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
89+
<PackageReference Include="System.IO.Hashing" />
90+
</ItemGroup>
91+
8592
</Project>

tests/Couchbase.CombinationTests/Couchbase.CombinationTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>
24+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
2425
</ItemGroup>
2526

2627
<ItemGroup>

tests/Couchbase.Extensions.DependencyInjection.UnitTests/Couchbase.Extensions.DependencyInjection.UnitTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2121
</PackageReference>
2222
<PackageReference Include="JUnitXml.TestLogger" />
23+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
2324
</ItemGroup>
2425

2526
<ItemGroup>

tests/Couchbase.Extensions.OpenTelemetry.IntegrationTests/Couchbase.Extensions.OpenTelemetry.IntegrationTests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" />
21+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
2122
</ItemGroup>
2223

2324
<ItemGroup>
@@ -38,10 +39,10 @@
3839
<None Remove="Microsoft.NET.Test.Sdk" />
3940
</ItemGroup>
4041

41-
4242
<ItemGroup>
4343
<None Update="config.json">
4444
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
4545
</None>
4646
</ItemGroup>
47+
4748
</Project>

tests/Couchbase.Extensions.OpenTelemetry.UnitTests/Couchbase.Extensions.OpenTelemetry.UnitTests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2020
</PackageReference>
2121
<PackageReference Include="Xunit.SkippableFact" />
22+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
2223
</ItemGroup>
2324

2425
<ItemGroup>

tests/Couchbase.IntegrationTests.Management/Couchbase.IntegrationTests.Management.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1818
</PackageReference>
19+
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
1920
</ItemGroup>
2021

2122
<ItemGroup>

0 commit comments

Comments
 (0)