Skip to content

Commit 1da8ed7

Browse files
azure-powershell-botazurepowershell
azure-powershell-bot
and
azurepowershell
authored
Sync tools folder from main branch to generation branch (#24736)
Co-authored-by: azurepowershell <[email protected]>
1 parent 945b85c commit 1da8ed7

File tree

17 files changed

+848
-699
lines changed

17 files changed

+848
-699
lines changed

‎.azure-pipelines/live-test.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -180,37 +180,37 @@ stages:
180180
psVersion: ${{ parameters.ps_latest }}
181181
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
182182

183-
- template: util/live-test-steps.yml
184-
parameters:
185-
name: 'ps_7_2_x_macOS'
186-
vmImage: ${{ parameters.os_macos }}
187-
osType: 'MacOS'
188-
psVersion: ${{ parameters.ps_7_2_x }}
189-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
190-
191-
- template: util/live-test-steps.yml
192-
parameters:
193-
name: 'ps_7_3_x_macOS'
194-
vmImage: ${{ parameters.os_macos }}
195-
osType: 'MacOS'
196-
psVersion: ${{ parameters.ps_7_3_x }}
197-
dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
198-
199-
- template: util/live-test-steps.yml
200-
parameters:
201-
name: 'ps_7_4_x_macOS'
202-
vmImage: ${{ parameters.os_macos }}
203-
osType: 'MacOS'
204-
psVersion: ${{ parameters.ps_7_4_x }}
205-
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
206-
207-
- template: util/live-test-steps.yml
208-
parameters:
209-
name: 'ps_latest_macOS'
210-
vmImage: ${{ parameters.os_macos }}
211-
osType: 'MacOS'
212-
psVersion: ${{ parameters.ps_latest }}
213-
dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
183+
# - template: util/live-test-steps.yml
184+
# parameters:
185+
# name: 'ps_7_2_x_macOS'
186+
# vmImage: ${{ parameters.os_macos }}
187+
# osType: 'MacOS'
188+
# psVersion: ${{ parameters.ps_7_2_x }}
189+
# dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
190+
191+
# - template: util/live-test-steps.yml
192+
# parameters:
193+
# name: 'ps_7_3_x_macOS'
194+
# vmImage: ${{ parameters.os_macos }}
195+
# osType: 'MacOS'
196+
# psVersion: ${{ parameters.ps_7_3_x }}
197+
# dotnetVersion: ${{ parameters.dotnet_sdk_7 }}
198+
199+
# - template: util/live-test-steps.yml
200+
# parameters:
201+
# name: 'ps_7_4_x_macOS'
202+
# vmImage: ${{ parameters.os_macos }}
203+
# osType: 'MacOS'
204+
# psVersion: ${{ parameters.ps_7_4_x }}
205+
# dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
206+
207+
# - template: util/live-test-steps.yml
208+
# parameters:
209+
# name: 'ps_latest_macOS'
210+
# vmImage: ${{ parameters.os_macos }}
211+
# osType: 'MacOS'
212+
# psVersion: ${{ parameters.ps_latest }}
213+
# dotnetVersion: ${{ parameters.dotnet_sdk_8 }}
214214

215215
- stage: Report
216216
displayName: Send Report

‎.azure-pipelines/release-test.yml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -136,42 +136,42 @@ jobs:
136136
psVersion: ${{ parameters.preview_ps }}
137137
netCoreVersion: ${{ parameters.netCoreVersion_8 }}
138138

139-
- template: util/smoke-test-steps.yml
140-
parameters:
141-
name: 'MacOS_PS7_2_X_SmokeTest'
142-
agentPoolName: ${{ variables.macOsAgentPoolName }}
143-
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
144-
psVersion: ${{ parameters.ps7_2 }}
145-
netCoreVersion: ${{ parameters.netCoreVersion }}
146-
147-
- template: util/smoke-test-steps.yml
148-
parameters:
149-
name: 'MacOS_PS7_3_X_SmokeTest'
150-
agentPoolName: ${{ variables.macOsAgentPoolName }}
151-
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
152-
psVersion: ${{ parameters.ps7_3 }}
153-
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
154-
155-
- template: util/smoke-test-steps.yml
156-
parameters:
157-
name: 'MacOS_PS7_4_X_SmokeTest'
158-
agentPoolName: ${{ variables.macOsAgentPoolName }}
159-
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
160-
psVersion: ${{ parameters.ps7_4 }}
161-
netCoreVersion: ${{ parameters.netCoreVersion_8 }}
162-
163-
- template: util/smoke-test-steps.yml
164-
parameters:
165-
name: 'MacOS_Latest_PS_SmokeTest'
166-
agentPoolName: ${{ variables.macOsAgentPoolName }}
167-
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
168-
psVersion: ${{ parameters.latest_ps }}
169-
netCoreVersion: ${{ parameters.netCoreVersion_8 }}
170-
171-
- template: util/smoke-test-steps.yml
172-
parameters:
173-
name: 'MacOS_Preview_PS_SmokeTest'
174-
agentPoolName: ${{ variables.macOsAgentPoolName }}
175-
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
176-
psVersion: ${{ parameters.preview_ps }}
177-
netCoreVersion: ${{ parameters.netCoreVersion_8 }}
139+
# - template: util/smoke-test-steps.yml
140+
# parameters:
141+
# name: 'MacOS_PS7_2_X_SmokeTest'
142+
# agentPoolName: ${{ variables.macOsAgentPoolName }}
143+
# agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
144+
# psVersion: ${{ parameters.ps7_2 }}
145+
# netCoreVersion: ${{ parameters.netCoreVersion }}
146+
147+
# - template: util/smoke-test-steps.yml
148+
# parameters:
149+
# name: 'MacOS_PS7_3_X_SmokeTest'
150+
# agentPoolName: ${{ variables.macOsAgentPoolName }}
151+
# agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
152+
# psVersion: ${{ parameters.ps7_3 }}
153+
# netCoreVersion: ${{ parameters.netCoreVersion_7 }}
154+
155+
# - template: util/smoke-test-steps.yml
156+
# parameters:
157+
# name: 'MacOS_PS7_4_X_SmokeTest'
158+
# agentPoolName: ${{ variables.macOsAgentPoolName }}
159+
# agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
160+
# psVersion: ${{ parameters.ps7_4 }}
161+
# netCoreVersion: ${{ parameters.netCoreVersion_8 }}
162+
163+
# - template: util/smoke-test-steps.yml
164+
# parameters:
165+
# name: 'MacOS_Latest_PS_SmokeTest'
166+
# agentPoolName: ${{ variables.macOsAgentPoolName }}
167+
# agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
168+
# psVersion: ${{ parameters.latest_ps }}
169+
# netCoreVersion: ${{ parameters.netCoreVersion_8 }}
170+
171+
# - template: util/smoke-test-steps.yml
172+
# parameters:
173+
# name: 'MacOS_Preview_PS_SmokeTest'
174+
# agentPoolName: ${{ variables.macOsAgentPoolName }}
175+
# agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
176+
# psVersion: ${{ parameters.preview_ps }}
177+
# netCoreVersion: ${{ parameters.netCoreVersion_8 }}

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
## Mandatory Checklist
88

9-
- Please choose the target release of Azure PowerShell
9+
- Please choose the target release of Azure PowerShell. (⚠️**Target release** is a different concept from **API readiness**. Please click below links for details.)
1010
- [ ] [General release](../blob/main/CONTRIBUTING.md#target-release-types)
1111
- [ ] [Public preview](../blob/main/CONTRIBUTING.md#target-release-types)
1212
- [ ] [Private preview](../blob/main/CONTRIBUTING.md#target-release-types)
1313
- [ ] [Engineering build](../blob/main/CONTRIBUTING.md#target-release-types)
14-
- [ ] N/A
14+
- [ ] No need for a release
1515

1616
- [ ] Check this box to confirm: **I have read the [_Submitting Changes_](../blob/main/CONTRIBUTING.md#submitting-changes) section of [`CONTRIBUTING.md`](../blob/main/CONTRIBUTING.md) and reviewed the following information:**
1717

‎tools/BreakingChanges/GenerateMigrationExcel.ps1‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,55 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15+
# The generated excel will contains one sheet. The title is:
16+
# ModuleName, CmdletName, Description, Before, After, TeamMember, PR
17+
18+
# .\tools\BreakingChanges\GenerateMigrationExcel.ps1 -ExcelPath (Join-Path $env:USERPROFILE "Documents" "2024-05-21-Az-12.0-Breaking-Change-Migration-Guide.xlsx")
19+
1520
#Requires -Modules PSExcel
1621
[CmdletBinding()]
1722
Param(
1823
[Parameter()]
1924
[string]$ExcelPath
2025
)
21-
$ExcelPath = Resolve-Path -Path $ExcelPath
2226
If (Test-Path $ExcelPath) {
2327
Remove-Item $ExcelPath
2428
}
2529
$Path = [System.IO.Path]::Combine($PSScriptRoot, '..', '..')
2630
Set-Location -Path $Path
27-
Get-ChildItem -Path .\tools\StaticAnalysis\Exceptions\ -Filter BreakingChangeIssues.csv -Recurse
28-
dotnet msbuild /t:Clean
29-
dotnet msbuild /t:Build
30-
dotnet msbuild /t:StaticAnalysis
31-
$BreakingChangeItems = Import-Csv .\artifacts\StaticAnalysisResults\BreakingChangeIssues.csv
32-
$TotalTable = @{}
33-
foreach ($BreakingChangeItem in $BreakingChangeItems) {
34-
$ModuleName = 'Az' + $BreakingChangeItem.AssemblyFileName.Replace("Microsoft.Azure.PowerShell.Cmdlets", "").Replace('.dll', '')
35-
$CmdletName = $BreakingChangeItem.Target
36-
$Description = $BreakingChangeItem.Description
37-
if (-not $TotalTable.ContainsKey($ModuleName)) {
38-
$TotalTable.Add($ModuleName, @{})
39-
}
40-
if (-not $TotalTable[$ModuleName].ContainsKey($CmdletName)) {
41-
$TotalTable[$ModuleName].Add($CmdletName, "")
42-
}
43-
$TotalTable[$ModuleName][$CmdletName] = $TotalTable[$ModuleName][$CmdletName] + "$Description`n"
44-
}
31+
# dotnet msbuild /t:Clean
32+
# dotnet msbuild /t:Build
33+
# dotnet msbuild /t:StaticAnalysis
4534

35+
Import-Module (Join-Path $PSScriptRoot "Get-BreakingChangeMetadata.ps1") -Force
36+
$ArtifactsPath = [System.IO.Path]::Combine($Path, "artifacts", "Debug")
37+
38+
$AllModuleList = Get-ChildItem -Path $ArtifactsPath -Filter Az.* | ForEach-Object { $_.Name }
4639
$Data = New-Object System.Collections.ArrayList
47-
foreach ($ModuleName in $TotalTable.Keys) {
48-
foreach ($CmdletName in $TotalTable[$ModuleName].Keys) {
49-
$Tmp = New-Object -TypeName PSObject -Property @{
40+
ForEach ($ModuleName In $AllModuleList)
41+
{
42+
Write-Host "Processing Module: $ModuleName"
43+
$ModuleBreakingChangeInfo = Get-BreakingChangeMetadata -ArtifactsPath $ArtifactsPath -ModuleName $ModuleName
44+
If ($ModuleBreakingChangeInfo.Count -eq 0)
45+
{
46+
Continue
47+
}
48+
49+
ForEach ($CmdletName In ($ModuleBreakingChangeInfo.Keys | Sort-Object))
50+
{
51+
Write-Host "Processing Cmdlet: $ModuleName - $CmdletName"
52+
$NewRow = New-Object -TypeName PSObject -Property @{
5053
ModuleName = $ModuleName
5154
CmdletName = $CmdletName
52-
Description = $TotalTable[$ModuleName][$CmdletName]
55+
Description = Export-BreakingChangeMessageOfCmdlet $ModuleBreakingChangeInfo[$CmdletName]
5356
Before = $Null
5457
After = $Null
5558
TeamMember = $Null
5659
PR = $Null
57-
} | Select ModuleName, CmdletName, Description, Before, After, TeamMember, PR
58-
$Null = $Data.Add($Tmp)
60+
} | Select-Object ModuleName, CmdletName, Description, Before, After, TeamMember, PR
61+
$Null = $Data.Add($NewRow)
5962
}
6063
}
64+
6165
$Data | Export-XLSX -Path $ExcelPath
6266
Write-Host "Excel is generated at $ExcelPath. Please goto edit it."

0 commit comments

Comments
 (0)