Merge branch 'dev' into getlocation-usecanonical

MiYanni · web-flow · commit 28074d1ee833 · 2018-11-12T10:41:11.000-08:00
diff --git a/src/Authentication.Abstractions/AzureRmProfileProvider.cs b/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;
 
diff --git a/src/Authentication.Abstractions/AzureSMProfileProvider.cs b/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;
 
diff --git a/src/Authentication.Abstractions/Extensions/AzureAccountExtensions.cs b/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
 {
diff --git a/src/Authentication.Abstractions/Extensions/AzureContextExtensions.cs b/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
 {
diff --git a/src/Authentication.Abstractions/Interfaces/IAzureContextContainer.cs b/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
diff --git a/src/Authentication.Abstractions/Interfaces/IClientAction.cs b/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
 {
diff --git a/src/Authentication.Abstractions/Interfaces/IHyakClientAction.cs b/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
 {
diff --git a/src/Authentication.Abstractions/Interfaces/IHyakClientFactory.cs b/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
 {
diff --git a/src/Authentication.Abstractions/Interfaces/IProfileProvider.cs b/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
diff --git a/src/Authentication.ResourceManager/AzureRmProfile.cs b/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;
diff --git a/src/Authentication.ResourceManager/AzureRmProfileConverter.cs b/src/Authentication.ResourceManager/AzureRmProfileConverter.cs
@@ -14,6 +14,10 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Core;
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.Serialization;
 using Newtonsoft.Json;
diff --git a/src/Authentication.ResourceManager/AzureRmServicePrincipalKeyStore.Netcore.cs b/src/Authentication.ResourceManager/AzureRmServicePrincipalKeyStore.Netcore.cs
@@ -13,6 +13,9 @@
 // ----------------------------------------------------------------------------------
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
 using System;
diff --git a/src/Authentication.ResourceManager/ContextModelExtensions.cs b/src/Authentication.ResourceManager/ContextModelExtensions.cs
@@ -15,6 +15,9 @@
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using System;
 using System.Linq;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+#endif
 
 namespace Microsoft.Azure.Commands.Common.Authentication.ResourceManager
 {
diff --git a/src/Authentication.ResourceManager/Models/AzureContextConverter.cs b/src/Authentication.ResourceManager/Models/AzureContextConverter.cs
@@ -16,6 +16,10 @@
 using System.Collections.Generic;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+using Microsoft.Azure.Commands.Profile.Models.Core;
+#endif
 using System.Collections;
 using Microsoft.Azure.Commands.Profile.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
diff --git a/src/Authentication.ResourceManager/Models/PSAzureContext.cs b/src/Authentication.ResourceManager/Models/PSAzureContext.cs
@@ -13,14 +13,21 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Core;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Profile.Common;
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
 using Microsoft.WindowsAzure.Commands.Common.Attributes;
 
+#if NETSTANDARD
+namespace Microsoft.Azure.Commands.Profile.Models.Core
+#else
 namespace Microsoft.Azure.Commands.Profile.Models
+#endif
 {
     /// <summary>
     /// The context for connecting cmdlets in the current session to Azure.
@@ -143,30 +150,30 @@ public PSAzureContext(PSObject other)
         /// <summary>
         /// The name of the context. The context may be selected by name
         /// </summary>
-        [Ps1Xml(Label = "Context Name", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 0)]
         public string Name { get; set; }
         /// <summary>
         /// The account used to connect to Azure.
         /// </summary>
-        [Ps1Xml(Label = "Account id", Target = ViewControl.Table, ScriptBlock = "$_.Account.Id")]
+        [Ps1Xml(Label = "Account", Target = ViewControl.Table, Position = 1)]
         public IAzureAccount Account { get; set; }
 
         /// <summary>
         /// The endpoint and connection metadata for the targeted instance of the Azure cloud.
         /// </summary>
-        [Ps1Xml(Label = "Environment Name", Target = ViewControl.Table, ScriptBlock = "$_.Environment.Name")]
+        [Ps1Xml(Label = "Environment", Target = ViewControl.Table, Position = 3)]
         public IAzureEnvironment Environment { get; set; }
 
         /// <summary>
         /// The subscription targeted in Azure.
         /// </summary>
-        [Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table, ScriptBlock = "$_.Subscription.Name")]
+        [Ps1Xml(Label = "SubscriptionName", Target = ViewControl.Table, ScriptBlock = "$_.Subscription.Name", Position = 2)]
         public IAzureSubscription Subscription { get; set; }
 
         /// <summary>
         /// The targeted tenant in Azure.
         /// </summary>
-        [Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table, ScriptBlock = "$_.Tenant.Id")]
+        [Ps1Xml(Label = "TenantId", Target = ViewControl.Table, ScriptBlock = "$_.Tenant.ToString()", Position = 4)]
         public IAzureTenant Tenant { get; set; }
 
         public IAzureTokenCache TokenCache { get; set; }
diff --git a/src/Authentication.ResourceManager/Models/PSAzureEnvironment.cs b/src/Authentication.ResourceManager/Models/PSAzureEnvironment.cs
@@ -14,6 +14,7 @@
 
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Profile.Common;
+using Microsoft.WindowsAzure.Commands.Common.Attributes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -117,6 +118,7 @@ public PSAzureEnvironment(PSObject other)
         /// <summary>
         /// Gets or sets the name of the environment.
         /// </summary>
+        [Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 0)]
         public string Name { get; set; }
 
         /// <summary>
@@ -170,6 +172,7 @@ public bool OnPremise
         /// <summary>
         /// Gets or sets the Uri of the Azure Resource Manager (ARM) service.
         /// </summary>
+        [Ps1Xml(Label = "Resource Manager Url", Target = ViewControl.Table, Position = 1)]
         public string ResourceManagerUrl { get; set; }
 
         /// <summary>
@@ -185,6 +188,7 @@ public bool OnPremise
         /// <summary>
         /// Gets or sets the Uri of the Active Directory authentication endpoint.
         /// </summary>
+        [Ps1Xml(Label = "ActiveDirectory Authority", Target = ViewControl.Table, Position = 2)]
         public string ActiveDirectoryAuthority { get; set; }
 
         /// <summary>
diff --git a/src/Authentication.ResourceManager/Models/PSAzureProfile.cs b/src/Authentication.ResourceManager/Models/PSAzureProfile.cs
@@ -18,7 +18,11 @@
 using System.Collections.Generic;
 using Microsoft.WindowsAzure.Commands.Common.Attributes;
 
+#if NETSTANDARD
+namespace Microsoft.Azure.Commands.Profile.Models.Core
+#else
 namespace Microsoft.Azure.Commands.Profile.Models
+#endif
 {
     /// <summary>
     /// Credential and environment data for connecting with an Azure instance in the current session.
@@ -80,10 +84,10 @@ public IDictionary<string, PSAzureEnvironment> Environments
         /// <summary>
         /// The current credentials and metadata for connecting with the current Azure cloud instance.
         /// </summary>
-        [Ps1Xml(Label = "Account Name", Target = ViewControl.Table, ScriptBlock = "$_.Context.Account.Name")]
-        [Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table, ScriptBlock = "$_.Context.Subscription.Name")]
-        [Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table, ScriptBlock = "$_.Context.Tenant.Name")]
-        [Ps1Xml(Label = "Environment Name", Target = ViewControl.Table, ScriptBlock = "$_.Context.Environment.Name")]
+        [Ps1Xml(Label = "Account", Target = ViewControl.Table, ScriptBlock = "$_.Context.Account.ToString()", Position = 0)]
+        [Ps1Xml(Label = "SubscriptionName", Target = ViewControl.Table, ScriptBlock = "$_.Context.Subscription.Name", Position = 1)]
+        [Ps1Xml(Label = "TenantId", Target = ViewControl.Table, ScriptBlock = "$_.Context.Tenant.ToString()", Position = 2)]
+        [Ps1Xml(Label = "Environment", Target = ViewControl.Table, ScriptBlock = "$_.Context.Environment.ToString()", Position = 3)]
         public PSAzureContext Context { get; set; }
 
         public override string ToString()
diff --git a/src/Authentication.ResourceManager/Models/PSAzureSubscription.cs b/src/Authentication.ResourceManager/Models/PSAzureSubscription.cs
@@ -88,15 +88,15 @@ public PSAzureSubscription(PSObject other)
         }
 
         /// <inheritdoc />
-        [Ps1Xml(Label = "Subscription Id", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "Id", Target = ViewControl.Table, Position = 1)]
         public string Id { get; set; }
 
         /// <inheritdoc />
-        [Ps1Xml(Label = "Subscription Name", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "Name", Target = ViewControl.Table, Position = 0)]
         public string Name { get; set; }
 
         /// <inheritdoc />
-        [Ps1Xml]
+        [Ps1Xml(Label = "State", Target = ViewControl.Table, Position = 3)]
         public string State { get; set; }
 
         /// <summary>
@@ -107,7 +107,7 @@ public PSAzureSubscription(PSObject other)
         /// <summary>
         /// The tenant home for the subscription.
         /// </summary>
-        [Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "TenantId", Target = ViewControl.Table, Position = 2)]
         public string TenantId
         {
             get
diff --git a/src/Authentication.ResourceManager/Models/PSAzureTenant.cs b/src/Authentication.ResourceManager/Models/PSAzureTenant.cs
@@ -88,13 +88,13 @@ public PSAzureTenant(PSObject other)
         /// <summary>
         /// The tenant id.
         /// </summary>
-        [Ps1Xml(Label = "Tenant Id", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "Id", Target = ViewControl.Table, Position = 0)]
         public string Id { get; set; }
 
         /// <summary>
         /// The name of the subscription.
         /// </summary>
-        [Ps1Xml(Label = "Directory Name", Target = ViewControl.Table)]
+        [Ps1Xml(Label = "Directory", Target = ViewControl.Table, Position = 1)]
         public string Directory { get; set; }
 
         /// <summary>
diff --git a/src/Authentication.ResourceManager/ProtectedProfileProvider.cs b/src/Authentication.ResourceManager/ProtectedProfileProvider.cs
@@ -14,6 +14,10 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+using Microsoft.Azure.Commands.Common.Authentication.Core;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
diff --git a/src/Authentication.ResourceManager/ResourceManagerProfileProvider.cs b/src/Authentication.ResourceManager/ResourceManagerProfileProvider.cs
@@ -14,6 +14,10 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+using Microsoft.Azure.Commands.Common.Authentication.Core;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
diff --git a/src/Authentication.Test/AzureSessionTests.cs b/src/Authentication.Test/AzureSessionTests.cs
@@ -13,6 +13,9 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Core;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication.Factories;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
diff --git a/src/Authentication.Test/LoginTests.cs b/src/Authentication.Test/LoginTests.cs
@@ -17,6 +17,9 @@
 using Hyak.Common;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Core;
+#endif
 using Microsoft.Azure.Commands.Common.Authentication.Factories;
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.Azure.Internal.Subscriptions;
diff --git a/src/Authentication/Authentication/AuthenticationStoreTokenCache.cs b/src/Authentication/Authentication/AuthenticationStoreTokenCache.cs
@@ -17,7 +17,11 @@
 using System;
 using System.Threading;
 
+#if NETSTANDARD
+namespace Microsoft.Azure.Commands.Common.Authentication.Core
+#else
 namespace Microsoft.Azure.Commands.Common.Authentication
+#endif
 {
     [Serializable]
     public class AuthenticationStoreTokenCache : TokenCache, IAzureTokenCache, IDisposable
diff --git a/src/Authentication/Authentication/ProtectedFileTokenCache.cs b/src/Authentication/Authentication/ProtectedFileTokenCache.cs
@@ -19,7 +19,11 @@
 using System.IO;
 using System.Security.Cryptography;
 
+#if NETSTANDARD
+namespace Microsoft.Azure.Commands.Common.Authentication.Core
+#else
 namespace Microsoft.Azure.Commands.Common.Authentication
+#endif
 {
     /// <summary>
     /// An implementation of the Adal token cache that stores the cache items
diff --git a/src/Authentication/AzureSessionInitializer.cs b/src/Authentication/AzureSessionInitializer.cs
@@ -22,6 +22,9 @@
 using Newtonsoft.Json;
 using TraceLevel = System.Diagnostics.TraceLevel;
 using System.Linq;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Core;
+#endif
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {
diff --git a/src/Authentication/Factories/ClientFactory.cs b/src/Authentication/Factories/ClientFactory.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
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.Properties;
 using System;
diff --git a/src/Common.Test/Common/MockSubsciptionFactory.cs b/src/Common.Test/Common/MockSubsciptionFactory.cs
diff --git a/src/Common/AzureDataCmdlet.cs b/src/Common/AzureDataCmdlet.cs
diff --git a/src/ResourceManager/AzureRMCmdlet.cs b/src/ResourceManager/AzureRMCmdlet.cs
diff --git a/src/ScenarioTest.ResourceManager/Mocks/MockClientFactory.cs b/src/ScenarioTest.ResourceManager/Mocks/MockClientFactory.cs
diff --git a/src/ScenarioTest/Mocks/MockClientFactory.cs b/src/ScenarioTest/Mocks/MockClientFactory.cs
diff --git a/src/ServiceManagement/AzureSMProfile.cs b/src/ServiceManagement/AzureSMProfile.cs
diff --git a/src/ServiceManagement/RPRegistrationAction.cs b/src/ServiceManagement/RPRegistrationAction.cs
diff --git a/src/ServiceManagement/ServiceManagementProfileProvider.cs b/src/ServiceManagement/ServiceManagementProfileProvider.cs
diff --git a/src/TestFx/TestClientFactory.cs b/src/TestFx/TestClientFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`
`15`	`15`	`using System;`
`16`	`16`	`using System.Linq;`
	`17`	`+#if NETSTANDARD`
	`18`	`+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;`
	`19`	`+#endif`
`17`	`20`
`18`	`21`	`namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions`
`19`	`22`	`{`