Skip to content

Commit b4097f8

Browse files
authored
Remove the step of installing Az (#19393)
1 parent 510187c commit b4097f8

File tree

1 file changed

+20
-27
lines changed

1 file changed

+20
-27
lines changed

tools/RunVersionController.ps1

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ Param(
1818
[string]$ModuleName,
1919

2020
[Parameter()]
21-
[string]$GalleryName = "PSGallery",
22-
23-
[Parameter()]
24-
[switch]$SkipAzInstall
21+
[string]$GalleryName = "PSGallery"
2522
)
2623

2724
enum PSVersion
@@ -193,7 +190,7 @@ function Get-ExistSerializedCmdletJsonFile
193190
function Bump-AzVersion
194191
{
195192
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
197194

198195
Write-Host "Getting gallery Az information..." -ForegroundColor Yellow
199196
$galleryAz = Find-Module -Name Az -Repository $GalleryName
@@ -202,15 +199,15 @@ function Bump-AzVersion
202199
$updatedModules = @()
203200
foreach ($localDependency in $localAz.RequiredModules)
204201
{
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)
207204
{
208-
$updatedModules += $localDependency.Name
205+
$updatedModules += $localDependency.ModuleName
209206
if ($versionBump -ne [PSVersion]::MAJOR)
210207
{
211208
$versionBump = [PSVersion]::MINOR
212209
}
213-
Write-Host "Found new added module $($localDependency.Name)"
210+
Write-Host "Found new added module $($localDependency.ModuleName)"
214211
continue
215212
}
216213

@@ -219,12 +216,19 @@ function Bump-AzVersion
219216
{
220217
$galleryVersion = $galleryDependency.MinimumVersion
221218
}
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+
223227
if ($galleryVersion.ToString() -ne $localVersion)
224228
{
225-
$updatedModules += $galleryDependency.Name
229+
$updatedModules += $localDependency.ModuleName
226230
$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)"
228232
if ($currBump -eq [PSVersion]::MAJOR)
229233
{
230234
$versionBump = [PSVersion]::MAJOR
@@ -246,7 +250,7 @@ function Bump-AzVersion
246250
return
247251
}
248252

249-
$newVersion = Get-BumpedVersion -Version $localAz.Version -VersionBump $versionBump
253+
$newVersion = Get-BumpedVersion -Version $localAz.ModuleVersion -VersionBump $versionBump
250254

251255
Write-Host "New version of Az: $newVersion" -ForegroundColor Green
252256

@@ -277,7 +281,7 @@ function Bump-AzVersion
277281
return $versionBump
278282
}
279283

280-
function Generate-AzPreview
284+
function Update-AzPreview
281285
{
282286
# The version of AzPrview aligns with Az
283287
$AzPrviewVersion = (Import-PowerShellDataFile "$PSScriptRoot\Az\Az.psd1").ModuleVersion
@@ -407,18 +411,7 @@ switch ($PSCmdlet.ParameterSetName)
407411
Write-Host "Module ${ModuleName} is not GA yet. The json file: ${JsonFile} is for reference"
408412
}
409413
}
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+
422415
Write-Host executing dotnet $PSScriptRoot/../artifacts/VersionController/VersionController.Netcore.dll
423416
dotnet $PSScriptRoot/../artifacts/VersionController/VersionController.Netcore.dll
424417

@@ -435,7 +428,7 @@ switch ($PSCmdlet.ParameterSetName)
435428

436429
# Each release needs to update AzPreview.psd1 and dotnet csv
437430
# Refresh AzPreview.psd1
438-
Generate-AzPreview
431+
Update-AzPreview
439432

440433
New-CommandMappingFile
441434

0 commit comments

Comments
 (0)