Convert Typechat core library to dotnet standard 2.0

src/typechat/ConstraintsValidator.cs

@@ -1,5 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using System.ComponentModel.DataAnnotations;
+
 namespace Microsoft.TypeChat;
 
 public interface IConstraintsValidator<T>
@@ -34,7 +36,7 @@ string ToErrorString(List<ValidationResult> validationResults)
         foreach (var result in validationResults)
         {
             sb.AppendLine("Errors in the following: ");
-            sb.AppendLine(string.Join(',', result.MemberNames));
+            sb.AppendLine(string.Join(",", result.MemberNames));
             sb.AppendLine(result.ErrorMessage);
         }
         return sb.ToString();

src/typechat/JsonResponse.cs

@@ -45,7 +45,7 @@ public JsonResponse(string responseText)
     {
         if (HasPrologue || HasEpilogue)
         {
-            return string.Join('\n', Prologue, Epilogue);
+            return string.Join("\n", Prologue, Epilogue);
         }
         return null;
     }

src/typechat/JsonSerializerTypeValidator.cs

@@ -94,7 +94,11 @@ public JsonSerializerTypeValidator(SchemaText schema, JsonSerializerOptions? opt
 
     public JsonSerializerTypeValidator(TypeSchema schema, JsonSerializerOptions? options = null)
     {
-        ArgumentNullException.ThrowIfNull(schema, nameof(schema));
+        if (schema == null)
+        {
+            throw new ArgumentNullException(nameof(schema));
+        }
+
         _schema = schema;
         if (options != null)
         {

src/typechat/JsonTranslator.cs

@@ -52,8 +52,14 @@ public JsonTranslator(
         IJsonTypeValidator<T> validator,
         IJsonTranslatorPrompts? prompts = null)
     {
-        ArgumentNullException.ThrowIfNull(model, nameof(model));
-        ArgumentNullException.ThrowIfNull(validator, nameof(validator));
+        if (model == null)
+        {
+            throw new ArgumentNullException(nameof(model));
+        }
+        if (validator == null)
+        {
+            throw new ArgumentNullException(nameof(validator));
+        }
 
         _model = model;
 
@@ -77,7 +83,10 @@ public IJsonTypeValidator<T> Validator
         get => _validator;
         set
         {
-            ArgumentNullException.ThrowIfNull(value, nameof(Validator));
+            if (value == null)
+            {
+                throw new ArgumentNullException(nameof(Validator));
+            }
             _validator = value;
         }
     }
@@ -163,7 +172,10 @@ public async Task<T> TranslateAsync(
         CancellationToken cancelToken = default
         )
     {
-        ArgumentNullException.ThrowIfNull(request);
+        if (request == null)
+        {
+            throw new ArgumentNullException(nameof(request));
+        }
 
         requestSettings ??= _translationSettings;
         Prompt prompt = CreateRequestPrompt(request, preamble);

src/typechat/JsonTranslatorPrompts.cs

@@ -18,7 +18,10 @@ public virtual string CreateRepairPrompt(TypeSchema schema, string json, string
 
     public static Prompt RequestPrompt(string typeName, string schema, Prompt request, IList<IPromptSection>? context = null)
     {
-        ArgumentNullException.ThrowIfNull(request, nameof(request));
+        if (request == null)
+        {
+            throw new ArgumentNullException(nameof(request));
+        }
         Prompt prompt = new Prompt();
 
         prompt += IntroSection(typeName, schema);

src/typechat/ModelInfo.cs

@@ -12,7 +12,11 @@ public class ModelInfo
     [JsonConstructor]
     public ModelInfo(string name, int maxTokens, double tokenToCharMultiple = 2.5)
     {
-        ArgumentException.ThrowIfNullOrEmpty(name, nameof(name));
+        if (string.IsNullOrEmpty(name))
+        {
+            throw new ArgumentException("Name cannot be null or empty.", nameof(name));
+        }
+
         _name = name;
         _maxTokens = maxTokens;
         _tokenToCharMultiple = tokenToCharMultiple;

src/typechat/Prompt.cs

@@ -32,7 +32,10 @@ public Prompt(IEnumerable<IPromptSection>? preamble, PromptSection? text = null,
 
     public new void Add(IPromptSection section)
     {
-        ArgumentNullException.ThrowIfNull(section, nameof(section));
+        if (section == null)
+        {
+            throw new ArgumentNullException(nameof(section));
+        }
         base.Add(section);
     }
 

src/typechat/PromptBuilder.cs

@@ -63,7 +63,10 @@ public bool Add(string text)
     /// <returns>true if added, false if not</returns>
     public bool Add(IPromptSection section)
     {
-        ArgumentNullException.ThrowIfNull(section, nameof(section));
+        if (section == null)
+        {
+            throw new ArgumentNullException(nameof(section));
+        }
 
         string text = section.GetText();
         if (string.IsNullOrEmpty(text))
@@ -89,7 +92,10 @@ public bool Add(IPromptSection section)
 
     public bool AddRange(IEnumerable<IPromptSection> sections)
     {
-        ArgumentNullException.ThrowIfNull(sections, nameof(sections));
+        if (sections == null)
+        {
+            throw new ArgumentNullException(nameof(sections));
+        }
         foreach (var section in sections)
         {
             if (!Add(section))

src/typechat/PromptSection.cs

@@ -28,8 +28,16 @@ public PromptSection(string text)
 
     public PromptSection(string source, string text)
     {
-        ArgumentException.ThrowIfNullOrEmpty(source, nameof(source));
-        ArgumentNullException.ThrowIfNull(text, nameof(text));
+        if (string.IsNullOrEmpty(source))
+        {
+            throw new ArgumentException("Source cannot be null or empty.", nameof(source));
+        }
+
+        if (text == null)
+        {
+            throw new ArgumentNullException(nameof(text));
+        }
+
         _source = source;
         SetText(text);
     }
@@ -40,7 +48,10 @@ public PromptSection(string source, string text)
 
     public void SetText(string text)
     {
-        ArgumentNullException.ThrowIfNull(text, nameof(text));
+        if (text == null)
+        {
+            throw new ArgumentNullException(nameof(text));
+        }
         _text = text;
     }
 

src/typechat/SchemaText.cs

@@ -1,5 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using System.Text.Json.Serialization;
+
 namespace Microsoft.TypeChat;
 
 public struct SchemaText
@@ -20,8 +22,14 @@ public SchemaText(string text)
     [JsonConstructor]
     public SchemaText(string text, string lang)
     {
-        ArgumentException.ThrowIfNullOrEmpty(text, nameof(text));
-        ArgumentException.ThrowIfNullOrEmpty(lang, nameof(lang));
+        if (string.IsNullOrEmpty(text))
+        {
+            throw new ArgumentException("Text cannot be null or empty.", nameof(text));
+        }
+        if (string.IsNullOrEmpty(lang))
+        {
+            throw new ArgumentException("Lanauge cannot be null or empty.", nameof(lang));
+        }
 
         _lang = lang;
         _text = text;

src/typechat/TypeChat.csproj

@@ -1,13 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>annotations</Nullable>
     <AssemblyName>TypeChat</AssemblyName>
     <RootNamespace>Microsoft.TypeChat</RootNamespace>
+    <LangVersion>10</LangVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
   <Import Project="Package/nuget.props" />
 
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.0" />
+  </ItemGroup>
+
 </Project>

src/typechat/TypeSchema.cs

@@ -9,7 +9,10 @@ public class TypeSchema
 
     public TypeSchema(Type type, string schemaText)
     {
-        ArgumentNullException.ThrowIfNull(type, nameof(type));
+        if (type == null)
+        {
+            throw new ArgumentNullException(nameof(type));
+        }
         _schema = new SchemaText(schemaText);
         _type = type;
     }