Skip to content

Commit 37db2c0

Browse files
bluewwblueww
committed
Merge branch 'main' of https://github.com/Azure/azure-powershell into mergestorage
2 parents 0068e9d + f5f89f2 commit 37db2c0

File tree

2,363 files changed

+262145
-53585
lines changed

Some content is hidden

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

2,363 files changed

+262145
-53585
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: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Variable 'ADOToken' and 'BotAccessToken' was defined in the Variables tab
2+
schedules:
3+
- cron: "50 15 * * *"
4+
displayName: 11:50 PM (UTC + 8:00) China Daily Run
5+
branches:
6+
include:
7+
- main
8+
9+
jobs:
10+
- job: UpdateJson
11+
displayName: Update fabricbot.json
12+
steps:
13+
- pwsh: |
14+
./tools/Github/ParseWiki2Json.ps1 -ADOToken $(ADOToken)
15+
displayName: Update fabricbot.json file locally
16+
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 "65331932+azure-powershell-bot@users.noreply.github.com"
30+
git config --global user.name "azure-powershell-bot"
31+
git checkout -b "internal/sync-fabricbot-json"
32+
33+
git add .
34+
git commit -m "Sync fabricbot.json"
35+
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'))
40+
41+
- pwsh: |
42+
$Title = "Sync fabricbot.json According To ADO Wiki Page"
43+
$HeadBranch = "internal/sync-fabricbot-json"
44+
$BaseBranch = "main"
45+
$Description = "This PR sync taskType: scheduledAndTrigger part of fabricbot.json from table of Service-Team-Label-and-Contact-List in ADO wiki page"
46+
./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(BotAccessToken) -Description $Description
47+
displayName: Create PR to main branch
48+
condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ jobs:
7878
Write-Host "List artifacts..."
7979
Get-ChildItem "$(Pipeline.Workspace)\\LocalRepo\\"
8080
81-
- task: NuGetCommand@2
82-
condition: and(succeeded(), eq('${{ parameters.psVersion }}', '5.1.14'))
83-
displayName: 'Download ThreadJob .nupkg File for PowerShell 5.1.14'
84-
inputs:
85-
command: custom
86-
arguments: 'install ThreadJob -directdownload -packagesavemode nupkg -source https://www.powershellgallery.com/api/v2 -OutputDirectory packages'
87-
8881
- task: NuGetCommand@2
8982
condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
9083
displayName: 'Download Previous Az .nupkg Files'

‎.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/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
-->
2020

