From 8437af2904e4bb2982a8325e4f7ddee71b90ecf8 Mon Sep 17 00:00:00 2001
From: John van Cadsand <emailvoorjohn@gmail.com>
Date: Mon, 21 Jan 2019 07:53:11 +0100
Subject: [PATCH] Added support for .net framework 3.5

---
 MessageBird/Client.cs               | 2 +-
 MessageBird/MessageBird.csproj      | 6 +++++-
 MessageBird/Utilities/Validation.cs | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/MessageBird/Client.cs b/MessageBird/Client.cs
index 5e3ac36..6d9aa53 100644
--- a/MessageBird/Client.cs
+++ b/MessageBird/Client.cs
@@ -347,7 +347,7 @@ private string GetAddContactsToGroupQuery(IEnumerable<string> contactIds)
                 parameters.Add("ids[]=" + contactId);
             }
 
-            return string.Join("&", parameters);
+            return string.Join("&", parameters.ToArray());
         }
 
         public void RemoveContactFromGroup(string groupId, string contactId)
diff --git a/MessageBird/MessageBird.csproj b/MessageBird/MessageBird.csproj
index cfa5496..28d1ef2 100644
--- a/MessageBird/MessageBird.csproj
+++ b/MessageBird/MessageBird.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net35;net40;netstandard2.0</TargetFrameworks>
     <Product>MessageBird</Product>
     <Title>MessageBird</Title>
     <Company>MessageBird</Company>
@@ -11,6 +11,10 @@
     <AssemblyVersion>1.4.1.0</AssemblyVersion>
   </PropertyGroup>
 
+  <!-- Conditionally obtain references for the .NET Framework 3.5 target -->
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
+  </ItemGroup>
+
   <!-- Conditionally obtain references for the .NET Framework 4.0 target -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
   </ItemGroup>
diff --git a/MessageBird/Utilities/Validation.cs b/MessageBird/Utilities/Validation.cs
index 1debf48..7556e4c 100644
--- a/MessageBird/Utilities/Validation.cs
+++ b/MessageBird/Utilities/Validation.cs
@@ -8,7 +8,7 @@ public class ParameterValidator
     {
         public static void IsNotNullOrWhiteSpace(string param, string paramName)
         {
-            if (String.IsNullOrWhiteSpace(param))
+            if (string.IsNullOrEmpty(param) || param.Trim() == "")
             {
                 throw new ArgumentException("Invalid string parameter, cannot be null, empty, or contain only whitespace", paramName);
             }