Skip to content

Commit 75e17f6

Browse files
VeryEarlyVeryEarly
committed
Merge remote-tracking branch 'origin/main' into yabo/Az.Storage-preview
2 parents 3d77074 + 2a8637b commit 75e17f6

File tree

609 files changed

+7152
-12326
lines changed

Some content is hidden

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

609 files changed

+7152
-12326
lines changed

‎.azure-pipelines/azure-powershell-ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ variables:
4040

4141
trigger:
4242
batch: true
43-
43+
branches:
44+
include:
45+
- main
46+
4447
jobs:
4548
- job: Build
4649
displayName: Build
@@ -116,8 +119,9 @@ jobs:
116119
}
117120
$filesChanged | Select-Object -Unique | Out-File $filesChangedOutputPath
118121
119-
$baseBranchName = "origin/$(Build.SourceBranchName)"
120-
$tmpBranchName = "archive/$(Build.SourceBranchName)/$(Build.Reason)"
122+
$sourceBranchName = "$(Build.SourceBranch)".Replace("refs/heads/","")
123+
$baseBranchName = "origin/$sourceBranchName"
124+
$tmpBranchName = "archive/$sourceBranchName/$(Build.Reason)"
121125
if ("$(Build.reason)" -in @('IndividualCI', 'BatchedCI')) {
122126
$trigger = "$(Build.SourceVersion)"
123127
$tmpBranchName += "/$(Build.SourceVersion)"
@@ -134,7 +138,7 @@ jobs:
134138
}
135139
}
136140
Write-Host "`n##[group]Switch from $baseBranchName to $tmpBranchName"
137-
git fetch origin $(Build.SourceBranchName)
141+
git fetch origin $sourceBranchName
138142
git checkout -b $tmpBranchName $baseBranchName
139143
140144
Write-Host "`n##[group]build steps"
@@ -158,7 +162,7 @@ jobs:
158162
git commit -m $prTitle
159163
git push origin $tmpBranchName --force
160164
161-
& $prScriptPath -Title $prTitle -HeadBranch $tmpBranchName -BaseBranch "$(Build.SourceBranchName)" -BotAccessToken '$(GithubToken)' -Description $prDescription
165+
& $prScriptPath -Title $prTitle -HeadBranch $tmpBranchName -BaseBranch $sourceBranchName -BotAccessToken '$(GithubToken)' -Description $prDescription
162166
163167
<#
164168
this commidId will be useful when we push directly to target branch in the future

‎.github/workflows/script/PrLabeled.ps1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ Please resolve all open review comments and make sure all CI checks are green. R
2828
"@
2929
"codegen-survey" = @"
3030
Thanks for using autorest.powershell to develop your PowerShell module! Would you like to take [a 5-minute survey](https://forms.office.com/r/j6rQuFUqUf?origin=lprLink) to help us improve the tool? Much appreciated :)
31+
"@
32+
"Legacy" = @"
33+
To improve dev experience and reduce maintenance efforts, we are deprecating branch: generation now. Azure-PowerShell modules generated by autorest.powershell no longer target branch generation, and will be targeting directly to main instead.
34+
35+
Please find migration guide and document below:
36+
- [If you have open PR or on going development](https://gist.github.com/VeryEarly/0c748e7bb8f18d9a87228956dc797bc5)
37+
- [If you are about to start new development and have prior experience](https://gist.github.com/VeryEarly/53cf3372a1c7c7c6f5e1ffd3949513a5)
38+
- [Starting from scratch](https://eng.ms/docs/cloud-ai-platform/azure-core/azure-experiences-and-ecosystems/azure-portal-and-client-tools-ruhim/azure-cli-tools-azure-cli-powershell-and-terraform/azure-cli-tools/onboarding/azurepowershell/dev_guidance_codegen)
3139
"@
3240
}
3341

‎eng/emitter-package.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"name": "azps",
3+
"version": "0.1.0",
4+
"type": "module",
5+
"dependencies": {
6+
"@typespec/compiler": "0.64.0",
7+
"@azure-tools/typespec-powershell": "0.0.x",
8+
"@azure-tools/typespec-autorest": "0.50.0",
9+
"@azure-tools/typespec-azure-core": "0.50.0",
10+
"@azure-tools/typespec-azure-resource-manager": "0.50.0",
11+
"@azure-tools/typespec-client-generator-core": "0.50.0",
12+
"@azure-tools/typespec-providerhub": "0.50.0",
13+
"@azure-tools/typespec-azure-rulesets": "0.50.0",
14+
"@typespec/http": "0.64.0",
15+
"@typespec/openapi": "0.64.0",
16+
"@typespec/rest": "0.64.0",
17+
"@typespec/versioning": "0.64.0",
18+
"@typespec/xml": "0.64.0",
19+
"@azure-tools/typespec-liftr-base": "0.7.0"
20+
},
21+
"private": true
22+
}

‎generated/ADDomainServices/ADDomainServices.Autorest/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "d0a10dda-d669-4e94-b127-ee991e1c33f6"
2+
"generate_Id": "43557719-93d8-4089-89e8-b86055a57bac"
33
}

‎generated/Advisor/Advisor.Autorest/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "5138398d-f864-4f90-965f-b5257e5ca332"
2+
"generate_Id": "661dccf0-7c82-45ce-bbc9-81c87a43eac3"
33
}

‎generated/Aks/Aks.Autorest/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "c21b9ea8-733a-4da8-bd57-68b661bef99f"
2+
"generate_Id": "f19cd9c3-73c7-4839-bd11-96ace885b488"
33
}

‎generated/AksArc/AksArc.Autorest/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "3847d3a3-3bcb-455b-9ae7-5235fe5b44b5"
2+
"generate_Id": "d69b1582-a64d-4ebf-85bc-ba719c9077c2"
33
}

‎generated/Alb/Alb.Autorest/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "30029440-082f-4f1b-b17f-5374b29e7419"
2+
"generate_Id": "d510aa92-a0ea-4060-8389-535e115c55a5"
33
}

‎generated/AlertsManagement/PrometheusRuleGroups.Autorest/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "3173efc3-bb9f-46e3-b143-fc3affb8a28b"
2+
"generate_Id": "a5f4a37e-1f35-429f-ba00-afb9674a2294"
33
}

‎generated/App/App.Autorest/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "0e5a0365-85d1-41dd-906a-38c6d7c4d095"
2+
"generate_Id": "5e379fe6-25b5-491c-9739-567adfc3f8cc"
33
}

0 commit comments

Comments
 (0)