Skip to content

Commit

Permalink
Fix nuget build pipeline. Update examples with latest nugets. (#460)
Browse files Browse the repository at this point in the history
  • Loading branch information
dluc authored May 4, 2024
1 parent df8f2f3 commit b6b8ecf
Show file tree
Hide file tree
Showing 59 changed files with 291 additions and 162 deletions.
11 changes: 9 additions & 2 deletions KernelMemory.sln
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{6EF76FD8-4
.editorconfig = .editorconfig
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
nuget-package.props = nuget-package.props
code-analysis.props = code-analysis.props
nuget.config = nuget.config
Dockerfile = Dockerfile
.dockerignore = .dockerignore
Expand Down Expand Up @@ -264,6 +262,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TikToken", "extensions\TikT
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TikToken.UnitTests", "extensions\TikToken\TikToken.UnitTests\TikToken.UnitTests.csproj", "{8ADA17CD-B779-4817-B10A-E9D7B019088D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{2165A553-E07E-4FF7-90DA-3F3643EA690D}"
ProjectSection(SolutionItems) = preProject
infra\dotnet\code-analysis.props = infra\dotnet\code-analysis.props
infra\dotnet\icon.png = infra\dotnet\icon.png
infra\dotnet\nuget-package.props = infra\dotnet\nuget-package.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -341,6 +346,8 @@ Global
{28534545-CB39-446A-9EB9-A5ABBFE0CFD3} = {0A43C65C-6007-4BB4-B3FE-8D439FC91841}
{91757AC4-4FE3-40FE-96D6-1DDEDFB4A830} = {155DA079-E267-49AF-973A-D1D44681970F}
{8ADA17CD-B779-4817-B10A-E9D7B019088D} = {3C17F42B-CFC8-4900-8CFB-88936311E919}
{B488168B-AD86-4CC5-9D89-324B6EB743D9} = {6EF76FD8-4C35-4370-8539-5DDF45357A50}
{2165A553-E07E-4FF7-90DA-3F3643EA690D} = {B488168B-AD86-4CC5-9D89-324B6EB743D9}
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8A9FA587-7EBA-4D43-BE47-38D798B1C74C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\service\Abstractions\Abstractions.csproj" PrivateAssets="All" />
<ProjectReference Include="..\WebClient\WebClient.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\service\Abstractions\Abstractions.csproj" />
<ProjectReference Include="..\WebClient\WebClient.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" />
</ItemGroup>

<Import Project="../../../code-analysis.props" />
<Import Project="../../../infra/dotnet/code-analysis.props" />

<Import Project="../../../nuget-package.props" />
<Import Project="../../../infra/dotnet/nuget-package.props" />

<PropertyGroup>
<IsPackable>true</IsPackable>
Expand Down
6 changes: 3 additions & 3 deletions clients/dotnet/WebClient/WebClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\service\Abstractions\Abstractions.csproj" PrivateAssets="All" />
<ProjectReference Include="..\..\..\service\Abstractions\Abstractions.csproj" />
</ItemGroup>

<Import Project="../../../code-analysis.props" />
<Import Project="../../../infra/dotnet/code-analysis.props" />

<Import Project="../../../nuget-package.props" />
<Import Project="../../../infra/dotnet/nuget-package.props" />

<PropertyGroup>
<IsPackable>true</IsPackable>
Expand Down
Binary file removed clients/dotnet/WebClient/icon.png
Binary file not shown.
1 change: 0 additions & 1 deletion examples/001-dotnet-WebClient/001-dotnet-WebClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

<ItemGroup>
<ProjectReference Include="..\..\clients\dotnet\WebClient\WebClient.csproj" />
<ProjectReference Include="..\..\service\Abstractions\Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions examples/002-dotnet-Serverless/002-dotnet-Serverless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\extensions\AzureAIDocIntel\AzureAIDocIntel.csproj" />
<ProjectReference Include="..\..\extensions\AzureAISearch\AzureAISearch\AzureAISearch.csproj" />
<ProjectReference Include="..\..\extensions\AzureBlobs\AzureBlobs.csproj" />
<ProjectReference Include="..\..\extensions\AzureOpenAI\AzureOpenAI.csproj" />
<ProjectReference Include="..\..\extensions\AzureQueues\AzureQueues.csproj" />
<ProjectReference Include="..\..\extensions\MongoDbAtlas\MongoDbAtlas\MongoDbAtlas.csproj" />
<ProjectReference Include="..\..\extensions\OpenAI\OpenAI.csproj" />
<ProjectReference Include="..\..\extensions\Qdrant\Qdrant\Qdrant.csproj" />
<ProjectReference Include="..\..\extensions\RabbitMQ\RabbitMQ.csproj" />
<ProjectReference Include="..\..\extensions\Redis\Redis\Redis.csproj" />
<ProjectReference Include="..\..\extensions\TikToken\TikToken\TikToken.csproj" />
<ProjectReference Include="..\..\service\Core\Core.csproj" />
<ProjectReference Include="..\..\extensions\LlamaSharp\LlamaSharp\LlamaSharp.csproj" />
<ProjectReference Include="..\..\extensions\Postgres\Postgres\Postgres.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,6 @@
<ItemGroup>
<ProjectReference Include="..\..\clients\dotnet\SemanticKernelPlugin\SemanticKernelPlugin.csproj" />
<ProjectReference Include="..\..\clients\dotnet\WebClient\WebClient.csproj" />
<ProjectReference Include="..\..\extensions\AzureAIDocIntel\AzureAIDocIntel.csproj" />
<ProjectReference Include="..\..\extensions\AzureAISearch\AzureAISearch\AzureAISearch.csproj" />
<ProjectReference Include="..\..\extensions\AzureBlobs\AzureBlobs.csproj" />
<ProjectReference Include="..\..\extensions\AzureOpenAI\AzureOpenAI.csproj" />
<ProjectReference Include="..\..\extensions\AzureQueues\AzureQueues.csproj" />
<ProjectReference Include="..\..\extensions\LlamaSharp\LlamaSharp\LlamaSharp.csproj" />
<ProjectReference Include="..\..\extensions\MongoDbAtlas\MongoDbAtlas\MongoDbAtlas.csproj" />
<ProjectReference Include="..\..\extensions\OpenAI\OpenAI.csproj" />
<ProjectReference Include="..\..\extensions\Postgres\Postgres\Postgres.csproj" />
<ProjectReference Include="..\..\extensions\Qdrant\Qdrant\Qdrant.csproj" />
<ProjectReference Include="..\..\extensions\RabbitMQ\RabbitMQ.csproj" />
<ProjectReference Include="..\..\extensions\Redis\Redis\Redis.csproj" />
<ProjectReference Include="..\..\extensions\TikToken\TikToken\TikToken.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.50.240502.2" />
<PackageReference Include="Microsoft.KernelMemory.Core" Version="0.50.240504.7" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.50.240502.2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\extensions\AzureAIDocIntel\AzureAIDocIntel.csproj" />
<ProjectReference Include="..\..\extensions\AzureOpenAI\AzureOpenAI.csproj" />
<ProjectReference Include="..\..\extensions\OpenAI\OpenAI.csproj" />
<ProjectReference Include="..\..\service\Abstractions\Abstractions.csproj" />
<PackageReference Include="Microsoft.KernelMemory.Service.AspNetCore" Version="0.50.240504.7" />
</ItemGroup>

</Project>
16 changes: 15 additions & 1 deletion extensions/AzureAIDocIntel/AzureAIDocIntel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@
<PackageReference Include="Azure.AI.FormRecognizer" />
</ItemGroup>

<Import Project="../../code-analysis.props" />
<Import Project="../../infra/dotnet/code-analysis.props" />

<Import Project="../../infra/dotnet/nuget-package.props" />

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Microsoft.KernelMemory.DataFormats.AzureAIDocIntel</PackageId>
<Product>Azure AI Document Intelligence for Kernel Memory</Product>
<Description>Add Azure AI Document Intelligence to Kernel Memory to extract content from images and documentss.</Description>
<PackageTags>OCR, PDF, Memory, RAG, Kernel Memory, Semantic Memory, Episodic Memory, Declarative Memory, AI, Artificial Intelligence, Embeddings, Vector DB, Vector Search, Memory DB, ETL</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="README.md" Link="README.md" Pack="true" PackagePath="." Visible="false" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

<ItemGroup>
<ProjectReference Include="..\..\..\service\tests\Core.FunctionalTests\Core.FunctionalTests.csproj" />
<ProjectReference Include="..\..\..\service\tests\TestHelpers\TestHelpers.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<RollForward>LatestMajor</RollForward>
<AssemblyName>Microsoft.AzureAISearch.TestApplication</AssemblyName>
<RootNamespace>Microsoft.AzureAISearch.TestApplication</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using Microsoft.KernelMemory.MemoryDb.AzureAISearch;
using Microsoft.KernelMemory.MemoryStorage;

namespace AzureAISearch.TestApplication;
namespace Microsoft.AzureAISearch.TestApplication;

public static class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<RollForward>LatestMajor</RollForward>
<AssemblyName>Microsoft.AzureAISearch.UnitTests</AssemblyName>
<RootNamespace>Microsoft.AzureAISearch.UnitTests</RootNamespace>
<IsTestProject>true</IsTestProject>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -11,6 +13,10 @@
<NoWarn>$(NoWarn);CS1591;CS8600;CS8604;</NoWarn>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\service\tests\TestHelpers\TestHelpers.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
Expand All @@ -24,9 +30,4 @@
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\service\tests\TestHelpers\TestHelpers.csproj" />
<ProjectReference Include="..\AzureAISearch\AzureAISearch.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.KM.TestHelpers;
using Xunit.Abstractions;

namespace AzureAISearch.UnitTests;
namespace Microsoft.AzureAISearch.UnitTests;

public class AzureAISearchFilteringTest : BaseUnitTestCase
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using Microsoft.Extensions.Hosting;

namespace AzureAISearch.UnitTests;
namespace Microsoft.AzureAISearch.UnitTests;

public class Startup
{
Expand Down
20 changes: 17 additions & 3 deletions extensions/AzureAISearch/AzureAISearch/AzureAISearch.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,24 @@
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="AzureAISearch.UnitTests" />
<InternalsVisibleTo Include="AzureAISearch.TestApplication" />
<InternalsVisibleTo Include="Microsoft.AzureAISearch.UnitTests" />
<InternalsVisibleTo Include="Microsoft.AzureAISearch.TestApplication" />
</ItemGroup>

<Import Project="../../../code-analysis.props" />
<Import Project="../../../infra/dotnet/code-analysis.props" />

<Import Project="../../../infra/dotnet/nuget-package.props" />

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Microsoft.KernelMemory.MemoryDb.AzureAISearch</PackageId>
<Product>Azure AI Search connector for Kernel Memory</Product>
<Description>Azure AI Search connector for Microsoft Kernel Memory, to store and search memory using Azure AI Search vector indexing and semantic features.</Description>
<PackageTags>Memory, RAG, Kernel Memory, Azure AI Search, HNSW, AI, Artificial Intelligence, Embeddings, Vector DB, Vector Search, ETL</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="..\README.md" Link="README.md" Pack="true" PackagePath="." Visible="false" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Microsoft.KernelMemory.MemoryDb.AzureAISearch;

internal class MemoryDbField
internal sealed class MemoryDbField
{
#pragma warning disable CA1720
public enum FieldType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Microsoft.KernelMemory.MemoryDb.AzureAISearch;

internal class MemoryDbSchema
internal sealed class MemoryDbSchema
{
public List<MemoryDbField> Fields { get; set; } = new();

Expand Down
16 changes: 15 additions & 1 deletion extensions/AzureBlobs/AzureBlobs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@
<PackageReference Include="Azure.Storage.Blobs" />
</ItemGroup>

<Import Project="../../code-analysis.props" />
<Import Project="../../infra/dotnet/code-analysis.props" />

<Import Project="../../infra/dotnet/nuget-package.props" />

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Microsoft.KernelMemory.ContentStorage.AzureBlobs</PackageId>
<Product>Azure Blob Storage for Kernel Memory content storage</Product>
<Description>Azure Blob Storage adapter allowing Kernel Memory to upload documents and maintain their state in Azure Blobs</Description>
<PackageTags>Copilot, Plugin, Memory, RAG, Kernel Memory, Azure Blob, Semantic Memory, Episodic Memory, Declarative Memory, AI, Artificial Intelligence, Embeddings, Vector DB, Vector Search, Memory DB, ETL</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="README.md" Link="README.md" Pack="true" PackagePath="." Visible="false" />
</ItemGroup>

</Project>
16 changes: 15 additions & 1 deletion extensions/AzureOpenAI/AzureOpenAI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,20 @@
<PackageReference Include="Microsoft.SemanticKernel.Connectors.OpenAI" />
</ItemGroup>

<Import Project="../../code-analysis.props" />
<Import Project="../../infra/dotnet/code-analysis.props" />

<Import Project="../../infra/dotnet/nuget-package.props" />

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Microsoft.KernelMemory.AI.AzureOpenAI</PackageId>
<Product>Azure OpenAI LLM connector for Kernel Memory</Product>
<Description>Provide access to Azure OpenAI LLM models in Kernel Memory to generate embeddings and text</Description>
<PackageTags>Azure OpenAI, Plugin, Memory, RAG, Kernel Memory, Azure Blob, Semantic Memory, Episodic Memory, Declarative Memory, AI, Artificial Intelligence, Embeddings, Vector DB, Vector Search, Memory DB, ETL</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="README.md" Link="README.md" Pack="true" PackagePath="." Visible="false" />
</ItemGroup>

</Project>
16 changes: 15 additions & 1 deletion extensions/AzureQueues/AzureQueues.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@
<PackageReference Include="Azure.Storage.Queues" />
</ItemGroup>

<Import Project="../../code-analysis.props" />
<Import Project="../../infra/dotnet/code-analysis.props" />

<Import Project="../../infra/dotnet/nuget-package.props" />

<PropertyGroup>
<IsPackable>true</IsPackable>
<PackageId>Microsoft.KernelMemory.Orchestration.AzureQueues</PackageId>
<Product>Azure Queue Storage connector for Kernel Memory pipelines</Product>
<Description>Azure Queue Storage connector for Microsoft Kernel Memory, to run asynchronous pipelines via Azure Queue Storage queues.</Description>
<PackageTags>Memory, RAG, Kernel Memory, Azure Queue, HNSW, AI, Artificial Intelligence, Embeddings, Vector DB, Vector Search, ETL</PackageTags>
</PropertyGroup>

<ItemGroup>
<None Include="README.md" Link="README.md" Pack="true" PackagePath="." Visible="false" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

<ItemGroup>
<ProjectReference Include="..\..\..\service\tests\Core.FunctionalTests\Core.FunctionalTests.csproj" />
<ProjectReference Include="..\..\..\service\tests\TestHelpers\TestHelpers.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<RollForward>LatestMajor</RollForward>
<RootNamespace>Microsoft.LlamaSharp.FunctionalTests</RootNamespace>
<AssemblyName>Microsoft.LlamaSharp.FunctionalTests</AssemblyName>
<IsTestProject>true</IsTestProject>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -12,6 +13,10 @@
<NoWarn>$(NoWarn);KMEXP00;KMEXP01;CS1591;CA1861;</NoWarn>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\service\tests\TestHelpers\TestHelpers.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
Expand All @@ -29,8 +34,4 @@
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\service\tests\TestHelpers\TestHelpers.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit b6b8ecf

Please sign in to comment.