Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Authentication.Abstractions/AzureRmProfileProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
// ----------------------------------------------------------------------------------

using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
#if NETSTANDARD
using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good. Do we need to change the name of the dll as well?

#endif

using System;
using System.Threading;

Expand Down
3 changes: 3 additions & 0 deletions src/Authentication.Abstractions/AzureSMProfileProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/Authentication.Abstractions/Interfaces/IClientAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/Authentication.ResourceManager/AzureRmProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions src/Authentication.ResourceManager/AzureRmProfileConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/Authentication.ResourceManager/ContextModelExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions src/Authentication.ResourceManager/Models/PSAzureContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions src/Authentication.ResourceManager/Models/PSAzureProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/Authentication.Test/AzureSessionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/Authentication.Test/LoginTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/Authentication/Authentication/ProtectedFileTokenCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/Authentication/AzureSessionInitializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
3 changes: 3 additions & 0 deletions src/Authentication/Factories/ClientFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions src/Common.Test/Common/MockSubsciptionFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
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.Core;
#endif

namespace Microsoft.WindowsAzure.Commands.Common.Test.Common
{
Expand Down
3 changes: 3 additions & 0 deletions src/Common/AzureDataCmdlet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
using System.Management.Automation;
using System.Management.Automation.Host;
using Microsoft.WindowsAzure.Commands.Common.Properties;
#if NETSTANDARD
using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
#endif

namespace Microsoft.WindowsAzure.Commands.Common
{
Expand Down
3 changes: 3 additions & 0 deletions src/ResourceManager/AzureRMCmdlet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,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.ResourceManager.Common.Properties;
using Microsoft.Azure.Management.Internal.Resources;
Expand Down
3 changes: 3 additions & 0 deletions src/ScenarioTest.ResourceManager/Mocks/MockClientFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
#if NETSTANDARD
using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Core;
#endif

namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
{
Expand Down
4 changes: 4 additions & 0 deletions src/ScenarioTest/Mocks/MockClientFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
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.Core;
using Microsoft.Azure.Commands.Common.Authentication.Core;
#endif

namespace Microsoft.WindowsAzure.Commands.Common.Test.Mocks
{
Expand Down
3 changes: 3 additions & 0 deletions src/ServiceManagement/AzureSMProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 Newtonsoft.Json;
using System;
using System.Collections.Generic;
Expand Down
3 changes: 3 additions & 0 deletions src/ServiceManagement/RPRegistrationAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,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.Abstractions.Core;
#endif
using Microsoft.Azure.Commands.Common.Authentication.Models;
using Microsoft.Azure.Management.Resources;
using Microsoft.WindowsAzure.Commands.Utilities.Common;
Expand Down
3 changes: 3 additions & 0 deletions src/ServiceManagement/ServiceManagementProfileProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,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.WindowsAzure.Commands.Utilities.Common;
using System.IO;
using System;
Expand Down
5 changes: 4 additions & 1 deletion src/TestFx/TestClientFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@
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.Core;
#endif

namespace Microsoft.Azure.Commands.TestFx
namespace Microsoft.Azure.Commands.TestFx
{
public class TestClientFactory : IClientFactory
{
Expand Down