Skip to content

Replace in-repo MEVD.Abstractions and ConformanceTests with NuGet package references #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
roji wants to merge 1 commit into from
Closed

Replace in-repo MEVD.Abstractions and ConformanceTests with NuGet package references #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,3 +502,5 @@ swa-cli.config.json

# dapr extension files
**/dapr.yaml

*.lscache
28 changes: 15 additions & 13 deletions dotnet/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.4" />
<PackageVersion Include="System.Memory.Data" Version="10.0.2" />
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.4" />
<PackageVersion Include="System.Text.Json" Version="10.0.4" />
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.6" />
<PackageVersion Include="System.Text.Json" Version="10.0.6" />
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
<PackageVersion Include="A2A" Version="0.3.1-preview" />
Expand All @@ -120,18 +120,18 @@
<!-- Tokenizers -->
<PackageVersion Include="Microsoft.ML.Tokenizers" Version="2.0.0" />
<!-- Microsoft.Extensions.* -->
<PackageVersion Include="Microsoft.Extensions.AI" Version="10.4.0" />
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.4.0" />
<PackageVersion Include="Microsoft.Extensions.AI" Version="10.5.0" />
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.5.0" />
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="10.0.0-preview.1.25559.3" />
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.4.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.5.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.6" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.4" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
Expand All @@ -147,6 +147,8 @@
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.2.0" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="10.5.0" />
<PackageVersion Include="Microsoft.Extensions.VectorData.ConformanceTests" Version="10.5.0" />
<!-- Test -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Moq" Version="[4.18.4]" />
Expand Down
5 changes: 1 addition & 4 deletions dotnet/MEVD.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"src/VectorData/SqlServer/SqlServer.csproj",
"src/VectorData/Weaviate/Weaviate.csproj",

"src/VectorData/VectorData.Abstractions/VectorData.Abstractions.csproj",

"test/VectorData/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj",
"test/VectorData/AzureAISearch.ConformanceTests/AzureAISearch.ConformanceTests.csproj",
Expand All @@ -42,9 +41,7 @@
"test/VectorData/SqliteVec.ConformanceTests/SqliteVec.ConformanceTests.csproj",
"test/VectorData/SqlServer.ConformanceTests/SqlServer.ConformanceTests.csproj",
"test/VectorData/Weaviate.UnitTests/Weaviate.UnitTests.csproj",
"test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj",

"test/VectorData/VectorData.ConformanceTests/VectorData.ConformanceTests.csproj"
"test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj"
]
}
}
3 changes: 0 additions & 3 deletions dotnet/SK-dotnet.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
<Project Path="src/VectorData/Redis/Redis.csproj" />
<Project Path="src/VectorData/SqliteVec/SqliteVec.csproj" />
<Project Path="src/VectorData/SqlServer/SqlServer.csproj" />
<Project Path="src/VectorData/VectorData.Abstractions/VectorData.Abstractions.csproj" />
<Project Path="src/VectorData/Weaviate/Weaviate.csproj" />
</Folder>
<Folder Name="/src/experimental/">
Expand Down Expand Up @@ -316,8 +315,6 @@
<Project Path="test/VectorData/SqliteVec.ConformanceTests/SqliteVec.ConformanceTests.csproj" />
<Project Path="test/VectorData/SqliteVec.UnitTests/SqliteVec.UnitTests.csproj" />
<Project Path="test/VectorData/SqlServer.ConformanceTests/SqlServer.ConformanceTests.csproj" />
<Project Path="test/VectorData/VectorData.ConformanceTests/VectorData.ConformanceTests.csproj" />
<Project Path="test/VectorData/VectorData.UnitTests/VectorData.UnitTests.csproj" />
<Project Path="test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj" />
<Project Path="test/VectorData/Weaviate.UnitTests/Weaviate.UnitTests.csproj" />
</Folder>
Expand Down
1 change: 0 additions & 1 deletion dotnet/SK-release.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"src\\VectorData\\Redis\\Redis.csproj",
"src\\VectorData\\SqliteVec\\SqliteVec.csproj",
"src\\VectorData\\SqlServer\\SqlServer.csproj",
"src\\VectorData\\VectorData.Abstractions\\VectorData.Abstractions.csproj",
"src\\VectorData\\Weaviate\\Weaviate.csproj",

"src\\Experimental\\Orchestration.Flow\\Experimental.Orchestration.Flow.csproj",
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/InternalUtilities/connectors/Memory/MongoDB/MongoModelBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ internal class MongoModelBuilder() : CollectionModelBuilder(s_validationOptions)
UsesExternalSerializer = true,
};

