From ef6ec96a3bde1daa70c4a3315f29878823686bcd Mon Sep 17 00:00:00 2001 From: Devis Lucato Date: Sun, 20 Oct 2024 15:30:40 -0700 Subject: [PATCH] Update build setup (#848) --- .editorconfig | 1 - Directory.Packages.props | 29 +++++++------------ applications/evaluation/Evaluation.csproj | 2 +- .../SemanticKernelPlugin.csproj | 2 +- clients/dotnet/WebClient/WebClient.csproj | 2 +- .../105-dotnet-serverless-llamasharp.csproj | 2 +- ...06-dotnet-configuration-and-logging.csproj | 6 ---- .../AzureAIContentSafety.csproj | 1 - .../AzureAIDocIntel/AzureAIDocIntel.csproj | 1 - .../AzureAISearch/AzureAISearch.csproj | 2 +- extensions/Discord/Discord/Discord.csproj | 20 ++++++------- .../Elasticsearch/Elasticsearch.csproj | 2 +- .../KM/KernelMemory/KernelMemory.csproj | 6 ++-- .../LlamaSharp/LlamaSharp/LlamaSharp.csproj | 2 +- .../MongoDbAtlas/MongoDbAtlas.csproj | 2 +- extensions/Ollama/Ollama/Ollama.csproj | 2 +- extensions/OpenAI/OpenAI/OpenAI.csproj | 2 +- extensions/Postgres/Postgres/Postgres.csproj | 4 +-- extensions/Qdrant/Qdrant/Qdrant.csproj | 2 +- extensions/Redis/Redis/Redis.csproj | 2 +- .../SQLServer/SQLServer/SQLServer.csproj | 1 - service/Abstractions/Abstractions.csproj | 3 +- service/Core/Core.csproj | 11 ++++--- .../Service.AspNetCore.csproj | 2 +- service/Service/Service.csproj | 2 +- 25 files changed, 46 insertions(+), 65 deletions(-) diff --git a/.editorconfig b/.editorconfig index b891d5b59..9003d88ed 100644 --- a/.editorconfig +++ b/.editorconfig @@ -447,7 +447,6 @@ 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.Packages.props b/Directory.Packages.props index 4c081cedd..453827321 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,27 +7,23 @@ - - - + - + - - - - - + + + + + - - @@ -37,25 +33,22 @@ - + - + - + - - - - + diff --git a/applications/evaluation/Evaluation.csproj b/applications/evaluation/Evaluation.csproj index ef611fcc7..6f1c78a9f 100644 --- a/applications/evaluation/Evaluation.csproj +++ b/applications/evaluation/Evaluation.csproj @@ -4,7 +4,7 @@ net8.0 Microsoft.KernelMemory.Evaluation Microsoft.KernelMemory.Evaluation - $(NoWarn);KMEXP00;CA1711;CS1574;NU5104;SKEXP0001;CS8002;SKEXP0010; + $(NoWarn);KMEXP00;CA1711;CS1574;SKEXP0001;SKEXP0010;CS8002; diff --git a/clients/dotnet/SemanticKernelPlugin/SemanticKernelPlugin.csproj b/clients/dotnet/SemanticKernelPlugin/SemanticKernelPlugin.csproj index 877b59bbf..27c80216e 100644 --- a/clients/dotnet/SemanticKernelPlugin/SemanticKernelPlugin.csproj +++ b/clients/dotnet/SemanticKernelPlugin/SemanticKernelPlugin.csproj @@ -5,7 +5,7 @@ LatestMajor Microsoft.KernelMemory.SemanticKernelPlugin Microsoft.KernelMemory.SemanticKernelPlugin - $(NoWarn);NU5104; + $(NoWarn); diff --git a/clients/dotnet/WebClient/WebClient.csproj b/clients/dotnet/WebClient/WebClient.csproj index 57224a0a0..9ed1f0ef2 100644 --- a/clients/dotnet/WebClient/WebClient.csproj +++ b/clients/dotnet/WebClient/WebClient.csproj @@ -5,7 +5,7 @@ LatestMajor Microsoft.KernelMemory.WebClient Microsoft.KernelMemory - $(NoWarn);NU5104; + $(NoWarn); diff --git a/examples/105-dotnet-serverless-llamasharp/105-dotnet-serverless-llamasharp.csproj b/examples/105-dotnet-serverless-llamasharp/105-dotnet-serverless-llamasharp.csproj index 43cad9e4f..13138bf95 100644 --- a/examples/105-dotnet-serverless-llamasharp/105-dotnet-serverless-llamasharp.csproj +++ b/examples/105-dotnet-serverless-llamasharp/105-dotnet-serverless-llamasharp.csproj @@ -3,7 +3,7 @@ net8.0 enable - $(NoWarn);CS8002; + $(NoWarn); diff --git a/examples/206-dotnet-configuration-and-logging/206-dotnet-configuration-and-logging.csproj b/examples/206-dotnet-configuration-and-logging/206-dotnet-configuration-and-logging.csproj index 59f4a20b7..8072551c7 100644 --- a/examples/206-dotnet-configuration-and-logging/206-dotnet-configuration-and-logging.csproj +++ b/examples/206-dotnet-configuration-and-logging/206-dotnet-configuration-and-logging.csproj @@ -22,10 +22,4 @@ - - - - - - diff --git a/extensions/AzureAIContentSafety/AzureAIContentSafety/AzureAIContentSafety.csproj b/extensions/AzureAIContentSafety/AzureAIContentSafety/AzureAIContentSafety.csproj index b4ce3d5a5..cf0e624da 100644 --- a/extensions/AzureAIContentSafety/AzureAIContentSafety/AzureAIContentSafety.csproj +++ b/extensions/AzureAIContentSafety/AzureAIContentSafety/AzureAIContentSafety.csproj @@ -14,7 +14,6 @@ - diff --git a/extensions/AzureAIDocIntel/AzureAIDocIntel.csproj b/extensions/AzureAIDocIntel/AzureAIDocIntel.csproj index 755930342..600e7d6e9 100644 --- a/extensions/AzureAIDocIntel/AzureAIDocIntel.csproj +++ b/extensions/AzureAIDocIntel/AzureAIDocIntel.csproj @@ -13,7 +13,6 @@ - diff --git a/extensions/AzureAISearch/AzureAISearch/AzureAISearch.csproj b/extensions/AzureAISearch/AzureAISearch/AzureAISearch.csproj index c4126a22b..0284588c5 100644 --- a/extensions/AzureAISearch/AzureAISearch/AzureAISearch.csproj +++ b/extensions/AzureAISearch/AzureAISearch/AzureAISearch.csproj @@ -5,7 +5,7 @@ LatestMajor Microsoft.KernelMemory.MemoryDb.AzureAISearch Microsoft.KernelMemory.MemoryDb.AzureAISearch - $(NoWarn);KMEXP00;KMEXP03;CA1724;CA1308; + $(NoWarn);CS1700;KMEXP00;KMEXP03;CA1724;CA1308; diff --git a/extensions/Discord/Discord/Discord.csproj b/extensions/Discord/Discord/Discord.csproj index d0b6eaf1a..d05f4e3a9 100644 --- a/extensions/Discord/Discord/Discord.csproj +++ b/extensions/Discord/Discord/Discord.csproj @@ -5,19 +5,11 @@ LatestMajor Microsoft.KernelMemory.Sources.DiscordBot Microsoft.KernelMemory.Sources.DiscordBot - $(NoWarn);CA1303;CS8002; - - - - false - Microsoft.KernelMemory.Sources.Discord - Discord connector for Kernel Memory - Discord connector for Kernel Memory - Discord, Kernel Memory, AI, Artificial Intelligence, ETL + $(NoWarn);CS8002;CA1303; - + @@ -25,4 +17,12 @@ + + false + Microsoft.KernelMemory.Sources.Discord + Discord connector for Kernel Memory + Discord connector for Kernel Memory + Discord, Kernel Memory, AI, Artificial Intelligence, ETL + + diff --git a/extensions/Elasticsearch/Elasticsearch/Elasticsearch.csproj b/extensions/Elasticsearch/Elasticsearch/Elasticsearch.csproj index 2e44e04fd..02f34d4c1 100644 --- a/extensions/Elasticsearch/Elasticsearch/Elasticsearch.csproj +++ b/extensions/Elasticsearch/Elasticsearch/Elasticsearch.csproj @@ -5,7 +5,7 @@ LatestMajor Microsoft.KernelMemory.MemoryDb.Elasticsearch Microsoft.KernelMemory.MemoryDb.Elasticsearch - $(NoWarn);KMEXP00;KMEXP03;CA1308;CA1724;CA1812; + $(NoWarn);CS1700;KMEXP00;KMEXP03;CA1308;CA1724;CA1812; enable enable diff --git a/extensions/KM/KernelMemory/KernelMemory.csproj b/extensions/KM/KernelMemory/KernelMemory.csproj index 9e55e7920..f2fe5e402 100644 --- a/extensions/KM/KernelMemory/KernelMemory.csproj +++ b/extensions/KM/KernelMemory/KernelMemory.csproj @@ -5,14 +5,14 @@ LatestMajor Microsoft.KernelMemory.All Microsoft.KernelMemory - $(NoWarn);NU5104;CS8002; + $(NoWarn);CS8002; - - + + diff --git a/extensions/LlamaSharp/LlamaSharp/LlamaSharp.csproj b/extensions/LlamaSharp/LlamaSharp/LlamaSharp.csproj index 510e709cc..3172a4fad 100644 --- a/extensions/LlamaSharp/LlamaSharp/LlamaSharp.csproj +++ b/extensions/LlamaSharp/LlamaSharp/LlamaSharp.csproj @@ -14,7 +14,7 @@ - + diff --git a/extensions/Postgres/Postgres/Postgres.csproj b/extensions/Postgres/Postgres/Postgres.csproj index 9ffc8cc22..6002b361b 100644 --- a/extensions/Postgres/Postgres/Postgres.csproj +++ b/extensions/Postgres/Postgres/Postgres.csproj @@ -5,7 +5,7 @@ LatestMajor Microsoft.KernelMemory.Postgres Microsoft.KernelMemory.Postgres - $(NoWarn);KMEXP00;KMEXP03;CA1724;NU5104;CA1308;CS8002; + $(NoWarn);KMEXP00;KMEXP03;CA1724;CA1308;CS8002; @@ -14,7 +14,7 @@ - + diff --git a/extensions/Qdrant/Qdrant/Qdrant.csproj b/extensions/Qdrant/Qdrant/Qdrant.csproj index a56292b56..ad7b54ea7 100644 --- a/extensions/Qdrant/Qdrant/Qdrant.csproj +++ b/extensions/Qdrant/Qdrant/Qdrant.csproj @@ -5,7 +5,7 @@ LatestMajor Microsoft.KernelMemory.MemoryDb.Qdrant Microsoft.KernelMemory.MemoryDb.Qdrant - $(NoWarn);KMEXP00;KMEXP03;CA1724;CA1308; + $(NoWarn);CS1700;KMEXP00;KMEXP03;CA1724;CA1308; diff --git a/extensions/Redis/Redis/Redis.csproj b/extensions/Redis/Redis/Redis.csproj index 400596bcf..5a44e42e0 100644 --- a/extensions/Redis/Redis/Redis.csproj +++ b/extensions/Redis/Redis/Redis.csproj @@ -16,7 +16,7 @@ - + diff --git a/extensions/SQLServer/SQLServer/SQLServer.csproj b/extensions/SQLServer/SQLServer/SQLServer.csproj index 28a869197..10975569f 100644 --- a/extensions/SQLServer/SQLServer/SQLServer.csproj +++ b/extensions/SQLServer/SQLServer/SQLServer.csproj @@ -15,7 +15,6 @@ - diff --git a/service/Abstractions/Abstractions.csproj b/service/Abstractions/Abstractions.csproj index 5c9be1b57..6fab4f39c 100644 --- a/service/Abstractions/Abstractions.csproj +++ b/service/Abstractions/Abstractions.csproj @@ -4,11 +4,10 @@ net8.0 Microsoft.KernelMemory.Abstractions Microsoft.KernelMemory - $(NoWarn);KMEXP00;CA1711;CA1724;CS1574;NU5104;SKEXP0001; + $(NoWarn);KMEXP00;CA1711;CA1724;CS1574;SKEXP0001; - diff --git a/service/Core/Core.csproj b/service/Core/Core.csproj index bb92f7df6..26aca1d01 100644 --- a/service/Core/Core.csproj +++ b/service/Core/Core.csproj @@ -5,7 +5,7 @@ LatestMajor Microsoft.KernelMemory.Core Microsoft.KernelMemory - $(NoWarn);KMEXP00;KMEXP01;KMEXP02;KMEXP03;KMEXP04;SKEXP0001;SKEXP0011;CA2208;CA1308;CA1724;NU5104;CS8002; + $(NoWarn);CS1700;KMEXP00;KMEXP01;KMEXP02;KMEXP03;KMEXP04;SKEXP0001;SKEXP0011;CA2208;CA1308;CA1724;NU5104;CS8002; @@ -13,13 +13,12 @@ - - + - + @@ -38,8 +37,8 @@ true Microsoft.KernelMemory.Core - Kernel Memory library, including extensions and Serverless and Web client - The package contains all the core logic and extensions of Kernel Memory, to index and query any data and documents, using LLM and natural language, tracking sources and showing citations. + Kernel Memory core library + The package contains the the core logic and abstractions of Kernel Memory, not including extensions. Copilot, Plugin, Memory, RAG, Kernel Memory, Semantic Memory, Episodic Memory, Declarative Memory, AI, Artificial Intelligence, Embeddings, Vector DB, Vector Search, Memory DB, ETL bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml diff --git a/service/Service.AspNetCore/Service.AspNetCore.csproj b/service/Service.AspNetCore/Service.AspNetCore.csproj index 6c7e5145e..cb9618b94 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;CS8002; + $(NoWarn);CA1031;CA2254; diff --git a/service/Service/Service.csproj b/service/Service/Service.csproj index 433446ad2..11739eb76 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;KMEXP05;CS8002; + $(NoWarn);CA2007;CA1724;CA2254;CA1031;CA1861;CA1303;SKEXP0001;KMEXP05;