Merge pull request #2 from atc-net/feature/fixes

Nuget fixes
atc-net · Apr 30, 2024 · 14ae522 · 14ae522
2 parents 305b3ad + 85ccf0f
commit 14ae522
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 32 deletions.
diff --git a/Atc.Semantic.Kernel.sln b/Atc.Semantic.Kernel.sln
@@ -12,36 +12,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{DAC1423F-D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{58BC6728-197C-484C-A8EC-38BC2F0B58C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Plugins", "src\Plugins\Atc.SemanticKernel.Plugins\Atc.SemanticKernel.Plugins.csproj", "{673BC3C5-3824-42C2-BF3B-D761192CE7DF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{67FE0C20-D944-47C5-A64E-AC05F7438940}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{47F559A0-49DF-48F5-ABD9-8A48962C4D47}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Client.Sample", "sample\Atc.SemanticKernel.Client.Sample\Atc.SemanticKernel.Client.Sample.csproj", "{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Connectors", "Connectors", "{B21D04E9-5AC8-4CC6-8A95-E370CC15046E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.WebApp.Sample", "sample\Atc.SemanticKernel.WebApp.Sample\Atc.SemanticKernel.WebApp.Sample.csproj", "{3EFEF526-4EF8-4B13-84CC-63A0F77EEBC9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Connectors.Ollama", "src\Connectors\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj", "{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Console.Sample", "sample\Atc.SemanticKernel.Console.Sample\Atc.SemanticKernel.Console.Sample.csproj", "{C5299A6E-FAE1-409E-A288-7EE763642DD4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{67FE0C20-D944-47C5-A64E-AC05F7438940}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Connectors", "Connectors", "{BB810D8C-E1BE-4FC6-8C90-12F3CD013C8D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Client.Sample", "sample\Atc.SemanticKernel.Client.Sample\Atc.SemanticKernel.Client.Sample.csproj", "{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{BEAA1DD3-E451-4809-BEEB-04B06C5A7F54}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.WebApp.Sample", "sample\Atc.SemanticKernel.WebApp.Sample\Atc.SemanticKernel.WebApp.Sample.csproj", "{3EFEF526-4EF8-4B13-84CC-63A0F77EEBC9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Connectors.Ollama", "src\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj", "{CD18613D-5516-469A-9FAE-8AB918305DD5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atc.SemanticKernel.Console.Sample", "sample\Atc.SemanticKernel.Console.Sample\Atc.SemanticKernel.Console.Sample.csproj", "{C5299A6E-FAE1-409E-A288-7EE763642DD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Plugins", "src\Atc.SemanticKernel.Plugins\Atc.SemanticKernel.Plugins.csproj", "{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{673BC3C5-3824-42C2-BF3B-D761192CE7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{673BC3C5-3824-42C2-BF3B-D761192CE7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{673BC3C5-3824-42C2-BF3B-D761192CE7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{673BC3C5-3824-42C2-BF3B-D761192CE7DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -54,18 +46,26 @@ Global
 		{C5299A6E-FAE1-409E-A288-7EE763642DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C5299A6E-FAE1-409E-A288-7EE763642DD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5299A6E-FAE1-409E-A288-7EE763642DD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD18613D-5516-469A-9FAE-8AB918305DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD18613D-5516-469A-9FAE-8AB918305DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD18613D-5516-469A-9FAE-8AB918305DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD18613D-5516-469A-9FAE-8AB918305DD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{673BC3C5-3824-42C2-BF3B-D761192CE7DF} = {47F559A0-49DF-48F5-ABD9-8A48962C4D47}
-		{47F559A0-49DF-48F5-ABD9-8A48962C4D47} = {69C84246-AA75-43E8-94B2-66FD555B18B0}
-		{B21D04E9-5AC8-4CC6-8A95-E370CC15046E} = {69C84246-AA75-43E8-94B2-66FD555B18B0}
-		{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE} = {B21D04E9-5AC8-4CC6-8A95-E370CC15046E}
 		{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD} = {67FE0C20-D944-47C5-A64E-AC05F7438940}
 		{3EFEF526-4EF8-4B13-84CC-63A0F77EEBC9} = {67FE0C20-D944-47C5-A64E-AC05F7438940}
 		{C5299A6E-FAE1-409E-A288-7EE763642DD4} = {67FE0C20-D944-47C5-A64E-AC05F7438940}
+		{BB810D8C-E1BE-4FC6-8C90-12F3CD013C8D} = {69C84246-AA75-43E8-94B2-66FD555B18B0}
+		{BEAA1DD3-E451-4809-BEEB-04B06C5A7F54} = {69C84246-AA75-43E8-94B2-66FD555B18B0}
+		{CD18613D-5516-469A-9FAE-8AB918305DD5} = {BB810D8C-E1BE-4FC6-8C90-12F3CD013C8D}
+		{B54F9836-081F-4AFA-ACD6-5CB394AAB39D} = {BEAA1DD3-E451-4809-BEEB-04B06C5A7F54}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {04120463-05C5-417B-8D7A-2D7D35B71A07}

diff --git a/sample/.editorconfig b/sample/.editorconfig
@@ -50,4 +50,6 @@ dotnet_diagnostic.S1075.severity = none             # Refactor your code not to
 # Custom - Code Analyzers Rules
 ##########################################
 
+dotnet_diagnostic.S1192.severity = none              # Define a constant instead of using this literal
+
 dotnet_diagnostic.CA1303.severity = none             # Do not pass literals as localized parameters
diff --git a/sample/Atc.SemanticKernel.Client.Sample/Atc.SemanticKernel.Client.Sample.csproj b/sample/Atc.SemanticKernel.Client.Sample/Atc.SemanticKernel.Client.Sample.csproj
@@ -7,11 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.10.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Connectors\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/sample/Atc.SemanticKernel.Console.Sample/Atc.SemanticKernel.Console.Sample.csproj b/sample/Atc.SemanticKernel.Console.Sample/Atc.SemanticKernel.Console.Sample.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.9.0" />
+    <PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.10.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Connectors\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
+    <ProjectReference Include="..\..\src\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/Atc.SemanticKernel.WebApp.Sample/Atc.SemanticKernel.WebApp.Sample.csproj b/sample/Atc.SemanticKernel.WebApp.Sample/Atc.SemanticKernel.WebApp.Sample.csproj
@@ -7,13 +7,13 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.9.0" />
-    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.9.0-alpha" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.10.0" />
+    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.10.0-alpha" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Connectors\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
+    <ProjectReference Include="..\..\src\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/sample/Atc.SemanticKernel.WebApp.Sample/Program.cs b/sample/Atc.SemanticKernel.WebApp.Sample/Program.cs
@@ -101,4 +101,4 @@ async IAsyncEnumerable<string> ChatCompletionAsync()
     .WithName("OllamaEmbeddingGeneration")
     .WithOpenApi();
 
-app.Run();
+await app.RunAsync();
diff --git a/...c.SemanticKernel.Connectors.Ollama.csproj → ...c.SemanticKernel.Connectors.Ollama.csproj b/...c.SemanticKernel.Connectors.Ollama.csproj → ...c.SemanticKernel.Connectors.Ollama.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.9.0" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.10.0" />
     <PackageReference Include="OllamaSharp" Version="1.1.1" />
   </ItemGroup>
 

diff --git a/...Completion/OllamaChatCompletionService.cs → ...Completion/OllamaChatCompletionService.cs b/...Completion/OllamaChatCompletionService.cs → ...Completion/OllamaChatCompletionService.cs
diff --git a/...amaChatCompletionServiceLoggerMessages.cs → ...amaChatCompletionServiceLoggerMessages.cs b/...amaChatCompletionServiceLoggerMessages.cs → ...amaChatCompletionServiceLoggerMessages.cs
diff --git a/...tensions/OllamaKernelBuilderExtensions.cs → ...tensions/OllamaKernelBuilderExtensions.cs b/...tensions/OllamaKernelBuilderExtensions.cs → ...tensions/OllamaKernelBuilderExtensions.cs
diff --git a/...ions/OllamaServiceCollectionExtensions.cs → ...ions/OllamaServiceCollectionExtensions.cs b/...ions/OllamaServiceCollectionExtensions.cs → ...ions/OllamaServiceCollectionExtensions.cs
diff --git a/...cKernel.Connectors.Ollama/GlobalUsings.cs → ...cKernel.Connectors.Ollama/GlobalUsings.cs b/...cKernel.Connectors.Ollama/GlobalUsings.cs → ...cKernel.Connectors.Ollama/GlobalUsings.cs
diff --git a/...nectors.Ollama/LoggingEventIdConstants.cs → ...nectors.Ollama/LoggingEventIdConstants.cs b/...nectors.Ollama/LoggingEventIdConstants.cs → ...nectors.Ollama/LoggingEventIdConstants.cs
diff --git a/...rnel.Connectors.Ollama/OllamaConstants.cs → ...rnel.Connectors.Ollama/OllamaConstants.cs b/...rnel.Connectors.Ollama/OllamaConstants.cs → ...rnel.Connectors.Ollama/OllamaConstants.cs
diff --git a/...el.Connectors.Ollama/OllamaServiceBase.cs → ...el.Connectors.Ollama/OllamaServiceBase.cs b/...el.Connectors.Ollama/OllamaServiceBase.cs → ...el.Connectors.Ollama/OllamaServiceBase.cs
diff --git a/...n/OllamaTextEmbeddingGenerationService.cs → ...n/OllamaTextEmbeddingGenerationService.cs b/...n/OllamaTextEmbeddingGenerationService.cs → ...n/OllamaTextEmbeddingGenerationService.cs
diff --git a/...beddingGenerationServiceLoggerMessages.cs → ...beddingGenerationServiceLoggerMessages.cs b/...beddingGenerationServiceLoggerMessages.cs → ...beddingGenerationServiceLoggerMessages.cs
diff --git a/...ionService/OllamaTextGenerationService.cs → ...ionService/OllamaTextGenerationService.cs b/...ionService/OllamaTextGenerationService.cs → ...ionService/OllamaTextGenerationService.cs
diff --git a/...amaTextGenerationServiceLoggerMessages.cs → ...amaTextGenerationServiceLoggerMessages.cs b/...amaTextGenerationServiceLoggerMessages.cs → ...amaTextGenerationServiceLoggerMessages.cs
diff --git a/...Plugins/Atc.SemanticKernel.Plugins.csproj → ...Plugins/Atc.SemanticKernel.Plugins.csproj b/...Plugins/Atc.SemanticKernel.Plugins.csproj → ...Plugins/Atc.SemanticKernel.Plugins.csproj