diff --git a/.editorconfig b/.editorconfig index 9003d88ed..b891d5b59 100644 --- a/.editorconfig +++ b/.editorconfig @@ -447,6 +447,7 @@ dotnet_diagnostic.CA1034.severity = none # Do not nest type. Alternatively, chan dotnet_diagnostic.CA1054.severity = none # URI parameters should not be strings dotnet_diagnostic.CA1062.severity = none # Disable null check, C# already does it for us dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member +dotnet_diagnostic.CS8002.severity = none # Referenced assembly does not have a strong name. dotnet_diagnostic.CA1805.severity = none # Member is explicitly initialized to its default value dotnet_diagnostic.CA1822.severity = none # Member does not access instance data and can be marked as static dotnet_diagnostic.CA1848.severity = none # For improved performance, use the LoggerMessage delegates diff --git a/Directory.Build.props b/Directory.Build.props index 1692429c7..b86f2fed1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 0.78.0 + 0.79.0 12 diff --git a/Directory.Packages.props b/Directory.Packages.props index 89c119582..789cf9827 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,14 +4,14 @@ - + - + - - + + @@ -26,15 +26,15 @@ - - - - - - - + + + + + + + - + @@ -42,7 +42,7 @@ - + @@ -51,16 +51,15 @@ - + - - - - - + + + + @@ -81,11 +80,11 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -104,7 +103,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/extensions/AzureOpenAI/Internals/AzureOpenAIClientBuilder.cs b/extensions/AzureOpenAI/Internals/AzureOpenAIClientBuilder.cs index 90c647a55..6803ec465 100644 --- a/extensions/AzureOpenAI/Internals/AzureOpenAIClientBuilder.cs +++ b/extensions/AzureOpenAI/Internals/AzureOpenAIClientBuilder.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft. All rights reserved. using System; +using System.ClientModel; using System.ClientModel.Primitives; using System.Net.Http; -using Azure; using Azure.AI.OpenAI; using Azure.Identity; using Microsoft.Extensions.Logging; @@ -26,7 +26,7 @@ internal static AzureOpenAIClient Build( AzureOpenAIClientOptions options = new() { RetryPolicy = new ClientSequentialRetryPolicy(maxRetries: Math.Max(0, config.MaxRetries), loggerFactory), - ApplicationId = Telemetry.HttpUserAgent, + UserAgentApplicationId = Telemetry.HttpUserAgent, }; if (httpClient is not null) @@ -48,7 +48,7 @@ internal static AzureOpenAIClient Build( throw new ConfigurationException($"Azure OpenAI: {config.APIKey} is empty"); } - return new AzureOpenAIClient(new Uri(config.Endpoint), new AzureKeyCredential(config.APIKey), options); + return new AzureOpenAIClient(new Uri(config.Endpoint), new ApiKeyCredential(config.APIKey), options); default: throw new ConfigurationException($"Azure OpenAI: authentication type '{config.Auth:G}' is not supported"); diff --git a/extensions/Ollama/Ollama/Ollama.csproj b/extensions/Ollama/Ollama/Ollama.csproj index e26c65d47..cce79491a 100644 --- a/extensions/Ollama/Ollama/Ollama.csproj +++ b/extensions/Ollama/Ollama/Ollama.csproj @@ -5,7 +5,7 @@ LatestMajor Microsoft.KernelMemory.AI.Ollama Microsoft.KernelMemory.AI.Ollama - $(NoWarn);KMEXP00;KMEXP01;CA1724; + $(NoWarn);KMEXP00;KMEXP01;CA1724;CS8002; diff --git a/extensions/OpenAI/OpenAI/Internals/OpenAIClientBuilder.cs b/extensions/OpenAI/OpenAI/Internals/OpenAIClientBuilder.cs index 532e2c042..c60667e26 100644 --- a/extensions/OpenAI/OpenAI/Internals/OpenAIClientBuilder.cs +++ b/extensions/OpenAI/OpenAI/Internals/OpenAIClientBuilder.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. using System; +using System.ClientModel; using System.ClientModel.Primitives; using System.Net.Http; using Microsoft.Extensions.Logging; @@ -19,7 +20,7 @@ internal static OpenAIClient Build( OpenAIClientOptions options = new() { RetryPolicy = new ClientSequentialRetryPolicy(maxRetries: Math.Max(0, config.MaxRetries), loggerFactory), - ApplicationId = Telemetry.HttpUserAgent, + UserAgentApplicationId = Telemetry.HttpUserAgent, }; if (httpClient is not null) @@ -34,6 +35,6 @@ internal static OpenAIClient Build( options.AddPolicy(new ChangeEndpointPolicy(config.Endpoint), PipelinePosition.PerTry); } - return new OpenAIClient(config.APIKey, options); + return new OpenAIClient(new ApiKeyCredential(config.APIKey), options); } } diff --git a/service/Abstractions/Abstractions.csproj b/service/Abstractions/Abstractions.csproj index a7f8a57a2..5c9be1b57 100644 --- a/service/Abstractions/Abstractions.csproj +++ b/service/Abstractions/Abstractions.csproj @@ -16,7 +16,6 @@ - diff --git a/service/Service.AspNetCore/Service.AspNetCore.csproj b/service/Service.AspNetCore/Service.AspNetCore.csproj index 8c11df35b..89bd1b9ac 100644 --- a/service/Service.AspNetCore/Service.AspNetCore.csproj +++ b/service/Service.AspNetCore/Service.AspNetCore.csproj @@ -6,7 +6,7 @@ LatestMajor Microsoft.KernelMemory.Service.AspNetCore Microsoft.KernelMemory.Service.AspNetCore - $(NoWarn);CA1031;CA2254; + $(NoWarn);CA1031;CA2254;CS8002; diff --git a/service/Service/Service.csproj b/service/Service/Service.csproj index bc65d41b4..0454629c5 100644 --- a/service/Service/Service.csproj +++ b/service/Service/Service.csproj @@ -8,7 +8,7 @@ Microsoft.KernelMemory.Service false false - $(NoWarn);CA2007;CA1724;CA2254;CA1031;CA1861;CA1303;SKEXP0001; + $(NoWarn);CA2007;CA1724;CA2254;CA1031;CA1861;CA1303;SKEXP0001;CS8002;