Skip to content

Commit dca24f5

Browse files
RogerBarretoRogerBarreto
authored
Merge branch 'main' into onnxchatclient
2 parents 1a8a569 + 2f84e5d commit dca24f5

File tree

860 files changed

+5975
-8725
lines changed

Some content is hidden

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

860 files changed

+5975
-8725
lines changed

‎.github/_typos.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extend-exclude = [
2323
"PopulationByCountry.csv",
2424
"PopulationByAdmin1.csv",
2525
"WomensSuffrage.txt",
26-
"SK-dotnet.sln.DotSettings",
26+
"SK-dotnet.slnx.DotSettings",
2727
"**/azure_ai_search_hotel_samples/README.md",
2828
"**/Demos/ProcessFrameworkWithAspire/ProcessFramework.Aspire/ProcessFramework.Aspire.ProcessOrchestrator/Program.cs",
2929
"**/Demos/ProcessFrameworkWithAspire/**/*.http",

‎.github/workflows/dotnet-build-and-test.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,28 +72,43 @@ jobs:
7272
- uses: actions/checkout@v4
7373
with:
7474
persist-credentials: false
75-
- name: Setup dotnet ${{ matrix.dotnet }}
76-
uses: actions/setup-dotnet@v3
75+
76+
- name: Setup dotnet
77+
uses: actions/[email protected]
7778
with:
78-
dotnet-version: ${{ matrix.dotnet }}
79+
global-json-file: ${{ github.workspace }}/dotnet/global.json
80+
7981
- name: Build dotnet solutions
8082
shell: bash
8183
run: |
82-
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.sln" | tr '\n' ' ')
84+
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | tr '\n' ' ')
8385
for solution in $SOLUTIONS; do
8486
dotnet build $solution -c ${{ matrix.configuration }} --warnaserror
8587
done
88+
8689
- name: Package install check
8790
shell: bash
88-
if: matrix.os == 'ubuntu-latest'
8991
run: |
90-
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.sln" | tr '\n' ' ')
92+
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | tr '\n' ' ')
9193
for solution in $SOLUTIONS; do
9294
dotnet pack $solution -c ${{ matrix.configuration }} --no-build --no-restore --output ./artifacts
9395
done
9496
dotnet new console --name packcheck --output consoleapp
95-
dotnet add consoleapp/packcheck.csproj package Microsoft.SemanticKernel --source ./artifacts
96-
dotnet build consoleapp/packcheck.csproj
97+
98+
# Create minimal nuget.config and use only dotnet nuget commands
99+
echo '<?xml version="1.0" encoding="utf-8"?><configuration><packageSources><clear /></packageSources></configuration>' > consoleapp/nuget.config
100+
101+
# Add sources with local first using dotnet nuget commands
102+
dotnet nuget add source ../artifacts --name local --configfile consoleapp/nuget.config
103+
dotnet nuget add source https://api.nuget.org/v3/index.json --name nuget.org --configfile consoleapp/nuget.config
104+
105+
# Change to project directory to ensure local nuget.config is used
106+
cd consoleapp
107+
dotnet add packcheck.csproj package Microsoft.SemanticKernel
108+
dotnet build -c ${{ matrix.configuration }} packcheck.csproj
109+
cd ..
110+
111+
# Clean up
97112
rm -rf ./artifacts
98113
rm -rf ./consoleapp
99114

‎.github/workflows/dotnet-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Find solutions
3333
shell: bash
34-
run: echo "solutions=$(find ./ -type f -name "*.sln" | tr '\n' ' ')" >> $GITHUB_ENV
34+
run: echo "solutions=$(find ./ -type f -name "*.slnx" | tr '\n' ' ')" >> $GITHUB_ENV
3535

3636
- name: Pull container dotnet/sdk:${{ matrix.dotnet }}
3737
run: |
@@ -94,7 +94,7 @@ jobs:
9494
9595
- name: Find solutions
9696
shell: bash
97-
run: echo "solutions=$(find ./dotnet -type f -name "*.sln" | tr '\n' ' ')" >> $GITHUB_ENV
97+
run: echo "solutions=$(find ./dotnet -type f -name "*.slnx" | tr '\n' ' ')" >> $GITHUB_ENV
9898

9999
- name: Restore dependencies
100100
shell: bash

