Skip to content

Commit d31366a

Browse files
rojiCopilot
roji
and
Copilot
committed
Replace in-repo MEVD.Abstractions and ConformanceTests with NuGet package references
- Replace ProjectReferences to in-repo MEVD.Abstractions and ConformanceTests with PackageReferences to published 10.5.0 NuGet packages - Centralize MEVD.Abstractions PackageReference in src/VectorData/Directory.Build.props - Centralize ConformanceTests PackageReference in test/VectorData/Directory.Build.props - Add Microsoft.Bcl.Memory polyfill to 9 providers needing System.Index on net462/netstandard2.0 (SqlServer, PgVector, SqliteVec, AzureAISearch, CosmosNoSql, Pinecone, Qdrant, Redis, Weaviate) - Add SuppressTfmSupportBuildWarnings for MEVD net462 buildTransitive warnings - Bump System.Text.Json to 10.0.6, M.E.Configuration* and M.E.DependencyInjection to 10.0.6 (required by ConformanceTests 10.5.0) - Fix VectorStoreVectorAttribute Dimensions -> dimensions casing change - Fix MongoModelBuilder.ProcessProperty override signature (remove Type? param) - Add 'where TRecord : class' constraint to VectorStoreTextSearch and related extension methods (required by MEVD 10.5.0 IVectorSearchable<TRecord>) - Replace ConditionalFact/ConditionalTheory with standard Fact/Theory attributes - Remove conditional test infrastructure (ITestCondition, DisableTests, etc.) - Convert SemanticKernel.Abstractions ProjectReference to PackageReference - Clean up solution files (remove stale entries, update slnf/slnx) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 20c91a3 commit d31366a

184 files changed

Lines changed: 167 additions & 10471 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,3 +502,5 @@ swa-cli.config.json
502502

503503
# dapr extension files
504504
**/dapr.yaml
505+
506+
*.lscache

‎dotnet/Directory.Packages.props‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<PackageVersion Include="Npgsql" Version="10.0.2" />
9393
<PackageVersion Include="OData2Linq" Version="2.2.0" />
9494
<PackageVersion Include="OllamaSharp" Version="5.4.12" />
95-
<PackageVersion Include="OpenAI" Version="2.9.1" />
95+
<PackageVersion Include="OpenAI" Version="2.10.0" />
9696
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
9797
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
9898
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
@@ -110,8 +110,8 @@
110110
<PackageVersion Include="System.Linq.AsyncEnumerable" Version="10.0.4" />
111111
<PackageVersion Include="System.Memory.Data" Version="10.0.2" />
112112
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
113-
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.4" />
114-
<PackageVersion Include="System.Text.Json" Version="10.0.4" />
113+
<PackageVersion Include="System.Numerics.Tensors" Version="10.0.6" />
114+
<PackageVersion Include="System.Text.Json" Version="10.0.6" />
115115
<PackageVersion Include="System.ValueTuple" Version="4.6.1" />
116116
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
117117
<PackageVersion Include="A2A" Version="0.3.1-preview" />
@@ -120,39 +120,41 @@
120120
<!-- Tokenizers -->
121121
<PackageVersion Include="Microsoft.ML.Tokenizers" Version="2.0.0" />
122122
<!-- Microsoft.Extensions.* -->
123-
<PackageVersion Include="Microsoft.Extensions.AI" Version="10.4.0" />
124-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.4.0" />
123+
<PackageVersion Include="Microsoft.Extensions.AI" Version="10.5.0" />
124+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.5.0" />
125125
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="10.0.0-preview.1.25559.3" />
126-
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.4.0" />
127-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.2" />
128-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.2" />
129-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.2" />
130-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.2" />
131-
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.2" />
132-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.2" />
133-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
134-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
126+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="10.5.0" />
127+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.6" />
128+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.6" />
129+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.6" />
130+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.6" />
131+
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.6" />
132+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.6" />
133+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.6" />
134+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.6" />
135135
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.4" />
136136
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.2" />
137137
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
138138
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.2" />
139139
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.2.0" />
140140
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.2.0" />
141141
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.2" />
142-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.4" />
142+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
143143
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.2" />
144144
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.2" />
145145
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.2" />
146146
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.2" />
147147
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.2.0" />
148-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.2" />
148+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.6" />
149149
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.2" />
150+
<PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="10.5.0" />
151+
<PackageVersion Include="Microsoft.Extensions.VectorData.ConformanceTests" Version="10.5.0" />
150152
<!-- Test -->
151153
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
152154
<PackageVersion Include="Moq" Version="[4.18.4]" />
153155
<PackageVersion Include="FluentAssertions" Version="8.2.0" />
154156
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
155-
<PackageVersion Include="System.Threading.Channels" Version="10.0.4" />
157+
<PackageVersion Include="System.Threading.Channels" Version="10.0.6" />
156158
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="10.0.2" />
157159
<PackageVersion Include="xunit" Version="2.9.3" />
158160
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />

‎dotnet/MEVD.slnf‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
"src/VectorData/SqlServer/SqlServer.csproj",
1919
"src/VectorData/Weaviate/Weaviate.csproj",
2020

21-
"src/VectorData/VectorData.Abstractions/VectorData.Abstractions.csproj",
2221