protected override void ProcessProperty(PropertyInfo? clrProperty, VectorStoreProperty? definitionProperty, Type? type)
protected override void ProcessProperty(PropertyInfo? clrProperty, VectorStoreProperty? definitionProperty)
{
base.ProcessProperty(clrProperty, definitionProperty, type);
base.ProcessProperty(clrProperty, definitionProperty);

if (clrProperty?.GetCustomAttribute<BsonElementAttribute>() is { } bsonElementAttribute
&& this.PropertyMap.TryGetValue(clrProperty.Name, out var property))
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/SemanticKernel.Abstractions/SemanticKernel.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData\VectorData.Abstractions\VectorData.Abstractions.csproj" />
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions dotnet/src/SemanticKernel.Core/Data/TextSearch/TextSearchKernelBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static class TextSearchKernelBuilderExtensions
ITextSearchResultMapper? resultMapper = null,
VectorStoreTextSearchOptions? options = null,
string? serviceId = default)
where TRecord : class
{
builder.Services.AddVectorStoreTextSearch<TRecord>(stringMapper, resultMapper, options, serviceId);
return builder;
Expand Down
1 change: 1 addition & 0 deletions dotnet/src/SemanticKernel.Core/Data/TextSearch/TextSearchServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public static class TextSearchServiceCollectionExtensions
ITextSearchResultMapper? resultMapper = null,
VectorStoreTextSearchOptions? options = null,
string? serviceId = default)
where TRecord : class
{
// If we are not constructing the dependent services, add the VectorStoreTextSearch as transient, since we
// cannot make assumptions about how dependent services are being managed.
Expand Down
1 change: 1 addition & 0 deletions dotnet/src/SemanticKernel.Core/Data/TextSearch/VectorStoreTextSearch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace Microsoft.SemanticKernel.Data;
[Experimental("SKEXP0001")]
#pragma warning disable CS0618 // ITextSearch is obsolete
public sealed class VectorStoreTextSearch<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] TRecord> : ITextSearch<TRecord>, ITextSearch
where TRecord : class
#pragma warning restore CS0618
#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
{
Expand Down
5 changes: 1 addition & 4 deletions dotnet/src/VectorData/AzureAISearch/AzureAISearch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,11 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Bcl.Memory" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="SemanticKernel.Connectors.AzureAISearch.UnitTests" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
</ItemGroup>
</Project>
11 changes: 2 additions & 9 deletions dotnet/src/VectorData/CosmosMongoDB/CosmosMongoDB.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,15 @@
<None Include="$(RepoRoot)/dotnet/nuget/VECTORDATA-CONNECTORS-NUGET.md" Link="VECTORDATA-CONNECTORS-NUGET.md" Pack="true" PackagePath="." />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MongoDB.Driver" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="SemanticKernel.Connectors.CosmosMongoDB.UnitTests" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
<PackageReference Include="MongoDB.Driver" />
</ItemGroup>

</Project>
13 changes: 5 additions & 8 deletions dotnet/src/VectorData/CosmosNoSql/CosmosNoSql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Cosmos" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Linq.AsyncEnumerable" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
<PackageReference Include="System.Linq.AsyncEnumerable" />
<PackageReference Include="Microsoft.Azure.Cosmos" />
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Bcl.Memory" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions dotnet/src/VectorData/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@

<PropertyGroup>
<NoWarn>$(NoWarn);MEVD9000,MEVD9001</NoWarn> <!-- Experimental MEVD connector-facing APIs -->

<!-- Temporary suppression of net462 warning coming from MEVD.Abstractions -->
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions dotnet/src/VectorData/InMemory/InMemory.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,4 @@
<PackageReference Include="System.Linq.AsyncEnumerable" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
</ItemGroup>

</Project>
9 changes: 1 addition & 8 deletions dotnet/src/VectorData/MongoDB/MongoDB.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,10 @@
<None Include="$(RepoRoot)/dotnet/nuget/VECTORDATA-CONNECTORS-NUGET.md" Link="VECTORDATA-CONNECTORS-NUGET.md" Pack="true" PackagePath="." />
</ItemGroup>

<ItemGroup>
<PackageReference Include="MongoDB.Driver" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
<PackageReference Include="MongoDB.Driver" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/VectorData/PgVector/PgVector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<PackageReference Include="Pgvector" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Bcl.Memory" />
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions dotnet/src/VectorData/Pinecone/Pinecone.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Bcl.Memory" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>

Expand All @@ -39,8 +40,4 @@
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
</ItemGroup>

</Project>
7 changes: 2 additions & 5 deletions dotnet/src/VectorData/Qdrant/Qdrant.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Linq.AsyncEnumerable" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
<PackageReference Include="Qdrant.Client" />
<PackageReference Include="System.Linq.AsyncEnumerable" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Bcl.Memory" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>

Expand All @@ -40,8 +41,4 @@
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions dotnet/src/VectorData/Redis/Redis.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<PackageReference Include="NRedisStack" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="Microsoft.SemanticKernel.Connectors.Redis.UnitTests" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Bcl.Memory" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
<InternalsVisibleTo Include="Microsoft.SemanticKernel.Connectors.Redis.UnitTests" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions dotnet/src/VectorData/SqlServer/SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<PackageReference Include="Microsoft.Data.SqlClient" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Bcl.Memory" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions dotnet/src/VectorData/SqliteVec/SqliteVec.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Linq.AsyncEnumerable" />
<PackageReference Include="System.Numerics.Tensors" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
<PackageReference Include="Microsoft.Data.Sqlite" />
<PackageReference Include="System.Linq.AsyncEnumerable" />
<PackageReference Include="System.Numerics.Tensors" />
<PackageReference Include="sqlite-vec" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net462' ">
<PackageReference Include="Microsoft.Bcl.Memory" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions dotnet/src/VectorData/VectorData.Abstractions/.editorconfig
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions dotnet/src/VectorData/VectorData.Abstractions/FilterClauses/AnyTagEqualToFilterClause.cs
View file
Open in desktop

This file was deleted.

Loading
Loading