Auto rest

build.proj

@@ -69,15 +69,16 @@
                       Exclude="$(LibrarySourceFolder)\HDInsight\**\*.sln;$(LibrarySourceFolder)\KeyVault\**\*.sln"
                       Condition=" '$(Scope)' == 'all'  " />
     <LibraryFxTargetList Include="$(FxTargetList)" />
+    <AutoRestLibraryFxTargetList Include="portable;net45" />
   </ItemGroup>
 
   <PropertyGroup>
     <NuGetCommand>&quot;$(LibraryToolsFolder)\nuget.exe&quot;</NuGetCommand>
   </PropertyGroup>
 
-  <UsingTask AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" TaskName="RegexReplacementTask" />
-  <UsingTask AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll" TaskName="ValidateStrongNameSignatureTask" />
-
+  <UsingTask TaskName="ValidateStrongNameSignatureTask" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll"  />
+  <UsingTask TaskName="FilterOutAutoRestLibraries" AssemblyFile="$(LibraryToolsFolder)\Microsoft.WindowsAzure.Build.Tasks.dll"  />
+  
   <!--
   CI build related
   -->
@@ -91,27 +92,41 @@
   <UsingTask Condition=" $(OnPremiseBuild) " TaskName="CorporateValidation" AssemblyFile="$(CIToolsPath)\Microsoft.WindowsAzure.Tools.Build.Tasks.OnPremise.dll" />
   <Import Condition=" $(OnPremiseBuild) " Project="$(CIToolsPath)\Microsoft.WindowsAzure.Build.OnPremise.msbuild" />
 
-  <Target Name="Build" DependsOnTargets="RestoreNugetPackages">
+  <Target Name="PrepareForAutoRestLibraries">
+    <FilterOutAutoRestLibraries AllLibraries="@(LibrariesToBuild)" AutoRestMark="AutoRestProjects">
+      <Output TaskParameter="AutoRestLibraries" ItemName="AutoRestLibraries" />
+      <Output TaskParameter="NonAutoRestLibraries" ItemName="NonAutoRestLibraries" />
+    </FilterOutAutoRestLibraries>    
+  </Target>
+
+  <Target Name="Build" DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask;PrepareForAutoRestLibraries">
     <PropertyGroup>
       <_ExtraPropertyList>CodeSign=$(CodeSign)</_ExtraPropertyList>
     </PropertyGroup>
-    <CallTarget Targets="BuildMsBuildTask" />
     <CallTarget Targets="BuildServerPreparation" Condition=" '$(CodeSign)' == 'true' " />
+
     <!--The solution contains configurations for each platform such as Net40-Debug, Net45-Release, etc
     So when invoke msbuild, feed the right configuration name-->   
-    <MSBuild Projects="@(LibrariesToBuild)"
+    <MSBuild Projects="@(NonAutoRestLibraries)"
              Properties="Configuration=%(LibraryFxTargetList.Identity)-$(Configuration);Platform=Any CPU;$(_ExtraPropertyList)"
              Targets="Build" />
 
+    <MSBuild Projects="@(AutoRestLibraries)"
+             Properties="Configuration=%(AutoRestLibraryFxTargetList.Identity)-$(Configuration);Platform=Any CPU;$(_ExtraPropertyList)"
+             Targets="Build" />
+
     <CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
 
   </Target>
 
-  <Target Name="Clean" DependsOnTargets="RestoreNugetPackages">
-    <MSBuild Projects="@(LibrariesToBuild)"
+  <Target Name="Clean" DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask;PrepareForAutoRestLibraries">
+    <MSBuild Projects="@(NonAutoRestLibraries)"
              Properties="Configuration=%(LibraryFxTargetList.Identity)-$(Configuration);Platform=Any CPU"
-             Targets="Clean"/>
+             Targets="Clean" />
 
+    <MSBuild Projects="@(AutoRestLibraries)"
+             Properties="Configuration=%(AutoRestLibraryFxTargetList.Identity)-$(Configuration);Platform=Any CPU;$(_ExtraPropertyList)"
+             Targets="Clean" />
     <RemoveDir Directories="$(BinariesFolder)" />
   </Target>
 
