Skip to content

Commit 0bee92a

Browse files
authored
Merge branch 'main' into copilot/fix-pwsh-exe-filename-warning
2 parents d9001ad + 39fa559 commit 0bee92a

55 files changed

Lines changed: 269 additions & 114 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/AiIssueTriager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
contents: read
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
15+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1616

1717
- name: Setup Node.js
1818
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0

.github/workflows/CI.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
egress-policy: audit
3636

37-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
37+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3838

3939
- name: Run AL-Go Actions Tests (${{ matrix.psVersion }})
4040
run: |

.github/workflows/CleanupTempRepos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
exit 1
3939
}
4040
41-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
41+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4242

4343
- name: Get GitHub Owner
4444
id: getGitHubOwner

.github/workflows/Deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
}
153153
}
154154
155-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
155+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
156156

157157
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
158158
id: app-token

.github/workflows/E2E.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
with:
6363
egress-policy: audit
6464

65-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
65+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6666

6767
- name: Check secrets
6868
id: check
@@ -124,7 +124,7 @@ jobs:
124124
with:
125125
egress-policy: audit
126126

127-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
127+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
128128
with:
129129
ref: ${{ github.event.inputs.ref }}
130130

@@ -159,7 +159,7 @@ jobs:
159159
with:
160160
egress-policy: audit
161161

162-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
162+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
163163
with:
164164
ref: ${{ github.event.inputs.ref }}
165165

@@ -285,7 +285,7 @@ jobs:
285285
with:
286286
egress-policy: audit
287287

288-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
288+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
289289
with:
290290
ref: ${{ github.event.inputs.ref }}
291291

@@ -322,7 +322,7 @@ jobs:
322322
with:
323323
egress-policy: audit
324324

325-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
325+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
326326
with:
327327
ref: ${{ github.event.inputs.ref }}
328328

@@ -359,7 +359,7 @@ jobs:
359359
with:
360360
egress-policy: audit
361361

362-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
362+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
363363
with:
364364
ref: ${{ github.event.inputs.ref }}
365365

@@ -408,7 +408,7 @@ jobs:
408408
with:
409409
egress-policy: audit
410410

411-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
411+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
412412
with:
413413
ref: ${{ github.event.inputs.ref }}
414414

@@ -457,7 +457,7 @@ jobs:
457457
with:
458458
egress-policy: audit
459459

460-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
460+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
461461
with:
462462
ref: ${{ github.event.inputs.ref }}
463463

.github/workflows/powershell.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
egress-policy: audit
2828

29-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
29+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3030

3131
- name: Run PSScriptAnalyzer
3232
uses: ./Actions/RunPSScriptAnalyzer

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
egress-policy: audit
2121

22-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
22+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2323
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2424
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
2525
with:

.github/workflows/scorecard-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
egress-policy: audit
2525

2626
- name: "Checkout code"
27-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
27+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2828
with:
2929
persist-credentials: false
3030

Actions/AL-Go-Helper.ps1

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -450,13 +450,18 @@ function GetBcContainerHelperPath([string] $bcContainerHelperVersion) {
450450
$tempName = Join-Path (GetTemporaryPath) ([Guid]::NewGuid().ToString())
451451
Write-Host "Downloading BcContainerHelper developer version from $bcContainerHelperVersion"
452452
try {
453-
$webclient.DownloadFile($bcContainerHelperVersion, "$tempName.zip")
453+
Invoke-CommandWithRetry -ScriptBlock {
454+
$webclient.DownloadFile($bcContainerHelperVersion, "$tempName.zip")
455+
} -RetryCount 3 -FirstDelay 5 -MaxWaitBetweenRetries 30
454456
}
455457
catch {
456458
$tempName = Join-Path $bcContainerHelperRootFolder ([Guid]::NewGuid().ToString())
457459
$bcContainerHelperVersion = "preview"
458460
Write-Host "Download failed, downloading BcContainerHelper $bcContainerHelperVersion version from Blob Storage"
459-
$webclient.DownloadFile("https://bccontainerhelper-addgd5gzaxf9fneh.b02.azurefd.net/public/$($bcContainerHelperVersion).zip", "$tempName.zip")
461+
$bcContainerHelperDownloadUrl = "https://bccontainerhelper-addgd5gzaxf9fneh.b02.azurefd.net/public/$($bcContainerHelperVersion).zip"
462+
Invoke-CommandWithRetry -ScriptBlock {
463+
$webclient.DownloadFile($bcContainerHelperDownloadUrl, "$tempName.zip")
464+
} -RetryCount 3 -FirstDelay 5 -MaxWaitBetweenRetries 30
460465
}
461466
}
462467
else {
@@ -466,7 +471,10 @@ function GetBcContainerHelperPath([string] $bcContainerHelperVersion) {
466471
$bcContainerHelperVersion = 'preview'
467472
}
468473
Write-Host "Downloading BcContainerHelper $bcContainerHelperVersion version from Blob Storage"
469-
$webclient.DownloadFile("https://bccontainerhelper-addgd5gzaxf9fneh.b02.azurefd.net/public/$($bcContainerHelperVersion).zip", "$tempName.zip")
474+
$bcContainerHelperDownloadUrl = "https://bccontainerhelper-addgd5gzaxf9fneh.b02.azurefd.net/public/$($bcContainerHelperVersion).zip"
475+
Invoke-CommandWithRetry -ScriptBlock {
476+
$webclient.DownloadFile($bcContainerHelperDownloadUrl, "$tempName.zip")
477+
} -RetryCount 3 -FirstDelay 5 -MaxWaitBetweenRetries 30
470478
}
471479
Expand-7zipArchive -Path "$tempName.zip" -DestinationPath $tempName
472480
$bcContainerHelperPath = (Get-Item -Path (Join-Path $tempName "*\BcContainerHelper.ps1")).FullName

Actions/CreateApp/CreateApp.ps1

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,13 @@ try {
5959
$sampleApp = (Get-Item -Path $sampleApp).FullName
6060
}
6161
else {
62-
$sampleApp = Join-Path $folders[1] "Applications\testframework\performancetoolkit\Microsoft_Performance Toolkit Samples.app"
62+
# Narrow the search to the Applications subdirectory if present, to avoid traversing the entire artifact tree
63+
$searchRoot = Get-ChildItem -Path $folders[1] -Directory -ErrorAction SilentlyContinue | Where-Object { $_.Name -ieq 'Applications' } | Select-Object -First 1 -ExpandProperty FullName
64+
if (!$searchRoot) { $searchRoot = $folders[1] }
65+
$sampleApp = Get-ChildItem -Path $searchRoot -Filter "Microsoft_Performance Toolkit Samples.app" -File -Recurse -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty FullName
6366
}
64-
if (!(Test-Path -Path $sampleApp)) {
65-
throw "Could not locate sample app for the Business Central version"
67+
if (!$sampleApp -or !(Test-Path -Path $sampleApp)) {
68+
throw "Could not locate 'Microsoft_Performance Toolkit Samples.app' under '$($folders[1])'"
6669
}
6770

6871
Extract-AppFileToFolder -appFilename $sampleApp -generateAppJson -appFolder $tmpFolder

0 commit comments

Comments
 (0)