From 0e14b6479e14ee9f78829becbe4b8b02d324033f Mon Sep 17 00:00:00 2001
From: Serkant Karaca <serkar@microsoft.com>
Date: Fri, 8 Feb 2019 11:45:34 -0800
Subject: [PATCH] Moving AD SDK 4.5 and Xamarin.iOS10 support

---
 .../EventHubClient.cs                         |  4 +++-
 .../Microsoft.Azure.EventHubs.csproj          | 22 ++++++++++++++-----
 .../AzureActiveDirectoryTokenProvider.cs      |  8 +++----
 .../Primitives/ClientInfo.cs                  |  2 ++
 .../Primitives/JsonSecurityToken.cs           |  1 -
 .../Primitives/TokenProvider.cs               |  5 ++++-
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/Microsoft.Azure.EventHubs/EventHubClient.cs b/src/Microsoft.Azure.EventHubs/EventHubClient.cs
index 749f282..7fb1a66 100644
--- a/src/Microsoft.Azure.EventHubs/EventHubClient.cs
+++ b/src/Microsoft.Azure.EventHubs/EventHubClient.cs
@@ -84,6 +84,7 @@ public static EventHubClient Create(
             return eventHubClient;
         }
 
+#if !UAP10_0 && !IOS
         /// <summary>
         /// Creates a new instance of the Event Hubs client using the specified endpoint, entity path, AAD authentication context.
         /// </summary>
@@ -109,6 +110,7 @@ public static EventHubClient Create(
                 operationTimeout,
                 transportType);
         }
+#endif
 
         /// <summary>
         /// Creates a new instance of the Event Hubs client using the specified endpoint, entity path, AAD authentication context.
@@ -142,7 +144,7 @@ public static EventHubClient Create(
                 transportType);
         }
 
-#if !UAP10_0
+#if !UAP10_0 && !IOS
         /// <summary>
         /// Creates a new instance of the Event Hubs client using the specified endpoint, entity path, AAD authentication context.
         /// </summary>
diff --git a/src/Microsoft.Azure.EventHubs/Microsoft.Azure.EventHubs.csproj b/src/Microsoft.Azure.EventHubs/Microsoft.Azure.EventHubs.csproj
index cc87116..70ac8f1 100644
--- a/src/Microsoft.Azure.EventHubs/Microsoft.Azure.EventHubs.csproj
+++ b/src/Microsoft.Azure.EventHubs/Microsoft.Azure.EventHubs.csproj
@@ -5,7 +5,7 @@
     <AssemblyTitle>Microsoft.Azure.EventHubs</AssemblyTitle>
     <VersionPrefix>2.2.0</VersionPrefix>
     <Authors>Microsoft</Authors>
-    <TargetFrameworks>net461;netstandard2.0;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;uap10.0;Xamarin.iOS10</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblyName>Microsoft.Azure.EventHubs</AssemblyName>
     <AssemblyOriginatorKeyFile>../../build/keyfile.snk</AssemblyOriginatorKeyFile>
@@ -49,11 +49,15 @@
     <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 	
+  <PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.iOS10'">
+    <DefineConstants>$(DefineConstants);IOS</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.IdentityModel" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="4.0.4.403061554" />
+	<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="4.0.4.403061554" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -67,17 +71,21 @@
 	<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.4" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.iOS10' ">
+	<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.40" PrivateAssets="All" />
+	<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.4" />
+  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.3.5" />
+    <PackageReference Include="Microsoft.Azure.Amqp" Version="2.3.7" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.8" />
+    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.5.0" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.0" />
   </ItemGroup>
 
-  
-    <ItemGroup>
+  <ItemGroup>
     <Compile Update="Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -92,4 +100,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
+  
 </Project>
