Release v18

.github/workflows/codeql-analysis.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/integrate.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Extract version from tag
         id: get_version
         uses: battila7/get-version-action@v2

Kontent.Ai.Delivery.Abstractions.Tests/Kontent.Ai.Delivery.Abstractions.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Kontent.Ai.Delivery.Abstractions/Configuration/DeliveryOptions.cs

@@ -18,9 +18,9 @@ public class DeliveryOptions
         public string PreviewEndpoint { get; set; } = "https://preview-deliver.kontent.ai/";
 
         /// <summary>
-        /// Gets or sets the project identifier.
+        /// Gets or sets the environment identifier.
         /// </summary>
-        public string ProjectId { get; set; }
+        public string EnvironmentId { get; set; }
 
         /// <summary>
         /// Gets or sets the API key that is used to retrieve content with the Preview API.

Kontent.Ai.Delivery.Abstractions/DeliveryClientExtensions.cs

@@ -67,7 +67,7 @@ public static Task<IDeliveryTaxonomyListingResponse> GetTaxonomiesAsync(this IDe
         }
 
         /// <summary>
-        /// Returns all active languages assigned to a given project and matching the optional filtering parameters.
+        /// Returns all active languages assigned to a given environment and matching the optional filtering parameters.
         /// </summary>
         /// <param name="client">An instance of the <see cref="IDeliveryClient"/></param>
         /// <param name="parameters">An array that contains zero or more query parameters, for example, for paging.</param>

Kontent.Ai.Delivery.Abstractions/Extensions/DeliveryOptionsExtensions.cs

