diff --git a/Directory.Packages.props b/Directory.Packages.props index 63d8cd7..800e10b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,13 +3,13 @@ - + - - + + diff --git a/MEVD/src/AzureAISearch/AzureAISearch.csproj b/MEVD/src/AzureAISearch/AzureAISearch.csproj index cb5363f..0d69c18 100644 --- a/MEVD/src/AzureAISearch/AzureAISearch.csproj +++ b/MEVD/src/AzureAISearch/AzureAISearch.csproj @@ -1,6 +1,6 @@  - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.AzureAISearch $(AssemblyName) net10.0;net8.0;netstandard2.0;net462 diff --git a/MEVD/src/CosmosMongoDB/CosmosMongoDB.csproj b/MEVD/src/CosmosMongoDB/CosmosMongoDB.csproj index e82cacb..dd18629 100644 --- a/MEVD/src/CosmosMongoDB/CosmosMongoDB.csproj +++ b/MEVD/src/CosmosMongoDB/CosmosMongoDB.csproj @@ -1,7 +1,7 @@  - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.CosmosMongoDB $(AssemblyName) net10.0;net8.0;netstandard2.1;net472 diff --git a/MEVD/src/CosmosMongoDB/MongoShared/MongoModelBuilder.cs b/MEVD/src/CosmosMongoDB/MongoShared/MongoModelBuilder.cs index abff7b0..4cbcbb6 100644 --- a/MEVD/src/CosmosMongoDB/MongoShared/MongoModelBuilder.cs +++ b/MEVD/src/CosmosMongoDB/MongoShared/MongoModelBuilder.cs @@ -32,22 +32,10 @@ protected override void ProcessProperty(PropertyInfo? clrProperty, VectorStorePr { base.ProcessProperty(clrProperty!, definitionProperty!); - // TODO: Reenable this after https://github.com/dotnet/extensions/pull/7475 - // if (clrProperty?.GetCustomAttribute() is { } bsonElementAttribute - // && this.PropertyMap.TryGetValue(clrProperty.Name, out var property)) - // { - // property.StorageName = bsonElementAttribute.ElementName; - // } - - // TODO: Workaround for https://github.com/dotnet/extensions/pull/7475 - // The BSON serializer determines field names from the CLR property name (or [BsonElement] if present). - // Since UsesExternalSerializer is true, the base CollectionModelBuilder is supposed to ignore StorageName - // from VectorStoreProperty attributes to stay in sync with the serializer. However, some versions of the - // base class don't do this correctly, causing StorageName to diverge from what the serializer uses. - // Override here to always keep StorageName in sync with the serializer's behavior. - if (clrProperty is not null && this.PropertyMap.TryGetValue(clrProperty.Name, out var property)) + if (clrProperty?.GetCustomAttribute() is { } bsonElementAttribute + && this.PropertyMap.TryGetValue(clrProperty.Name, out var property)) { - property.StorageName = clrProperty.GetCustomAttribute()?.ElementName ?? clrProperty.Name; + property.StorageName = bsonElementAttribute.ElementName; } } diff --git a/MEVD/src/InMemory/InMemory.csproj b/MEVD/src/InMemory/InMemory.csproj index 3af482b..8010dd7 100644 --- a/MEVD/src/InMemory/InMemory.csproj +++ b/MEVD/src/InMemory/InMemory.csproj @@ -1,6 +1,6 @@  - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.InMemory $(AssemblyName) net10.0;net8.0;netstandard2.0;net462 diff --git a/MEVD/src/PgVector/PgVector.csproj b/MEVD/src/PgVector/PgVector.csproj index 9c54c40..8f9b0ba 100644 --- a/MEVD/src/PgVector/PgVector.csproj +++ b/MEVD/src/PgVector/PgVector.csproj @@ -1,7 +1,7 @@  - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.PgVector $(AssemblyName) net10.0;net8.0;netstandard2.0;net462 diff --git a/MEVD/src/Pinecone/Pinecone.csproj b/MEVD/src/Pinecone/Pinecone.csproj index b69c3a9..fe13df3 100644 --- a/MEVD/src/Pinecone/Pinecone.csproj +++ b/MEVD/src/Pinecone/Pinecone.csproj @@ -1,7 +1,7 @@  - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.Pinecone $(AssemblyName) net10.0;net8.0;netstandard2.0;net462 diff --git a/MEVD/src/Qdrant/Qdrant.csproj b/MEVD/src/Qdrant/Qdrant.csproj index d591b0a..731543b 100644 --- a/MEVD/src/Qdrant/Qdrant.csproj +++ b/MEVD/src/Qdrant/Qdrant.csproj @@ -1,7 +1,7 @@  - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.Qdrant $(AssemblyName) net10.0;net8.0;netstandard2.0;net462 diff --git a/MEVD/src/Redis/Redis.csproj b/MEVD/src/Redis/Redis.csproj index e69217c..59bf849 100644 --- a/MEVD/src/Redis/Redis.csproj +++ b/MEVD/src/Redis/Redis.csproj @@ -1,7 +1,7 @@  - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.Redis $(AssemblyName) net10.0;net8.0;netstandard2.0;net462 diff --git a/MEVD/src/SqliteVec/SqliteVec.csproj b/MEVD/src/SqliteVec/SqliteVec.csproj index 8965f22..544cbe7 100644 --- a/MEVD/src/SqliteVec/SqliteVec.csproj +++ b/MEVD/src/SqliteVec/SqliteVec.csproj @@ -1,7 +1,7 @@  - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.SqliteVec $(AssemblyName) net10.0;net8.0;netstandard2.0;net462 diff --git a/MEVD/src/Weaviate/Weaviate.csproj b/MEVD/src/Weaviate/Weaviate.csproj index 9cc7209..28e8e6e 100644 --- a/MEVD/src/Weaviate/Weaviate.csproj +++ b/MEVD/src/Weaviate/Weaviate.csproj @@ -2,7 +2,7 @@ - 1.0.0-preview.2 + 1.0.0-preview.3 CommunityToolkit.VectorData.Weaviate $(AssemblyName) net10.0;net8.0;netstandard2.0;net462