Skip to content

[#112641071] Convert AzureRM to a 'shell' module with version range dependencies #1775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hovsepm merged 18 commits into from
Mar 11, 2016
Merged

[#112641071] Convert AzureRM to a 'shell' module with version range dependencies #1775

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d9434a2
Removed script modules and replaced with module dependencies
Feb 4, 2016
64aa44f
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Feb 5, 2016
1a6d6c5
Changed back AzureRM version
Feb 5, 2016
10b5158
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Feb 17, 2016
7ff78b6
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Feb 24, 2016
790474b
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Feb 26, 2016
ca2bfd4
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Feb 26, 2016
cb1d4f7
Merge branch 'release-1.2.2' of github.com:Azure/azure-powershell int…
Mar 2, 2016
88dac8e
Moving AzureRM publish to the end of publish process
Mar 2, 2016
21ba2e3
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Mar 7, 2016
789dfa1
updated minimum version of the AzureRM modules.
Mar 7, 2016
8574336
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Mar 8, 2016
cc21949
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Mar 9, 2016
5640275
Merge branch 'dev' of github.com:Azure/azure-powershell into AzureRmS…
Mar 10, 2016
28106c0
Added ranges to Profile dependencies
Mar 10, 2016
bf2c3c7
Fixing common assembly version
Mar 10, 2016
12ef78a
Fixed storage project dependency from Profile.
Mar 11, 2016
cf5e41b
Fixed SQL test to ignore UserAgent checks
Mar 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,6 @@
<!-- Copying shortcut to be signed -->
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1"
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />

<ItemGroup>
<DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
Expand Down Expand Up @@ -255,8 +253,6 @@
<!-- Copying signed shortcut back -->
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1"
DestinationFolder="$(LibraryRoot)tools\AzureRM" />
</Target>

<Target Name="CodeSignInstaller">
Expand Down
39 changes: 32 additions & 7 deletions tools/AzureRM/AzureRM.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#

@{

# Script module or binary module file associated with this manifest.
RootModule = '.\AzureRM.psm1'

# Version number of this module.
ModuleVersion = '1.2.0'
Expand Down Expand Up @@ -48,7 +45,36 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @()
RequiredModules = @(
@{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
Copy link
Member

@markcowl markcowl Feb 6, 2016

Choose a reason for hiding this comment

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

Is there any script to update the Module Version dependencies in this module (was there any such script for updating the versions in the script)?

@{ ModuleName = 'Azure.Storage'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.ApiManagement'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.Automation'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.Backup'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.Batch'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.Compute'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.2.2'},
@{ ModuleName = 'AzureRM.DataFactories'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.DataLakeAnalytics'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.DataLakeStore'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.Dns'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.HDInsight'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'},
@{ ModuleName = 'AzureRM.Insights'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.KeyVault'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.1.3'},
@{ ModuleName = 'AzureRM.Network'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.NotificationHubs'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.OperationalInsights'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.RecoveryServices'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'},
@{ ModuleName = 'AzureRM.RedisCache'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.1.2'},
@{ ModuleName = 'AzureRM.Resources'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.SiteRecovery'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.1.3'},
@{ ModuleName = 'AzureRM.Sql'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.Storage'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.StreamAnalytics'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.Tags'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.TrafficManager'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.UsageAggregates'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'},
@{ ModuleName = 'AzureRM.Websites'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'}
)

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand All @@ -65,8 +91,7 @@ FormatsToProcess = @(
)

# Modules to import as nested modules of the module specified in ModuleToProcess
NestedModules = @(
)
NestedModules = @()

# Functions to export from this module
FunctionsToExport = '*'
Expand All @@ -78,7 +103,7 @@ CmdletsToExport = '*'
VariablesToExport = '*'

# Aliases to export from this module
AliasesToExport = @('Install-AzureRM')
AliasesToExport = @()

# List of all modules packaged with this module
ModuleList = @()
Expand Down
260 changes: 0 additions & 260 deletions tools/AzureRM/AzureRM.psm1
View file
Open in desktop

This file was deleted.

Loading