‎.github/workflows/dotnet-format.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ jobs:
7373
done
7474
done
7575
else
76-
# if the changed-files step failed, run dotnet on the whole sln instead of specific projects
77-
csproj_files=$(find ./ -type f -name "*.sln" | tr '\n' ' ');
76+
# if the changed-files step failed, run dotnet on the whole slnx instead of specific projects
77+
csproj_files=$(find ./ -type f -name "*.slnx" | tr '\n' ' ');
7878
fi
7979
csproj_files=($(printf "%s\n" "${csproj_files[@]}" | sort -u))
80-
echo "Found ${#csproj_files[@]} unique csproj/sln files: ${csproj_files[*]}"
80+
echo "Found ${#csproj_files[@]} unique csproj/slnx files: ${csproj_files[*]}"
8181
echo "::set-output name=csproj_files::${csproj_files[*]}"
8282
8383
- name: Pull container dotnet/sdk:${{ matrix.dotnet }}

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@ __pycache__/
439439
.mypy_cache/
440440
__pypackages__/
441441
.pdm.toml
442-
global.json
443442

444443
# doxfx
445444
**/DROP/
@@ -499,4 +498,4 @@ swa-cli.config.json
499498
**/.kiota
500499

501500
# dapr extension files
502-
**/dapr.yaml
501+
**/dapr.yaml

‎dotnet/Directory.Build.targets

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
<!-- using Central Package Management feature -->
44
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
55
<Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.1.3" />
6-
<!-- Only run 'dotnet format' on dev machines, Release builds. Skip on GitHub Actions -->
7-
<!-- as this runs in its own Actions job. -->
6+
<!-- Only run 'dotnet format' on dev machines, Release builds. Skip on GitHub Actions and Azure DevOps. -->
87
<Target Name="DotnetFormatOnBuild" BeforeTargets="Build"
9-
Condition=" '$(Configuration)' == 'Release' AND '$(GITHUB_ACTIONS)' == '' ">
8+
Condition=" '$(Configuration)' == 'Release' AND '$(GITHUB_ACTIONS)' == '' AND '$(TF_BUILD)' != 'true' ">
109
<Message Text="Running dotnet format" Importance="high" />
1110
<Exec Command="dotnet format --no-restore -v diag $(ProjectFileName)" />
1211
</Target>

‎dotnet/Directory.Packages.props

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@
4040
<PackageVersion Include="Grpc.AspNetCore.Web" Version="2.70.0" />
4141
<PackageVersion Include="Grpc.Net.Client" Version="2.70.0" />
4242
<PackageVersion Include="Grpc.Tools" Version="2.71.0" />
43-
<PackageVersion Include="JmesPath.Net" Version="1.0.330" />
44-
<PackageVersion Include="JsonSchema.Net.Generation" Version="5.0.2" />
4543
<PackageVersion Include="Handlebars.Net.Helpers" Version="2.4.10" />
4644
<PackageVersion Include="Handlebars.Net" Version="2.1.6" />
4745
<PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
46+
<PackageVersion Include="JmesPath.Net" Version="1.0.330" />
4847
<PackageVersion Include="JsonSchema.Net" Version="7.3.4" />
48+
<PackageVersion Include="JsonSchema.Net.Generation" Version="5.0.2" />
4949
<PackageVersion Include="Markdig" Version="0.40.0" />
50+
<PackageVersion Include="Microsoft.Agents.CopilotStudio.Client" Version="1.1.107-beta" />
5051
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
5152
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.13" />
5253
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.14" />
@@ -65,9 +66,14 @@
6566
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
6667
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
6768
<PackageVersion Include="Microsoft.Identity.Client" Version="4.67.2" />
69+
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.67.2" />
6870
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
6971
<PackageVersion Include="Microsoft.ML.OnnxRuntime" Version="1.22.0" />
7072
<PackageVersion Include="Microsoft.ML.Tokenizers.Data.Cl100kBase" Version="1.0.1" />
73+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.47.0" />
74+
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.47.0" />
75+
<PackageVersion Include="Microsoft.SemanticKernel.Core" Version="1.47.0" />
76+
<PackageVersion Include="Microsoft.SemanticKernel.Planners.OpenAI" Version="1.47.0-preview" />
7177
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
7278
<PackageVersion Include="ModelContextProtocol" Version="0.2.0-preview.3" />
7379
<PackageVersion Include="MSTest.TestFramework" Version="3.8.0" />
@@ -147,7 +153,6 @@
147153
<PackageVersion Include="DuckDB.NET.Data" Version="1.1.3" />
148154
<PackageVersion Include="MongoDB.Driver" Version="2.30.0" />
149155
<PackageVersion Include="Microsoft.Graph" Version="4.51.0" />
150-
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.67.2" />
151156
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.23" />
152157
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.23" />
153158
<PackageVersion Include="Microsoft.OpenApi.ApiManifest" Version="0.5.6-preview" />