diff --git a/src/Microsoft.Azure.EventHubs/Primitives/AzureActiveDirectoryTokenProvider.cs b/src/Microsoft.Azure.EventHubs/Primitives/AzureActiveDirectoryTokenProvider.cs
index 6877cc6..5fd5d8d 100644
--- a/src/Microsoft.Azure.EventHubs/Primitives/AzureActiveDirectoryTokenProvider.cs
+++ b/src/Microsoft.Azure.EventHubs/Primitives/AzureActiveDirectoryTokenProvider.cs
@@ -13,8 +13,9 @@ namespace Microsoft.Azure.EventHubs
     public class AzureActiveDirectoryTokenProvider : TokenProvider
     {
         readonly AuthenticationContext authContext;
+
+#if !UAP10_0 && !IOS
         readonly ClientCredential clientCredential;
-#if !UAP10_0
         readonly ClientAssertionCertificate clientAssertionCertificate;
 #endif
         readonly string clientId;
@@ -32,6 +33,7 @@ enum AuthType
 
         readonly AuthType authType;
 
+#if !UAP10_0 && !IOS
         internal AzureActiveDirectoryTokenProvider(AuthenticationContext authContext, ClientCredential credential)
         {
             this.clientCredential = credential;
@@ -40,7 +42,6 @@ internal AzureActiveDirectoryTokenProvider(AuthenticationContext authContext, Cl
             this.clientId = clientCredential.ClientId;
         }
 
-#if !UAP10_0
         internal AzureActiveDirectoryTokenProvider(AuthenticationContext authContext, ClientAssertionCertificate clientAssertionCertificate)
         {
             this.clientAssertionCertificate = clientAssertionCertificate;
@@ -72,16 +73,15 @@ public override async Task<SecurityToken> GetTokenAsync(string appliesTo, TimeSp
 
             switch (this.authType)
             {
+#if !UAP10_0 && !IOS
                 case AuthType.ClientCredential:
                     authResult = await this.authContext.AcquireTokenAsync(ClientConstants.AadEventHubsAudience, this.clientCredential);
                     break;
 
-#if !UAP10_0
                 case AuthType.ClientAssertionCertificate:
                     authResult = await this.authContext.AcquireTokenAsync(ClientConstants.AadEventHubsAudience, this.clientAssertionCertificate);
                     break;
 #endif
-
                 case AuthType.InteractiveUserLogin:
                     authResult = await this.authContext.AcquireTokenAsync(ClientConstants.AadEventHubsAudience, this.clientId, this.redirectUri, this.platformParameters, this.userIdentifier);
                     break;
diff --git a/src/Microsoft.Azure.EventHubs/Primitives/ClientInfo.cs b/src/Microsoft.Azure.EventHubs/Primitives/ClientInfo.cs
index a1291ca..3a0165b 100644
--- a/src/Microsoft.Azure.EventHubs/Primitives/ClientInfo.cs
+++ b/src/Microsoft.Azure.EventHubs/Primitives/ClientInfo.cs
@@ -29,6 +29,8 @@ static ClientInfo()
                 platform = "UAP";
 #elif NET461
                 platform = Environment.OSVersion.VersionString;
+#elif IOS
+                platform = "IOS";
 #endif
             }
             catch { }
diff --git a/src/Microsoft.Azure.EventHubs/Primitives/JsonSecurityToken.cs b/src/Microsoft.Azure.EventHubs/Primitives/JsonSecurityToken.cs
index 2f3e32b..bd866a8 100644
--- a/src/Microsoft.Azure.EventHubs/Primitives/JsonSecurityToken.cs
+++ b/src/Microsoft.Azure.EventHubs/Primitives/JsonSecurityToken.cs
@@ -4,7 +4,6 @@
 namespace Microsoft.Azure.EventHubs
 {
     using System;
-    using System.Collections.ObjectModel;
     using System.IdentityModel.Tokens;
 #if !NET461
     using System.IdentityModel.Tokens.Jwt;
diff --git a/src/Microsoft.Azure.EventHubs/Primitives/TokenProvider.cs b/src/Microsoft.Azure.EventHubs/Primitives/TokenProvider.cs
index c0bb2d2..c208666 100644
--- a/src/Microsoft.Azure.EventHubs/Primitives/TokenProvider.cs
+++ b/src/Microsoft.Azure.EventHubs/Primitives/TokenProvider.cs
@@ -76,6 +76,8 @@ public static TokenProvider CreateSharedAccessSignatureTokenProvider(string keyN
             return new SharedAccessSignatureTokenProvider(keyName, sharedAccessKey, tokenTimeToLive, tokenScope);
         }
 
+
+#if !UAP10_0 && !IOS
         /// <summary>Creates an Azure Active Directory token provider.</summary>
         /// <param name="authContext">AuthenticationContext for AAD.</param>
         /// <param name="clientCredential">The app credential.</param>
@@ -87,6 +89,7 @@ public static TokenProvider CreateAadTokenProvider(AuthenticationContext authCon
 
             return new AzureActiveDirectoryTokenProvider(authContext, clientCredential);
         }
+#endif
 
         /// <summary>Creates an Azure Active Directory token provider.</summary>
         /// <param name="authContext">AuthenticationContext for AAD.</param>
@@ -110,7 +113,7 @@ public static TokenProvider CreateAadTokenProvider(
             return new AzureActiveDirectoryTokenProvider(authContext, clientId, redirectUri, platformParameters, userIdentifier);
         }
 
-#if !UAP10_0
+#if !UAP10_0 && !IOS
         /// <summary>Creates an Azure Active Directory token provider.</summary>
         /// <param name="authContext">AuthenticationContext for AAD.</param>
         /// <param name="clientAssertionCertificate">The client assertion certificate credential.</param>