2121
## Upcoming Release
22+
* Updated Azure.Core library to 1.28.0.
23+
* Fixed an issue that the helper message about missing modules shows up at the wrong time. [#19228]
2224

2325
## Version 2.11.2
2426
* Supported Web Account Manager on ARM64-based Windows systems. Fixed an issue where `Connect-AzAccount` failed with error "Unable to load DLL 'msalruntime_arm64'". [#20700]

‎src/Accounts/Accounts/Utilities/CommandNotFoundHelper.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ public static void RegisterCommandNotFoundAction(CommandInvocationIntrinsics cii
131131

132132
private static void OnCommandNotFound(object sender, CommandLookupEventArgs args)
133133
{
134-
if (IsAzOrAzureRMCmdlet(args.CommandName))
134+
// The command was dispatched by the msh engine as a result of a dispatch request from an already running command.
135+
// We are not interested in such cases.
136+
if (args.CommandOrigin == CommandOrigin.Runspace && IsAzOrAzureRMCmdlet(args.CommandName))
135137
{
136138
bool isHelpful = true;
137139
if (IsAzureRMCommand(args.CommandName))

‎src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
4242
// todo: add a tool to update assembly versions after replacing the assemblies. (Can it support newly introduced assemblies?)
4343
// todo: consider moving the list to a standalone config file
4444
#region AssemblyList
45-
CreateAssembly("netcoreapp2.1", "Azure.Core", "1.25.0.0").WithPowerShellCore(),
45+
CreateAssembly("netcoreapp2.1", "Azure.Core", "1.28.0.0").WithPowerShellCore(),
4646
CreateAssembly("netcoreapp2.1", "Microsoft.Identity.Client", "4.49.1.0").WithPowerShellCore(),
4747
CreateAssembly("netcoreapp3.1", "Microsoft.Identity.Client.Extensions.Msal", "2.23.0.0").WithPowerShellCore(),
4848

@@ -64,7 +64,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
6464
CreateAssembly("netstandard2.0", "System.ServiceModel.Primitives", "4.7.0.0").WithWindowsPowerShell(),
6565
CreateAssembly("netstandard2.0", "System.Threading.Tasks.Extensions", "4.2.0.1").WithWindowsPowerShell(),
6666

67-
CreateAssembly("netfx", "Azure.Core", "1.25.0.0").WithWindowsPowerShell(),
67+
CreateAssembly("netfx", "Azure.Core", "1.28.0.0").WithWindowsPowerShell(),
6868
CreateAssembly("netfx", "Microsoft.Identity.Client", "4.49.1.0").WithWindowsPowerShell(),
6969
CreateAssembly("netfx", "Microsoft.Identity.Client.Extensions.Msal", "2.23.0.0").WithWindowsPowerShell(),
7070
CreateAssembly("netfx", "Newtonsoft.Json", "12.0.0.0").WithWindowsPowerShell(),

‎src/AlertsManagement/AlertsManagement/help/Get-AzAlertProcessingRule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Azure.PowerShell.Cmdlets.AlertsManagement.dll-Help.xml
33
Module Name: Az.AlertsManagement
4-
online version: https://learn.microsoft.com/powershell/module/az.alertsmanagement/get-azactionrule
4+
online version: https://learn.microsoft.com/powershell/module/az.alertsmanagement/get-azalertprocessingrule
55
schema: 2.0.0
66
---
77

‎src/AlertsManagement/AlertsManagement/help/Remove-AzAlertProcessingRule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Azure.PowerShell.Cmdlets.AlertsManagement.dll-Help.xml
33
Module Name: Az.AlertsManagement
4-
online version: https://learn.microsoft.com/powershell/module/az.alertsmanagement/remove-azactionrule
4+
online version: https://learn.microsoft.com/powershell/module/az.alertsmanagement/remove-azalertprocessingrule
55
schema: 2.0.0
66
---
77

‎src/AlertsManagement/AlertsManagement/help/Set-AzAlertProcessingRule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Azure.PowerShell.Cmdlets.AlertsManagement.dll-Help.xml
33
Module Name: Az.AlertsManagement
4-
online version: https://learn.microsoft.com/powershell/module/az.alertsmanagement/set-azactionrule
4+
online version: https://learn.microsoft.com/powershell/module/az.alertsmanagement/set-azalertprocessingrule
55
schema: 2.0.0
66
---
77

‎src/AlertsManagement/AlertsManagement/help/Update-AzAlertProcessingRule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Azure.PowerShell.Cmdlets.AlertsManagement.dll-Help.xml
33
Module Name: Az.AlertsManagement
4-
online version: https://learn.microsoft.com/powershell/module/az.alertsmanagement/update-azactionrule
4+
online version: https://learn.microsoft.com/powershell/module/az.alertsmanagement/update-azalertprocessingrule
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppCustomDomainObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappcustomdomainobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappcustomdomainobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppDaprMetadataObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappdaprmetadataobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappdaprmetadataobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppEnvironmentVarObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappenvironmentvarobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappenvironmentvarobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppIdentityProviderObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappidentityproviderobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappidentityproviderobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppProbeHeaderObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappprobeheaderobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappprobeheaderobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppProbeObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappprobeobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappprobeobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppRegistryCredentialObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappregistrycredentialobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappregistrycredentialobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppScaleRuleAuthObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappscaleruleauthobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappscaleruleauthobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppScaleRuleObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappscaleruleobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappscaleruleobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppSecretObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappsecretobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappsecretobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppTemplateObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerapptemplateobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerapptemplateobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppTrafficWeightObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerapptrafficweightobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerapptrafficweightobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppVolumeMountObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappvolumemountobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappvolumemountobject
55
schema: 2.0.0
66
---
77

‎src/App/help/New-AzContainerAppVolumeObject.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.App
4-
online version: https://learn.microsoft.com/powershell/module/az./new-azcontainerappvolumeobject
4+
online version: https://learn.microsoft.com/powershell/module/az.app/new-azcontainerappvolumeobject
55
schema: 2.0.0
66
---
77

0 commit comments

Comments
 (0)