Skip to content

Commit 14ae522

Browse files
perkopsperkops
authored
Merge pull request #2 from atc-net/feature/fixes
Nuget fixes
2 parents 305b3ad + 85ccf0f commit 14ae522

20 files changed

+31
-32
lines changed

‎Atc.Semantic.Kernel.sln

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{DAC1423F-D
1212
EndProject
1313
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{58BC6728-197C-484C-A8EC-38BC2F0B58C4}"
1414
EndProject
15-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Plugins", "src\Plugins\Atc.SemanticKernel.Plugins\Atc.SemanticKernel.Plugins.csproj", "{673BC3C5-3824-42C2-BF3B-D761192CE7DF}"
15+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{67FE0C20-D944-47C5-A64E-AC05F7438940}"
1616
EndProject
17-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{47F559A0-49DF-48F5-ABD9-8A48962C4D47}"
17+
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}"
1818
EndProject
19-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Connectors", "Connectors", "{B21D04E9-5AC8-4CC6-8A95-E370CC15046E}"
19+
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}"
2020
EndProject
21-
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}"
21+
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}"
2222
EndProject
23-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{67FE0C20-D944-47C5-A64E-AC05F7438940}"
23+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Connectors", "Connectors", "{BB810D8C-E1BE-4FC6-8C90-12F3CD013C8D}"
2424
EndProject
25-
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}"
25+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{BEAA1DD3-E451-4809-BEEB-04B06C5A7F54}"
2626
EndProject
27-
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}"
27+
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}"
2828
EndProject
29-
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}"
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Atc.SemanticKernel.Plugins", "src\Atc.SemanticKernel.Plugins\Atc.SemanticKernel.Plugins.csproj", "{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}"
3030
EndProject
3131
Global
3232
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3333
Debug|Any CPU = Debug|Any CPU
3434
Release|Any CPU = Release|Any CPU
3535
EndGlobalSection
3636
GlobalSection(ProjectConfigurationPlatforms) = postSolution
37-
{673BC3C5-3824-42C2-BF3B-D761192CE7DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{673BC3C5-3824-42C2-BF3B-D761192CE7DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{673BC3C5-3824-42C2-BF3B-D761192CE7DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{673BC3C5-3824-42C2-BF3B-D761192CE7DF}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE}.Release|Any CPU.Build.0 = Release|Any CPU
4537
{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4638
{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
4739
{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -54,18 +46,26 @@ Global
5446
{C5299A6E-FAE1-409E-A288-7EE763642DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
5547
{C5299A6E-FAE1-409E-A288-7EE763642DD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
5648
{C5299A6E-FAE1-409E-A288-7EE763642DD4}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{CD18613D-5516-469A-9FAE-8AB918305DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{CD18613D-5516-469A-9FAE-8AB918305DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{CD18613D-5516-469A-9FAE-8AB918305DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{CD18613D-5516-469A-9FAE-8AB918305DD5}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{B54F9836-081F-4AFA-ACD6-5CB394AAB39D}.Release|Any CPU.Build.0 = Release|Any CPU
5757
EndGlobalSection
5858
GlobalSection(SolutionProperties) = preSolution
5959
HideSolutionNode = FALSE
6060
EndGlobalSection
6161
GlobalSection(NestedProjects) = preSolution
62-
{673BC3C5-3824-42C2-BF3B-D761192CE7DF} = {47F559A0-49DF-48F5-ABD9-8A48962C4D47}
63-
{47F559A0-49DF-48F5-ABD9-8A48962C4D47} = {69C84246-AA75-43E8-94B2-66FD555B18B0}
64-
{B21D04E9-5AC8-4CC6-8A95-E370CC15046E} = {69C84246-AA75-43E8-94B2-66FD555B18B0}
65-
{3DAF279B-9CAE-4F4C-B030-AB3B4CAF43FE} = {B21D04E9-5AC8-4CC6-8A95-E370CC15046E}
6662
{5C37ED9E-46B8-493C-8260-30EB8DA2B3BD} = {67FE0C20-D944-47C5-A64E-AC05F7438940}
6763
{3EFEF526-4EF8-4B13-84CC-63A0F77EEBC9} = {67FE0C20-D944-47C5-A64E-AC05F7438940}
6864
{C5299A6E-FAE1-409E-A288-7EE763642DD4} = {67FE0C20-D944-47C5-A64E-AC05F7438940}
65+
{BB810D8C-E1BE-4FC6-8C90-12F3CD013C8D} = {69C84246-AA75-43E8-94B2-66FD555B18B0}
66+
{BEAA1DD3-E451-4809-BEEB-04B06C5A7F54} = {69C84246-AA75-43E8-94B2-66FD555B18B0}
67+
{CD18613D-5516-469A-9FAE-8AB918305DD5} = {BB810D8C-E1BE-4FC6-8C90-12F3CD013C8D}
68+
{B54F9836-081F-4AFA-ACD6-5CB394AAB39D} = {BEAA1DD3-E451-4809-BEEB-04B06C5A7F54}
6969
EndGlobalSection
7070
GlobalSection(ExtensibilityGlobals) = postSolution
7171
SolutionGuid = {04120463-05C5-417B-8D7A-2D7D35B71A07}

‎sample/.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,6 @@ dotnet_diagnostic.S1075.severity = none # Refactor your code not to
5050
# Custom - Code Analyzers Rules
5151
##########################################
5252

53+
dotnet_diagnostic.S1192.severity = none # Define a constant instead of using this literal
54+
5355
dotnet_diagnostic.CA1303.severity = none # Do not pass literals as localized parameters

‎sample/Atc.SemanticKernel.Client.Sample/Atc.SemanticKernel.Client.Sample.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.10.0" />
1011
<PackageReference Include="System.Net.Http" Version="4.3.4" />
1112
</ItemGroup>
1213

13-
<ItemGroup>
14-
<ProjectReference Include="..\..\src\Connectors\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
15-
</ItemGroup>
16-
1714
</Project>

‎sample/Atc.SemanticKernel.Console.Sample/Atc.SemanticKernel.Console.Sample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.9.0" />
10+
<PackageReference Include="Microsoft.SemanticKernel.Abstractions" Version="1.10.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<ProjectReference Include="..\..\src\Connectors\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
14+
<ProjectReference Include="..\..\src\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
1515
</ItemGroup>
1616

1717
</Project>

‎sample/Atc.SemanticKernel.WebApp.Sample/Atc.SemanticKernel.WebApp.Sample.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
<ItemGroup>
99
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.4" />
10-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.9.0" />
11-
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.9.0-alpha" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
10+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.10.0" />
11+
<PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.10.0-alpha" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\..\src\Connectors\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
16+
<ProjectReference Include="..\..\src\Atc.SemanticKernel.Connectors.Ollama\Atc.SemanticKernel.Connectors.Ollama.csproj" />
1717
</ItemGroup>
1818

1919
</Project>

‎sample/Atc.SemanticKernel.WebApp.Sample/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ async IAsyncEnumerable<string> ChatCompletionAsync()
101101
.WithName("OllamaEmbeddingGeneration")
102102
.WithOpenApi();
103103

104-
app.Run();
104+
await app.RunAsync();

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/Atc.SemanticKernel.Connectors.Ollama.csproj renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/Atc.SemanticKernel.Connectors.Ollama.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.SemanticKernel" Version="1.9.0" />
16+
<PackageReference Include="Microsoft.SemanticKernel" Version="1.10.0" />
1717
<PackageReference Include="OllamaSharp" Version="1.1.1" />
1818
</ItemGroup>
1919

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/ChatCompletion/OllamaChatCompletionService.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/ChatCompletion/OllamaChatCompletionService.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/ChatCompletion/OllamaChatCompletionServiceLoggerMessages.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/ChatCompletion/OllamaChatCompletionServiceLoggerMessages.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/Extensions/OllamaKernelBuilderExtensions.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/Extensions/OllamaKernelBuilderExtensions.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/Extensions/OllamaServiceCollectionExtensions.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/Extensions/OllamaServiceCollectionExtensions.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/GlobalUsings.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/GlobalUsings.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/LoggingEventIdConstants.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/LoggingEventIdConstants.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/OllamaConstants.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/OllamaConstants.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/OllamaServiceBase.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/OllamaServiceBase.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/TextEmbeddingGeneration/OllamaTextEmbeddingGenerationService.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/TextEmbeddingGeneration/OllamaTextEmbeddingGenerationService.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/TextEmbeddingGeneration/OllamaTextEmbeddingGenerationServiceLoggerMessages.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/TextEmbeddingGeneration/OllamaTextEmbeddingGenerationServiceLoggerMessages.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/TextGenerationService/OllamaTextGenerationService.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/TextGenerationService/OllamaTextGenerationService.cs

File renamed without changes.

‎src/Connectors/Atc.SemanticKernel.Connectors.Ollama/TextGenerationService/OllamaTextGenerationServiceLoggerMessages.cs renamed to ‎src/Atc.SemanticKernel.Connectors.Ollama/TextGenerationService/OllamaTextGenerationServiceLoggerMessages.cs

File renamed without changes.

‎src/Plugins/Atc.SemanticKernel.Plugins/Atc.SemanticKernel.Plugins.csproj renamed to ‎src/Atc.SemanticKernel.Plugins/Atc.SemanticKernel.Plugins.csproj

File renamed without changes.

0 commit comments

Comments
 (0)