Update to RC3

kbeaugrand · Dec 10, 2023 · c290f4f · c290f4f
1 parent 4cd8a48
commit c290f4f
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 21 deletions.
diff --git a/SemanticKernel.Connectors.Memory.SqlServer.sln b/SemanticKernel.Connectors.Memory.SqlServer.sln
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5569512D-4D33-4DD8-A027-6AF4236546CB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connectors.Memory.SqlServer", "src\Connectors.Memory.SqlServer\Connectors.Memory.SqlServer.csproj", "{A669B285-4F66-469B-B79D-FDCA0E81BC2A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "src\Connectors.Memory.SqlServer.Tests\IntegrationTests.csproj", "{8CD5A6C2-0BF0-4A14-9F6F-0BDCD986D94F}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A669B285-4F66-469B-B79D-FDCA0E81BC2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A669B285-4F66-469B-B79D-FDCA0E81BC2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A669B285-4F66-469B-B79D-FDCA0E81BC2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A669B285-4F66-469B-B79D-FDCA0E81BC2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CD5A6C2-0BF0-4A14-9F6F-0BDCD986D94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CD5A6C2-0BF0-4A14-9F6F-0BDCD986D94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CD5A6C2-0BF0-4A14-9F6F-0BDCD986D94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CD5A6C2-0BF0-4A14-9F6F-0BDCD986D94F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A669B285-4F66-469B-B79D-FDCA0E81BC2A} = {5569512D-4D33-4DD8-A027-6AF4236546CB}
+		{8CD5A6C2-0BF0-4A14-9F6F-0BDCD986D94F} = {5569512D-4D33-4DD8-A027-6AF4236546CB}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A32F435C-6A25-4E24-8FFC-FB4F8A235B8C}
+	EndGlobalSection
+EndGlobal
diff --git a/src/Connectors.Memory.SqlServer.Tests/IntegrationTests.csproj b/src/Connectors.Memory.SqlServer.Tests/IntegrationTests.csproj
@@ -7,7 +7,7 @@
     <RollForward>LatestMajor</RollForward>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
-    <NoWarn>CA2007,VSTHRD111</NoWarn>
+    <NoWarn>CA2007,VSTHRD111;SKEXP0003</NoWarn>
     <UserSecretsId>b7762d10-e29b-4bb1-8b74-b6d69a667dd4</UserSecretsId>
   </PropertyGroup>
 

diff --git a/src/Connectors.Memory.SqlServer/Connectors.Memory.SqlServer.csproj b/src/Connectors.Memory.SqlServer/Connectors.Memory.SqlServer.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <!-- THIS PROPERTY GROUP MUST COME FIRST -->
@@ -16,13 +16,26 @@
     <Description>MSSQL connector for Semantic Kernel skills and semantic memory</Description>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702;SKEXP0003</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702;SKEXP0003</NoWarn>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Publish|AnyCPU'">
+    <NoWarn>1701;1702;SKEXP0003</NoWarn>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Data.SqlClient" />
     <PackageReference Include="Microsoft.SemanticKernel" />
   </ItemGroup>
 
   <ItemGroup>
-
+    <PackageReference Include="Microsoft.SemanticKernel.Abstractions" />
+    <PackageReference Include="Microsoft.SemanticKernel.Plugins.Core" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Connectors.Memory.SqlServer/SqlServerMemoryStore.cs b/src/Connectors.Memory.SqlServer/SqlServerMemoryStore.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Kevin BEAUGRAND. All rights reserved.
 
+using Microsoft.SemanticKernel.Memory;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SemanticKernel.AI.Embeddings;
-using Microsoft.SemanticKernel.Memory;
 
 namespace SemanticKernel.Connectors.Memory.SqlServer;
 

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -5,24 +5,24 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.0.0-beta8" />
-    <PackageVersion Include="System.Text.Json" Version="6.0.9" />
-
-
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.0.0-rc3" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.0.0-rc3" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Plugins.Core" Version="1.0.0-rc3" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.0" />
     <!-- Microsoft.Extensions.Configuration -->
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
     <!-- Test -->
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Moq" Version="4.20.69" />
     <PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
-    <PackageVersion Include="xunit" Version="2.6.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" />
+    <PackageVersion Include="xunit" Version="2.6.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <!-- Skills -->
     <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.2" />
@@ -57,7 +57,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="xunit.analyzers" Version="1.6.0" />
+    <PackageVersion Include="xunit.analyzers" Version="1.7.0" />
     <PackageReference Include="xunit.analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -67,20 +67,20 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.6.4" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.7.0" />
     <PackageReference Include="Roslynator.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.6.2" />
+    <PackageVersion Include="Roslynator.CodeAnalysis.Analyzers" Version="4.7.0" />
     <PackageReference Include="Roslynator.CodeAnalysis.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.6.4" />
+    <PackageVersion Include="Roslynator.Formatting.Analyzers" Version="4.7.0" />
     <PackageReference Include="Roslynator.Formatting.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-</Project>
+</Project>