@@ -18,10 +18,7 @@ Param(
18
18
[string ]$ModuleName ,
19
19
20
20
[Parameter ()]
21
- [string ]$GalleryName = " PSGallery" ,
22
-
23
- [Parameter ()]
24
- [switch ]$SkipAzInstall
21
+ [string ]$GalleryName = " PSGallery"
25
22
)
26
23
27
24
enum PSVersion
@@ -193,7 +190,7 @@ function Get-ExistSerializedCmdletJsonFile
193
190
function Bump-AzVersion
194
191
{
195
192
Write-Host " Getting local Az information..." - ForegroundColor Yellow
196
- $localAz = Test-ModuleManifest - Path " $PSScriptRoot \Az\Az.psd1"
193
+ $localAz = Import-PowerShellDataFile - Path " $PSScriptRoot \Az\Az.psd1" - SkipLimitCheck
197
194
198
195
Write-Host " Getting gallery Az information..." - ForegroundColor Yellow
199
196
$galleryAz = Find-Module - Name Az - Repository $GalleryName
@@ -202,15 +199,15 @@ function Bump-AzVersion
202
199
$updatedModules = @ ()
203
200
foreach ($localDependency in $localAz.RequiredModules )
204
201
{
205
- $galleryDependency = $galleryAz.Dependencies | where { $_.Name -eq $localDependency.Name }
206
- if ($galleryDependency -eq $null )
202
+ $galleryDependency = $galleryAz.Dependencies | where { $_.Name -eq $localDependency.ModuleName }
203
+ if ($null -eq $galleryDependency )
207
204
{
208
- $updatedModules += $localDependency.Name
205
+ $updatedModules += $localDependency.ModuleName
209
206
if ($versionBump -ne [PSVersion ]::MAJOR)
210
207
{
211
208
$versionBump = [PSVersion ]::MINOR
212
209
}
213
- Write-Host " Found new added module $ ( $localDependency.Name ) "
210
+ Write-Host " Found new added module $ ( $localDependency.ModuleName ) "
214
211
continue
215
212
}
216
213
@@ -219,12 +216,19 @@ function Bump-AzVersion
219
216
{
220
217
$galleryVersion = $galleryDependency.MinimumVersion
221
218
}
222
- $localVersion = $localDependency.Version.ToString ()
219
+
220
+ $localVersion = $localDependency.RequiredVersion
221
+ # Az.Accounts uses ModuleVersion to annote Version
222
+ if ([string ]::IsNullOrEmpty($localVersion ))
223
+ {
224
+ $localVersion = $localDependency.ModuleVersion
225
+ }
226
+
223
227
if ($galleryVersion.ToString () -ne $localVersion )
224
228
{
225
- $updatedModules += $galleryDependency .Name
229
+ $updatedModules += $localDependency .ModuleName
226
230
$currBump = Get-VersionBump - GalleryVersion $galleryVersion.ToString () - LocalVersion $localVersion
227
- Write-Host " Found $currBump version bump for $ ( $localDependency.NAME ) "
231
+ Write-Host " Found $currBump version bump for $ ( $localDependency.ModuleName ) "
228
232
if ($currBump -eq [PSVersion ]::MAJOR)
229
233
{
230
234
$versionBump = [PSVersion ]::MAJOR
@@ -246,7 +250,7 @@ function Bump-AzVersion
246
250
return
247
251
}
248
252
249
- $newVersion = Get-BumpedVersion - Version $localAz.Version - VersionBump $versionBump
253
+ $newVersion = Get-BumpedVersion - Version $localAz.ModuleVersion - VersionBump $versionBump
250
254
251
255
Write-Host " New version of Az: $newVersion " - ForegroundColor Green
252
256
@@ -277,7 +281,7 @@ function Bump-AzVersion
277
281
return $versionBump
278
282
}
279
283
280
- function Generate -AzPreview
284
+ function Update -AzPreview
281
285
{
282
286
# The version of AzPrview aligns with Az
283
287
$AzPrviewVersion = (Import-PowerShellDataFile " $PSScriptRoot \Az\Az.psd1" ).ModuleVersion
@@ -407,18 +411,7 @@ switch ($PSCmdlet.ParameterSetName)
407
411
Write-Host " Module ${ModuleName} is not GA yet. The json file: ${JsonFile} is for reference"
408
412
}
409
413
}
410
- try
411
- {
412
- if (! $SkipAzInstall.IsPresent )
413
- {
414
- Install-Module Az - Repository $GalleryName - Force - AllowClobber
415
- }
416
- }
417
- catch
418
- {
419
- throw " Please rerun in Administrator mode."
420
- }
421
-
414
+
422
415
Write-Host executing dotnet $PSScriptRoot / ../ artifacts/ VersionController/ VersionController.Netcore.dll
423
416
dotnet $PSScriptRoot / ../ artifacts/ VersionController/ VersionController.Netcore.dll
424
417
@@ -435,7 +428,7 @@ switch ($PSCmdlet.ParameterSetName)
435
428
436
429
# Each release needs to update AzPreview.psd1 and dotnet csv
437
430
# Refresh AzPreview.psd1
438
- Generate - AzPreview
431
+ Update -AzPreview
439
432
440
433
New-CommandMappingFile
441
434
0 commit comments