Skip to content

Commit f1144eb

Browse files
author
Hovsep Mkrtchyan
committed
Addressed review comments
1 parent 4f5dd00 commit f1144eb

File tree

2 files changed

+37
-37
lines changed

2 files changed

+37
-37
lines changed

tools/AzureRM/AzureRM.psm1

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
$AzureRMDependencies = @{
2-
"Azure.Storage" = "1.0";
3-
"AzureRM.Profile" = "1.0";
2+
"Azure.Storage" = "1.0.3";
3+
"AzureRM.Profile" = "1.0.3";
44
}
55

66
$AzureRMModules = @{
7-
"AzureRM.ApiManagement" = "1.0";
8-
"AzureRM.Automation" = "1.0";
9-
"AzureRM.Backup" = "1.0";
10-
"AzureRM.Batch" = "1.0";
11-
"AzureRM.Compute" = "1.2";
12-
"AzureRM.DataFactories" = "1.0";
13-
"AzureRM.DataLakeAnalytics" = "1.0";
14-
"AzureRM.DataLakeStore" = "1.0";
15-
"AzureRM.Dns" = "1.0";
16-
"AzureRM.HDInsight" = "1.0";
17-
"AzureRM.Insights" = "1.0";
18-
"AzureRM.KeyVault" = "1.1";
19-
"AzureRM.Network" = "1.0";
20-
"AzureRM.NotificationHubs" = "1.0";
21-
"AzureRM.OperationalInsights" = "1.0";
22-
"AzureRM.RecoveryServices" = "1.0";
23-
"AzureRM.RedisCache" = "1.1";
24-
"AzureRM.Resources" = "1.0";
25-
"AzureRM.SiteRecovery" = "1.1";
26-
"AzureRM.Sql" = "1.0";
27-
"AzureRM.Storage" = "1.0";
28-
"AzureRM.StreamAnalytics" = "1.0";
29-
"AzureRM.Tags" = "1.0";
30-
"AzureRM.TrafficManager" = "1.0";
31-
"AzureRM.UsageAggregates" = "1.0";
32-
"AzureRM.Websites" = "1.0";
7+
"AzureRM.ApiManagement" = "1.0.3";
8+
"AzureRM.Automation" = "1.0.3";
9+
"AzureRM.Backup" = "1.0.3";
10+
"AzureRM.Batch" = "1.0.3";
11+
"AzureRM.Compute" = "1.2.1";
12+
"AzureRM.DataFactories" = "1.0.3";
13+
"AzureRM.DataLakeAnalytics" = "1.0.3";
14+
"AzureRM.DataLakeStore" = "1.0.3";
15+
"AzureRM.Dns" = "1.0.3";
16+
"AzureRM.HDInsight" = "1.0.4";
17+
"AzureRM.Insights" = "1.0.3";
18+
"AzureRM.KeyVault" = "1.1.2";
19+
"AzureRM.Network" = "1.0.3";
20+
"AzureRM.NotificationHubs" = "1.0.3";
21+
"AzureRM.OperationalInsights" = "1.0.3";
22+
"AzureRM.RecoveryServices" = "1.0.4";
23+
"AzureRM.RedisCache" = "1.1.1";
24+
"AzureRM.Resources" = "1.0.3";
25+
"AzureRM.SiteRecovery" = "1.1.2";
26+
"AzureRM.Sql" = "1.0.3";
27+
"AzureRM.Storage" = "1.0.3";
28+
"AzureRM.StreamAnalytics" = "1.0.3";
29+
"AzureRM.Tags" = "1.0.3";
30+
"AzureRM.TrafficManager" = "1.0.3";
31+
"AzureRM.UsageAggregates" = "1.0.3";
32+
"AzureRM.Websites" = "1.0.3";
3333
}
3434

3535
function Test-AdminRights([string]$Scope)
@@ -70,7 +70,7 @@ function CheckIncompatibleVersion([bool]$Force)
7070
function Install-ModuleWithVersionCheck([string]$Name,[string]$MinimumVersion,[string]$Repository,[string]$Scope,[switch]$Force)
7171
{
7272
$_MinVer = $MinimumVersion
73-
$_MaxVer = "$($_MinVer.Split(".")[0]).9999.0"
73+
$_MaxVer = "$($_MinVer.Split(".")[0]).9999.9999.9999"
7474
$script:InstallCounter ++
7575
try {
7676
$_ExistingModule = Get-Module -ListAvailable -Name $Name
@@ -117,7 +117,7 @@ function Update-AzureRM
117117
param(
118118
[Parameter(Position=0, Mandatory = $false)]
119119
[string]
120-
$MinVersion,
120+
$MajorVersion,
121121
[Parameter(Position=1, Mandatory = $false)]
122122
[string]
123123
$Repository = "PSGallery",
@@ -146,8 +146,8 @@ function Update-AzureRM
146146

147147
# Start new job
148148
$AzureRMModules.Keys | ForEach {
149-
$_MinVer = $MinVersion
150-
if(!$MinVersion) {
149+
$_MinVer = $MajorVersion
150+
if(!$MajorVersion) {
151151
$_MinVer = $AzureRMModules[$_]
152152
}
153153
Install-ModuleWithVersionCheck $_ $_MinVer $Repository $Scope -Force:$force
@@ -173,16 +173,16 @@ function Import-AzureRM
173173
param(
174174
[Parameter(Position=0, Mandatory = $false)]
175175
[string]
176-
$MinorVersion)
176+
$MajorVersion )
177177
Write-Output "Importing AzureRM modules."
178178

179179
$AzureRMModules.Keys | ForEach {
180180
$moduleName = $_
181-
$_MinVer = $MinorVersion
182-
if(!MinorVersion) {
181+
$_MinVer = $MajorVersion
182+
if(!MajorVersion ) {
183183
$_MinVer = $AzureRMModules[$_]
184184
}
185-
$_MaxVer = "$($_MinVer.Split(".")[0]).9999.0"
185+
$_MaxVer = "$($_MinVer.Split(".")[0]).9999.9999.9999"
186186

187187
$_MatchedModule = Get-InstalledModule -Name $moduleName -MinimumVersion $_MinVer -MaximumVersion $_MaxVer -ErrorAction Ignore | where {$_.Name -eq $moduleName}
188188
if ($_MatchedModule -ne $null) {

tools/AzureRM/AzureRM.psm1-help.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@
282282
</command:syntax>
283283
<command:parameters>
284284
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="0">
285-
<maml:name>MinVersion</maml:name>
285+
<maml:name>MajorVersion</maml:name>
286286
<maml:description>
287287
<maml:para>Minimum major version for the update.</maml:para>
288288
</maml:description>

0 commit comments

Comments
 (0)