Skip to content

Commit 32471fe

Browse files
dlucdluc
authored
Enable Elasticsearch and clean up project files (#483)
Enable Elasticsearch in web service configuration. Cleanup project files.
1 parent 26a08f2 commit 32471fe

File tree

76 files changed

+181
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+181
-268
lines changed

‎.editorconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,12 +642,17 @@ csharp_style_expression_bodied_local_functions = false:silent
642642
[**/*.{FunctionalTests,TestApplication,UnitTests}/**.cs]
643643
dotnet_diagnostic.CA1303.severity = none # Passing literal strings as values
644644
dotnet_diagnostic.CA2007.severity = none # no need of ConfigureAwait(false) in tests
645+
dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member
645646
dotnet_diagnostic.IDE0005.severity = none # No need for documentation
647+
dotnet_diagnostic.IDE1006.severity = none # No need for Async suffix on test names
646648
resharper_inconsistent_naming_highlighting = none
647649

648650
[examples/**.cs]
649651
dotnet_diagnostic.CA1303.severity = none # Passing literal strings as values
650652
dotnet_diagnostic.CA2007.severity = none # no need of ConfigureAwait(false) in examples
653+
dotnet_diagnostic.CS1591.severity = none # Missing XML comment for publicly visible type or member
654+
dotnet_diagnostic.IDE0005.severity = none # No need for documentation
655+
dotnet_diagnostic.IDE1006.severity = none # No need for Async suffix on test names
651656
dotnet_diagnostic.SKEXP0003.severity = none
652657
dotnet_diagnostic.SKEXP0011.severity = none
653658
dotnet_diagnostic.SKEXP0052.severity = none

‎Directory.Build.props‎

Lines changed: 102 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
<!-- App Settings -->
22
<Project>
33
<PropertyGroup>
4-
<!-- Default properties inherited by all projects. Projects can override. -->
5-
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
6-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
7-
<AnalysisMode>AllEnabledByDefault</AnalysisMode>
8-
<AnalysisLevel>latest</AnalysisLevel>
9-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
104
<LangVersion>12</LangVersion>
115
<Nullable>enable</Nullable>
126
<ImplicitUsings>disable</ImplicitUsings>
137
<RollForward>LatestMajor</RollForward>
148
</PropertyGroup>
159

16-
<PropertyGroup>
17-
<!-- Disable NuGet packaging by default. Projects can override. -->
18-
<IsPackable>disable</IsPackable>
19-
</PropertyGroup>
20-
2110
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
2211
<DebugSymbols>true</DebugSymbols>
2312
<DebugType>full</DebugType>
@@ -28,7 +17,7 @@
2817
</PropertyGroup>
2918

3019
<PropertyGroup>
31-
<RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))</RepoRoot>
20+
<RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))/</RepoRoot>
3221
</PropertyGroup>
3322

3423
<ItemGroup>
@@ -37,4 +26,105 @@
3726
<_Parameter1>false</_Parameter1>
3827
</AssemblyAttribute>
3928
</ItemGroup>
29+
30+
<!-- ################################# -->
31+
<!-- ###### CODE ANALYSIS START ###### -->
32+
<!-- ################################# -->
33+
34+
<PropertyGroup>
35+
<!-- Default properties inherited by all projects. Projects can override. -->
36+
<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
37+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
38+
<AnalysisMode>All</AnalysisMode>
39+
<AnalysisLevel>latest</AnalysisLevel>
40+
<!-- Used by IDE0005 -->
41+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
42+
</PropertyGroup>
43+
44+
<ItemGroup>
45+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
46+
<PrivateAssets>all</PrivateAssets>
47+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
48+
</PackageReference>
49+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle">
50+
<PrivateAssets>all</PrivateAssets>
51+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
52+
</PackageReference>
53+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
54+
<PrivateAssets>all</PrivateAssets>
55+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
56+
</PackageReference>
57+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
58+
<PrivateAssets>all</PrivateAssets>
59+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
60+
</PackageReference>
61+
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers">
62+
<PrivateAssets>all</PrivateAssets>
63+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
64+
</PackageReference>
65+
<PackageReference Include="Roslynator.Formatting.Analyzers">
66+
<PrivateAssets>all</PrivateAssets>
67+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
68+
</PackageReference>
69+
</ItemGroup>
70+
71+
<!-- ###### CODE ANALYSIS END ######## -->
72+
73+
<!-- ################################# -->
74+
<!-- ###### NUGET START ############## -->
75+
<!-- ################################# -->
76+
77+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
78+
<IsPackable>false</IsPackable>
79+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
80+
</PropertyGroup>
81+
82+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
83+
<!-- Central version prefix - applies to all nuget packages. -->
84+
<Version>0.51.0</Version>
85+
86+
<!-- Disable NuGet packaging by default. Projects can override. -->
87+
<IsPackable>false</IsPackable>
88+
89+
<!-- Default description and tags. Packages can override. -->
90+
<OutputType>Library</OutputType>
91+
<Authors>Microsoft</Authors>
92+
<Company>Microsoft</Company>
93+
<Product>Kernel Memory</Product>
94+
<Description>Memory Service and Plugin to index and query any data using LLM and natural language, tracking sources and showing citations.</Description>
95+
<PackageTags>Memory, RAG, Plugin, Semantic Memory, Episodic Memory, Declarative Memory, Copilot, AI, Kernel Memory, Artificial Intelligence, Embeddings, Vector DB, Vector Search, Memory DB, ETL</PackageTags>
96+
97+
<!-- Required license, copyright, and repo information. Packages can override. -->
98+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
99+
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
100+
<PackageProjectUrl>https://github.com/microsoft/kernel-memory</PackageProjectUrl>
101+
<RepositoryUrl>https://github.com/microsoft/kernel-memory</RepositoryUrl>
102+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
103+
104+
<!-- Use icon linked below -->
105+
<PackageIcon>icon.png</PackageIcon>
106+
<PackageIconUrl>icon.png</PackageIconUrl>
107+
108+
<!-- Use readme linked by the project (csproj must include a README) -->
109+
<PackageReadmeFile>README.md</PackageReadmeFile>
110+
111+
<!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
112+
<IncludeSymbols>true</IncludeSymbols>
113+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
114+
115+
<!-- Embed C# sources in PDB -->
116+
<EmbedAllSources>true</EmbedAllSources>
117+
118+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
119+
</PropertyGroup>
120+
121+
<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
122+
<!-- SourceLink allows step-through debugging for source hosted on GitHub. -->
123+
<!-- https://github.com/dotnet/sourcelink -->
124+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
125+
126+
<None Include="$(RepoRoot)icon.png" Link="icon.png" Pack="true" PackagePath="." Visible="false" />
127+
</ItemGroup>
128+
129+
<!-- ###### NUGET END ################ -->
40130
</Project>

‎Directory.Packages.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<ItemGroup>
66
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-preview.7.24251.11" />
77
<PackageVersion Include="Azure.AI.FormRecognizer" Version="4.1.0" />
8+
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
89
<PackageVersion Include="Azure.Identity" Version="1.11.2" />
910
<PackageVersion Include="Azure.Search.Documents" Version="11.5.1" />
1011
<PackageVersion Include="Azure.Storage.Blobs" Version="12.19.1" />
@@ -19,6 +20,7 @@
1920
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
2021
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.0" />
2122
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
23+
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="7.2.0" />
2224
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
2325
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
2426
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
@@ -29,6 +31,8 @@
2931
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
3032
<PackageVersion Include="Microsoft.Extensions.Logging.TraceSource" Version="8.0.0" />
3133
<PackageVersion Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24179.1" />
34+
<PackageVersion Include="Microsoft.KernelMemory.Core" Version="0.50.240504.7" />
35+
<PackageVersion Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.50.240504.7" />
3236
<PackageVersion Include="MongoDB.Driver.GridFS" Version="2.25.0" />
3337
<PackageVersion Include="Moq" Version="4.20.70" />
3438
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

‎KernelMemory.sln‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{7BA7F1B2-1
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{0A43C65C-6007-4BB4-B3FE-8D439FC91841}"
3737
ProjectSection(SolutionItems) = preProject
38-
examples\Directory.Build.props = examples\Directory.Build.props
3938
examples\README.md = examples\README.md
4039
EndProjectSection
4140
EndProject
@@ -261,13 +260,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TikToken", "extensions\TikT
261260
EndProject
262261
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TikToken.UnitTests", "extensions\TikToken\TikToken.UnitTests\TikToken.UnitTests.csproj", "{8ADA17CD-B779-4817-B10A-E9D7B019088D}"
263262
EndProject
264-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{2165A553-E07E-4FF7-90DA-3F3643EA690D}"
265-
ProjectSection(SolutionItems) = preProject
266-
infra\dotnet\code-analysis.props = infra\dotnet\code-analysis.props
267-
infra\dotnet\icon.png = infra\dotnet\icon.png
268-
infra\dotnet\nuget-package.props = infra\dotnet\nuget-package.props
269-
EndProjectSection
270-
EndProject
271263
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLServer", "extensions\SQLServer\SQLServer\SQLServer.csproj", "{B9BE1099-F78F-4A5F-A897-BF2C75E19C57}"
272264
EndProject
273265
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elasticsearch", "extensions\Elasticsearch\Elasticsearch\Elasticsearch.csproj", "{2E10420F-BF96-411C-8FE0-F6268F2EEB67}"
@@ -587,7 +579,6 @@ Global
587579
{28534545-CB39-446A-9EB9-A5ABBFE0CFD3} = {0A43C65C-6007-4BB4-B3FE-8D439FC91841}
588580
{91757AC4-4FE3-40FE-96D6-1DDEDFB4A830} = {155DA079-E267-49AF-973A-D1D44681970F}
589581
{8ADA17CD-B779-4817-B10A-E9D7B019088D} = {3C17F42B-CFC8-4900-8CFB-88936311E919}
590-
{2165A553-E07E-4FF7-90DA-3F3643EA690D} = {B488168B-AD86-4CC5-9D89-324B6EB743D9}
591582
{B9BE1099-F78F-4A5F-A897-BF2C75E19C57} = {155DA079-E267-49AF-973A-D1D44681970F}
592583
{2E10420F-BF96-411C-8FE0-F6268F2EEB67} = {155DA079-E267-49AF-973A-D1D44681970F}
593584
{C5E6B28C-F54D-423D-954D-A9EAEFB89732} = {3C17F42B-CFC8-4900-8CFB-88936311E919}

‎clients/dotnet/SemanticKernelPlugin/SemanticKernelPlugin.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@
1717
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" />
1818
</ItemGroup>
1919

20-
<Import Project="../../../infra/dotnet/code-analysis.props" />
21-
22-
<Import Project="../../../infra/dotnet/nuget-package.props" />
23-
2420
<PropertyGroup>
2521
<IsPackable>true</IsPackable>
2622
<PackageId>Microsoft.KernelMemory.SemanticKernelPlugin</PackageId>
2723
<Product>Memory Plugin for Semantic Kernel</Product>
2824
<Description>Kernel Memory Plugin allows to use Kernel Memory Service as a Semantic Kernel plugin, to index and query any data and documents, using LLM and natural language, tracking sources and showing citations.</Description>
2925
<PackageTags>Copilot, Plugin, Memory, RAG, Kernel Memory, Semantic Memory, Episodic Memory, Declarative Memory, AI, Artificial Intelligence, Embeddings, Vector DB, Vector Search, Memory DB, ETL</PackageTags>
26+
<DocumentationFile>bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml</DocumentationFile>
3027
</PropertyGroup>
3128

3229
<ItemGroup>

‎clients/dotnet/WebClient/WebClient.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@
1212
<ProjectReference Include="..\..\..\service\Abstractions\Abstractions.csproj" />
1313
</ItemGroup>
1414

15-
<Import Project="../../../infra/dotnet/code-analysis.props" />
16-
17-
<Import Project="../../../infra/dotnet/nuget-package.props" />
18-
1915
<PropertyGroup>
2016
<IsPackable>true</IsPackable>
2117
<PackageId>Microsoft.KernelMemory.WebClient</PackageId>
2218
<Product>Kernel Memory Web Client</Product>
2319
<Description>Kernel Memory Web Client allows to connect to Kernel Memory Web Service to index and query any data and documents, using LLM and natural language, tracking sources and showing citations.</Description>
2420
<PackageTags>Copilot, Plugin, Memory, RAG, Kernel Memory, Semantic Memory, Semantic Kernel, Episodic Memory, Declarative Memory, AI, Artificial Intelligence, Embeddings, Vector DB, Vector Search, Memory DB, ETL</PackageTags>
21+
<DocumentationFile>bin/$(Configuration)/$(TargetFramework)/$(AssemblyName).xml</DocumentationFile>
2522
</PropertyGroup>
2623

2724
<ItemGroup>

‎examples/001-dotnet-WebClient/001-dotnet-WebClient.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
<NoWarn>$(NoWarn);CA1050;CA2000;CA1707;CA1303;CA2007;CA1861;</NoWarn>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<NoWarn>$(NoWarn);CA1050;CA2000;CA1707;CA1303;CA2007;CA1861;CS1591;IDE1006;</NoWarn>
67
</PropertyGroup>
78

89
<ItemGroup>

‎examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
<NoWarn>$(NoWarn);CA1050;CA2000;CA1707;CA1303;CA2007;CA1724;CA1861;</NoWarn>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<NoWarn>$(NoWarn);CA1050;CA2000;CA1707;CA1303;CA2007;CA1724;CA1861;IDE1006;</NoWarn>
67
</PropertyGroup>
78

89
<ItemGroup>

‎examples/003-dotnet-SemanticKernel-plugin/003-dotnet-SemanticKernel-plugin.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
<NoWarn>$(NoWarn);CA1050;CA1859;CA2000;</NoWarn>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<NoWarn>$(NoWarn);CA1050;CA1859;CA2000;CS1591;</NoWarn>
67
</PropertyGroup>
78

89
<ItemGroup>

‎examples/004-dotnet-serverless-custom-pipeline/004-dotnet-serverless-custom-pipeline.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
56
<NoWarn>$(NoWarn);CA1050;CA2000;CA1707;CA1303;CA2007;CA1724;CA1861;</NoWarn>
67
</PropertyGroup>
78

0 commit comments

Comments
 (0)