@@ -122,7 +137,7 @@
        <TestPartialName>$([System.IO.Path]::GetFileName($(Scope)))</TestPartialName>
      </PropertyGroup>
     <ItemGroup>
-      <!--TODO: improve inclue the logic to be more explicit -->
+      <!--TODO: improve the logic to be more explicit -->
       <TestDlls Include=".\src\**\*.Tests\bin\net45-$(Configuration)\*.Tests.dll" Condition=" '$(Scope)' == 'All' " />
       <TestDlls Include=".\src\$(Scope)\*.Tests\bin\net45-$(Configuration)\*$(TestPartialName)*.Tests.dll" 
                 Condition=" '$(Scope)' != 'All' " />

src/Authentication/Common.Authentication.Tests/Common.Authentication.Tests.csproj

@@ -28,13 +28,21 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(LibraryNugetPackageFolder)\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.5.207081303-alpha\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.14.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(LibraryNugetPackageFolder)\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.5.207081303-alpha\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.1.1.1\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.1.0.18-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Storage">
       <HintPath>$(LibraryNugetPackageFolder)\Microsoft.WindowsAzure.Management.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

src/Authentication/Common.Authentication.Tests/Mocks/MockCertificateAuthenticationFactory.cs

@@ -56,5 +56,11 @@ public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext
         {
             return new CertificateCloudCredentials(context.Subscription.Id.ToString(), Certificate);
         }
+
+
+        public Rest.ServiceClientCredentials GetServiceClientCredentials(AzureContext context)
+        {
+            throw new System.NotImplementedException();
+        }
     }
 }

src/Authentication/Common.Authentication.Tests/Mocks/MockClientFactory.cs

@@ -90,5 +90,16 @@ public List<System.Net.Http.Headers.ProductInfoHeaderValue> UserAgents
                 throw new NotImplementedException();
             }
         }
+
+        public TClient CreateArmClient<TClient>(AzureContext context, AzureEnvironment.Endpoint endpoint) where TClient : Rest.ServiceClient<TClient>
+        {
+            var creds = AzureSession.AuthenticationFactory.GetServiceClientCredentials(context);
+            return CreateCustomArmClient<TClient>(creds, context.Environment.GetEndpointAsUri(endpoint));
+        }
+
+        public TClient CreateCustomArmClient<TClient>(params object[] parameters) where TClient : Rest.ServiceClient<TClient>
+        {
+            return ManagementClients.FirstOrDefault(o => o is TClient) as TClient;
+        }
     }
 }

src/Authentication/Common.Authentication.Tests/Mocks/MockTokenAuthenticationFactory.cs

@@ -15,6 +15,7 @@
 using Microsoft.Azure;
 using Microsoft.Azure.Common.Authentication;
 using Microsoft.Azure.Common.Authentication.Models;
+using Microsoft.Rest;
 using System;
 using System.Security;
 
@@ -68,5 +69,11 @@ public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext
         {
             return new AccessTokenCredential(context.Subscription.Id, Token);
         }
+
+
+        public ServiceClientCredentials GetServiceClientCredentials(AzureContext context)
+        {
+            return new TokenCredentials(Token.AccessToken);
+        }
     }
 }

src/Authentication/Common.Authentication.Tests/packages.config

@@ -6,8 +6,10 @@
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
-  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
+  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="3.5.207081303-alpha" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.22" targetFramework="net45" />
+  <package id="Microsoft.Rest.ClientRuntime" version="1.1.1" targetFramework="net45" />
+  <package id="Microsoft.Rest.ClientRuntime.Azure" version="1.0.18-preview" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Storage" version="5.0.0" targetFramework="net45" />
   <package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

src/Authentication/Common.Authentication/Authentication/AdalConfiguration.cs

@@ -28,7 +28,7 @@ public class AdalConfiguration
         // These constants define the default values to use for AD authentication
         // against RDFE
         //
