Update dependencies to dotnet 6 (#246)

* remove dotnet core 3.1 dependencies * update .net and json.text dependencies to 6.x.0 versions use cultureinfo invariantculture for decimal formatting * fix polly config test
commercetools · Aug 31, 2023 · 93cf3e6 · 93cf3e6
1 parent b1c5da5
commit 93cf3e6
Show file tree

Hide file tree

Showing 26 changed files with 113 additions and 108 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,11 +18,11 @@ jobs:
         run: git config --global core.longpaths true
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Setup dotnet 3.1
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.x
+            6.0.x
             7.0.x
       - run: dotnet tool restore
         working-directory: ./commercetools.Sdk
@@ -59,11 +59,11 @@ jobs:
         run: git config --global core.longpaths true
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Setup dotnet 3.1
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.x
+            6.0.x
             7.0.x
       - run: dotnet tool restore
         working-directory: ./commercetools.Sdk
@@ -110,11 +110,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Setup
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.x
+            6.0.x
             7.0.x
       - run: dotnet tool restore
         working-directory: ./commercetools.Sdk
@@ -188,7 +188,7 @@ jobs:
       - uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.x
+            6.0.x
             7.0.x
           source-url: https://nuget.pkg.github.com/commercetools/index.json
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,11 +18,11 @@ jobs:
         run: git config --global core.longpaths true
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Setup dotnet 3.1
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.x
+            6.0.x
             7.0.x
       - run: dotnet tool restore
         working-directory: ./commercetools.Sdk
@@ -47,10 +47,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       # Authenticates packages to push to GPR
-      - uses: actions/setup-dotnet@v3
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            3.1.x
+            6.0.x
             7.0.x
           source-url: https://nuget.pkg.github.com/commercetools/index.json
         env:

diff --git a/...ercetools.Sdk/Examples/commercetools.Api.CheckoutApp/commercetools.Api.CheckoutApp.csproj b/...ercetools.Sdk/Examples/commercetools.Api.CheckoutApp/commercetools.Api.CheckoutApp.csproj
@@ -9,6 +9,7 @@
     </ItemGroup>
 
     <ItemGroup>
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="OpenTelemetry.AutoInstrumentation" Version="1.0.0-rc.2" />
       <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.1-beta.1" />
       <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.5.1-beta.1" />

diff --git a/commercetools.Sdk/Examples/commercetools.Api.ConsoleApp/commercetools.Api.ConsoleApp.csproj b/commercetools.Sdk/Examples/commercetools.Api.ConsoleApp/commercetools.Api.ConsoleApp.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>8</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>

diff --git a/commercetools.Sdk/IntegrationTests/commercetools.Api.IntegrationTests/PollyTest.cs b/commercetools.Sdk/IntegrationTests/commercetools.Api.IntegrationTests/PollyTest.cs
@@ -81,7 +81,7 @@ public async Task proxy()
                 await client
                     .ExecuteAsync<object>(new HttpRequestMessage(HttpMethod.Get, "https://www.example.com"));
             });
-            Assert.Equal("Connection refused", exception.Message);
+            Assert.StartsWith("Connection refused", exception.Message);
         }
     }
 }
diff --git a/...grationTests/commercetools.Api.IntegrationTests/commercetools.Api.IntegrationTests.csproj b/...grationTests/commercetools.Api.IntegrationTests/commercetools.Api.IntegrationTests.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <UserSecretsId>6e42aa04-1612-4e1c-8bb2-190e5c88343f</UserSecretsId>
         <IsTestProject>true</IsTestProject>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.14" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.21" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/...mercetools.GraphQL.Api.IntegrationTests/commercetools.GraphQL.Api.IntegrationTests.csproj b/...mercetools.GraphQL.Api.IntegrationTests/commercetools.GraphQL.Api.IntegrationTests.csproj
@@ -12,18 +12,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.14" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.21" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\commercetools.Base.Client\commercetools.Base.Client.csproj" />

