Merge branch 'dev' into resourcemanager-api20180501

Author: MiYanni

src/Authentication.Abstractions/AzureRmProfileProvider.cs

@@ -13,6 +13,10 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
+
 using System;
 using System.Threading;
 

src/Authentication.Abstractions/AzureSMProfileProvider.cs

@@ -13,6 +13,9 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 using System;
 using System.Threading;
 

src/Authentication.Abstractions/Extensions/AzureAccountExtensions.cs

@@ -15,6 +15,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
+
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
 {

src/Authentication.Abstractions/Extensions/AzureContextExtensions.cs

@@ -14,6 +14,9 @@
 
 using System;
 using System.Linq;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
 {

src/Authentication.Abstractions/Interfaces/IAzureContextContainer.cs

@@ -14,7 +14,11 @@
 
 using System.Collections.Generic;
 
+#if NETSTANDARD
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core
+#else
 namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
+#endif
 {
     /// <summary>
     /// Storage container for all targeted environments, allowing the user to store named target configurations

src/Authentication.Abstractions/Interfaces/IClientAction.cs

@@ -14,6 +14,9 @@
 
 using Microsoft.Rest;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Models
 {

src/Authentication.Abstractions/Interfaces/IHyakClientAction.cs

@@ -14,6 +14,9 @@
 
 using Hyak.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Models
 {

src/Authentication.Abstractions/Interfaces/IHyakClientFactory.cs

@@ -14,6 +14,9 @@
 
 using Hyak.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {

src/Authentication.Abstractions/Interfaces/IProfileProvider.cs

@@ -12,6 +12,10 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
+
 namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
 {
     public interface IProfileProvider

src/Authentication.ResourceManager/AzureRmProfile.cs

@@ -17,6 +17,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using System.Xml.Serialization;
 using Microsoft.Azure.Commands.ResourceManager.Common.Serialization;