Skip to content

Commit ab469ee

Browse files
bluewwblueww
committed
Merge branch 'main' of https://github.com/Azure/azure-powershell into mergestorage
2 parents bec02c6 + 919880f commit ab469ee

File tree

1,708 files changed

+145136
-52517
lines changed

Some content is hidden

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

1,708 files changed

+145136
-52517
lines changed

‎.azure-pipelines/SyncDocsConfig.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"SyncPath": [
3+
"documentation/breaking-changes/upcoming-breaking-changes.md"
4+
],
5+
"UnSyncPath": [
6+
]
7+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ parameters:
1414
- name: ps7_2
1515
displayName: PowerShell 7.2.x Version
1616
type: string
17-
default: 7.2.*
17+
default: 7.2.8
1818
- name: ps7_3
1919
displayName: PowerShell 7.3.x Version
2020
type: string
@@ -198,4 +198,4 @@ jobs:
198198
agentPoolName: ${{ variables.macOsAgentPoolName }}
199199
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
200200
psVersion: ${{ parameters.preview_ps }}
201-
netCoreVersion: ${{ parameters.netCoreVersion_7 }}
201+
netCoreVersion: ${{ parameters.netCoreVersion_7 }}

‎.azure-pipelines/sync-MSdoc.yml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
resources:
2+
repositories:
3+
- repository: self
4+
type: git
5+
ref: main
6+
7+
trigger:
8+
branches:
9+
include:
10+
- main
11+
paths:
12+
include:
13+
- documentation\breaking-changes\upcoming-breaking-changes.md
14+
15+
variables:
16+
TargetedRepo: azure-docs-powershell
17+
TargetedBranchName: sync-upcoming-breaking-changes
18+
GithubToken: $(GITHUB_TOKEN)
19+
20+
jobs:
21+
- job: Sync
22+
displayName: Sync task
23+
condition: succeeded()
24+
strategy:
25+
matrix:
26+
Generation:
27+
BranchName: ${{ variables.TargetedBranchName }}
28+
29+
steps:
30+
- task: PowerShell@2
31+
displayName: Sync branch
32+
inputs:
33+
targetType: inline
34+
script: >-
35+
./tools/SyncDocsToMicrosoftDocsOrg.ps1 -BranchName $(BranchName) -GithubToken $(GithubToken)
36+
pwsh: true
37+
38+
- pwsh: |
39+
$Title = "Sync upcoming breaking changes docs from Azure/azure-powershell repo"
40+
$HeadBranch = "$(BranchName)"
41+
$BaseBranch = "main"
42+
$Description = "Sync latest upcoming breaking changes doc from Azure/azure-powershell repo."
43+
$Headers = @{"Accept" = "application/vnd.github+json"; "Authorization" = "Bearer $(GithubToken)"}
44+
$PrBody = @"
45+
<!-- DO NOT DELETE THIS TEMPLATE -->
46+
47+
## Description
48+
$Description
49+
50+
<!-- Please add a brief description of the changes made in this PR. If you have an ongoing or finished cmdlet design, please paste the link below. -->
51+
"@
52+
$RequestBody = @{"title" = $Title; "body" = $PrBody; "head" = $HeadBranch; "base" = $BaseBranch }
53+
Invoke-WebRequest -Uri https://api.github.com/repos/MicrosoftDocs/azure-docs-powershell/pulls -method POST -Headers $Headers -Body ($RequestBody | ConvertTo-Json)
54+
55+
continueOnError: true
56+
displayName: Create PR to main branch

‎.azure-pipelines/sync-aliases.yml‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,29 @@ jobs:
1414
./tools/Github/ParseWiki2Json.ps1 -ADOToken $(ADOToken)
1515
displayName: Update fabricbot.json file locally
1616
17-
- task: PowerShell@2
18-
displayName: Git commit and push
19-
inputs:
20-
targetType: inline
21-
script: |
22-
git config --global user.email "[email protected]"
23-
git config --global user.name "azure-powershell-bot"
24-
git checkout -b "internal/sync-fabricbot-json"
17+
- pwsh: |
18+
$gitStatus = git status -s
19+
if (-not $gitStatus) {
20+
Write-Host "The wiki has no changes ."
21+
Write-Host "##vso[task.setvariable variable=ChangesDetected]false"
22+
} else {
23+
Write-Host "There are changes in the repository."
24+
Write-Host "##vso[task.setvariable variable=ChangesDetected]true"
25+
}
26+
displayName: Check if Wiki table has any changes
27+
28+
- pwsh: |
29+
git config --global user.email "[email protected]"
30+
git config --global user.name "azure-powershell-bot"
31+
git checkout -b "internal/sync-fabricbot-json"
2532
26-
git add .
27-
git commit -m "Sync fabricbot.json"
33+
git add .
34+
git commit -m "Sync fabricbot.json"
2835
29-
git remote set-url origin https://$(BotAccessToken)@github.com/Azure/azure-powershell.git;
30-
git push origin internal/sync-fabricbot-json --force
36+
git remote set-url origin https://azure-powershell-bot:$(BotAccessToken)@github.com/Azure/azure-powershell.git;
37+
git push origin internal/sync-fabricbot-json --force
38+
displayName: Git commit and push
39+
condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))
3140
3241
- pwsh: |
3342
$Title = "Sync fabricbot.json According To ADO Wiki Page"
@@ -36,4 +45,4 @@ jobs:
3645
$Description = "This PR sync taskType: scheduledAndTrigger part of fabricbot.json from table of Service-Team-Label-and-Contact-List in ADO wiki page"
3746
./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(BotAccessToken) -Description $Description
3847
displayName: Create PR to main branch
39-
48+
condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))

