Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev

# Conflicts:
#	setup/azurecmdfiles.wxi

Author: huangpf

AzurePowershell.Test.targets

@@ -84,7 +84,7 @@
       <XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
       <XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
-      <XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>	                      
+      <XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>  
       <XUnitTests Include="@(AsmXUnitTests)"/>
     </ItemGroup>
     <ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">
@@ -98,19 +98,37 @@
   <Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
     <Message Importance="high" Text="Running XUnit tests" />
     <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
-    <Exec 
-        Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -parallel none -maxthreads 0 -trait &quot;AcceptanceType=CheckIn&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
-        Timeout="$(TestTimeout)" ContinueOnError="false" Condition=" @(XUnitTests) != '' "/>
-    <OnError ExecuteTargets="TimeoutErrorHandler"/>
+
+    <xunit 
+        Assemblies="@(XUnitTests)" 
+        AppDomains="true"
+        ShadowCopy="false"
+        ParallelizeTestCollections="false"
+        ParallelizeAssemblies="true"
+        IncludeTraits="AcceptanceType=CheckIn"
+        Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
+        MaxParallelThreads="10"
+        DiagnosticMessages="false"
+        ContinueOnError="false" 
+        Condition=" @(XUnitTests) != '' "/>
   </Target>
 
   <Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
     <Message Importance="high" Text="Running XUnit tests" />
     <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
-    <Exec 
-        Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -notrait &quot;RunType=LiveOnly&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
-        Timeout="$(TestTimeout)" ContinueOnError="false"/>
-    <OnError ExecuteTargets="TimeoutErrorHandler"/>
+    
+    <xunit 
+        Assemblies="@(XUnitTests)" 
+        AppDomains="true"
+        ShadowCopy="false"
+        ParallelizeTestCollections="false"
+        ParallelizeAssemblies="true"
+        ExcludeTraits="RunType=LiveOnly"
+        Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
+        MaxParallelThreads="10"
+        DiagnosticMessages="false"
+        ContinueOnError="false" 
+        Condition=" @(XUnitTests) != '' "/>
   </Target>
 
   <Target Name="TimeoutErrorHandler">
@@ -458,7 +476,7 @@
 
   <Target Name="LiveTests"> 
     <MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
-    <Exec Command="packages\xunit.runners.1.9.2\tools\xunit.console.clr4.exe  @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
+    <Exec Command="packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe  @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
   </Target> 
 
 

build.proj

@@ -70,7 +70,7 @@
   <Import Condition=" $(OnPremiseBuild) " Project="$(CIToolsPath)\Microsoft.WindowsAzure.Build.OnPremise.msbuild" />
 
   <UsingTask 
-    AssemblyFile="$(MSBuildProjectDirectory)\src\packages\xunit.MSBuild.2.0.0.0\tools\xunit.runner.msbuild.dll"
+    AssemblyFile="$(MSBuildProjectDirectory)\packages\xunit.runner.msbuild.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll"
     TaskName="Xunit.Runner.MSBuild.xunit" />
 
   <!-- Clean the build in all configurations -->

packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="xunit.runner.console" version="2.0.0" />
-  <package id="xunit.runners" version="1.9.2" />
+  <package id="xunit.runner.console" version="2.1.0" />
+  <package id="xunit.runner.msbuild" version="2.1.0" />
 </packages>

setup/azurecmdfiles.wxi

