change breaking change to az

maddieclayton · maddieclayton · commit 51115003be82 · 2018-11-06T13:35:05.000-08:00
diff --git a/src/Authentication.Abstractions/AzureRmProfileProvider.cs b/src/Authentication.Abstractions/AzureRmProfileProvider.cs
@@ -13,8 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 
 using System;
diff --git a/src/Authentication.Abstractions/AzureSMProfileProvider.cs b/src/Authentication.Abstractions/AzureSMProfileProvider.cs
@@ -13,8 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#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,8 +15,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 
 
diff --git a/src/Authentication.Abstractions/Extensions/AzureContextExtensions.cs b/src/Authentication.Abstractions/Extensions/AzureContextExtensions.cs
@@ -14,8 +14,8 @@
 
 using System;
 using System.Linq;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#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
@@ -15,10 +15,9 @@
 using System.Collections.Generic;
 
 #if NETSTANDARD
-namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
-#else
-namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core
 #endif
+namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
 {
     /// <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,8 +14,8 @@
 
 using Microsoft.Rest;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#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,8 +14,8 @@
 
 using Hyak.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#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,8 +14,8 @@
 
 using Hyak.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#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,8 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
diff --git a/src/Authentication.ResourceManager/AzureRmProfile.cs b/src/Authentication.ResourceManager/AzureRmProfile.cs
@@ -17,8 +17,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using System.Xml.Serialization;
diff --git a/src/Authentication.ResourceManager/AzureRmProfileConverter.cs b/src/Authentication.ResourceManager/AzureRmProfileConverter.cs
@@ -14,9 +14,9 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Desktop;
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#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;
diff --git a/src/Authentication.ResourceManager/ContextModelExtensions.cs b/src/Authentication.ResourceManager/ContextModelExtensions.cs
@@ -15,8 +15,8 @@
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using System;
 using System.Linq;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#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,9 +16,9 @@
 using System.Collections.Generic;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
-using Microsoft.Azure.Commands.Profile.Models.Desktop;
+#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;
diff --git a/src/Authentication.ResourceManager/Models/PSAzureContext.cs b/src/Authentication.ResourceManager/Models/PSAzureContext.cs
@@ -13,8 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Core;
 #endif
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.Profile.Common;
@@ -24,9 +24,9 @@
 using Microsoft.WindowsAzure.Commands.Common.Attributes;
 
 #if NETSTANDARD
-namespace Microsoft.Azure.Commands.Profile.Models
+namespace Microsoft.Azure.Commands.Profile.Models.Core
 #else
-namespace Microsoft.Azure.Commands.Profile.Models.Desktop
+namespace Microsoft.Azure.Commands.Profile.Models
 #endif
 {
     /// <summary>
diff --git a/src/Authentication.ResourceManager/Models/PSAzureProfile.cs b/src/Authentication.ResourceManager/Models/PSAzureProfile.cs
@@ -19,9 +19,9 @@
 using Microsoft.WindowsAzure.Commands.Common.Attributes;
 
 #if NETSTANDARD
-namespace Microsoft.Azure.Commands.Profile.Models
+namespace Microsoft.Azure.Commands.Profile.Models.Core
 #else
-namespace Microsoft.Azure.Commands.Profile.Models.Desktop
+namespace Microsoft.Azure.Commands.Profile.Models
 #endif
 {
     /// <summary>
diff --git a/src/Authentication.ResourceManager/ProtectedProfileProvider.cs b/src/Authentication.ResourceManager/ProtectedProfileProvider.cs
@@ -14,9 +14,9 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
-using Microsoft.Azure.Commands.Common.Authentication.Desktop;
+#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;
diff --git a/src/Authentication.ResourceManager/ResourceManagerProfileProvider.cs b/src/Authentication.ResourceManager/ResourceManagerProfileProvider.cs
@@ -14,9 +14,9 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
-using Microsoft.Azure.Commands.Common.Authentication.Desktop;
+#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;
diff --git a/src/Authentication.Test/AzureSessionTests.cs b/src/Authentication.Test/AzureSessionTests.cs
@@ -13,8 +13,8 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.Azure.Commands.Common.Authentication;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Core;
 #endif
 using Microsoft.Azure.Commands.Common.Authentication.Factories;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
diff --git a/src/Authentication/Authentication/AuthenticationStoreTokenCache.cs b/src/Authentication/Authentication/AuthenticationStoreTokenCache.cs
@@ -18,9 +18,9 @@
 using System.Threading;
 
 #if NETSTANDARD
-namespace Microsoft.Azure.Commands.Common.Authentication
+namespace Microsoft.Azure.Commands.Common.Authentication.Core
 #else
-namespace Microsoft.Azure.Commands.Common.Authentication.Desktop
+namespace Microsoft.Azure.Commands.Common.Authentication
 #endif
 {
     [Serializable]
diff --git a/src/Authentication/Authentication/ProtectedFileTokenCache.cs b/src/Authentication/Authentication/ProtectedFileTokenCache.cs
@@ -20,9 +20,9 @@
 using System.Security.Cryptography;
 
 #if NETSTANDARD
-namespace Microsoft.Azure.Commands.Common.Authentication
+namespace Microsoft.Azure.Commands.Common.Authentication.Core
 #else
-namespace Microsoft.Azure.Commands.Common.Authentication.Desktop
+namespace Microsoft.Azure.Commands.Common.Authentication
 #endif
 {
     /// <summary>
diff --git a/src/Authentication/AzureSessionInitializer.cs b/src/Authentication/AzureSessionInitializer.cs
@@ -22,8 +22,8 @@
 using Newtonsoft.Json;
 using TraceLevel = System.Diagnostics.TraceLevel;
 using System.Linq;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Desktop;
+#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,8 +14,8 @@
 
 using Hyak.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#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;
diff --git a/src/Common.Test/Common/MockSubsciptionFactory.cs b/src/Common.Test/Common/MockSubsciptionFactory.cs
@@ -23,8 +23,8 @@
 using System.Net.Http.Headers;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 
 namespace Microsoft.WindowsAzure.Commands.Common.Test.Common
diff --git a/src/Common/AzureDataCmdlet.cs b/src/Common/AzureDataCmdlet.cs
@@ -21,8 +21,8 @@
 using System.Management.Automation;
 using System.Management.Automation.Host;
 using Microsoft.WindowsAzure.Commands.Common.Properties;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 
 namespace Microsoft.WindowsAzure.Commands.Common
diff --git a/src/ResourceManager/AzureRMCmdlet.cs b/src/ResourceManager/AzureRMCmdlet.cs
@@ -14,8 +14,8 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.Properties;
diff --git a/src/ScenarioTest.ResourceManager/Mocks/MockClientFactory.cs b/src/ScenarioTest.ResourceManager/Mocks/MockClientFactory.cs
@@ -33,8 +33,8 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 
 namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
diff --git a/src/ScenarioTest/Mocks/MockClientFactory.cs b/src/ScenarioTest/Mocks/MockClientFactory.cs
@@ -32,9 +32,9 @@
 using Microsoft.Azure.ServiceManagemenet.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
-using Microsoft.Azure.Commands.Common.Authentication.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
+using Microsoft.Azure.Commands.Common.Authentication.Core;
 #endif
 
 namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
diff --git a/src/ServiceManagement/AzureSMProfile.cs b/src/ServiceManagement/AzureSMProfile.cs
@@ -14,8 +14,8 @@
 
 using Hyak.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 using Newtonsoft.Json;
 using System;
diff --git a/src/ServiceManagement/RPRegistrationAction.cs b/src/ServiceManagement/RPRegistrationAction.cs
@@ -15,8 +15,8 @@
 using Hyak.Common;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Management.Resources;
diff --git a/src/ServiceManagement/ServiceManagementProfileProvider.cs b/src/ServiceManagement/ServiceManagementProfileProvider.cs
@@ -14,8 +14,8 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.IO;
diff --git a/src/TestFx/TestClientFactory.cs b/src/TestFx/TestClientFactory.cs
@@ -25,8 +25,8 @@
 using Microsoft.Azure.Graph.RBAC.Version1_6;
 using Microsoft.Rest;
 using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
-#if !NETSTANDARD
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Desktop;
+#if NETSTANDARD
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
 #endif
 
 namespace Microsoft.Azure.Commands.TestFx
