Merge pull request #49 from neon-sunset/net6

feat: net6.0 tfm support
neon-sunset · Aug 15, 2023 · 1227c1b · 1227c1b
2 parents 1ff5e7f + dda2cdf
commit 1227c1b
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 7 deletions.
diff --git a/src/ITransport.cs b/src/ITransport.cs
@@ -1,8 +1,37 @@
+using System.Diagnostics.CodeAnalysis;
+using Pinecone.Grpc;
+using Pinecone.Rest;
+
 namespace Pinecone;
 
-public interface ITransport<T> : IDisposable
+public interface ITransport<
+#if NET7_0_OR_GREATER
+    T> : IDisposable
+#else
+    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T> : IDisposable
+#endif
 {
+#if NET7_0_OR_GREATER
     static abstract T Create(string host, string apiKey);
+#else
+    static T Create(string host, string apiKey)
+    {
+        if (typeof(T) == typeof(GrpcTransport))
+        {
+            return (T)(object)new GrpcTransport(host, apiKey);
+        }
+        else if (typeof(T) == typeof(RestTransport))
+        {
+            return (T)(object)new RestTransport(host, apiKey);
+        }
+        else
+        {
+            var instance = (T?)Activator.CreateInstance(typeof(T), host, apiKey);
+
+            return instance ?? throw new InvalidOperationException($"Unable to create instance of {typeof(T)}");
+        }
+    }
+#endif
 
     Task<IndexStats> DescribeStats(MetadataMap? filter = null);
     Task<ScoredVector[]> Query(

diff --git a/src/Index.cs b/src/Index.cs
@@ -1,10 +1,14 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 
 namespace Pinecone;
 
 // Contract
-public sealed partial record Index<TTransport>
-    where TTransport : ITransport<TTransport>
+public sealed partial record Index<
+#if NET6_0
+    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)]
+#endif
+    TTransport> where TTransport : ITransport<TTransport>
 {
     [JsonPropertyName("database")]
     public required IndexDetails Details { get; init; }

diff --git a/src/Pinecone.csproj b/src/Pinecone.csproj
@@ -13,16 +13,20 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <WarningsAsErrors>nullable</WarningsAsErrors>
     <IsAotCompatible>true</IsAotCompatible>
     <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>preview</LangVersion>
-    <Features>strict</Features>
+    <LangVersion>11</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Net.Http.Json" Version="8.0.0-preview.7.23375.6" />
     <PackageReference Include="System.Text.Json" Version="8.0.0-preview.7.23375.6" />
     <PackageReference Include="PolySharp" Version="1.13.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/PineconeClient.cs b/src/PineconeClient.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Net.Http.Json;
 using CommunityToolkit.Diagnostics;
 using Pinecone.Grpc;
@@ -61,7 +62,12 @@ public async Task CreateIndex(
 
     public Task<Index<GrpcTransport>> GetIndex(IndexName name) => GetIndex<GrpcTransport>(name);
 
+#if NET7_0_OR_GREATER
     public async Task<Index<TTransport>> GetIndex<TTransport>(IndexName name)
+#else
+    public async Task<Index<TTransport>> GetIndex<
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TTransport>(IndexName name)
+#endif
         where TTransport : ITransport<TTransport>
     {
         var response = await Http.GetFromJsonAsync(
@@ -73,7 +79,11 @@ public async Task<Index<TTransport>> GetIndex<TTransport>(IndexName name)
         var host = index.Status.Host;
         var apiKey = Http.DefaultRequestHeaders.GetValues(Constants.RestApiKey).First();
 
+#if NET7_0_OR_GREATER
         index.Transport = TTransport.Create(host, apiKey);
+#else
+        index.Transport = ITransport<TTransport>.Create(host, apiKey);
+#endif
         return index;
     }