diff --git a/.../commercetools.ImportApi.IntegrationTests/commercetools.ImportApi.IntegrationTests.csproj b/.../commercetools.ImportApi.IntegrationTests/commercetools.ImportApi.IntegrationTests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <UserSecretsId>6e42aa04-1612-4e1c-8bb2-190e5c88343f</UserSecretsId>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.14" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-        <PackageReference Include="xunit" Version="2.4.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/commercetools.Sdk/Tests/commercetools.Api.Serialization.Tests/AttributesTests.cs b/commercetools.Sdk/Tests/commercetools.Api.Serialization.Tests/AttributesTests.cs
@@ -444,7 +444,7 @@ public void IntDeserialization()
         public void DecimalSerialization()
         {
             var serializerService = this._serializationFixture.SerializerService;
-            var attributes = new List<Attribute>
+            var attributes = new List<IAttribute>
                 {
                     new DecimalAttribute() { Name = "decimal", Value = 13m },
                     new DecimalAttribute() { Name = "decimal-zero", Value = 13.0m },
@@ -522,7 +522,7 @@ public void testNestedSetList()
                                     new SetAttribute<NestedAttribute>()
                                     {
                                         Name = "products",
-                                        Value = new List<NestedAttribute>()
+                                        Value = new List<IAttribute>()
                                     },
                                     new LocalizedStringAttribute
                                     {

diff --git a/commercetools.Sdk/Tests/commercetools.Api.Serialization.Tests/MessagesTests.cs b/commercetools.Sdk/Tests/commercetools.Api.Serialization.Tests/MessagesTests.cs
@@ -195,11 +195,10 @@ public void DeserializeChangeSubscription()
 
             var changeSubscription1 = serializerService.Deserialize<ChangeSubscription>(serialized1);
             var changeSubscription2 = serializerService.Deserialize<ChangeSubscription>(serialized2);
-            Assert.Equal("cart-discount", changeSubscription1.ResourceTypeId);
-            Assert.Equal("new-type", changeSubscription2.ResourceTypeId);
+            Assert.Equal("cart-discount", changeSubscription1.ResourceTypeId.ToString());
+            Assert.Equal("new-type", changeSubscription2.ResourceTypeId.ToString());
         }
 
-
         [Fact]
         public void DeserializeOfSubscriptions()
         {

diff --git a/.../Tests/commercetools.Api.Serialization.Tests/commercetools.Api.Serialization.Tests.csproj b/.../Tests/commercetools.Api.Serialization.Tests/commercetools.Api.Serialization.Tests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.14" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-        <PackageReference Include="coverlet.collector" Version="1.3.0" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0"/>
+        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/commercetools.Sdk/Tests/commercetools.Sdk.Api.Tests/commercetools.Sdk.Api.Tests.csproj b/commercetools.Sdk/Tests/commercetools.Sdk.Api.Tests/commercetools.Sdk.Api.Tests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.14" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.14" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...ls.Sdk/Tests/commercetools.Sdk.HistoryApi.Tests/commercetools.Sdk.HistoryApi.Tests.csproj b/...ls.Sdk/Tests/commercetools.Sdk.HistoryApi.Tests/commercetools.Sdk.HistoryApi.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\commercetools.Base.Serialization\commercetools.Base.Serialization.csproj" />

diff --git a/...ools.Sdk/Tests/commercetools.Sdk.ImportApi.Tests/commercetools.Sdk.ImportApi.Tests.csproj b/...ools.Sdk/Tests/commercetools.Sdk.ImportApi.Tests/commercetools.Sdk.ImportApi.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\commercetools.Base.Serialization\commercetools.Base.Serialization.csproj" />

diff --git a/commercetools.Sdk/Tests/commercetools.Sdk.MLApi.Tests/commercetools.Sdk.MLApi.Tests.csproj b/commercetools.Sdk/Tests/commercetools.Sdk.MLApi.Tests/commercetools.Sdk.MLApi.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\commercetools.Base.Serialization\commercetools.Base.Serialization.csproj" />

diff --git a/commercetools.Sdk/commercetools.Base.Client/commercetools.Base.Client.csproj b/commercetools.Sdk/commercetools.Base.Client/commercetools.Base.Client.csproj
@@ -16,8 +16,11 @@
     <Folder Include="Domain\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.14" />
+    <PackageReference Include="System.Text.Json" Version="6.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\commercetools.Base.Abstractions\commercetools.Base.Abstractions.csproj" />

diff --git a/commercetools.Sdk/commercetools.Base.Registration/commercetools.Base.Registration.csproj b/commercetools.Sdk/commercetools.Base.Registration/commercetools.Base.Registration.csproj
@@ -12,6 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.14" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
   </ItemGroup>
 </Project>
diff --git a/commercetools.Sdk/commercetools.Base.Serialization/commercetools.Base.Serialization.csproj b/commercetools.Sdk/commercetools.Base.Serialization/commercetools.Base.Serialization.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.14" />
+    <PackageReference Include="System.Text.Json" Version="6.0.8" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/commercetools.Sdk/commercetools.Sdk.Api/Predicates/Query/GeoJsonPredicateBuilder.cs b/commercetools.Sdk/commercetools.Sdk.Api/Predicates/Query/GeoJsonPredicateBuilder.cs
@@ -1,6 +1,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 
 namespace commercetools.Sdk.Api.Predicates.Query
 {
@@ -20,9 +21,9 @@ public GeoJsonPredicateBuilder(BinaryQueryPredicate predicate,
         public CombinationQueryPredicate<T> WithinCircle(decimal longitude, decimal latitude,
         long distance)
         {
-            IEnumerable<IQueryPredicate> p = new[]{ ConstantQueryPredicate.Of().Constant(longitude.ToString()),
-                ConstantQueryPredicate.Of().Constant(latitude.ToString()),
-                ConstantQueryPredicate.Of().Constant(distance.ToString())};
+            IEnumerable<IQueryPredicate> p = new[]{ ConstantQueryPredicate.Of().Constant(longitude.ToString(CultureInfo.InvariantCulture)),
+                ConstantQueryPredicate.Of().Constant(latitude.ToString(CultureInfo.InvariantCulture)),
+                ConstantQueryPredicate.Of().Constant(distance.ToString(CultureInfo.InvariantCulture))};
             return combinationFn.Invoke(predicate.Operator(PredicateOperator.Within.ToString())
                 .Right(ContainerQueryPredicate.Of()
                     .Parent(ConstantQueryPredicate.Of().Constant("circle"))

diff --git a/commercetools.Sdk/commercetools.Sdk.Api/commercetools.Sdk.Api.csproj b/commercetools.Sdk/commercetools.Sdk.Api/commercetools.Sdk.Api.csproj
@@ -15,8 +15,7 @@
     <NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JsonSubTypes" Version="2.0.1" />
-    <PackageReference Include="System.Text.Json" Version="4.7.2" />
+    <PackageReference Include="System.Text.Json" Version="6.0.8" />
   </ItemGroup>
 
   <ItemGroup>