@@ -12,7 +12,7 @@ public static class DeliveryOptionsExtensions
         /// <param name="options">A source.</param>
         public static void Configure(this DeliveryOptions o, DeliveryOptions options)
         {
-            o.ProjectId = options.ProjectId;
+            o.EnvironmentId = options.EnvironmentId;
             o.ProductionEndpoint = options.ProductionEndpoint;
             o.PreviewEndpoint = options.PreviewEndpoint;
             o.PreviewApiKey = options.PreviewApiKey;

Kontent.Ai.Delivery.Abstractions/IDeliveryClient.cs

@@ -71,7 +71,7 @@ public interface IDeliveryClient
 
 
         /// <summary>
-        /// Returns all active languages assigned to a given project and matching the optional filtering parameters.
+        /// Returns all active languages assigned to a given environment and matching the optional filtering parameters.
         /// </summary>
         /// <param name="parameters">A collection of query parameters, for example, for paging.</param>
         /// <returns>The <see cref="IDeliveryLanguageListingResponse"/> instance that represents the languages. If no query parameters are specified, all languages are returned.</returns>
@@ -85,7 +85,7 @@ public interface IDeliveryClient
         Task<IDeliverySyncInitResponse> PostSyncInitAsync(IEnumerable<IQueryParameter> parameters = null);
 
         /// <summary>
-        /// Retrieve a list of delta updates to recently changed content items in the specified project. The types of items you get is determined by the X-Continuation token you use.
+        /// Retrieve a list of delta updates to recently changed content items in the specified environment. The types of items you get is determined by the X-Continuation token you use.
         /// </summary>
         /// <returns>The <see cref="IDeliverySyncResponse"/> instance that represents the sync response that contains collection of delta updates and continuation token needed for further sync execution.</returns>
         Task<IDeliverySyncResponse> GetSyncAsync(string continuationToken);

Kontent.Ai.Delivery.Abstractions/Kontent.Ai.Delivery.Abstractions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Kontent s.r.o.</Authors>
     <Company>Kontent s.r.o.</Company>
     <Product>Kontent.ai</Product>

Kontent.Ai.Delivery.Benchmarks/DeliveryClientBenchmark.cs

@@ -18,8 +18,8 @@ public class DeliveryClientBenchmark
         [GlobalSetup]
         public async Task Setup()
         {
-            var projectId = Guid.NewGuid();
-            var baseUrl = $"https://deliver.kontent.ai/{projectId}";
+            var environmentId = Guid.NewGuid();
+            var baseUrl = $"https://deliver.kontent.ai/{environmentId}";
             var mockHttp = new MockHttpMessageHandler();
 
             mockHttp
@@ -32,7 +32,7 @@ public async Task Setup()
                 .Respond("application/json",
                     await File.ReadAllTextAsync(Path.Combine(Environment.CurrentDirectory, $"Fixtures{Path.DirectorySeparatorChar}full_articles.json")));
 
-            _client = DeliveryClientBuilder.WithProjectId(projectId).WithTypeProvider(new CustomTypeProvider()).WithDeliveryHttpClient(new DeliveryHttpClient(mockHttp.ToHttpClient())).Build();
+            _client = DeliveryClientBuilder.WithEnvironmentId(environmentId).WithTypeProvider(new CustomTypeProvider()).WithDeliveryHttpClient(new DeliveryHttpClient(mockHttp.ToHttpClient())).Build();
         }
 
         [Benchmark]

Kontent.Ai.Delivery.Benchmarks/Kontent.Ai.Delivery.Benchmarks.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
     <IsPackable>false</IsPackable>

Kontent.Ai.Delivery.Caching.Tests/BinarySerializationTests.cs

@@ -13,15 +13,15 @@ namespace Kontent.Ai.Delivery.Caching.Tests
 {
     public class BinarySerializationTests
     {
-        private readonly Guid _projectId;
+        private readonly Guid _environmentId;
         private readonly string _baseUrl;
         private readonly MockHttpMessageHandler _mockHttp;
 
         public BinarySerializationTests()
         {
-            _projectId = Guid.NewGuid();
-            var projectId = _projectId.ToString();
-            _baseUrl = $"https://deliver.kontent.ai/{projectId}";
+            _environmentId = Guid.NewGuid();
+            var environmentId = _environmentId.ToString();
+            _baseUrl = $"https://deliver.kontent.ai/{environmentId}";
             _mockHttp = new MockHttpMessageHandler();
         }
 
@@ -35,7 +35,7 @@ public async void GetItemAsync_SerializeAndDeserialize()
                 .When(url)
                 .Respond("application/json", await File.ReadAllTextAsync(Path.Combine(Environment.CurrentDirectory, $"Fixtures{Path.DirectorySeparatorChar}brazil_natural_barra_grande.json")));
 
-            var client = DeliveryClientBuilder.WithProjectId(_projectId).WithTypeProvider(new CustomTypeProvider()).WithDeliveryHttpClient(new DeliveryHttpClient(_mockHttp.ToHttpClient())).Build();
+            var client = DeliveryClientBuilder.WithEnvironmentId(_environmentId).WithTypeProvider(new CustomTypeProvider()).WithDeliveryHttpClient(new DeliveryHttpClient(_mockHttp.ToHttpClient())).Build();
 
             // Act
             var response = await client.GetItemAsync<Coffee>("brazil_natural_barra_grande");
@@ -62,7 +62,7 @@ public async void GetItemsAsync_SerializeAndDeserialize()
                 .Respond("application/json",
                     await File.ReadAllTextAsync(Path.Combine(Environment.CurrentDirectory, $"Fixtures{Path.DirectorySeparatorChar}full_articles.json")));
 
-            var client = DeliveryClientBuilder.WithProjectId(_projectId).WithTypeProvider(new CustomTypeProvider()).WithDeliveryHttpClient(new DeliveryHttpClient(_mockHttp.ToHttpClient())).Build();
+            var client = DeliveryClientBuilder.WithEnvironmentId(_environmentId).WithTypeProvider(new CustomTypeProvider()).WithDeliveryHttpClient(new DeliveryHttpClient(_mockHttp.ToHttpClient())).Build();
 
             // Act
             var response = await client.GetItemsAsync<Article>();

Kontent.Ai.Delivery.Caching.Tests/Kontent.Ai.Delivery.Caching.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Kontent.Ai.Delivery.Caching.Tests/ScenarioBuilder.cs

@@ -16,7 +16,7 @@ namespace Kontent.Ai.Delivery.Caching.Tests
 {
     public class ScenarioBuilder
     {
-        private readonly string _projectId = Guid.NewGuid().ToString();
+        private readonly string _environmentId = Guid.NewGuid().ToString();
         private readonly string _baseUrl;
         private readonly CacheTypeEnum _cacheType;
         private readonly CacheExpirationType _cacheExpirationType;
@@ -36,7 +36,7 @@ public ScenarioBuilder(
             DistributedCacheResilientPolicy distributedCacheResilientPolicy = DistributedCacheResilientPolicy.Crash,
             ILoggerFactory loggerFactory = null)
         {
-            _baseUrl = $"https://deliver.kontent.ai/{_projectId}/";
+            _baseUrl = $"https://deliver.kontent.ai/{_environmentId}/";
             _cacheType = cacheType;
             _cacheExpirationType = cacheExpirationType;
             _distributedCacheResilientPolicy = distributedCacheResilientPolicy;
@@ -108,11 +108,11 @@ public Scenario Build()
             }
             if (_cacheType == CacheTypeEnum.Memory)
             {
-                return new Scenario(_memoryCache, _cacheExpirationType, mockHttp.ToHttpClient(), new DeliveryOptions { ProjectId = _projectId }, _requestCounter);
+                return new Scenario(_memoryCache, _cacheExpirationType, mockHttp.ToHttpClient(), new DeliveryOptions { EnvironmentId = _environmentId }, _requestCounter);
             }
             else
             {
-                return new Scenario(_distributedCache, _cacheExpirationType, _distributedCacheResilientPolicy, mockHttp.ToHttpClient(), new DeliveryOptions { ProjectId = _projectId }, _requestCounter, _loggerFactory);
+                return new Scenario(_distributedCache, _cacheExpirationType, _distributedCacheResilientPolicy, mockHttp.ToHttpClient(), new DeliveryOptions { EnvironmentId = _environmentId }, _requestCounter, _loggerFactory);
             }
         }
     }

Kontent.Ai.Delivery.Caching.Tests/ServiceCollectionExtensionsTests.cs

@@ -43,7 +43,7 @@ public void AddDeliveryClientCacheWitNoPreviousRegistrationDeliveryClient_Throws
         [InlineData(CacheTypeEnum.Distributed)]
         public void AddDeliveryClient_WithNoCache_GetClient(CacheTypeEnum cacheType)
         {
-            _serviceCollection.AddDeliveryClient(new DeliveryOptions() { ProjectId = Guid.NewGuid().ToString() });
+            _serviceCollection.AddDeliveryClient(new DeliveryOptions() { EnvironmentId = Guid.NewGuid().ToString() });
             _serviceCollection.AddDeliveryClientCache(new DeliveryCacheOptions()
             {
                 CacheType = cacheType
@@ -62,7 +62,7 @@ public void AddDeliveryClient_WithNoCache_GetClient(CacheTypeEnum cacheType)
         [InlineData(CacheTypeEnum.Distributed)]
         public void AddDeliveryClient_CacheWithDeliveryCacheOptions_ThrowsNotImeplementException(CacheTypeEnum cacheType)
         {
-            _serviceCollection.AddDeliveryClient(new DeliveryOptions() { ProjectId = Guid.NewGuid().ToString() });
+            _serviceCollection.AddDeliveryClient(new DeliveryOptions() { EnvironmentId = Guid.NewGuid().ToString() });
             _serviceCollection.AddDeliveryClientCache(new DeliveryCacheOptions()
             {
                 CacheType = cacheType

Kontent.Ai.Delivery.Caching/DeliveryClientCache.cs

@@ -15,7 +15,7 @@ public class DeliveryClientCache : IDeliveryClient
         private readonly IDeliveryCacheManager _deliveryCacheManager;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DeliveryClientCache"/> class for retrieving cached content of the specified project.
+        /// Initializes a new instance of the <see cref="DeliveryClientCache"/> class for retrieving cached content of the specified environment.
         /// </summary>
         /// <param name="cacheManager"></param>
         /// <param name="deliveryClient"></param>
@@ -168,7 +168,7 @@ public Task<IDeliverySyncInitResponse> PostSyncInitAsync(IEnumerable<IQueryParam
         }
 
         /// <summary>
-        /// Retrieve a list of delta updates to recently changed content items in the specified project. The types of items you get is determined by the X-Continuation token you use.
+        /// Retrieve a list of delta updates to recently changed content items in the specified environment. The types of items you get is determined by the X-Continuation token you use.
         /// </summary>
         /// <returns>The <see cref="IDeliverySyncResponse"/> instance that represents the sync response that contains collection of delta updates and continuation token needed for further sync execution.</returns>
         public Task<IDeliverySyncResponse> GetSyncAsync(string continuationToken)

Kontent.Ai.Delivery.Caching/Kontent.Ai.Delivery.Caching.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Kontent s.r.o.</Authors>
     <Company>Kontent s.r.o.</Company>
     <Product>Kontent.ai</Product>

Kontent.Ai.Delivery.Extensions.DependencyInjection.Tests/DeliveryClientFactoryTests.cs

@@ -27,7 +27,7 @@ public DeliveryClientFactoryTests()
         [Fact]
         public void GetNamedClient_WithCorrectName_GetClient()
         {
-            var deliveryOptions = new DeliveryOptions() { ProjectId = Guid.NewGuid().ToString(), Name = _clientName };
+            var deliveryOptions = new DeliveryOptions() { EnvironmentId = Guid.NewGuid().ToString(), Name = _clientName };
             A.CallTo(() => _deliveryOptionsMock.Get(_clientName))
                 .Returns(deliveryOptions);
 
@@ -42,7 +42,7 @@ public void GetNamedClient_WithCorrectName_GetClient()
         [Fact]
         public void GetNamedClient_WithWrongName_GetNull()
         {
-            var deliveryOptions = new DeliveryOptions() { ProjectId = Guid.NewGuid().ToString() };
+            var deliveryOptions = new DeliveryOptions() { EnvironmentId = Guid.NewGuid().ToString() };
             A.CallTo(() => _deliveryOptionsMock.Get(_clientName))
                 .Returns(deliveryOptions);
 

Kontent.Ai.Delivery.Extensions.DependencyInjection.Tests/Kontent.Ai.Delivery.Extensions.DependencyInjection.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Kontent.Ai.Delivery.Extensions.DependencyInjection.Tests/ServiceCollectionExtensionsTests.MultipleDeliveryClientFactory.cs

@@ -17,7 +17,7 @@ public partial class ServiceCollectionExtensionsTests
         public class MultipleDeliveryClientFactory
         {
             private readonly IServiceCollection _serviceCollection;
-            private readonly DeliveryOptions _deliveryOptions = new DeliveryOptions { ProjectId = Guid.NewGuid().ToString() };
+            private readonly DeliveryOptions _deliveryOptions = new DeliveryOptions { EnvironmentId = Guid.NewGuid().ToString() };
             private readonly string _correctName = "correctName";
             private readonly string _wrongName = "wrongName";
 
@@ -267,15 +267,15 @@ public void AddMultipleDeliveryClientFactory_WithTwoClientsWithCustomTypeProvide
                 var typeProviderB = A.Fake<ITypeProvider>();
                 var clientAName = "Marketing";
                 var clientBName = "Finance";
-                var projectAID = "923850ac-5869-4743-8414-eb278e7beb69";
-                var projectBID = "88d518c5-db60-432d-918a-14dba79c63ac";
+                var environmentAID = "923850ac-5869-4743-8414-eb278e7beb69";
+                var environmentBID = "88d518c5-db60-432d-918a-14dba79c63ac";
 
                 _serviceCollection.AddMultipleDeliveryClientFactory(
                     factoryBuilder => factoryBuilder
                     .AddDeliveryClient(
                         clientAName,
                         builder => builder
-                            .WithProjectId(projectAID)
+                            .WithEnvironmentId(environmentAID)
                             .UseProductionApi()
                             .Build(),
                         optionalConfig => optionalConfig
@@ -284,7 +284,7 @@ public void AddMultipleDeliveryClientFactory_WithTwoClientsWithCustomTypeProvide
                     .AddDeliveryClient(
                         clientBName,
                         builder => builder
-                            .WithProjectId(projectBID)
+                            .WithEnvironmentId(environmentBID)
                             .UseProductionApi()
                             .Build(),
                         optionalConfig => optionalConfig
@@ -324,11 +324,11 @@ public void AddMultipleDeliveryClientFactory_WithTwoClientsWithCustomTypeProvide
                    .GetField("DeliveryOptions", bindingFlags)
                    .GetValue(clientB);
 
-                deliveryOptionsA.CurrentValue.ProjectId.Should().Be(projectAID);
+                deliveryOptionsA.CurrentValue.EnvironmentId.Should().Be(environmentAID);
                 registeredTypeProviderA.Should().Be(typeProviderA);
                 innerRegisteredTypeProviderA.Should().Be(typeProviderA);
 
-                deliveryOptionsB.CurrentValue.ProjectId.Should().Be(projectBID);
+                deliveryOptionsB.CurrentValue.EnvironmentId.Should().Be(environmentBID);
                 registeredTypeProviderB.Should().Be(typeProviderB);
                 innerRegisteredTypeProviderB.Should().Be(typeProviderB);
             }

Kontent.Ai.Delivery.Extensions.DependencyInjection.Tests/ServiceCollectionExtensionsTests.NamedCacheClient.cs

@@ -14,7 +14,7 @@ public partial class ServiceCollectionExtensionsTests
         public class NamedCacheClient
         {
             private readonly IServiceCollection _serviceCollection;
-            private readonly DeliveryOptions _deliveryOptions = new DeliveryOptions { ProjectId = Guid.NewGuid().ToString() };
+            private readonly DeliveryOptions _deliveryOptions = new DeliveryOptions { EnvironmentId = Guid.NewGuid().ToString() };
             private readonly string _correctName = "correctName";
             private readonly string _wrongName = "wrongName";
 

Kontent.Ai.Delivery.Extensions.DependencyInjection.Tests/ServiceCollectionExtensionsTests.NamedClient.cs

@@ -16,7 +16,7 @@ public class NamedClient
             private readonly IServiceCollection _serviceCollection;
             private readonly INamedServiceProvider _namedServiceProvider;
             private readonly IConfiguration _configuration;
-            private readonly DeliveryOptions _deliveryOptions = new DeliveryOptions { ProjectId = Guid.NewGuid().ToString() };
+            private readonly DeliveryOptions _deliveryOptions = new DeliveryOptions { EnvironmentId = Guid.NewGuid().ToString() };
             private readonly string _correctName = "correctName";
             private readonly string _wrongName = "wrongName";
 

Kontent.Ai.Delivery.Extensions.DependencyInjection/Kontent.Ai.Delivery.Extensions.DependencyInjection.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Kontent s.r.o.</Authors>
     <Product>Kontent.ai</Product>
     <Copyright>© 2022 Kontent s.r.o. All rights reserved.</Copyright>

Kontent.Ai.Delivery.Rx.Tests/DeliveryObservableProxyTests.cs

@@ -191,7 +191,7 @@ private IDeliveryClient GetDeliveryClient(Action mockAction)
         {
             mockAction();
             var deliveryHttpClient = new DeliveryHttpClient(_mockHttp.ToHttpClient());
-            var deliveryOptions = CreateMonitor(new DeliveryOptions { ProjectId = _guid });
+            var deliveryOptions = CreateMonitor(new DeliveryOptions { EnvironmentId = _guid });
             var contentLinkUrlResolver = A.Fake<IContentLinkUrlResolver>();
             var contentItemsProcessor = A.Fake<IInlineContentItemsProcessor>();
             var contentPropertyMapper = new PropertyMapper();

Kontent.Ai.Delivery.Rx.Tests/Fixtures/languages.json

@@ -3,7 +3,7 @@
     {
       "system": {
         "id": "00000000-0000-0000-0000-000000000000",
-        "name": "Default project language",
+        "name": "Default environment language",
         "codename": "default"
       }
     },

Kontent.Ai.Delivery.Rx.Tests/Kontent.Ai.Delivery.Rx.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

Kontent.Ai.Delivery.Rx/Kontent.Ai.Delivery.Rx.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Kontent s.r.o.</Authors>
     <Company>Kontent s.r.o.</Company>
     <Product>Kontent.ai</Product>