2322
"test/VectorData/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj",
2423
"test/VectorData/AzureAISearch.ConformanceTests/AzureAISearch.ConformanceTests.csproj",
@@ -42,9 +41,7 @@
4241
"test/VectorData/SqliteVec.ConformanceTests/SqliteVec.ConformanceTests.csproj",
4342
"test/VectorData/SqlServer.ConformanceTests/SqlServer.ConformanceTests.csproj",
4443
"test/VectorData/Weaviate.UnitTests/Weaviate.UnitTests.csproj",
45-
"test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj",
46-
47-
"test/VectorData/VectorData.ConformanceTests/VectorData.ConformanceTests.csproj"
44+
"test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj"
4845
]
4946
}
5047
}

‎dotnet/SK-dotnet.slnx‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136
<Project Path="src/VectorData/Redis/Redis.csproj" />
137137
<Project Path="src/VectorData/SqliteVec/SqliteVec.csproj" />
138138
<Project Path="src/VectorData/SqlServer/SqlServer.csproj" />
139-
<Project Path="src/VectorData/VectorData.Abstractions/VectorData.Abstractions.csproj" />
140139
<Project Path="src/VectorData/Weaviate/Weaviate.csproj" />
141140
</Folder>
142141
<Folder Name="/src/experimental/">
@@ -316,8 +315,6 @@
316315
<Project Path="test/VectorData/SqliteVec.ConformanceTests/SqliteVec.ConformanceTests.csproj" />
317316
<Project Path="test/VectorData/SqliteVec.UnitTests/SqliteVec.UnitTests.csproj" />
318317
<Project Path="test/VectorData/SqlServer.ConformanceTests/SqlServer.ConformanceTests.csproj" />
319-
<Project Path="test/VectorData/VectorData.ConformanceTests/VectorData.ConformanceTests.csproj" />
320-
<Project Path="test/VectorData/VectorData.UnitTests/VectorData.UnitTests.csproj" />
321318
<Project Path="test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj" />
322319
<Project Path="test/VectorData/Weaviate.UnitTests/Weaviate.UnitTests.csproj" />
323320
</Folder>

‎dotnet/SK-release.slnf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"src\\VectorData\\Redis\\Redis.csproj",
4646
"src\\VectorData\\SqliteVec\\SqliteVec.csproj",
4747
"src\\VectorData\\SqlServer\\SqlServer.csproj",
48-
"src\\VectorData\\VectorData.Abstractions\\VectorData.Abstractions.csproj",
4948
"src\\VectorData\\Weaviate\\Weaviate.csproj",
5049

5150
"src\\Experimental\\Orchestration.Flow\\Experimental.Orchestration.Flow.csproj",

‎dotnet/src/InternalUtilities/connectors/Memory/MongoDB/MongoModelBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ internal class MongoModelBuilder() : CollectionModelBuilder(s_validationOptions)
2727
UsesExternalSerializer = true,
2828
};
2929

30-
protected override void ProcessProperty(PropertyInfo? clrProperty, VectorStoreProperty? definitionProperty, Type? type)
30+
protected override void ProcessProperty(PropertyInfo? clrProperty, VectorStoreProperty? definitionProperty)
3131
{
32-
base.ProcessProperty(clrProperty, definitionProperty, type);
32+
base.ProcessProperty(clrProperty, definitionProperty);
3333

3434
if (clrProperty?.GetCustomAttribute<BsonElementAttribute>() is { } bsonElementAttribute
3535
&& this.PropertyMap.TryGetValue(clrProperty.Name, out var property))

‎dotnet/src/SemanticKernel.Abstractions/SemanticKernel.Abstractions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<ProjectReference Include="..\VectorData\VectorData.Abstractions\VectorData.Abstractions.csproj" />
27+
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎dotnet/src/SemanticKernel.Core/Data/TextSearch/TextSearchKernelBuilderExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static class TextSearchKernelBuilderExtensions
2424
ITextSearchResultMapper? resultMapper = null,
2525
VectorStoreTextSearchOptions? options = null,
2626
string? serviceId = default)
27+
where TRecord : class
2728
{
2829
builder.Services.AddVectorStoreTextSearch<TRecord>(stringMapper, resultMapper, options, serviceId);
2930
return builder;

‎dotnet/src/SemanticKernel.Core/Data/TextSearch/TextSearchServiceCollectionExtensions.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public static class TextSearchServiceCollectionExtensions
2828
ITextSearchResultMapper? resultMapper = null,
2929
VectorStoreTextSearchOptions? options = null,
3030
string? serviceId = default)
31+
where TRecord : class
3132
{
3233
// If we are not constructing the dependent services, add the VectorStoreTextSearch as transient, since we
3334
// cannot make assumptions about how dependent services are being managed.

‎dotnet/src/SemanticKernel.Core/Data/TextSearch/VectorStoreTextSearch.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ namespace Microsoft.SemanticKernel.Data;
2121
[Experimental("SKEXP0001")]
2222
#pragma warning disable CS0618 // ITextSearch is obsolete
2323
public sealed class VectorStoreTextSearch<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] TRecord> : ITextSearch<TRecord>, ITextSearch
24+
where TRecord : class
2425
#pragma warning restore CS0618
2526
#pragma warning restore CA1711 // Identifiers should not have incorrect suffix
2627
{

0 commit comments

Comments
 (0)