‎dotnet/MEVD.slnf

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,50 @@
11
{
22
"solution": {
3-
"path": "SK-dotnet.sln",
3+
"path": "SK-dotnet.slnx",
44
"projects":
55
[
6-
"src/Connectors/Connectors.Memory.AzureAISearch/Connectors.Memory.AzureAISearch.csproj",
7-
"src/Connectors/Connectors.Memory.CosmosMongoDB/Connectors.Memory.CosmosMongoDB.csproj",
8-
"src/Connectors/Connectors.Memory.CosmosNoSql/Connectors.Memory.CosmosNoSql.csproj",
9-
"src/Connectors/Connectors.Memory.Chroma/Connectors.Memory.Chroma.csproj",
10-
"src/Connectors/Connectors.Memory.DuckDB/Connectors.Memory.DuckDB.csproj",
11-
"src/Connectors/Connectors.Memory.InMemory/Connectors.Memory.InMemory.csproj",
12-
"src/Connectors/Connectors.Memory.Kusto/Connectors.Memory.Kusto.csproj",
13-
"src/Connectors/Connectors.Memory.Milvus/Connectors.Memory.Milvus.csproj",
14-
"src/Connectors/Connectors.Memory.MongoDB/Connectors.Memory.MongoDB.csproj",
15-
"src/Connectors/Connectors.Memory.Pinecone/Connectors.Memory.Pinecone.csproj",
16-
"src/Connectors/Connectors.Memory.PgVector/Connectors.Memory.PgVector.csproj",
17-
"src/Connectors/Connectors.Memory.Qdrant/Connectors.Memory.Qdrant.csproj",
18-
"src/Connectors/Connectors.Memory.Redis/Connectors.Memory.Redis.csproj",
19-
"src/Connectors/Connectors.Memory.SqliteVec/Connectors.Memory.SqliteVec.csproj",
20-
"src/Connectors/Connectors.Memory.SqlServer/Connectors.Memory.SqlServer.csproj",
21-
"src/Connectors/Connectors.Memory.Weaviate/Connectors.Memory.Weaviate.csproj",
6+
"src/VectorData/AzureAISearch/AzureAISearch.csproj",
7+
"src/VectorData/CosmosMongoDB/CosmosMongoDB.csproj",
8+
"src/VectorData/CosmosNoSql/CosmosNoSql.csproj",
9+
"src/VectorData/Chroma/Chroma.csproj",
10+
"src/VectorData/InMemory/InMemory.csproj",
11+
"src/VectorData/Milvus/Milvus.csproj",
12+
"src/VectorData/MongoDB/MongoDB.csproj",
13+
"src/VectorData/Pinecone/Pinecone.csproj",
14+
"src/VectorData/PgVector/PgVector.csproj",
15+
"src/VectorData/Qdrant/Qdrant.csproj",
16+
"src/VectorData/Redis/Redis.csproj",
17+
"src/VectorData/SqliteVec/SqliteVec.csproj",
18+
"src/VectorData/SqlServer/SqlServer.csproj",
19+
"src/VectorData/Weaviate/Weaviate.csproj",
2220

23-
"src/Connectors/Connectors.AzureAISearch.UnitTests/Connectors.AzureAISearch.UnitTests.csproj",
24-
"src/Connectors/Connectors.CosmosMongoDB.UnitTests/Connectors.CosmosMongoDB.UnitTests.csproj",
25-
"src/Connectors/Connectors.CosmosNoSql.UnitTests/Connectors.CosmosNoSql.UnitTests.csproj",
26-
"src/Connectors/Connectors.InMemory.UnitTests/Connectors.InMemory.UnitTests.csproj",
27-
"src/Connectors/Connectors.MongoDB.UnitTests/Connectors.MongoDB.UnitTests.csproj",
28-
"src/Connectors/Connectors.Pinecone.UnitTests/Connectors.Pinecone.UnitTests.csproj",
29-
"src/Connectors/Connectors.PgVector.UnitTests/Connectors.PgVector.UnitTests.csproj",
30-
"src/Connectors/Connectors.Qdrant.UnitTests/Connectors.Qdrant.UnitTests.csproj",
31-
"src/Connectors/Connectors.Redis.UnitTests/Connectors.Redis.UnitTests.csproj",
32-
"src/Connectors/Connectors.SqliteVec.UnitTests/Connectors.SqliteVec.UnitTests.csproj",
33-
"src/Connectors/Connectors.Weaviate.UnitTests/Connectors.Weaviate.UnitTests.csproj",
21+
"src/VectorData/VectorData.Abstractions/VectorData.Abstractions.csproj",
3422

35-
"src/VectorDataIntegrationTests/AzureAISearchIntegrationTests/AzureAISearchIntegrationTests.csproj",
36-
"src/VectorDataIntegrationTests/CosmosMongoDBIntegrationTests/CosmosMongoDBIntegrationTests.csproj",
37-
"src/VectorDataIntegrationTests/CosmosNoSqlIntegrationTests/CosmosNoSqlIntegrationTests.csproj",
38-
"src/VectorDataIntegrationTests/InMemoryIntegrationTests/InMemoryIntegrationTests.csproj",
39-
"src/VectorDataIntegrationTests/MongoDBIntegrationTests/MongoDBIntegrationTests.csproj",
40-
"src/VectorDataIntegrationTests/PineconeIntegrationTests/PineconeIntegrationTests.csproj",
41-
"src/VectorDataIntegrationTests/PgVectorIntegrationTests/PgVectorIntegrationTests.csproj",
42-
"src/VectorDataIntegrationTests/QdrantIntegrationTests/QdrantIntegrationTests.csproj",
43-
"src/VectorDataIntegrationTests/RedisIntegrationTests/RedisIntegrationTests.csproj",
44-
"src/VectorDataIntegrationTests/SqliteVecIntegrationTests/SqliteVecIntegrationTests.csproj",
45-
"src/VectorDataIntegrationTests/SqlServerIntegrationTests/SqlServerIntegrationTests.csproj",
46-
"src/VectorDataIntegrationTests/WeaviateIntegrationTests/WeaviateIntegrationTests.csproj",
23+
"test/VectorData/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj",
24+
"test/VectorData/AzureAISearch.ConformanceTests/AzureAISearch.ConformanceTests.csproj",
25+
"test/VectorData/CosmosMongoDB.UnitTests/CosmosMongoDB.UnitTests.csproj",
26+
"test/VectorData/CosmosMongoDB.ConformanceTests/CosmosMongoDB.ConformanceTests.csproj",
27+
"test/VectorData/CosmosNoSql.UnitTests/CosmosNoSql.UnitTests.csproj",
28+
"test/VectorData/CosmosNoSql.ConformanceTests/CosmosNoSql.ConformanceTests.csproj",
29+
"test/VectorData/InMemory.UnitTests/InMemory.UnitTests.csproj",
30+
"test/VectorData/InMemory.ConformanceTests/InMemory.ConformanceTests.csproj",
31+
"test/VectorData/MongoDB.UnitTests/MongoDB.UnitTests.csproj",
32+
"test/VectorData/MongoDB.ConformanceTests/MongoDB.ConformanceTests.csproj",
33+
"test/VectorData/Pinecone.UnitTests/Pinecone.UnitTests.csproj",
34+
"test/VectorData/Pinecone.ConformanceTests/Pinecone.ConformanceTests.csproj",
35+
"test/VectorData/PgVector.UnitTests/PgVector.UnitTests.csproj",
36+
"test/VectorData/PgVector.ConformanceTests/PgVector.ConformanceTests.csproj",
37+
"test/VectorData/Qdrant.UnitTests/Qdrant.UnitTests.csproj",
38+
"test/VectorData/Qdrant.ConformanceTests/Qdrant.ConformanceTests.csproj",
39+
"test/VectorData/Redis.UnitTests/Redis.UnitTests.csproj",
40+
"test/VectorData/Redis.ConformanceTests/Redis.ConformanceTests.csproj",
41+
"test/VectorData/SqliteVec.UnitTests/SqliteVec.UnitTests.csproj",
42+
"test/VectorData/SqliteVec.ConformanceTests/SqliteVec.ConformanceTests.csproj",
43+
"test/VectorData/SqlServer.ConformanceTests/SqlServer.ConformanceTests.csproj",
44+
"test/VectorData/Weaviate.UnitTests/Weaviate.UnitTests.csproj",
45+
"test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj",
4746

48-
"src/VectorDataIntegrationTests/VectorDataIntegrationTests/VectorDataIntegrationTests.csproj"
47+
"test/VectorData/VectorData.ConformanceTests/VectorData.ConformanceTests.csproj"
4948
]
5049
}
5150
}

0 commit comments

Comments
 (0)