@@ -0,0 +1,94 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+
+namespace Microsoft.Azure.Commands.Common.Authentication
+{
+    /// <summary>
+    /// Base class representing an exception that occurs when
+    /// authenticating against Azure Active Directory
+    /// </summary>
+    [Serializable]
+    public abstract class AadAuthenticationException : Exception
+    {
+        protected AadAuthenticationException()
+        {
+        }
+
+        protected AadAuthenticationException(string message) : base(message)
+        {
+        }
+
+        protected AadAuthenticationException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Exception that gets thrown when the user explicitly
+    /// cancels an authentication operation.
+    /// </summary>
+    [Serializable]
+    public class AadAuthenticationCanceledException : AadAuthenticationException
+    {
+        public AadAuthenticationCanceledException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Exception that gets thrown when the ADAL library
+    /// is unable to authenticate without a popup dialog.
+    /// </summary>
+    [Serializable]
+    public class AadAuthenticationFailedWithoutPopupException : AadAuthenticationException
+    {
+        public AadAuthenticationFailedWithoutPopupException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Exception that gets thrown if an authentication operation
+    /// fails on the server.
+    /// </summary>
+    [Serializable]
+    public class AadAuthenticationFailedException : AadAuthenticationException
+    {
+        public AadAuthenticationFailedException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Exception thrown if a refresh token has expired.
+    /// </summary>
+    [Serializable]
+    public class AadAuthenticationCantRenewException : AadAuthenticationException
+    {
+        public AadAuthenticationCantRenewException()
+        {
+        }
+
+        public AadAuthenticationCantRenewException(string message) : base(message)
+        {
+        }
+
+        public AadAuthenticationCantRenewException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}

src/Common/Commands.Common.Authentication/Authentication/AadAuthenticationException.cs

@@ -0,0 +1,50 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.Common.Authentication
+{
+    public class AccessTokenCredential : SubscriptionCloudCredentials
+    {
+        private readonly Guid subscriptionId;
+        private readonly IAccessToken token;
+
+        public AccessTokenCredential(Guid subscriptionId, IAccessToken token)
+        {
+            this.subscriptionId = subscriptionId;
+            this.token = token;
+            this.TenantID = token.TenantId;
+        }
+        
+        public override Task ProcessHttpRequestAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            token.AuthorizeRequest((tokenType, tokenValue) => {
+                request.Headers.Authorization = new AuthenticationHeaderValue(tokenType, tokenValue);
+            });
+            return base.ProcessHttpRequestAsync(request, cancellationToken);
+        }
+
+        public override string SubscriptionId
+        {
+            get { return subscriptionId.ToString(); }
+        }
+
+        public string TenantID { get; set; }
+    }
+}

src/Common/Commands.Common.Authentication/Authentication/AccessTokenCredential.cs

@@ -0,0 +1,63 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using System;
+
+namespace Microsoft.Azure.Commands.Common.Authentication
+{
+    /// <summary>
+    /// Class storing the configuration information needed
+    /// for ADAL to request token from the right AD tenant
+    /// depending on environment.
+    /// </summary>
+    public class AdalConfiguration
+    {
+        //
+        // These constants define the default values to use for AD authentication
+        // against RDFE
+        //
+        public const string PowerShellClientId = "1950a258-227b-4e31-a9cf-717495945fc2";          
+
+        public static readonly Uri PowerShellRedirectUri = new Uri("urn:ietf:wg:oauth:2.0:oob");
+
+        // ID for site to pass to enable EBD (email-based differentiation)
+        // This gets passed in the call to get the azure branding on the
+        // login window. Also adding popup flag to handle overly large login windows.
+        public const string EnableEbdMagicCookie = "site_id=501358&display=popup";
+
+        public string AdEndpoint { get;set; }
+
+        public bool ValidateAuthority { get; set; }
+
+        public string AdDomain { get; set; }
+
+        public string ClientId { get; set; }
+
+        public Uri ClientRedirectUri { get; set; }
+
+        public string ResourceClientUri { get; set; }
+
+        public TokenCache TokenCache { get; set; }
+
+        public AdalConfiguration()
+        {
+            ClientId = PowerShellClientId;
+            ClientRedirectUri = PowerShellRedirectUri;
+            ValidateAuthority = true;
+            AdEndpoint = string.Empty;
+            ResourceClientUri = "https://management.core.windows.net/";
+        }
+    }
+}

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

@@ -0,0 +1,68 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Common.Authentication.Models;
+using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using System;
+using System.Security;
+using System.Windows.Forms;
+
+namespace Microsoft.Azure.Commands.Common.Authentication
+{
+    /// <summary>
+    /// A token provider that uses ADAL to retrieve
+    /// tokens from Azure Active Directory
+    /// </summary>
+    public class AdalTokenProvider : ITokenProvider
+    {
+        private readonly ITokenProvider userTokenProvider;
+        private readonly ITokenProvider servicePrincipalTokenProvider;
+
+        public AdalTokenProvider()
+            : this(new ConsoleParentWindow())
+        {
+        }
+
+        public AdalTokenProvider(IWin32Window parentWindow)
+        {
+            this.userTokenProvider = new UserTokenProvider(parentWindow);
+            servicePrincipalTokenProvider = new ServicePrincipalTokenProvider();
+        }
+
+        public IAccessToken GetAccessToken(AdalConfiguration config, ShowDialog promptBehavior, string userId, SecureString password,
+            AzureAccount.AccountType credentialType)
+        {
+            switch (credentialType)
+            {
+                case AzureAccount.AccountType.User:
+                    return userTokenProvider.GetAccessToken(config, promptBehavior, userId, password, credentialType);
+                case AzureAccount.AccountType.ServicePrincipal:
+                    return servicePrincipalTokenProvider.GetAccessToken(config, promptBehavior, userId, password, credentialType);
+                default:
+                    throw new ArgumentException(Resources.UnknownCredentialType, "credentialType");
+            }
+        }
+
+        public IAccessToken GetAccessTokenWithCertificate(AdalConfiguration config, string clientId, string certificate, AzureAccount.AccountType credentialType)
+        {
+            switch (credentialType)
+            {
+                case AzureAccount.AccountType.ServicePrincipal:
+                    return servicePrincipalTokenProvider.GetAccessTokenWithCertificate(config, clientId, certificate, credentialType);
+                default:
+                    throw new ArgumentException(string.Format(Resources.UnsupportedCredentialType, credentialType), "credentialType");
+            }
+        }
+    }
+}