Skip to content

Commit 9aab93b

Browse files
azure-powershell-botazurepowershell
and
azurepowershell
authored
Sync tools folder from main branch to generation branch (#25610)
Co-authored-by: azurepowershell <azurepowershell@ms.com>
1 parent d94a07e commit 9aab93b

File tree

10 files changed

+26
-10
lines changed

10 files changed

+26
-10
lines changed

.azure-pipelines/code-gen.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
pool: pool-windows-2019
2222
steps:
2323
- checkout: self
24-
- template: util/get-github-pat-steps.yml
24+
persistCredentials: true
25+
- template: util/get-github-token-steps.yml
2526
- task: NodeTool@0
2627
displayName: Use Node 14.15.5
2728
inputs:

.azure-pipelines/live-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ variables:
5252
ArtifactsName: LiveTestArtifacts
5353
DataLocation: $(Pipeline.Workspace)/$(ArtifactsName)
5454
SuppressAzurePowerShellBreakingChangeWarnings: true
55+
Codeql.Enabled: false
5556

5657
schedules:
5758
- cron: "0 19 * * *"

.azure-pipelines/util/analyze-steps.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ parameters:
55
IsGenerateBased: ''
66

77
steps:
8-
- template: get-github-pat-steps.yml
98
- template: download-build-steps.yml
109
parameters:
1110
artifactName: build-${{ parameters.testFramework }}
@@ -50,7 +49,6 @@ steps:
5049
custom: msbuild
5150
arguments: 'build.proj /t:GenerateHelp /p:Configuration=${{ parameters.configuration }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
5251
env:
53-
OCTOKITPAT: $(GithubToken)
5452
PowerShellPlatform: ${{ parameters.powerShellPlatform }}
5553

5654
- task: DotNetCoreCLI@2
@@ -60,7 +58,6 @@ steps:
6058
custom: msbuild
6159
arguments: 'build.proj /t:StaticAnalysis /p:Configuration=${{ parameters.configuration }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
6260
env:
63-
OCTOKITPAT: $(GithubToken)
6461
IsGenerateBased: ${{ parameters.IsGenerateBased }}
6562

6663
- template: publish-artifacts-steps.yml

.azure-pipelines/util/build-steps.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ parameters:
44
powerShellPlatform: ''
55

66
steps:
7-
- template: get-github-pat-steps.yml
7+
- checkout: self
8+
persistCredentials: true
9+
- template: get-github-token-steps.yml
810
- task: NodeTool@0
911
condition: eq(variables.IsGenerateBased, true)
1012
displayName: Install Autorest
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
steps:
2+
- task: PowerShell@2
3+
displayName: Get GitHub Token
4+
inputs:
5+
targetType: 'inline'
6+
script: |
7+
$httpConfigs = (git config --get-regexp "http" )
8+
$authConfig = $httpConfigs | Where-Object {$_ -like "*AUTHORIZATION*"}
9+
$token = ($authConfig -split ' ')[-1]
10+
$ghToken = ([System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($token)) -split ':')[1]
11+
Write-Host "##vso[task.setvariable variable=GithubToken;issecret=true]$ghToken"
12+

.azure-pipelines/util/test-steps.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ parameters:
66
powerShellPlatform: ''
77

88
steps:
9-
- template: get-github-pat-steps.yml
109
- template: download-build-steps.yml
1110
parameters:
1211
artifactName: build-${{ parameters.testFramework }}
@@ -31,7 +30,6 @@ steps:
3130
custom: msbuild
3231
arguments: 'build.proj /t:${{ parameters.testTarget }} /p:Configuration=${{ parameters.configuration }};TestFramework=${{ parameters.testFramework }};PullRequestNumber=$(System.PullRequest.PullRequestNumber)'
3332
env:
34-
OCTOKITPAT: $(GithubToken)
3533
PowerShellPlatform: ${{ parameters.powerShellPlatform }}
3634
continueOnError: true
3735

src/lib/netstandard2.0/Azure.Core.dll

-8 Bytes
Binary file not shown.

tools/Common.Netcore.Dependencies.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
2323
</ItemGroup>
2424
<ItemGroup>
25-
<PackageReference Include="Azure.Core" Version="1.40.0"/>
25+
<PackageReference Include="Azure.Core" Version="1.41.0"/>
2626
</ItemGroup>
2727
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
2828
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0">

tools/StaticAnalysis/Exceptions/Az.Resources/SignatureIssues.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,6 @@
8888
"Az.Resources","Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation.SetAzSubscriptionDeploymentStack","Set-AzSubscriptionDeploymentStack","1","8410","Parameter DenySettingsApplyToChildScopes of cmdlet Set-AzSubscriptionDeploymentStack does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
8989
"Az.Resources","Get-AzADOrganization","Get-AzADOrganization","2","8010","Get-AzADOrganization Changes the ConfirmImpact but does not set the SupportsShouldProcess property to true in the cmdlet attribute.","Determine if the cmdlet should implement ShouldProcess and if so determine if it should implement Force / ShouldContinue"
9090
"Az.Resources","Get-AzADOrganization","Get-AzADOrganization","2","8200","Get-AzADOrganization changes the confirm impact. Please ensure that the change in ConfirmImpact is justified","Verify that ConfirmImpact is changed appropriately by the cmdlet. It is very rare for a cmdlet to change the ConfirmImpact."
91+
"Az.Resources","Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation.TestAzManagementGroupDeploymentStack","Test-AzManagementGroupDeploymentStack","1","8410","Parameter DenySettingsApplyToChildScopes of cmdlet Test-AzManagementGroupDeploymentStack does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
92+
"Az.Resources","Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation.TestAzResourceGroupDeploymentStack","Test-AzResourceGroupDeploymentStack","1","8410","Parameter DenySettingsApplyToChildScopes of cmdlet Test-AzResourceGroupDeploymentStack does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."
93+
"Az.Resources","Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation.TestAzSubscriptionDeploymentStack","Test-AzSubscriptionDeploymentStack","1","8410","Parameter DenySettingsApplyToChildScopes of cmdlet Test-AzSubscriptionDeploymentStack does not follow the enforced naming convention of using a singular noun for a parameter name.","Consider using a singular noun for the parameter name."

tools/TestFx/Live/LiveTestUtility.psm1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,11 @@ function Invoke-LiveTestScenario {
302302

303303
do {
304304
try {
305-
$prefs = @([psvariable]::new("ErrorActionPreference", "Stop"))
306305
if ($snrRetryCount -eq $script:ScenarioMaxRetryCount) {
307-
$prefs += [psvariable]::new("DebugPreference", "Continue")
306+
$prefs = @([psvariable]::new("ErrorActionPreference", "Stop"), [psvariable]::new("DebugPreference", "Continue"))
307+
}
308+
else {
309+
$prefs = [psvariable]::new("ErrorActionPreference", "Stop")
308310
}
309311

310312
$ScenarioScript.InvokeWithContext($null, $prefs, $snrResourceGroup)

0 commit comments

Comments
 (0)