‎.ci-config.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@
114114
"signature:module",
115115
"test:dependence-module",
116116
"file-change:module",
117-
"ux:module"
117+
"ux:module",
118+
"cmdlet-diff:module"
118119
]
119120
},
120121
{

‎.github/fabricbot.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@
10641064
],
10651065
"mentionees": [
10661066
"mojayara",
1067-
"Prasanna-Padmanabhan"
1067+
"jportugal0"
10681068
]
10691069
},
10701070
{
@@ -2231,7 +2231,7 @@
22312231
"Migrate"
22322232
],
22332233
"mentionees": [
2234-
"shijojoy"
2234+
"prsadhu-ms-idc"
22352235
]
22362236
},
22372237
{

‎build.proj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@
236236
<MakeDir Directories="$(StaticAnalysisOutputDirectory)" />
237237

238238
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;Set-Variable -Name ProgressPreference -Value 'SilentlyContinue';. $(RepoTools)/GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration)&quot;" />
239-
<Exec Command="dotnet $(RepoArtifacts)StaticAnalysis/StaticAnalysis.Netcore.dll -p $(RepoArtifacts)$(Configuration) -r $(StaticAnalysisOutputDirectory) --analyzers help -h -u -m '@(ModulesChanged)'" Condition="'$(RunStaticAnalysis)' == 'true'" />
240239
</Target>
241240

242241
<!-- Everything except Publish -->

‎src/ADDomainServices/help/New-AzADDomainServiceForestTrustObject.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file:
33
Module Name: Az.ADDomainServices
4-
online version: https://learn.microsoft.com/powershell/module/az.ADDomainService/new-AzADDomainServiceForestTrustObject
4+
online version: https://learn.microsoft.com/powershell/module/az.addomainservices/new-azaddomainserviceforesttrustobject
55
schema: 2.0.0
66
---
77

‎src/ADDomainServices/help/New-AzADDomainServiceReplicaSetObject.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file:
33
Module Name: Az.ADDomainServices
4-
online version: https://learn.microsoft.com/powershell/module/az.ADDomainService/new-AzADDomainServiceReplicaSetObject
4+
online version: https://learn.microsoft.com/powershell/module/az.addomainservices/new-azaddomainservicereplicasetobject
55
schema: 2.0.0
66
---
77

‎src/Accounts/Accounts/Utilities/CommandMappings.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4316,6 +4316,7 @@
43164316
"Remove-AzNetworkManagerManagementGroupConnection": {},
43174317
"Set-AzNetworkManagerManagementGroupConnection": {},
43184318
"Get-AzFirewallLearnedIpPrefix": {},
4319+
"New-AzFirewallPolicySnat": {},
43194320
"List-AzApplicationGatewayAvailableWafRuleSets": {},
43204321
"List-AzApplicationGatewayAvailableSslOptions": {},
43214322
"List-AzApplicationGatewaySslPredefinedPolicy": {},
@@ -4535,7 +4536,11 @@
45354536
"Start-AzPolicyRemediation": {},
45364537
"Stop-AzPolicyRemediation": {},
45374538
"Get-AzPolicyMetadata": {},
4538-
"Start-AzPolicyComplianceScan": {}
4539+
"Start-AzPolicyComplianceScan": {},
4540+
"New-AzPolicyAttestation": {},
4541+
"Get-AzPolicyAttestation": {},
4542+
"Set-AzPolicyAttestation": {},
4543+
"Remove-AzPolicyAttestation": {}
45394544
},
45404545
"Az.Portal": {
45414546
"Get-AzPortalDashboard": {},
@@ -5577,6 +5582,7 @@
55775582
"Get-AzServiceLinkerConfigurationForContainerApp": {},
55785583
"Get-AzServiceLinkerConfigurationForSpringCloud": {},
55795584
"Get-AzServiceLinkerConfigurationForWebApp": {},
5585+
"Get-AzServiceLinkerConfigurationName": {},
55805586
"Get-AzServiceLinkerForContainerApp": {},
55815587
"Get-AzServiceLinkerForSpringCloud": {},
55825588
"Get-AzServiceLinkerForWebApp": {},
@@ -5591,7 +5597,7 @@
55915597
"New-AzServiceLinkerSystemAssignedIdentityAuthInfoObject": {},
55925598
"New-AzServiceLinkerUserAssignedIdentityAuthInfoObject": {},
55935599
"Remove-AzServiceLinkerForContainerApp": {},
5594-
"Remove-AzServiceLinkerForSpringcloud": {},
5600+
"Remove-AzServiceLinkerForSpringCloud": {},
55955601
"Remove-AzServiceLinkerForWebApp": {},
55965602
"Test-AzServiceLinkerForContainerApp": {},
55975603
"Test-AzServiceLinkerForSpringCloud": {},

0 commit comments

Comments
 (0)