From 9bac58638122a8afb659069d6f57c5bf52f8e27f Mon Sep 17 00:00:00 2001 From: cormacpayne Date: Fri, 3 Nov 2017 11:16:28 -0700 Subject: [PATCH 1/8] Update Common code for preview modules --- .../AzurePSDataCollectionProfile.cs | 2 +- ....Common.Authentication.Abstractions.csproj | 4 ++ .../DataCollectionController.cs | 13 +++--- .../DiskDataStore.cs | 17 +++++--- .../Properties/Resources.Designer.cs | 27 ++++++++++++ .../Properties/Resources.resx | 9 ++++ .../Utilities/FileUtilities.cs | 42 +++++++++++++++---- .../KeyStoreApplicationCredentialProvider.cs | 1 - .../ServicePrincipalTokenProvider.cs | 1 - .../AzureSessionInitializer.cs | 1 - .../Commands.Common.Authentication.csproj | 4 -- .../Models/MemoryDataStore.cs | 1 - .../Commands.Common/Commands.Common.csproj | 4 -- .../Extensions/CmdletExtensions.cs | 1 + src/Common/Commands.Common/MetricHelper.cs | 1 + .../Commands.Common/Utilities/Validate.cs | 2 +- 16 files changed, 96 insertions(+), 34 deletions(-) rename src/Common/{Commands.Common => Commands.Common.Authentication.Abstractions}/AzurePSDataCollectionProfile.cs (95%) rename src/Common/{Commands.Common => Commands.Common.Authentication.Abstractions}/DataCollectionController.cs (94%) rename src/Common/{Commands.Common => Commands.Common.Authentication.Abstractions}/DiskDataStore.cs (95%) rename src/Common/{Commands.Common => Commands.Common.Authentication.Abstractions}/Utilities/FileUtilities.cs (91%) diff --git a/src/Common/Commands.Common/AzurePSDataCollectionProfile.cs b/src/Common/Commands.Common.Authentication.Abstractions/AzurePSDataCollectionProfile.cs similarity index 95% rename from src/Common/Commands.Common/AzurePSDataCollectionProfile.cs rename to src/Common/Commands.Common.Authentication.Abstractions/AzurePSDataCollectionProfile.cs index d4a27f2711eb..1297bd808c1c 100644 --- a/src/Common/Commands.Common/AzurePSDataCollectionProfile.cs +++ b/src/Common/Commands.Common.Authentication.Abstractions/AzurePSDataCollectionProfile.cs @@ -15,7 +15,7 @@ using Newtonsoft.Json; using System; -namespace Microsoft.WindowsAzure.Commands.Common +namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions { public class AzurePSDataCollectionProfile { diff --git a/src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj b/src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj index a7f152f5f53d..e896be268ad6 100644 --- a/src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj +++ b/src/Common/Commands.Common.Authentication.Abstractions/Commands.Common.Authentication.Abstractions.csproj @@ -101,9 +101,12 @@ + + + @@ -157,6 +160,7 @@ + diff --git a/src/Common/Commands.Common/DataCollectionController.cs b/src/Common/Commands.Common.Authentication.Abstractions/DataCollectionController.cs similarity index 94% rename from src/Common/Commands.Common/DataCollectionController.cs rename to src/Common/Commands.Common.Authentication.Abstractions/DataCollectionController.cs index 3626eed2ce67..940c78a8b576 100644 --- a/src/Common/Commands.Common/DataCollectionController.cs +++ b/src/Common/Commands.Common.Authentication.Abstractions/DataCollectionController.cs @@ -1,9 +1,4 @@ -using Microsoft.Azure.Commands.Common.Authentication.Abstractions; -using Microsoft.WindowsAzure.Commands.Common.Properties; -using Newtonsoft.Json; -using System; -using System.IO; -// ---------------------------------------------------------------------------------- +// ---------------------------------------------------------------------------------- // // Copyright Microsoft Corporation // Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,7 +12,11 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -namespace Microsoft.WindowsAzure.Commands.Common +using Newtonsoft.Json; +using System; +using System.IO; + +namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions { public abstract class DataCollectionController { diff --git a/src/Common/Commands.Common/DiskDataStore.cs b/src/Common/Commands.Common.Authentication.Abstractions/DiskDataStore.cs similarity index 95% rename from src/Common/Commands.Common/DiskDataStore.cs rename to src/Common/Commands.Common.Authentication.Abstractions/DiskDataStore.cs index 8e0a01228e3e..a0ec7e7e47e5 100644 --- a/src/Common/Commands.Common/DiskDataStore.cs +++ b/src/Common/Commands.Common.Authentication.Abstractions/DiskDataStore.cs @@ -12,14 +12,13 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Properties; using System; using System.IO; using System.Security.Cryptography.X509Certificates; using System.Text; -using Microsoft.WindowsAzure.Commands.Common.Properties; -namespace Microsoft.WindowsAzure.Commands.Common +namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions { /// /// A ddata store based on the managed windows file system functions (System.IO) @@ -192,7 +191,11 @@ public X509Certificate2 GetCertificate(string thumbprint) } else { - Validate.ValidateStringIsNullOrEmpty(thumbprint, "certificate thumbprint"); + if (string.IsNullOrEmpty(thumbprint)) + { + throw new ArgumentException(string.Format(Resources.InvalidOrEmptyArgumentMessage, "certificate thumbprint")); + } + X509Certificate2Collection certificates; if (TryFindCertificatesInStore(thumbprint, StoreLocation.CurrentUser, out certificates) || TryFindCertificatesInStore(thumbprint, StoreLocation.LocalMachine, out certificates)) @@ -212,7 +215,11 @@ public X509Certificate2 GetCertificate(string thumbprint) /// The certificate to add public void AddCertificate(X509Certificate2 certificate) { - Validate.ValidateNullArgument(certificate, Resources.InvalidCertificate); + if (certificate == null) + { + throw new ArgumentException(Resources.InvalidCertificate); + } + X509StoreWrapper(StoreName.My, StoreLocation.CurrentUser, (store) => { store.Open(OpenFlags.ReadWrite); diff --git a/src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.Designer.cs b/src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.Designer.cs index 346739c11499..035eb7c58744 100644 --- a/src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.Designer.cs +++ b/src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.Designer.cs @@ -96,6 +96,15 @@ internal static string InvalidDnsName { } } + /// + /// Looks up a localized string similar to {0} is invalid or empty.. + /// + internal static string InvalidOrEmptyArgumentMessage { + get { + return ResourceManager.GetString("InvalidOrEmptyArgumentMessage", resourceCulture); + } + } + /// /// Looks up a localized string similar to Please connect to internet before executing this cmdlet. /// @@ -105,6 +114,15 @@ internal static string NoInternetConnection { } } + /// + /// Looks up a localized string similar to Path {0} doesn't exist.. + /// + internal static string PathDoesNotExist { + get { + return ResourceManager.GetString("PathDoesNotExist", resourceCulture); + } + } + /// /// Looks up a localized string similar to Attempted to read from the Azure PowerShell context after it was disposed. Please reload the module and try this operation again.. /// @@ -248,5 +266,14 @@ internal static string SessionNotInitialized { return ResourceManager.GetString("SessionNotInitialized", resourceCulture); } } + + /// + /// Looks up a localized string similar to (x86). + /// + internal static string x86InProgramFiles { + get { + return ResourceManager.GetString("x86InProgramFiles", resourceCulture); + } + } } } diff --git a/src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.resx b/src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.resx index ce5a4f76654b..7bd308a2532d 100644 --- a/src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.resx +++ b/src/Common/Commands.Common.Authentication.Abstractions/Properties/Resources.resx @@ -129,9 +129,15 @@ "{0}" is an invalid DNS name for {1} + + {0} is invalid or empty. + Please connect to internet before executing this cmdlet + + Path {0} doesn't exist. + Attempted to read from the Azure PowerShell context after it was disposed. Please reload the module and try this operation again. @@ -180,4 +186,7 @@ The Azure PowerShell session has not been properly initialized. Please import the module and try again. + + (x86) + \ No newline at end of file diff --git a/src/Common/Commands.Common/Utilities/FileUtilities.cs b/src/Common/Commands.Common.Authentication.Abstractions/Utilities/FileUtilities.cs similarity index 91% rename from src/Common/Commands.Common/Utilities/FileUtilities.cs rename to src/Common/Commands.Common.Authentication.Abstractions/Utilities/FileUtilities.cs index 2b0d0075eb13..17bf65000d8a 100644 --- a/src/Common/Commands.Common/Utilities/FileUtilities.cs +++ b/src/Common/Commands.Common.Authentication.Abstractions/Utilities/FileUtilities.cs @@ -12,10 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.Common.Authentication; -using Microsoft.Azure.Commands.Common.Authentication.Abstractions; -using Microsoft.Azure.Commands.Common.Authentication.Models; -using Microsoft.WindowsAzure.Commands.Common.Properties; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions.Properties; using System; using System.Diagnostics; using System.IO; @@ -23,7 +20,7 @@ using System.Reflection; using System.Text; -namespace Microsoft.WindowsAzure.Commands.Common +namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions { /// /// File utilities using the data store @@ -111,7 +108,7 @@ public static string GetWithProgramFilesPath(string directoryName, bool throwIfN programFilesPath += Resources.x86InProgramFiles; if (throwIfNotFound) { - Validate.ValidateDirectoryExists(Path.Combine(programFilesPath, directoryName)); + ValidateDirectoryExists(Path.Combine(programFilesPath, directoryName)); } return Path.Combine(programFilesPath, directoryName); } @@ -120,7 +117,7 @@ public static string GetWithProgramFilesPath(string directoryName, bool throwIfN programFilesPath = programFilesPath.Replace(Resources.x86InProgramFiles, String.Empty); if (throwIfNotFound) { - Validate.ValidateDirectoryExists(Path.Combine(programFilesPath, directoryName)); + ValidateDirectoryExists(Path.Combine(programFilesPath, directoryName)); } return Path.Combine(programFilesPath, directoryName); } @@ -167,7 +164,7 @@ public static void DirectoryCopy(string sourceDirName, string destDirName, bool /// The path to the file that will be created public static void EnsureDirectoryExists(string pathName) { - Validate.ValidateStringIsNullOrEmpty(pathName, "Settings directory"); + ValidateStringIsNullOrEmpty(pathName, "Settings directory"); string directoryPath = Path.GetDirectoryName(pathName); if (!DataStore.DirectoryExists(directoryPath)) { @@ -368,5 +365,34 @@ public static string GetModuleFolderName(AzureModule module) { return module.ToString().Replace("Azure", ""); } + + private static void ValidateDirectoryExists(string directory, string exceptionMessage = null) + { + string msg = string.Format(Resources.PathDoesNotExist, directory); + if (!DataStore.DirectoryExists(directory)) + { + if (!string.IsNullOrEmpty(exceptionMessage)) + { + msg = exceptionMessage; + } + + throw new FileNotFoundException(msg); + } + } + + private static void ValidateStringIsNullOrEmpty(string data, string messageData, bool useDefaultMessage = true) + { + if (string.IsNullOrEmpty(data)) + { + if (useDefaultMessage) + { + throw new ArgumentException(string.Format(Resources.InvalidOrEmptyArgumentMessage, messageData)); + } + else + { + throw new ArgumentException(messageData); + } + } + } } } diff --git a/src/Common/Commands.Common.Authentication/Authentication/KeyStoreApplicationCredentialProvider.cs b/src/Common/Commands.Common.Authentication/Authentication/KeyStoreApplicationCredentialProvider.cs index 4c9323e0fcce..760b693f4fc6 100644 --- a/src/Common/Commands.Common.Authentication/Authentication/KeyStoreApplicationCredentialProvider.cs +++ b/src/Common/Commands.Common.Authentication/Authentication/KeyStoreApplicationCredentialProvider.cs @@ -14,7 +14,6 @@ using Microsoft.IdentityModel.Clients.ActiveDirectory; using Microsoft.Rest.Azure.Authentication; -using Microsoft.WindowsAzure.Commands.Common; using System.Security; using System.Threading.Tasks; diff --git a/src/Common/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs b/src/Common/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs index afd3d163c031..4e4bcd521112 100644 --- a/src/Common/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs +++ b/src/Common/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs @@ -16,7 +16,6 @@ using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.IdentityModel.Clients.ActiveDirectory; using Microsoft.Rest.Azure.Authentication; -using Microsoft.WindowsAzure.Commands.Common; using System; using System.Collections.Generic; using System.Security; diff --git a/src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs b/src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs index f1f65beb5153..d58846e7f47e 100644 --- a/src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs +++ b/src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs @@ -15,7 +15,6 @@ using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Common.Authentication.Factories; using Microsoft.IdentityModel.Clients.ActiveDirectory; -using Microsoft.WindowsAzure.Commands.Common; using System; using System.IO; using System.Diagnostics; diff --git a/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj b/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj index 5b5b5cb477ec..238b7b3ccd10 100644 --- a/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj +++ b/src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj @@ -165,10 +165,6 @@ {70527617-7598-4aef-b5bd-db9186b8184b} Commands.Common.Authentication.Abstractions - - {5ee72c53-1720-4309-b54b-5fb79703195f} - Commands.Common - diff --git a/src/Common/Commands.Common.Authentication/Models/MemoryDataStore.cs b/src/Common/Commands.Common.Authentication/Models/MemoryDataStore.cs index 91b40707ce4b..8bb039415477 100644 --- a/src/Common/Commands.Common.Authentication/Models/MemoryDataStore.cs +++ b/src/Common/Commands.Common.Authentication/Models/MemoryDataStore.cs @@ -13,7 +13,6 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Common.Authentication.Abstractions; -using Microsoft.WindowsAzure.Commands.Common; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Common/Commands.Common/Commands.Common.csproj b/src/Common/Commands.Common/Commands.Common.csproj index 52e0198ebc91..843a894951a2 100644 --- a/src/Common/Commands.Common/Commands.Common.csproj +++ b/src/Common/Commands.Common/Commands.Common.csproj @@ -122,18 +122,14 @@ - - - - diff --git a/src/Common/Commands.Common/Extensions/CmdletExtensions.cs b/src/Common/Commands.Common/Extensions/CmdletExtensions.cs index 18ab52618f0c..8304ab56c7dd 100644 --- a/src/Common/Commands.Common/Extensions/CmdletExtensions.cs +++ b/src/Common/Commands.Common/Extensions/CmdletExtensions.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.WindowsAzure.Commands.Common; using System; using System.Collections.Generic; diff --git a/src/Common/Commands.Common/MetricHelper.cs b/src/Common/Commands.Common/MetricHelper.cs index 0a370da0a624..6453494ff71e 100644 --- a/src/Common/Commands.Common/MetricHelper.cs +++ b/src/Common/Commands.Common/MetricHelper.cs @@ -15,6 +15,7 @@ using Microsoft.ApplicationInsights; using Microsoft.ApplicationInsights.DataContracts; using Microsoft.ApplicationInsights.Extensibility; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.WindowsAzure.Commands.Common.Utilities; using Microsoft.WindowsAzure.Commands.Utilities.Common; using Newtonsoft.Json; diff --git a/src/Common/Commands.Common/Utilities/Validate.cs b/src/Common/Commands.Common/Utilities/Validate.cs index 211c7200cd21..1b9f57f4f211 100644 --- a/src/Common/Commands.Common/Utilities/Validate.cs +++ b/src/Common/Commands.Common/Utilities/Validate.cs @@ -12,7 +12,6 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.Common.Authentication; using System; using System.Diagnostics.CodeAnalysis; using System.IO; @@ -21,6 +20,7 @@ using System.Net.Sockets; using System.Runtime.InteropServices; using Microsoft.WindowsAzure.Commands.Common.Properties; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Common { From 650bf3a0338dfcdb3deb7ba1b2e9c13c32ec82cf Mon Sep 17 00:00:00 2001 From: cormacpayne Date: Fri, 3 Nov 2017 11:18:28 -0700 Subject: [PATCH 2/8] Update .psd1 files for preview modules --- .../AzureRM.AnalysisServices.psd1 | 2 +- .../Azure.AnalysisServices.psd1 | 20 ++++++++++--- .../ApiManagement/AzureRM.ApiManagement.psd1 | 10 +++++-- .../AzureRM.ApplicationInsights.psd1 | 2 +- .../Automation/AzureRM.Automation.psd1 | 2 +- .../AzureBackup/AzureRM.Backup.psd1 | 2 +- .../AzureBatch/AzureRM.Batch.psd1 | 7 ++++- .../Billing/AzureRM.Billing.psd1 | 2 +- src/ResourceManager/Cdn/AzureRM.Cdn.psd1 | 2 +- .../AzureRM.CognitiveServices.psd1 | 2 +- .../Compute/AzureRM.Compute.psd1 | 11 +++++++- .../Consumption/AzureRM.Consumption.psd1 | 2 +- .../AzureRM.ContainerInstance.psd1 | 3 +- .../AzureRM.ContainerRegistry.psd1 | 5 +++- .../DataFactories/AzureRM.DataFactories.psd1 | 7 ++++- .../DataFactories/AzureRM.DataFactoryV2.psd1 | 3 +- .../AzureRM.DataLakeAnalytics.psd1 | 2 +- .../DataLakeStore/AzureRM.DataLakeStore.psd1 | 2 +- .../DevTestLabs/AzureRM.DevTestLabs.psd1 | 2 +- src/ResourceManager/Dns/AzureRM.Dns.psd1 | 2 +- .../EventGrid/AzureRM.EventGrid.psd1 | 2 +- .../EventHub/AzureRM.EventHub.psd1 | 2 +- .../HDInsight/AzureRM.HDInsight.psd1 | 7 ++++- .../Insights/AzureRM.Insights.psd1 | 2 +- .../IotHub/AzureRM.IotHub.psd1 | 2 +- .../KeyVault/AzureRM.KeyVault.psd1 | 5 +++- .../LogicApp/AzureRM.LogicApp.psd1 | 3 +- .../AzureRM.MachineLearning.psd1 | 2 +- .../AzureRM.MachineLearningCompute.psd1 | 2 +- .../AzureRM.MarketplaceOrdering.psd1 | 2 +- src/ResourceManager/Media/AzureRM.Media.psd1 | 2 +- .../Network/AzureRM.Network.psd1 | 3 +- .../AzureRM.NotificationHubs.psd1 | 2 +- .../AzureRM.OperationalInsights.psd1 | 2 +- .../AzureRM.PowerBIEmbedded.psd1 | 2 +- .../Profile/AzureRM.Profile.psd1 | 28 +++++++++++++++++-- .../AzureRM.RecoveryServices.Backup.psd1 | 3 +- ...AzureRM.RecoveryServices.SiteRecovery.psd1 | 4 ++- .../AzureRM.RecoveryServices.psd1 | 2 +- .../RedisCache/AzureRM.RedisCache.psd1 | 7 ++++- src/ResourceManager/Relay/AzureRM.Relay.psd1 | 2 +- .../Resources/AzureRM.Resources.Netcore.psd1 | 3 +- .../Resources/AzureRM.Resources.psd1 | 6 ++-- .../Scheduler/AzureRM.Scheduler.psd1 | 2 +- .../AzureRM.ServerManagement.psd1 | 2 +- .../ServiceBus/AzureRM.ServiceBus.psd1 | 2 +- .../ServiceFabric/AzureRM.ServiceFabric.psd1 | 9 +++++- .../SiteRecovery/AzureRM.SiteRecovery.psd1 | 2 +- src/ResourceManager/Sql/AzureRM.Sql.psd1 | 8 +++++- .../Storage/AzureRM.Storage.psd1 | 6 +++- .../AzureRM.StreamAnalytics.psd1 | 6 +++- .../AzureRM.TrafficManager.psd1 | 2 +- .../AzureRM.UsageAggregates.psd1 | 2 +- .../Websites/AzureRM.Websites.psd1 | 2 +- tools/AzureRM/AzureRM.psd1 | 1 + 55 files changed, 166 insertions(+), 63 deletions(-) diff --git a/src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1 b/src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1 index a0558e9763a2..993ed569c955 100644 --- a/src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1 +++ b/src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1 b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1 index dd3303e5cee1..ca8916f8a13a 100644 --- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1 +++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1 @@ -45,7 +45,21 @@ CLRVersion='4.0' ProcessorArchitecture = 'None' # Assemblies that must be loaded prior to importing this module -RequiredAssemblies = @() +RequiredAssemblies = '.\Hyak.Common.dll', + '.\Microsoft.ApplicationInsights.dll', + '.\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll', + '.\Microsoft.Azure.Common.dll', + '.\Microsoft.Azure.Common.NetFramework.dll', + '.\Microsoft.IdentityModel.Clients.ActiveDirectory.dll', + '.\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll', + '.\Microsoft.Rest.ClientRuntime.Azure.dll', + '.\Microsoft.Rest.ClientRuntime.dll', + '.\Microsoft.Threading.Tasks.dll', + '.\Microsoft.Threading.Tasks.Extensions.Desktop.dll', + '.\Microsoft.Threading.Tasks.Extensions.dll', + '.\Microsoft.WindowsAzure.Commands.Common.dll', + '.\Microsoft.WindowsAzure.Management.dll', + '.\Newtonsoft.Json.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module ScriptsToProcess = @() @@ -57,9 +71,7 @@ TypesToProcess = @() FormatsToProcess = @() # Modules to import as nested modules of the module specified in ModuleToProcess -NestedModules = @( - '.\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll' -) +NestedModules = @('.\Microsoft.Azure.Commands.AnalysisServices.Dataplane.dll') # Functions to export from this module FunctionsToExport = '*' diff --git a/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 index 785b7d1a41bb..7e0790bedc6c 100644 --- a/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 +++ b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 @@ -54,7 +54,12 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\AutoMapper.dll', + '.\Microsoft.Azure.Management.ApiManagement.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() @@ -66,8 +71,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; } # FormatsToProcess = @() # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess -NestedModules = @('.\Microsoft.Azure.Commands.ApiManagement.dll', - '.\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll') +NestedModules = @('.\Microsoft.Azure.Commands.ApiManagement.dll', '.\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll') # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. FunctionsToExport = @() diff --git a/src/ResourceManager/ApplicationInsights/AzureRM.ApplicationInsights.psd1 b/src/ResourceManager/ApplicationInsights/AzureRM.ApplicationInsights.psd1 index 27af91c88a1b..3d52a92e5fc9 100644 --- a/src/ResourceManager/ApplicationInsights/AzureRM.ApplicationInsights.psd1 +++ b/src/ResourceManager/ApplicationInsights/AzureRM.ApplicationInsights.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.ApplicationInsights.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Automation/AzureRM.Automation.psd1 b/src/ResourceManager/Automation/AzureRM.Automation.psd1 index d8687c77685d..e22afb825577 100644 --- a/src/ResourceManager/Automation/AzureRM.Automation.psd1 +++ b/src/ResourceManager/Automation/AzureRM.Automation.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Automation.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 b/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 index 29c7a3384561..38247299798c 100644 --- a/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 +++ b/src/ResourceManager/AzureBackup/AzureRM.Backup.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.BackupServicesManagement.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 b/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 index 37bcea9a4772..d7a19dd45cb2 100644 --- a/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 +++ b/src/ResourceManager/AzureBatch/AzureRM.Batch.psd1 @@ -54,7 +54,12 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Batch.dll', + '.\Microsoft.Azure.Management.Batch.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Billing/AzureRM.Billing.psd1 b/src/ResourceManager/Billing/AzureRM.Billing.psd1 index 8b4f487b1b79..d1ef951f34aa 100644 --- a/src/ResourceManager/Billing/AzureRM.Billing.psd1 +++ b/src/ResourceManager/Billing/AzureRM.Billing.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Billing.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Cdn/AzureRM.Cdn.psd1 b/src/ResourceManager/Cdn/AzureRM.Cdn.psd1 index 426d4bf0aebb..d6914ebed185 100644 --- a/src/ResourceManager/Cdn/AzureRM.Cdn.psd1 +++ b/src/ResourceManager/Cdn/AzureRM.Cdn.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Cdn.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/CognitiveServices/AzureRM.CognitiveServices.psd1 b/src/ResourceManager/CognitiveServices/AzureRM.CognitiveServices.psd1 index 9ad87e2fbf8d..d2e43391bc27 100644 --- a/src/ResourceManager/CognitiveServices/AzureRM.CognitiveServices.psd1 +++ b/src/ResourceManager/CognitiveServices/AzureRM.CognitiveServices.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.CognitiveServices.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Compute/AzureRM.Compute.psd1 b/src/ResourceManager/Compute/AzureRM.Compute.psd1 index da04c96ec829..af006fd05765 100644 --- a/src/ResourceManager/Compute/AzureRM.Compute.psd1 +++ b/src/ResourceManager/Compute/AzureRM.Compute.psd1 @@ -54,7 +54,16 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\AutoMapper.dll', + '.\Microsoft.Azure.Management.Compute.dll', + '.\Microsoft.Azure.Management.KeyVault.dll', + '.\Microsoft.Azure.Management.Storage.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.WindowsAzure.Commands.Sync.dll', + '.\Microsoft.WindowsAzure.Commands.Tools.Vhd.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Consumption/AzureRM.Consumption.psd1 b/src/ResourceManager/Consumption/AzureRM.Consumption.psd1 index e017ff2882c8..c46e0dc29f11 100644 --- a/src/ResourceManager/Consumption/AzureRM.Consumption.psd1 +++ b/src/ResourceManager/Consumption/AzureRM.Consumption.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Consumption.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/ContainerInstance/AzureRM.ContainerInstance.psd1 b/src/ResourceManager/ContainerInstance/AzureRM.ContainerInstance.psd1 index 9c4063d6bd9f..a303b7e5274c 100644 --- a/src/ResourceManager/ContainerInstance/AzureRM.ContainerInstance.psd1 +++ b/src/ResourceManager/ContainerInstance/AzureRM.ContainerInstance.psd1 @@ -54,7 +54,8 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\AutoMapper.dll', + '.\Microsoft.Azure.Management.ContainerInstance.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/ContainerRegistry/AzureRM.ContainerRegistry.psd1 b/src/ResourceManager/ContainerRegistry/AzureRM.ContainerRegistry.psd1 index 7db41aef911e..a831b3491263 100644 --- a/src/ResourceManager/ContainerRegistry/AzureRM.ContainerRegistry.psd1 +++ b/src/ResourceManager/ContainerRegistry/AzureRM.ContainerRegistry.psd1 @@ -54,7 +54,10 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.ContainerRegistry.dll', + '.\Microsoft.Azure.Management.ResourceManager.dll', + '.\Microsoft.Azure.Management.Storage.dll', + '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 b/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 index a46609dfab54..30bcdb1eb7d0 100644 --- a/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 +++ b/src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1 @@ -54,7 +54,12 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.DataFactories.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.DataTransfer.Gateway.Encryption.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/DataFactories/AzureRM.DataFactoryV2.psd1 b/src/ResourceManager/DataFactories/AzureRM.DataFactoryV2.psd1 index cabde9c8a663..9570d78f0056 100644 --- a/src/ResourceManager/DataFactories/AzureRM.DataFactoryV2.psd1 +++ b/src/ResourceManager/DataFactories/AzureRM.DataFactoryV2.psd1 @@ -54,7 +54,8 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.DataFactory.dll', + '.\Microsoft.DataTransfer.Gateway.Encryption.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1 b/src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1 index 7e571c22002a..9af4dedcadfe 100644 --- a/src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1 +++ b/src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.DataLake.Analytics.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1 b/src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1 index 3f6956a2bdaa..9b27598c4d60 100644 --- a/src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1 +++ b/src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.DataLake.Store.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/DevTestLabs/AzureRM.DevTestLabs.psd1 b/src/ResourceManager/DevTestLabs/AzureRM.DevTestLabs.psd1 index dbba14b9abb5..00e85ff7e9c2 100644 --- a/src/ResourceManager/DevTestLabs/AzureRM.DevTestLabs.psd1 +++ b/src/ResourceManager/DevTestLabs/AzureRM.DevTestLabs.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.DevTestLabs.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Dns/AzureRM.Dns.psd1 b/src/ResourceManager/Dns/AzureRM.Dns.psd1 index 202cdbacd0bf..f2a19475b224 100644 --- a/src/ResourceManager/Dns/AzureRM.Dns.psd1 +++ b/src/ResourceManager/Dns/AzureRM.Dns.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Dns.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/EventGrid/AzureRM.EventGrid.psd1 b/src/ResourceManager/EventGrid/AzureRM.EventGrid.psd1 index 0ec8f89bdca5..daf4d49d363e 100644 --- a/src/ResourceManager/EventGrid/AzureRM.EventGrid.psd1 +++ b/src/ResourceManager/EventGrid/AzureRM.EventGrid.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.EventGrid.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/EventHub/AzureRM.EventHub.psd1 b/src/ResourceManager/EventHub/AzureRM.EventHub.psd1 index a4aa24173ab2..203a8b0b0623 100644 --- a/src/ResourceManager/EventHub/AzureRM.EventHub.psd1 +++ b/src/ResourceManager/EventHub/AzureRM.EventHub.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.EventHub.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 b/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 index 652eb3e2ae67..7ada8dd6896a 100644 --- a/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 +++ b/src/ResourceManager/HDInsight/AzureRM.HDInsight.psd1 @@ -54,7 +54,12 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.HDInsight.dll', + '.\Microsoft.Azure.Management.HDInsight.Job.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Insights/AzureRM.Insights.psd1 b/src/ResourceManager/Insights/AzureRM.Insights.psd1 index 2884d1bc484c..f44329a7d731 100644 --- a/src/ResourceManager/Insights/AzureRM.Insights.psd1 +++ b/src/ResourceManager/Insights/AzureRM.Insights.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Monitor.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/IotHub/AzureRM.IotHub.psd1 b/src/ResourceManager/IotHub/AzureRM.IotHub.psd1 index 2b46d7651485..a2208e7e94d8 100644 --- a/src/ResourceManager/IotHub/AzureRM.IotHub.psd1 +++ b/src/ResourceManager/IotHub/AzureRM.IotHub.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.IotHub.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 b/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 index 828a08b2a298..de21db363f89 100644 --- a/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 +++ b/src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1 @@ -54,7 +54,10 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.ActiveDirectory.GraphClient.dll', + '.\Microsoft.Azure.KeyVault.dll', + '.\Microsoft.Azure.KeyVault.WebKey.dll', + '.\Microsoft.Azure.Management.KeyVault.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1 b/src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1 index 77d6d553f185..fa3076571cf4 100644 --- a/src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1 +++ b/src/ResourceManager/LogicApp/AzureRM.LogicApp.psd1 @@ -54,7 +54,8 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Logic.dll', + '.\Microsoft.Azure.Management.Websites.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/MachineLearning/AzureRM.MachineLearning.psd1 b/src/ResourceManager/MachineLearning/AzureRM.MachineLearning.psd1 index 5c958d720081..feb882a8a7f7 100644 --- a/src/ResourceManager/MachineLearning/AzureRM.MachineLearning.psd1 +++ b/src/ResourceManager/MachineLearning/AzureRM.MachineLearning.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.MachineLearning.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/MachineLearningCompute/AzureRM.MachineLearningCompute.psd1 b/src/ResourceManager/MachineLearningCompute/AzureRM.MachineLearningCompute.psd1 index 821c3e88c290..9acc955b49b5 100644 --- a/src/ResourceManager/MachineLearningCompute/AzureRM.MachineLearningCompute.psd1 +++ b/src/ResourceManager/MachineLearningCompute/AzureRM.MachineLearningCompute.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.MachineLearningCompute.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/MarketplaceOrdering/AzureRM.MarketplaceOrdering.psd1 b/src/ResourceManager/MarketplaceOrdering/AzureRM.MarketplaceOrdering.psd1 index 67b435d83344..65ba07ebd522 100644 --- a/src/ResourceManager/MarketplaceOrdering/AzureRM.MarketplaceOrdering.psd1 +++ b/src/ResourceManager/MarketplaceOrdering/AzureRM.MarketplaceOrdering.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.MarketplaceOrdering.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Media/AzureRM.Media.psd1 b/src/ResourceManager/Media/AzureRM.Media.psd1 index d7a0329d99b1..991390319a05 100644 --- a/src/ResourceManager/Media/AzureRM.Media.psd1 +++ b/src/ResourceManager/Media/AzureRM.Media.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Media.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Network/AzureRM.Network.psd1 b/src/ResourceManager/Network/AzureRM.Network.psd1 index e2e0adbc46db..0a512739758f 100644 --- a/src/ResourceManager/Network/AzureRM.Network.psd1 +++ b/src/ResourceManager/Network/AzureRM.Network.psd1 @@ -54,7 +54,8 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\AutoMapper.dll', + '.\Microsoft.Azure.Management.Network.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.psd1 b/src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.psd1 index dae885376cc8..3ad854385375 100644 --- a/src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.psd1 +++ b/src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.NotificationHubs.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 b/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 index 2d4709e4a931..fe0469ae8a4d 100644 --- a/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 +++ b/src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.OperationalInsights.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/PowerBIEmbedded/AzureRM.PowerBIEmbedded.psd1 b/src/ResourceManager/PowerBIEmbedded/AzureRM.PowerBIEmbedded.psd1 index 785e7055313e..30482be1b1ec 100644 --- a/src/ResourceManager/PowerBIEmbedded/AzureRM.PowerBIEmbedded.psd1 +++ b/src/ResourceManager/PowerBIEmbedded/AzureRM.PowerBIEmbedded.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.PowerBIEmbedded.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Profile/AzureRM.Profile.psd1 b/src/ResourceManager/Profile/AzureRM.Profile.psd1 index 56ad5869e95e..86509b333ea5 100644 --- a/src/ResourceManager/Profile/AzureRM.Profile.psd1 +++ b/src/ResourceManager/Profile/AzureRM.Profile.psd1 @@ -54,8 +54,32 @@ CLRVersion = '4.0' # RequiredModules = @() # Assemblies that must be loaded prior to importing this module -RequiredAssemblies = - '.\Microsoft.Azure.Commands.Common.Authentication.ResourceManager.dll' +RequiredAssemblies = '.\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll', + '.\Microsoft.Azure.Commands.Common.Authentication.dll', + '.\Microsoft.Azure.Commands.Common.Authentication.ResourceManager.dll', + '.\Microsoft.Azure.Commands.Common.Authorization.dll', + '.\Microsoft.Azure.Commands.Common.Graph.RBAC.dll', + '.\Microsoft.Azure.Commands.Common.Network.dll', + '.\Microsoft.Azure.Commands.ResourceManager.Common.dll', + '.\Microsoft.WindowsAzure.Commands.Common.dll', + '.\Microsoft.WindowsAzure.Commands.Common.Storage.dll', + '.\Hyak.Common.dll', + '.\Microsoft.ApplicationInsights.dll', + '.\Microsoft.Azure.Common.dll', + '.\Microsoft.Azure.Common.NetFramework.dll', + '.\Microsoft.Azure.KeyVault.Core.dll', + '.\Microsoft.IdentityModel.Clients.ActiveDirectory.dll', + '.\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll', + '.\Microsoft.Rest.ClientRuntime.dll', + '.\Microsoft.Rest.ClientRuntime.Azure.dll', + '.\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll', + '.\Microsoft.Threading.Tasks.dll', + '.\Microsoft.Threading.Tasks.Extensions.dll', + '.\Microsoft.Threading.Tasks.Extensions.Desktop.dll', + '.\Microsoft.WindowsAzure.Management.dll', + '.\Newtonsoft.Json.dll', + '.\System.Net.Http.Extensions.dll', + '.\System.Net.Http.Primitives.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1 b/src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1 index 8161d5447dfd..060599297e18 100644 --- a/src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1 +++ b/src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1 @@ -54,7 +54,8 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Commands.RecoveryServices.Backup.Models.dll', + '.\Microsoft.Azure.Management.RecoveryServices.Backup.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/RecoveryServices.SiteRecovery/AzureRM.RecoveryServices.SiteRecovery.psd1 b/src/ResourceManager/RecoveryServices.SiteRecovery/AzureRM.RecoveryServices.SiteRecovery.psd1 index 51da57e43b35..50b033de14c1 100644 --- a/src/ResourceManager/RecoveryServices.SiteRecovery/AzureRM.RecoveryServices.SiteRecovery.psd1 +++ b/src/ResourceManager/RecoveryServices.SiteRecovery/AzureRM.RecoveryServices.SiteRecovery.psd1 @@ -54,7 +54,9 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\AutoMapper.dll', + '.\Microsoft.Azure.Management.RecoveryServices.dll', + '.\Microsoft.Azure.Management.RecoveryServices.SiteRecovery.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1 b/src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1 index 876173019c2e..50ce5b78d27a 100644 --- a/src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1 +++ b/src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.RecoveryServices.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 b/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 index 94d3c1ac8e46..49b6fa117864 100644 --- a/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 +++ b/src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1 @@ -54,7 +54,12 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Insights.dll', + '.\Microsoft.Azure.Management.Redis.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Relay/AzureRM.Relay.psd1 b/src/ResourceManager/Relay/AzureRM.Relay.psd1 index f54bfcdfd5d9..8a43b1a2a3b8 100644 --- a/src/ResourceManager/Relay/AzureRM.Relay.psd1 +++ b/src/ResourceManager/Relay/AzureRM.Relay.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Relay.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Resources/AzureRM.Resources.Netcore.psd1 b/src/ResourceManager/Resources/AzureRM.Resources.Netcore.psd1 index ec8ea6f85521..df659c934ef5 100644 --- a/src/ResourceManager/Resources/AzureRM.Resources.Netcore.psd1 +++ b/src/ResourceManager/Resources/AzureRM.Resources.Netcore.psd1 @@ -67,8 +67,7 @@ FormatsToProcess = 'netcoreapp2.0\Microsoft.Azure.Commands.Resources.format.ps1x 'netcoreapp2.0\Microsoft.Azure.Commands.ResourceManager.Cmdlets.format.ps1xml' # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess -NestedModules = @('netcoreapp2.0\Microsoft.Azure.Commands.Resources.dll', - 'netcoreapp2.0\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll') +NestedModules = @('netcoreapp2.0\Microsoft.Azure.Commands.Resources.dll', 'netcoreapp2.0\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll') # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. FunctionsToExport = @() diff --git a/src/ResourceManager/Resources/AzureRM.Resources.psd1 b/src/ResourceManager/Resources/AzureRM.Resources.psd1 index f4723b9d2a8a..95f24d145db9 100644 --- a/src/ResourceManager/Resources/AzureRM.Resources.psd1 +++ b/src/ResourceManager/Resources/AzureRM.Resources.psd1 @@ -54,7 +54,8 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.ResourceManager.dll', + '.\Microsoft.Azure.ResourceManager.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() @@ -67,8 +68,7 @@ FormatsToProcess = '.\Microsoft.Azure.Commands.Resources.format.ps1xml', '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.format.ps1xml' # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess -NestedModules = @('.\Microsoft.Azure.Commands.Resources.dll', - '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll') +NestedModules = @('.\Microsoft.Azure.Commands.Resources.dll', '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll') # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. FunctionsToExport = @() diff --git a/src/ResourceManager/Scheduler/AzureRM.Scheduler.psd1 b/src/ResourceManager/Scheduler/AzureRM.Scheduler.psd1 index d4d3144e73b7..e4dad69c1754 100644 --- a/src/ResourceManager/Scheduler/AzureRM.Scheduler.psd1 +++ b/src/ResourceManager/Scheduler/AzureRM.Scheduler.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Scheduler.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/ServerManagement/AzureRM.ServerManagement.psd1 b/src/ResourceManager/ServerManagement/AzureRM.ServerManagement.psd1 index d5355dda3f99..05480cedad8f 100644 --- a/src/ResourceManager/ServerManagement/AzureRM.ServerManagement.psd1 +++ b/src/ResourceManager/ServerManagement/AzureRM.ServerManagement.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.ServerManagement.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/ServiceBus/AzureRM.ServiceBus.psd1 b/src/ResourceManager/ServiceBus/AzureRM.ServiceBus.psd1 index bf17779e1d0b..05237406820d 100644 --- a/src/ResourceManager/ServiceBus/AzureRM.ServiceBus.psd1 +++ b/src/ResourceManager/ServiceBus/AzureRM.ServiceBus.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.ServiceBus.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/ServiceFabric/AzureRM.ServiceFabric.psd1 b/src/ResourceManager/ServiceFabric/AzureRM.ServiceFabric.psd1 index c42d2b7046de..9bc9136fe689 100644 --- a/src/ResourceManager/ServiceFabric/AzureRM.ServiceFabric.psd1 +++ b/src/ResourceManager/ServiceFabric/AzureRM.ServiceFabric.psd1 @@ -54,7 +54,14 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.KeyVault.dll', + '.\Microsoft.Azure.KeyVault.WebKey.dll', + '.\Microsoft.Azure.Management.Compute.dll', + '.\Microsoft.Azure.Management.KeyVault.dll', + '.\Microsoft.Azure.Management.Network.dll', + '.\Microsoft.Azure.Management.ResourceManager.dll', + '.\Microsoft.Azure.Management.ServiceFabric.dll', + '.\Microsoft.Azure.Management.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 b/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 index 3072a3b16235..fba8ccd6467f 100644 --- a/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 +++ b/src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.SiteRecovery.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Sql/AzureRM.Sql.psd1 b/src/ResourceManager/Sql/AzureRM.Sql.psd1 index 8c3414eeb7d1..2c84ba6ffff7 100644 --- a/src/ResourceManager/Sql/AzureRM.Sql.psd1 +++ b/src/ResourceManager/Sql/AzureRM.Sql.psd1 @@ -54,7 +54,13 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Sql.dll', + '.\Microsoft.Azure.Management.Sql.Legacy.dll', + '.\Microsoft.Azure.Management.Storage.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Storage/AzureRM.Storage.psd1 b/src/ResourceManager/Storage/AzureRM.Storage.psd1 index bd0a0a81c5cd..ae530fda1892 100644 --- a/src/ResourceManager/Storage/AzureRM.Storage.psd1 +++ b/src/ResourceManager/Storage/AzureRM.Storage.psd1 @@ -55,7 +55,11 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; } @{ModuleName = 'Azure.Storage'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Storage.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 b/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 index 8edcd1c1702d..9fd2ef71ec7e 100644 --- a/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 +++ b/src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.psd1 @@ -54,7 +54,11 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.StreamAnalytics.dll', + '.\Microsoft.Data.Edm.dll', + '.\Microsoft.Data.OData.dll', + '.\Microsoft.Data.Services.Client.dll', + '.\Microsoft.WindowsAzure.Storage.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 b/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 index f845d6961894..7ab5e6afaabc 100644 --- a/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 +++ b/src/ResourceManager/TrafficManager/AzureRM.TrafficManager.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.TrafficManager.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 b/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 index 4fa436ee7d2f..eac6c3f57190 100644 --- a/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 +++ b/src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Commerce.UsageAggregates.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/src/ResourceManager/Websites/AzureRM.Websites.psd1 b/src/ResourceManager/Websites/AzureRM.Websites.psd1 index 082175435f8d..593708b04602 100644 --- a/src/ResourceManager/Websites/AzureRM.Websites.psd1 +++ b/src/ResourceManager/Websites/AzureRM.Websites.psd1 @@ -54,7 +54,7 @@ CLRVersion = '4.0' RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) # Assemblies that must be loaded prior to importing this module -# RequiredAssemblies = @() +RequiredAssemblies = '.\Microsoft.Azure.Management.Websites.dll' # Script files (.ps1) that are run in the caller's environment prior to importing this module. # ScriptsToProcess = @() diff --git a/tools/AzureRM/AzureRM.psd1 b/tools/AzureRM/AzureRM.psd1 index 7ed37a2a6ade..8eefc40acc58 100644 --- a/tools/AzureRM/AzureRM.psd1 +++ b/tools/AzureRM/AzureRM.psd1 @@ -90,6 +90,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '4.0.0'; @{ModuleName = 'AzureRM.PowerBIEmbedded'; RequiredVersion = '4.0.0'; }, @{ModuleName = 'AzureRM.RecoveryServices'; RequiredVersion = '4.0.0'; }, @{ModuleName = 'AzureRM.RecoveryServices.Backup'; RequiredVersion = '4.0.0'; }, + @{ModuleName = 'AzureRM.RecoveryServices.SiteRecovery'; RequiredVersion = '0.2.0'; }, @{ModuleName = 'AzureRM.RedisCache'; RequiredVersion = '4.0.0'; }, @{ModuleName = 'AzureRM.Relay'; RequiredVersion = '0.3.0'; }, @{ModuleName = 'AzureRM.Resources'; RequiredVersion = '5.0.0'; }, From 2fffc9b9a6a5c04924600c84885a1b4f1a5f9f91 Mon Sep 17 00:00:00 2001 From: cormacpayne Date: Fri, 3 Nov 2017 11:19:37 -0700 Subject: [PATCH 3/8] Update references in C# files for preview modules --- .../Models/AsAzureAuthenticationProvider.cs | 1 + .../Cdn/Commands.Cdn/CustomDomain/NewAzureRmCdnCustomDomain.cs | 1 + .../Generated/VirtualMachine/VirtualMachineRunCommandMethod.cs | 3 ++- .../ManagementCommands/EnableAzureHDInsightOMSCommand.cs | 1 + .../GetAzureApplicationGatewayAvailableWafRuleSets.cs | 1 + ...zureOperationalInsightsAzureActivityLogDataSourceCommand.cs | 1 + .../Profile/Commands.Profile.Test/TelemetryTests.cs | 1 + .../DataCollection/EnableAzureRMDataCollection.cs | 1 + ...veAzureRmRecoveryServicesAsrStorageClassificationMapping.cs | 1 + .../Vault/GetAzureRmRecoveryServicesBackupProperty.cs | 1 + .../CmdletBase/ResourceWithParameterCmdletBase.cs | 1 + .../ManagedApplications/ManagedApplicationCmdletBase.cs | 1 + .../Cmdlets/Implementation/Policy/NewAzurePolicyAssignment.cs | 1 + .../Cmdlets/Implementation/Policy/NewAzurePolicyDefinition.cs | 1 + .../Cmdlets/Implementation/Policy/PolicyCmdletBase.cs | 1 + .../Cmdlets/Implementation/Policy/SetAzurePolicyDefinition.cs | 1 + .../Implementation/Policy/SetAzurePolicySetDefinition.cs | 1 + .../Commands.ResourceManager/Cmdlets/Utilities/FileUtility.cs | 1 + .../Cmdlets/Utilities/TemplateUtility.cs | 1 + .../Commands/NewAzureRmServiceFabricCluster.cs | 1 + .../Sql/Commands.Sql/Server/Cmdlet/GetAzureSqlServer.cs | 1 + .../Cmdlets/DeploymentSlots/SwitchAzureWebAppSlot.cs | 1 + .../Common/Commands.Common.Test/Common/Data.cs | 1 + .../Common/Commands.Common.Test/Common/GeneralTests.cs | 1 + .../Common/Commands.ScenarioTest/Common/PowerShellTest.cs | 1 + .../FunctionalTests/GenericIaaSExtensionTests.cs | 1 + .../Extensions/Common/VirtualMachineExtensionCmdletBase.cs | 1 + .../DataCollection/EnableAzureDataCollection.cs | 1 + .../Service/CreateAzureSiteRecoveryRecoveryPlan.cs | 2 +- .../Services/Commands.Test.Utilities/Common/AzureAssert.cs | 1 + .../Commands.Test.Utilities/Common/FileSystemHelper.cs | 1 + .../Development/DisableAzureRemoteDesktopCommandTest.cs | 1 + .../Development/EnableAzureRemoteDesktopCommandTest.cs | 1 + .../Development/SaveAzureServiceProjectPackageTests.cs | 1 + .../Commands.Test/CloudService/Utilities/AzureServiceTests.cs | 1 + .../Commands.Test/CloudService/Utilities/ScaffoldTests.cs | 1 + .../Services/Commands.Utilities/Common/AzureTools/CsPack.cs | 1 + .../Services/Commands.Utilities/Common/CommonUtilities.cs | 1 + .../Commands.Utilities/Common/JavaScriptPackageHelpers.cs | 1 + .../Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs | 1 + .../Services/Commands.Utilities/Websites/Services/Cache.cs | 1 + .../Websites/Services/LinkedRevisionControl.cs | 1 + .../Development/Scaffolding/NewAzureRoleTemplate.cs | 1 + .../Services/Commands/Websites/NewAzureWebSite.cs | 1 + .../FunctionalTests/OutputFormatValidator.cs | 1 + .../Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs | 1 + 46 files changed, 47 insertions(+), 2 deletions(-) diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Models/AsAzureAuthenticationProvider.cs b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Models/AsAzureAuthenticationProvider.cs index f5af3962b773..5a40a421f9c8 100644 --- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Models/AsAzureAuthenticationProvider.cs +++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Models/AsAzureAuthenticationProvider.cs @@ -22,6 +22,7 @@ using Microsoft.IdentityModel.Clients.ActiveDirectory; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Common.Properties; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane.Models { diff --git a/src/ResourceManager/Cdn/Commands.Cdn/CustomDomain/NewAzureRmCdnCustomDomain.cs b/src/ResourceManager/Cdn/Commands.Cdn/CustomDomain/NewAzureRmCdnCustomDomain.cs index 56b42f5ce89a..6cdc86bac68c 100644 --- a/src/ResourceManager/Cdn/Commands.Cdn/CustomDomain/NewAzureRmCdnCustomDomain.cs +++ b/src/ResourceManager/Cdn/Commands.Cdn/CustomDomain/NewAzureRmCdnCustomDomain.cs @@ -27,6 +27,7 @@ using Microsoft.Azure.Commands.Cdn.Models.Endpoint; using System.Linq; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.Cdn.CustomDomain { diff --git a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachine/VirtualMachineRunCommandMethod.cs b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachine/VirtualMachineRunCommandMethod.cs index afad1104c631..98381f1df211 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachine/VirtualMachineRunCommandMethod.cs +++ b/src/ResourceManager/Compute/Commands.Compute/Generated/VirtualMachine/VirtualMachineRunCommandMethod.cs @@ -19,6 +19,7 @@ // Changes to this file may cause incorrect behavior and will be lost if the // code is regenerated. +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Compute.Automation.Models; using Microsoft.Azure.Management.Compute; using Microsoft.Azure.Management.Compute.Models; @@ -130,7 +131,7 @@ protected override void ProcessRecord() parameters.Script = new List(); PathIntrinsics currentPath = SessionState.Path; var filePath = new System.IO.FileInfo(currentPath.GetUnresolvedProviderPathFromPSPath(this.ScriptPath)); - string fileContent = WindowsAzure.Commands.Common.FileUtilities.DataStore.ReadFileAsText(filePath.FullName); + string fileContent = FileUtilities.DataStore.ReadFileAsText(filePath.FullName); parameters.Script = fileContent.Split(new string[] { "\r\n", "\n", "\r" }, StringSplitOptions.RemoveEmptyEntries); } if (this.Parameter != null) diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/EnableAzureHDInsightOMSCommand.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/EnableAzureHDInsightOMSCommand.cs index 68a266542139..e529f65094ad 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/EnableAzureHDInsightOMSCommand.cs +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/EnableAzureHDInsightOMSCommand.cs @@ -18,6 +18,7 @@ using System.Management.Automation; using System.IO; using System.Reflection; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.HDInsight { diff --git a/src/ResourceManager/Network/Commands.Network/ApplicationGateway/GetAzureApplicationGatewayAvailableWafRuleSets.cs b/src/ResourceManager/Network/Commands.Network/ApplicationGateway/GetAzureApplicationGatewayAvailableWafRuleSets.cs index 591f63829a7b..67b07e73cbed 100644 --- a/src/ResourceManager/Network/Commands.Network/ApplicationGateway/GetAzureApplicationGatewayAvailableWafRuleSets.cs +++ b/src/ResourceManager/Network/Commands.Network/ApplicationGateway/GetAzureApplicationGatewayAvailableWafRuleSets.cs @@ -14,6 +14,7 @@ using AutoMapper; using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Network.Models; using Microsoft.Azure.Management.Network; using Microsoft.WindowsAzure.Commands.Common; diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/DataSources/NewDataSourceCmdletsPerKind/NewAzureOperationalInsightsAzureActivityLogDataSourceCommand.cs b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/DataSources/NewDataSourceCmdletsPerKind/NewAzureOperationalInsightsAzureActivityLogDataSourceCommand.cs index bf7c39606abf..82deea5f3bee 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/DataSources/NewDataSourceCmdletsPerKind/NewAzureOperationalInsightsAzureActivityLogDataSourceCommand.cs +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/DataSources/NewDataSourceCmdletsPerKind/NewAzureOperationalInsightsAzureActivityLogDataSourceCommand.cs @@ -22,6 +22,7 @@ using System.Reflection; using System.Management.Automation; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.OperationalInsights { diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/TelemetryTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/TelemetryTests.cs index 78fae53b34c6..c9c12e3e490b 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/TelemetryTests.cs +++ b/src/ResourceManager/Profile/Commands.Profile.Test/TelemetryTests.cs @@ -13,6 +13,7 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Common.Authentication.Models; using Microsoft.Azure.Commands.ScenarioTest; using Microsoft.WindowsAzure.Commands.Common; diff --git a/src/ResourceManager/Profile/Commands.Profile/DataCollection/EnableAzureRMDataCollection.cs b/src/ResourceManager/Profile/Commands.Profile/DataCollection/EnableAzureRMDataCollection.cs index f45db44d4180..2675ea073bf0 100644 --- a/src/ResourceManager/Profile/Commands.Profile/DataCollection/EnableAzureRMDataCollection.cs +++ b/src/ResourceManager/Profile/Commands.Profile/DataCollection/EnableAzureRMDataCollection.cs @@ -13,6 +13,7 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Profile.Properties; using Microsoft.Azure.Commands.ResourceManager.Common; using Microsoft.WindowsAzure.Commands.Common; diff --git a/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Storage/Classification/RemoveAzureRmRecoveryServicesAsrStorageClassificationMapping.cs b/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Storage/Classification/RemoveAzureRmRecoveryServicesAsrStorageClassificationMapping.cs index e4eff1f92319..2919abcb4000 100644 --- a/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Storage/Classification/RemoveAzureRmRecoveryServicesAsrStorageClassificationMapping.cs +++ b/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Storage/Classification/RemoveAzureRmRecoveryServicesAsrStorageClassificationMapping.cs @@ -18,6 +18,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Commands.ResourceManager.Common; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.RecoveryServices.SiteRecovery { diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRmRecoveryServicesBackupProperty.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRmRecoveryServicesBackupProperty.cs index af20df710fab..19cc730df12f 100644 --- a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRmRecoveryServicesBackupProperty.cs +++ b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRmRecoveryServicesBackupProperty.cs @@ -19,6 +19,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Management.RecoveryServices.Models; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.RecoveryServices { diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs index 3fa40da5dcd7..5f53e11f0ee0 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs @@ -13,6 +13,7 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ManagedApplications/ManagedApplicationCmdletBase.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ManagedApplications/ManagedApplicationCmdletBase.cs index 2f51df0d750d..26ffaf5b1cb1 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ManagedApplications/ManagedApplicationCmdletBase.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/ManagedApplications/ManagedApplicationCmdletBase.cs @@ -27,6 +27,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation using Microsoft.WindowsAzure.Commands.Common; using System.Collections.Generic; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Application; + using Commands.Common.Authentication.Abstractions; /// /// Base class for policy assignment cmdlets. diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyAssignment.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyAssignment.cs index 287a447699f4..5f9ac24eebc0 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyAssignment.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyAssignment.cs @@ -25,6 +25,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation using System.Linq; using System.Collections; using WindowsAzure.Commands.Common; + using Commands.Common.Authentication.Abstractions; /// /// Creates a policy assignment. diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyDefinition.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyDefinition.cs index c7cd8968cf2d..d5bde1ec6477 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyDefinition.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/NewAzurePolicyDefinition.cs @@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation { + using Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Policy; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions; diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PolicyCmdletBase.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PolicyCmdletBase.cs index 1d70447ba993..736f62dbe31a 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PolicyCmdletBase.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/PolicyCmdletBase.cs @@ -25,6 +25,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation using System.Linq; using System.Management.Automation; using System.Threading.Tasks; + using Commands.Common.Authentication.Abstractions; /// /// Base class for policy cmdlets. diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicyDefinition.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicyDefinition.cs index 6d6e6d2dfb1a..57efb6f9fdca 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicyDefinition.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicyDefinition.cs @@ -16,6 +16,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation { + using Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Policy; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions; diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicySetDefinition.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicySetDefinition.cs index e08d310186e4..e23ae416dfe4 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicySetDefinition.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Policy/SetAzurePolicySetDefinition.cs @@ -14,6 +14,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation { + using Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Components; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Entities.Policy; using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions; diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/FileUtility.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/FileUtility.cs index 3c8f11bc4729..e382043e9687 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/FileUtility.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/FileUtility.cs @@ -14,6 +14,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities { + using Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Common.Authentication; using System; using System.IO; diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/TemplateUtility.cs b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/TemplateUtility.cs index 1ff5c62dca1a..8eee557bab2d 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/TemplateUtility.cs +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Utilities/TemplateUtility.cs @@ -25,6 +25,7 @@ using System.Diagnostics; using System.Security; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities { diff --git a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs index b3055631247d..0cc08bb81ef7 100644 --- a/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs +++ b/src/ResourceManager/ServiceFabric/Commands.ServiceFabric/Commands/NewAzureRmServiceFabricCluster.cs @@ -33,6 +33,7 @@ using Microsoft.WindowsAzure.Commands.Common; using Newtonsoft.Json; using OperatingSystem = Microsoft.Azure.Commands.ServiceFabric.Models.OperatingSystem; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.ServiceFabric.Commands { diff --git a/src/ResourceManager/Sql/Commands.Sql/Server/Cmdlet/GetAzureSqlServer.cs b/src/ResourceManager/Sql/Commands.Sql/Server/Cmdlet/GetAzureSqlServer.cs index 735dc6eb8013..9fd5f3d85408 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Server/Cmdlet/GetAzureSqlServer.cs +++ b/src/ResourceManager/Sql/Commands.Sql/Server/Cmdlet/GetAzureSqlServer.cs @@ -13,6 +13,7 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.Sql.Server.Model; using Microsoft.WindowsAzure.Commands.Common; using System.Collections.Generic; diff --git a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/DeploymentSlots/SwitchAzureWebAppSlot.cs b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/DeploymentSlots/SwitchAzureWebAppSlot.cs index adc654fcbc80..41337301d6a8 100644 --- a/src/ResourceManager/Websites/Commands.Websites/Cmdlets/DeploymentSlots/SwitchAzureWebAppSlot.cs +++ b/src/ResourceManager/Websites/Commands.Websites/Cmdlets/DeploymentSlots/SwitchAzureWebAppSlot.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.Common; using System; using Microsoft.WindowsAzure.Commands.Utilities.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.WebApps.Cmdlets.DeploymentSlots { diff --git a/src/ServiceManagement/Common/Commands.Common.Test/Common/Data.cs b/src/ServiceManagement/Common/Commands.Common.Test/Common/Data.cs index d6a699657483..abd568e6c7e2 100644 --- a/src/ServiceManagement/Common/Commands.Common.Test/Common/Data.cs +++ b/src/ServiceManagement/Common/Commands.Common.Test/Common/Data.cs @@ -21,6 +21,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { diff --git a/src/ServiceManagement/Common/Commands.Common.Test/Common/GeneralTests.cs b/src/ServiceManagement/Common/Commands.Common.Test/Common/GeneralTests.cs index f74d98baf2ae..1c4c009b9950 100644 --- a/src/ServiceManagement/Common/Commands.Common.Test/Common/GeneralTests.cs +++ b/src/ServiceManagement/Common/Commands.Common.Test/Common/GeneralTests.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit.Abstractions; using Microsoft.WindowsAzure.ServiceManagemenet.Common.Models; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Common.Test.Common { diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs index 4d5d48504f62..c17e895fd21d 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Common/PowerShellTest.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.ScenarioTest.Common { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/GenericIaaSExtensionTests.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/GenericIaaSExtensionTests.cs index d2ec1a0a6fad..0ba9a838a677 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/GenericIaaSExtensionTests.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/GenericIaaSExtensionTests.cs @@ -24,6 +24,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Test.FunctionalTests { diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Common/VirtualMachineExtensionCmdletBase.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Common/VirtualMachineExtensionCmdletBase.cs index a118514fe6e5..6dce4293775f 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Common/VirtualMachineExtensionCmdletBase.cs +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/Common/VirtualMachineExtensionCmdletBase.cs @@ -13,6 +13,7 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.ServiceManagement.Helpers; using Microsoft.WindowsAzure.Commands.ServiceManagement.Model; diff --git a/src/ServiceManagement/Profile/Commands.Profile/DataCollection/EnableAzureDataCollection.cs b/src/ServiceManagement/Profile/Commands.Profile/DataCollection/EnableAzureDataCollection.cs index cb0487b848d2..d0805dd3fca5 100644 --- a/src/ServiceManagement/Profile/Commands.Profile/DataCollection/EnableAzureDataCollection.cs +++ b/src/ServiceManagement/Profile/Commands.Profile/DataCollection/EnableAzureDataCollection.cs @@ -13,6 +13,7 @@ // ---------------------------------------------------------------------------------- using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.Utilities.Common; using System.Management.Automation; diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryRecoveryPlan.cs b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryRecoveryPlan.cs index 78252fd06faf..21d9df621a66 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryRecoveryPlan.cs +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/CreateAzureSiteRecoveryRecoveryPlan.cs @@ -14,8 +14,8 @@ using System; using System.Management.Automation; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; using Microsoft.Azure.Commands.RecoveryServices.SiteRecovery; -using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Management.SiteRecovery.Models; namespace Microsoft.Azure.Commands.RecoveryServices diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/AzureAssert.cs b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/AzureAssert.cs index 4c4d5643ca7b..b10fe5c3dc55 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/AzureAssert.cs +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/AzureAssert.cs @@ -28,6 +28,7 @@ namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common using DefinitionConfigurationSetting = Commands.Utilities.Common.XmlSchema.ServiceDefinitionSchema.ConfigurationSetting; using Microsoft.Azure.Commands.Common.Authentication; using Commands.Common; + using Azure.Commands.Common.Authentication.Abstractions; public static class AzureAssert { diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs index 1ab6636dd8ce..e6a8626d730a 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs @@ -21,6 +21,7 @@ using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Commands.Common.Authentication.Models; using Microsoft.Azure.ServiceManagemenet.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Test.Utilities.Common { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs index ba8edce172e5..deae5e0a894b 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/DisableAzureRemoteDesktopCommandTest.cs @@ -25,6 +25,7 @@ using Xunit; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.Azure.Commands.Common.Authentication.Models; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs index 280821e377ed..552a2458c06c 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureRemoteDesktopCommandTest.cs @@ -28,6 +28,7 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs index 71f42bcf3e63..f7d0f615e098 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs @@ -26,6 +26,7 @@ using Microsoft.WindowsAzure.Commands.ScenarioTest; using Xunit; using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Development { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs index 1348ced88b69..495ab95135ed 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/AzureServiceTests.cs @@ -28,6 +28,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Utilities { diff --git a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/ScaffoldTests.cs b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/ScaffoldTests.cs index 06d1132855ee..f77ca2be4923 100644 --- a/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/ScaffoldTests.cs +++ b/src/ServiceManagement/Services/Commands.Test/CloudService/Utilities/ScaffoldTests.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Test.CloudService.Utilities { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs index a29e5814c4bb..510a2fb91f6b 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs @@ -24,6 +24,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.AzureTools { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/CommonUtilities.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/CommonUtilities.cs index 61f714f9f039..174c21e4ba1e 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/CommonUtilities.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/CommonUtilities.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Utilities.Common { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/JavaScriptPackageHelpers.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/JavaScriptPackageHelpers.cs index bfb11195ce6c..68a3c77e260e 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/JavaScriptPackageHelpers.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/JavaScriptPackageHelpers.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs index 10998ba7b9b8..df60f27890f9 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Common/Scaffolding/Scaffold.cs @@ -22,6 +22,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Utilities.CloudService.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Cache.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Cache.cs index 70a343b0e0b4..44593e84f3b6 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Cache.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Cache.cs @@ -20,6 +20,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.WindowsAzure.Commands.Common; using Microsoft.Azure.Commands.Common.Authentication; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Utilities.Websites.Services { diff --git a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs index 8c5cd0871275..842662ba531d 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs +++ b/src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs @@ -19,6 +19,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Websites.Services.WebEntities; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.Utilities.Websites.Services { diff --git a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/NewAzureRoleTemplate.cs b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/NewAzureRoleTemplate.cs index 10f8118992d9..c1e8934273f2 100644 --- a/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/NewAzureRoleTemplate.cs +++ b/src/ServiceManagement/Services/Commands/CloudService/Development/Scaffolding/NewAzureRoleTemplate.cs @@ -21,6 +21,7 @@ using Microsoft.WindowsAzure.Commands.Utilities.Properties; using Microsoft.Azure.Commands.Common.Authentication; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.CloudService.Development.Scaffolding { diff --git a/src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs b/src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs index 05b33e1165e5..ffdd9e2f8023 100644 --- a/src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs +++ b/src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs @@ -35,6 +35,7 @@ namespace Microsoft.WindowsAzure.Commands.Websites using Microsoft.Azure.Commands.Common.Authentication; using Hyak.Common; using Common; + using Azure.Commands.Common.Authentication.Abstractions; /// /// Creates a new azure website. diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/FunctionalTests/OutputFormatValidator.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/FunctionalTests/OutputFormatValidator.cs index 14076d895e95..fbec9baa2cbb 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/FunctionalTests/OutputFormatValidator.cs +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/FunctionalTests/OutputFormatValidator.cs @@ -16,6 +16,7 @@ using System.IO; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.WindowsAzure.Commands.SqlDatabase.Test.FunctionalTests { diff --git a/src/Storage/Stack/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs b/src/Storage/Stack/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs index 332cb7e735cf..89740c1b3d4d 100644 --- a/src/Storage/Stack/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs +++ b/src/Storage/Stack/Commands.Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs @@ -33,6 +33,7 @@ namespace Microsoft.WindowsAzure.Commands.Storage.Blob.Cmdlet using Microsoft.WindowsAzure.Storage.File; using Microsoft.Azure.Commands.Common.Authentication; using System.Reflection; + using Azure.Commands.Common.Authentication.Abstractions; [Cmdlet(VerbsLifecycle.Start, StorageNouns.CopyBlob, ConfirmImpact = ConfirmImpact.High, DefaultParameterSetName = ContainerNameParameterSet), OutputType(typeof(AzureStorageBlob))] From ef7722ce9c9b21d0b127873499a92f099300dda5 Mon Sep 17 00:00:00 2001 From: cormacpayne Date: Fri, 3 Nov 2017 11:20:13 -0700 Subject: [PATCH 4/8] Update tooling for preview modules --- tools/AzureRM.Example.psm1 | 10 +----- tools/CleanupBuild.ps1 | 49 ++++++++++++++++++++++------- tools/PublishModules.ps1 | 43 +++++++------------------ tools/UpdateModules.ps1 | 64 ++++++++++++++++++++++++++++++-------- 4 files changed, 100 insertions(+), 66 deletions(-) diff --git a/tools/AzureRM.Example.psm1 b/tools/AzureRM.Example.psm1 index cea741faa043..a0823eb08331 100644 --- a/tools/AzureRM.Example.psm1 +++ b/tools/AzureRM.Example.psm1 @@ -9,12 +9,4 @@ $PSDefaultParameterValues.Clear() Set-StrictMode -Version Latest -# Import dependencies using required version, if it is allowed -if ($PSVersionTable.PSVersion.Major -ge 5) -{ -%STRICT-DEPENDENCIES% -} -else -{ -%DEPENDENCIES% -} \ No newline at end of file +%IMPORTED-DEPENDENCIES% \ No newline at end of file diff --git a/tools/CleanupBuild.ps1 b/tools/CleanupBuild.ps1 index 456ae664de15..529237d85065 100644 --- a/tools/CleanupBuild.ps1 +++ b/tools/CleanupBuild.ps1 @@ -5,17 +5,42 @@ Param [string]$BuildConfig ) -function Cleanup-MarkdownHelp -{ - [CmdletBinding()] - Param - ( - [Parameter()] - [string]$BuildConfig - ) +$output = Join-Path (Get-Item $PSScriptRoot).Parent.FullName "src\Package\$BuildConfig" +Write-Verbose "The output folder is set to $output" +$serviceManagementPath = Join-Path $output "ServiceManagement\Azure" +$resourceManagerPath = Join-Path $output "ResourceManager\AzureResourceManager" + +Write-Verbose "Removing generated NuGet folders from $output" +$resourcesFolders = @("de", "es", "fr", "it", "ja", "ko", "ru", "zh-Hans", "zh-Hant") +Get-ChildItem -Include $resourcesFolders -Recurse -Force -Path $output | Remove-Item -Force -Recurse -ErrorAction SilentlyContinue + +Write-Verbose "Removing autogenerated XML help files, code analysis, config files, and symbols." +$exclude = @("*.dll-Help.xml", "Scaffold.xml", "RoleSettings.xml", "WebRole.xml", "WorkerRole.xml") +$include = @("*.xml", "*.lastcodeanalysissucceeded", "*.dll.config", "*.pdb") +Get-ChildItem -Include $include -Exclude $exclude -Recurse -Path $output | Remove-Item -Force -Recurse +Get-ChildItem -Recurse -Path $output -Include *.dll-Help.psd1 | Remove-Item -Force - $HelpFolders = Get-ChildItem "help" -Recurse -Directory | where { $_.FullName -like "*$BuildConfig*" } - $HelpFolders | foreach { Remove-Item -Path $_ -Recurse -Force } -} +Write-Verbose "Removing markdown help files and folders" +Get-ChildItem -Recurse -Path $output -Include *.md | Remove-Item -Force +Get-ChildItem -Directory -Include help -Recurse -Path $output | Remove-Item -Force + +Write-Verbose "Removing unneeded web deployment dependencies" +$webdependencies = @("Microsoft.Web.Hosting.dll", "Microsoft.Web.Delegation.dll", "Microsoft.Web.Administration.dll", "Microsoft.Web.Deployment.Tracing.dll") +Get-ChildItem -Include $webdependencies -Recurse -Path $output | Remove-Item -Force + +$resourceManagerFolders = Get-ChildItem -Path $resourceManagerPath -Directory +foreach ($RMFolder in $resourceManagerFolders) +{ + $psd1 = Get-ChildItem -Path $RMFolder.FullName -Filter "$($RMFolder.Name).psd1" + Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $psd1.DirectoryName -FileName $psd1.Name + + $acceptedDlls = @() + $acceptedDlls += $ModuleMetadata.NestedModules + $acceptedDlls += $ModuleMetadata.RequiredAssemblies -Cleanup-MarkdownHelp -BuildConfig $BuildConfig \ No newline at end of file + $acceptedDlls = $acceptedDlls | where { $_ -ne $null } | % { $_.Substring(2) } + + Write-Verbose "Removing redundant dlls in $($RMFolder.Name)" + $removedDlls = Get-ChildItem -Path $RMFolder.FullName -Filter "*.dll" | where { $acceptedDlls -notcontains $_.Name} + $removedDlls | % { Write-Verbose "Removing $($_.Name)"; Remove-Item $_.FullName -Force } +} \ No newline at end of file diff --git a/tools/PublishModules.ps1 b/tools/PublishModules.ps1 index 3e88b1037c09..923d2094d635 100644 --- a/tools/PublishModules.ps1 +++ b/tools/PublishModules.ps1 @@ -110,30 +110,6 @@ function Get-TargetModules } } -function Make-StrictModuleDependencies -{ - [CmdletBinding()] - param( - [string] $Path) - - PROCESS - { - $manifest = Test-ModuleManifest -Path $Path - $newModules = @() - foreach ($module in $manifest.RequiredModules) - { - $newModules += (@{ModuleName = $module.Name; RequiredVersion= $module.Version}) - } - - if ($newModules.Count -gt 0) - { - Update-ModuleManifest -Path $Path -RequiredModules $newModules - } - - } - -} - function Add-PSM1Dependency { [CmdletBinding()] @@ -145,7 +121,6 @@ function Add-PSM1Dependency $file = Get-Item -Path $Path $manifestFile = $file.Name $psm1file = $manifestFile -replace ".psd1", ".psm1" - $manifest = Test-ModuleManifest -Path $Path if($isNetCore -eq "false") { Update-ModuleManifest -Path $Path -RootModule $psm1file } @@ -167,6 +142,10 @@ function Remove-ModuleDependencies $text = $regex.Replace($content, "RequiredModules = @()") $text | Out-File -FilePath $Path + $regex = New-Object System.Text.RegularExpressions.Regex "NestedModules\s*=\s*@\([^\)]+\)" + $content = (Get-Content -Path $Path) -join "`r`n" + $text = $regex.Replace($content, "NestedModules = @()") + $text | Out-File -FilePath $Path } } @@ -216,15 +195,15 @@ function Change-RMModule $moduleName = (Get-Item -Path $Path).Name $moduleManifest = $moduleName + ".psd1" $moduleSourcePath = Join-Path -Path $Path -ChildPath $moduleManifest - $manifest = Make-StrictModuleDependencies $moduleSourcePath - $manifest = Test-ModuleManifest -Path $moduleSourcePath + $file = Get-Item $moduleSourcePath + Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $file.DirectoryName -FileName $file.Name $toss = Publish-Module -Path $Path -Repository $TempRepo -Force Write-Output "Changing to directory for module modifications $TempRepoPath" pushd $TempRepoPath try { - $nupkgPath = Join-Path -Path . -ChildPath ($moduleName + "." + $manifest.Version.ToString() + ".nupkg") - $zipPath = Join-Path -Path . -ChildPath ($moduleName + "." + $manifest.Version.ToString() + ".zip") + $nupkgPath = Join-Path -Path . -ChildPath ($moduleName + "." + $ModuleMetadata.ModuleVersion.ToString() + ".nupkg") + $zipPath = Join-Path -Path . -ChildPath ($moduleName + "." + $ModuleMetadata.ModuleVersion.ToString() + ".zip") $dirPath = Join-Path -Path . -ChildPath $moduleName $unzippedManifest = Join-Path -Path $dirPath -ChildPath ($moduleName + ".psd1") @@ -240,7 +219,6 @@ function Change-RMModule Add-PSM1Dependency -Path $unzippedManifest Write-Output "Removing module manifest dependencies for $unzippedManifest" Remove-ModuleDependencies -Path $unzippedManifest - Remove-Item -Path $zipPath -Force Write-Output "Repackaging $dirPath" Update-NugetPackage -BasePath $TempRepoPath -ModuleName $moduleName -DirPath $dirPath -NugetExe $NugetExe @@ -268,8 +246,9 @@ function Publish-RMModule $moduleName = (Get-Item -Path $Path).Name $moduleManifest = $moduleName + ".psd1" $moduleSourcePath = Join-Path -Path $Path -ChildPath $moduleManifest - $manifest = Test-ModuleManifest -Path $moduleSourcePath - $nupkgPath = Join-Path -Path $TempRepoPath -ChildPath ($moduleName + "." + $manifest.Version.ToString() + ".nupkg") + $file = Get-Item $moduleSourcePath + Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $file.DirectoryName -FileName $file.Name + $nupkgPath = Join-Path -Path $TempRepoPath -ChildPath ($moduleName + "." + $ModuleMetadata.ModuleVersion.ToString() + ".nupkg") if (!(Test-Path -Path $nupkgPath)) { throw "Module at $nupkgPath in $TempRepoPath does not exist" diff --git a/tools/UpdateModules.ps1 b/tools/UpdateModules.ps1 index 22959c4dbb10..84bdb15647b9 100644 --- a/tools/UpdateModules.ps1 +++ b/tools/UpdateModules.ps1 @@ -31,29 +31,68 @@ function Create-ModulePsm1 PROCESS { - $manifestDir = Get-Item -Path $ModulePath - $moduleName = $manifestDir.Name + ".psd1" - $manifestPath = Join-Path -Path $ModulePath -ChildPath $moduleName - $module = Test-ModuleManifest -Path $manifestPath + $manifestDir = Get-Item -Path $ModulePath + $moduleName = $manifestDir.Name + ".psd1" + $manifestPath = Join-Path -Path $ModulePath -ChildPath $moduleName + $file = Get-Item $manifestPath + Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $file.DirectoryName -FileName $file.Name $templateOutputPath = $manifestPath -replace ".psd1", ".psm1" - [string]$strict - [string]$loose - foreach ($mod in $module.RequiredModules) + [string]$importedModules + if ($ModuleMetadata.RequiredModules -ne $null) { - $strict += " Import-Module " + $mod.Name + " -RequiredVersion " + [string]$mod.Version + "`r`n" - $loose += " Import-Module " + $mod.Name + "`r`n" + foreach ($mod in $ModuleMetadata.RequiredModules) + { + if ($mod["ModuleVersion"]) + { + $importedModules += Create-MinimumVersionEntry -ModuleName $mod["ModuleName"] -MinimumVersion $mod["ModuleVersion"] + } + elseif ($mod["RequiredVersion"]) + { + $importedModules += "Import-Module " + $mod["ModuleName"] + " -RequiredVersion " + $mod["RequiredVersion"] + "`r`n" + } + } + } + + if ($ModuleMetadata.NestedModules -ne $null) + { + foreach ($dll in $ModuleMetadata.NestedModules) + { + $importedModules += "Import-Module (Join-Path -Path `$PSScriptRoot -ChildPath " + $dll.Substring(2) + ")`r`n" + } } + $template = Get-Content -Path $TemplatePath - $template = $template -replace "%MODULE-NAME%", $module.Name + $template = $template -replace "%MODULE-NAME%", $file.BaseName $template = $template -replace "%DATE%", [string](Get-Date) - $template = $template -replace "%STRICT-DEPENDENCIES%", $strict - $template = $template -replace "%DEPENDENCIES%", $loose + $template = $template -replace "%IMPORTED-DEPENDENCIES%", $importedModules Write-Host "Writing psm1 manifest to $templateOutputPath" $template | Out-File -FilePath $templateOutputPath -Force $file = Get-Item -Path $templateOutputPath } } +function Create-MinimumVersionEntry +{ + [CmdletBinding()] + param( + [string]$ModuleName, + [string]$MinimumVersion + ) + + PROCESS + { + return "`$module = Get-Module $ModuleName ` +if (`$module -ne `$null -and `$module.Version.ToString().CompareTo(`"$MinimumVersion`") -lt 0) ` +{ ` + Write-Error `"This module requires $ModuleName version $MinimumVersion. An earlier version of $ModuleName is imported in the current PowerShell session. Please open a new session before importing this module. This error could indicate that multiple incompatible versions of the Azure PowerShell cmdlets are installed on your system. Please see https://aka.ms/azps-version-error for troubleshooting information.`" -ErrorAction Stop ` +} ` +elseif (`$module -eq `$null) ` +{ ` + Import-Module $ModuleName -MinimumVersion $MinimumVersion -Scope Global ` +}`r`n" + } +} + if ([string]::IsNullOrEmpty($buildConfig)) { Write-Verbose "Setting build configuration to 'Release'" @@ -145,4 +184,3 @@ if (($scope -eq 'All') -or ($scope -eq 'AzureRM')) { } } - From 25b314de941db0a290f442fafaf3260cfed8469f Mon Sep 17 00:00:00 2001 From: cormacpayne Date: Fri, 3 Nov 2017 11:20:43 -0700 Subject: [PATCH 5/8] Update .wxi file --- setup/azurecmdfiles.wxi | 3863 +-------------------------------------- 1 file changed, 29 insertions(+), 3834 deletions(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index a99cc70c4862..705d2a1d341b 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -23,57 +23,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -82,66 +37,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -153,12 +57,6 @@ - - - - - - @@ -171,21 +69,6 @@ - - - - - - - - - - - - - - - @@ -198,112 +81,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -311,66 +112,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -379,12 +129,6 @@ - - - - - - @@ -394,63 +138,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -459,12 +149,6 @@ - - - - - - @@ -477,21 +161,6 @@ - - - - - - - - - - - - - - - @@ -504,42 +173,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -554,12 +190,6 @@ - - - - - - @@ -569,60 +199,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -634,66 +219,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -702,66 +236,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -773,18 +256,6 @@ - - - - - - - - - - - - @@ -800,18 +271,6 @@ - - - - - - - - - - - - @@ -830,51 +289,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -888,15 +311,6 @@ - - - - - - - - - @@ -906,51 +320,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -962,15 +334,6 @@ - - - - - - - - - @@ -980,51 +343,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1036,15 +357,6 @@ - - - - - - - - - @@ -1066,18 +378,6 @@ - - - - - - - - - - - - @@ -1087,36 +387,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1125,15 +395,6 @@ - - - - - - - - - @@ -1143,18 +404,6 @@ - - - - - - - - - - - - @@ -1170,41 +419,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1214,18 +430,6 @@ - - - - - - - - - - - - @@ -1235,60 +439,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1297,15 +453,6 @@ - - - - - - - - - @@ -1315,51 +462,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1368,15 +473,6 @@ - - - - - - - - - @@ -1386,51 +482,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1439,15 +493,6 @@ - - - - - - - - - @@ -1457,51 +502,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1510,66 +513,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,18 +530,6 @@ - - - - - - - - - - - - @@ -1599,57 +539,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1664,15 +556,6 @@ - - - - - - - - - @@ -1688,51 +571,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1744,39 +585,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1792,48 +606,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1842,15 +617,6 @@ - - - - - - - - - @@ -1860,51 +626,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1913,66 +637,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1981,21 +654,9 @@ - - - - - - - - - - - - @@ -2005,18 +666,6 @@ - - - - - - - - - - - - @@ -2026,48 +675,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2076,15 +683,6 @@ - - - - - - - - - @@ -2094,54 +692,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2150,66 +706,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2218,75 +723,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2295,15 +740,6 @@ - - - - - - - - - @@ -2313,51 +749,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2366,66 +760,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2440,18 +783,6 @@ - - - - - - - - - - - - @@ -2461,51 +792,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2514,66 +803,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2582,15 +820,6 @@ - - - - - - - - - @@ -2600,54 +829,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2656,66 +843,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2742,6 +878,15 @@ + + + + + + + + + @@ -2793,6 +938,9 @@ + + + @@ -2816,69 +964,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2890,18 +984,6 @@ - - - - - - - - - - - - @@ -2911,75 +993,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2997,90 +1016,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3089,15 +1039,6 @@ - - - - - - - - - @@ -3107,21 +1048,9 @@ - - - - - - - - - - - - @@ -3134,42 +1063,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3178,66 +1074,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3246,21 +1091,6 @@ - - - - - - - - - - - - - - - @@ -3273,9 +1103,6 @@ - - - @@ -3285,51 +1112,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3338,18 +1126,6 @@ - - - - - - - - - - - - @@ -3359,48 +1135,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3409,18 +1146,6 @@ - - - - - - - - - - - - @@ -3430,48 +1155,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3480,18 +1166,6 @@ - - - - - - - - - - - - @@ -3501,48 +1175,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3551,21 +1186,6 @@ - - - - - - - - - - - - - - - @@ -3575,15 +1195,6 @@ - - - - - - - - - @@ -3608,39 +1219,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3673,75 +1254,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3750,21 +1271,6 @@ - - - - - - - - - - - - - - - @@ -3777,15 +1283,6 @@ - - - - - - - - - @@ -3804,48 +1301,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3854,15 +1315,6 @@ - - - - - - - - - @@ -3872,18 +1324,6 @@ - - - - - - - - - - - - @@ -3896,45 +1336,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3943,18 +1347,6 @@ - - - - - - - - - - - - @@ -3964,15 +1356,6 @@ - - - - - - - - - @@ -3985,42 +1368,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4029,18 +1379,6 @@ - - - - - - - - - - - - @@ -4050,45 +1388,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4097,66 +1396,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4165,18 +1413,6 @@ - - - - - - - - - - - - @@ -4189,45 +1425,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4236,69 +1433,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5904,6 +3047,9 @@ + + + @@ -5937,337 +3083,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6275,542 +3192,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6819,6 +3344,9 @@ + + + @@ -6836,6 +3364,7 @@ + @@ -6843,256 +3372,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7101,17 +3451,7 @@ - - - - - - - - - - @@ -7120,210 +3460,64 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7838,6 +4032,7 @@ + From 5b3078e7129e1ffbdee8c7f7f2c433d9a2d663bc Mon Sep 17 00:00:00 2001 From: cormacpayne Date: Fri, 3 Nov 2017 11:21:13 -0700 Subject: [PATCH 6/8] Miscellaneous updates for preview modules --- build.proj | 28 +++++++++---------- .../Commands.Profile/Commands.Profile.csproj | 16 +++++++++++ src/ResourceManager/Profile/Profile.sln | 24 ++++++++++++++++ 3 files changed, 54 insertions(+), 14 deletions(-) diff --git a/build.proj b/build.proj index 8ea4a7043dae..5d2af23d2c7a 100644 --- a/build.proj +++ b/build.proj @@ -79,16 +79,16 @@ - - - + + + - - - - - + + + + + @@ -196,7 +196,7 @@ - + - + @@ -234,7 +234,7 @@ DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" Condition=" '$(CodeSign)' == 'true' "/> - + - + \ No newline at end of file diff --git a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj index dd8b90d5c47e..fa800a6e8412 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj +++ b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj @@ -146,6 +146,22 @@ {d3804b64-c0d3-48f8-82ec-1f632f833c9e} Commands.Common.Authentication + + {24508e26-154d-47f1-80ee-439bf0710996} + Commands.Common.Authorization + + + {269acf73-0a34-42dc-ab9c-4b15931a489d} + Commands.Common.Graph.RBAC + + + {1338f7ae-7111-4ed3-8916-2d0fecc876f4} + Commands.Common.Network + + + {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} + Commands.Common.Storage + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common diff --git a/src/ResourceManager/Profile/Profile.sln b/src/ResourceManager/Profile/Profile.sln index a2536ca2c932..c5cd4cb3a664 100644 --- a/src/ResourceManager/Profile/Profile.sln +++ b/src/ResourceManager/Profile/Profile.sln @@ -26,6 +26,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authenticat EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authentication.ResourceManager", "..\Common\Commands.Common.Authentication.ResourceManager\Commands.Common.Authentication.ResourceManager.csproj", "{69C2EB6B-CD63-480A-89A0-C489706E9299}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authorization", "..\..\Common\Commands.Common.Authorization\Commands.Common.Authorization.csproj", "{24508E26-154D-47F1-80EE-439BF0710996}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Graph.RBAC", "..\..\Common\Commands.Common.Graph.RBAC\Commands.Common.Graph.RBAC.csproj", "{269ACF73-0A34-42DC-AB9C-4B15931A489D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Network", "..\..\Common\Commands.Common.Network\Commands.Common.Network.csproj", "{1338F7AE-7111-4ED3-8916-2D0FECC876F4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -76,6 +84,22 @@ Global {69C2EB6B-CD63-480A-89A0-C489706E9299}.Debug|Any CPU.Build.0 = Debug|Any CPU {69C2EB6B-CD63-480A-89A0-C489706E9299}.Release|Any CPU.ActiveCfg = Release|Any CPU {69C2EB6B-CD63-480A-89A0-C489706E9299}.Release|Any CPU.Build.0 = Release|Any CPU + {24508E26-154D-47F1-80EE-439BF0710996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {24508E26-154D-47F1-80EE-439BF0710996}.Debug|Any CPU.Build.0 = Debug|Any CPU + {24508E26-154D-47F1-80EE-439BF0710996}.Release|Any CPU.ActiveCfg = Release|Any CPU + {24508E26-154D-47F1-80EE-439BF0710996}.Release|Any CPU.Build.0 = Release|Any CPU + {269ACF73-0A34-42DC-AB9C-4B15931A489D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {269ACF73-0A34-42DC-AB9C-4B15931A489D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {269ACF73-0A34-42DC-AB9C-4B15931A489D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {269ACF73-0A34-42DC-AB9C-4B15931A489D}.Release|Any CPU.Build.0 = Release|Any CPU + {1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Release|Any CPU.Build.0 = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 1e829338099cdf719ae842b038a2ad1cd4b44461 Mon Sep 17 00:00:00 2001 From: cormacpayne Date: Fri, 3 Nov 2017 11:40:00 -0700 Subject: [PATCH 7/8] Remove RequiredAssemblies and add dependency on AzureRM.Profile for Azure.AnalysisServices --- .../Azure.AnalysisServices.psd1 | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1 b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1 index ca8916f8a13a..ad983217bcfe 100644 --- a/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1 +++ b/src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Azure.AnalysisServices.psd1 @@ -44,22 +44,11 @@ CLRVersion='4.0' # Processor architecture (None, X86, Amd64, IA64) required by this module ProcessorArchitecture = 'None' +# Modules that must be imported into the global environment prior to importing this module +RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; }) + # Assemblies that must be loaded prior to importing this module -RequiredAssemblies = '.\Hyak.Common.dll', - '.\Microsoft.ApplicationInsights.dll', - '.\Microsoft.Azure.Commands.Common.Authentication.Abstractions.dll', - '.\Microsoft.Azure.Common.dll', - '.\Microsoft.Azure.Common.NetFramework.dll', - '.\Microsoft.IdentityModel.Clients.ActiveDirectory.dll', - '.\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll', - '.\Microsoft.Rest.ClientRuntime.Azure.dll', - '.\Microsoft.Rest.ClientRuntime.dll', - '.\Microsoft.Threading.Tasks.dll', - '.\Microsoft.Threading.Tasks.Extensions.Desktop.dll', - '.\Microsoft.Threading.Tasks.Extensions.dll', - '.\Microsoft.WindowsAzure.Commands.Common.dll', - '.\Microsoft.WindowsAzure.Management.dll', - '.\Newtonsoft.Json.dll' +RequiredAssemblies = @() # Script files (.ps1) that are run in the caller's environment prior to importing this module ScriptsToProcess = @() From df70f40846d0cb72d664399de2b4d2dc3a60eb1b Mon Sep 17 00:00:00 2001 From: cormacpayne Date: Mon, 6 Nov 2017 09:27:18 -0800 Subject: [PATCH 8/8] Fix build error with RecoveryServices.SiteRecovery --- .../ScenarioTests/AsrTestsBase.cs | 2 +- .../Vault/ImportAzureRmRecoveryServicesAsrVaultSettingsFile.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Test/ScenarioTests/AsrTestsBase.cs b/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Test/ScenarioTests/AsrTestsBase.cs index 94e93deab1b4..f8846afbe7b1 100644 --- a/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Test/ScenarioTests/AsrTestsBase.cs +++ b/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery.Test/ScenarioTests/AsrTestsBase.cs @@ -27,10 +27,10 @@ using Microsoft.Azure.Portal.RecoveryServices.Models.Common; using Microsoft.Azure.Test; using Microsoft.Azure.Test.HttpRecorder; -using Microsoft.WindowsAzure.Commands.Common; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using RestTestFramework = Microsoft.Rest.ClientRuntime.Azure.TestFramework; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace RecoveryServices.SiteRecovery.Test { diff --git a/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Vault/ImportAzureRmRecoveryServicesAsrVaultSettingsFile.cs b/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Vault/ImportAzureRmRecoveryServicesAsrVaultSettingsFile.cs index b435d2828216..17576efbf05d 100644 --- a/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Vault/ImportAzureRmRecoveryServicesAsrVaultSettingsFile.cs +++ b/src/ResourceManager/RecoveryServices.SiteRecovery/Commands.RecoveryServices.SiteRecovery/Vault/ImportAzureRmRecoveryServicesAsrVaultSettingsFile.cs @@ -19,7 +19,7 @@ using System.Xml; using Microsoft.Azure.Commands.RecoveryServices.SiteRecovery.Properties; using Microsoft.Azure.Portal.RecoveryServices.Models.Common; -using Microsoft.WindowsAzure.Commands.Common; +using Microsoft.Azure.Commands.Common.Authentication.Abstractions; namespace Microsoft.Azure.Commands.RecoveryServices.SiteRecovery {