-        private const string PowerShellClientId = "1950a258-227b-4e31-a9cf-717495945fc2";          
+        public const string PowerShellClientId = "1950a258-227b-4e31-a9cf-717495945fc2";          
 
         public static readonly Uri PowerShellRedirectUri = new Uri("urn:ietf:wg:oauth:2.0:oob");
 
@@ -55,6 +55,7 @@ public AdalConfiguration()
             ClientRedirectUri = PowerShellRedirectUri;
             ValidateAuthority = true;
             AdEndpoint = string.Empty;
+            ResourceClientUri = "https://management.core.windows.net/";
         }
     }
 }

src/Authentication/Common.Authentication/Authentication/ServicePrincipalKeyStore.cs

@@ -88,13 +88,19 @@ public static SecureString GetKey(string appId, string tenantId)
                 }
                 return null;
             }
+            catch 
+            {
+                // we could be running in an environment that does not have credentials store
+            }
             finally
             {
                 if (pCredential != IntPtr.Zero)
                 {
                     CredStore.NativeMethods.CredFree(pCredential);
                 }   
             }
+
+            return null;
         }
 
 

src/Authentication/Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs

@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Generic;
 using System.Security;
+using System.Threading.Tasks;
 
 namespace Microsoft.Azure.Common.Authentication
 {
@@ -33,36 +34,41 @@ public IAccessToken GetAccessToken(AdalConfiguration config, ShowDialog promptBe
             {
                 throw new ArgumentException(string.Format(Resources.InvalidCredentialType, "User"), "credentialType");
             }
-            return new ServicePrincipalAccessToken(config, AcquireToken(config, userId, password), this, userId);
+            return new ServicePrincipalAccessToken(
+                config, 
+                AcquireToken(config, userId, password).ConfigureAwait(false).GetAwaiter().GetResult(), 
+                this, 
+                userId);
         }
 
-        private AuthenticationResult AcquireToken(AdalConfiguration config, string appId, SecureString appKey)
+        private async Task<AuthenticationResult> AcquireToken(AdalConfiguration config, string appId, SecureString appKey)
         {
             if (appKey == null)
             {
-                return Renew(config, appId);
+                return await Renew(config, appId);
             }
 
             StoreAppKey(appId, config.AdDomain, appKey);
 
             string authority = config.AdEndpoint + config.AdDomain;
             var context = new AuthenticationContext(authority, config.ValidateAuthority,
                 AzureSession.TokenCache);
-            var credential = new ClientCredential(appId, appKey);
-            return context.AcquireToken("https://management.core.windows.net/", credential);
+            var credential = new ClientCredential(appId, UserTokenProvider.ConvertToString(appKey));
+            return await context.AcquireTokenAsync(config.ResourceClientUri, credential);
         }
 
-        private AuthenticationResult Renew(AdalConfiguration config, string appId)
+        private async Task<AuthenticationResult> Renew(AdalConfiguration config, string appId)
         {
             TracingAdapter.Information(Resources.SPNRenewTokenTrace, appId, config.AdDomain, config.AdEndpoint, 
                 config.ClientId, config.ClientRedirectUri);
-           using (SecureString appKey = LoadAppKey(appId, config.AdDomain))
+
+            using (SecureString appKey = LoadAppKey(appId, config.AdDomain))
             {
                 if (appKey == null)
                 {
                     throw new KeyNotFoundException(string.Format(Resources.ServiceKeyNotFound, appId));
                 }
-                return AcquireToken(config, appId, appKey);
+                return await AcquireToken(config, appId, appKey);
             }
         }
 
@@ -96,7 +102,7 @@ public void AuthorizeRequest(Action<string, string> authTokenSetter)
             {
                 if (IsExpired)
                 {
-                    AuthResult = tokenProvider.Renew(Configuration, appId);
+                    AuthResult = tokenProvider.Renew(Configuration, appId).ConfigureAwait(false).GetAwaiter().GetResult();
                 }
 
                 authTokenSetter(AuthResult.AccessTokenType, AuthResult.AccessToken);