Skip to content

Commit 17c6450

Browse files
authored
Merge pull request #1 from Azure/main
merge
2 parents 235bc8f + 4deb9e9 commit 17c6450

File tree

4,156 files changed

+681494
-259540
lines changed

Some content is hidden

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

4,156 files changed

+681494
-259540
lines changed

.azure-pipelines/code-gen.yml

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -75,30 +75,36 @@ jobs:
7575
}
7676
git checkout src/${{ parameters.ServiceName }};
7777
git checkout -b codegen/${{ parameters.ServiceName }} origin/${{ parameters.TargetBranch }};
78-
- pwsh: |
79-
#Uninstall-Module -Name PackageManagement -AllVersions
80-
Install-Module -Name PowerShellGet -RequiredVersion 2.2.3 -Force;
81-
Install-Module -Name platyPS -RequiredVersion 0.14.2 -Force;
82-
Install-Module -Name Az.Accounts -Force;
83-
Import-Module .\tools\Gen2Master\MoveFromGeneration2Master.ps1;
84-
Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
85-
git config user.email "[email protected]";
86-
git config user.name "azure-powershell-bot";
87-
git add ./src;
88-
git add tools/CreateMappings_rules.json;
89-
git commit -m "Move ${{ parameters.ServiceName }} to ${{ parameters.TargetBranch }}";
90-
git remote set-url origin https://azure-powershell-bot:$(GithubToken)@github.com/Azure/azure-powershell.git;
91-
git push origin codegen/${{ parameters.ServiceName }} --force;
78+
9279
displayName: Create codegen/${{ parameters.ServiceName }} branch
93-
- pwsh: |
94-
$SourceBranch = "$(Build.SourceBranch)"
95-
$SourceBranch = $SourceBranch.Replace("refs/heads/", "")
96-
$Title = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}"
97-
$HeadBranch = "codegen/${{ parameters.ServiceName }}"
98-
$BaseBranch = "${{ parameters.TargetBranch }}"
99-
$Description = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}
100-
The last commit of src/${{ parameters.ServiceName }} in $SourceBranch is:
101-
$(git log -1 origin/$SourceBranch -- ./src/${{ parameters.ServiceName }})
102-
"
103-
./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(GithubToken) -Description $Description
80+
inputs:
81+
targetType: inline
82+
script: >-
83+
#Uninstall-Module -Name PackageManagement -AllVersions
84+
Install-Module -Name PowerShellGet -RequiredVersion 2.2.3 -Force;
85+
Install-Module -Name platyPS -RequiredVersion 0.14.2 -Force;
86+
Install-Module -Name Az.Accounts -Force;
87+
Import-Module .\tools\Gen2Master\MoveFromGeneration2Master.ps1;
88+
Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
89+
git config user.email "[email protected]";
90+
git config user.name "azure-powershell-bot";
91+
git add ./src;
92+
git add tools/CreateMappings_rules.json;
93+
git commit -m "Move ${{ parameters.ServiceName }} to ${{ parameters.TargetBranch }}";
94+
git remote set-url origin https://azure-powershell-bot:$(GithubToken)@github.com/Azure/azure-powershell.git;
95+
git push origin codegen/${{ parameters.ServiceName }} --force;
96+
- task: PowerShell@2
10497
displayName: Create PR to main branch
98+
inputs:
99+
targetType: inline
100+
script: >-
101+
$SourceBranch = "$(Build.SourceBranch)"
102+
$SourceBranch = $SourceBranch.Replace("refs/heads/", "")
103+
$Title = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}"
104+
$HeadBranch = "codegen/${{ parameters.ServiceName }}"
105+
$BaseBranch = "${{ parameters.TargetBranch }}"
106+
$Description = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}
107+
The last commit of src/${{ parameters.ServiceName }} in $SourceBranch is:
108+
$(git log -1 origin/$SourceBranch -- ./src/${{ parameters.ServiceName }})
109+
"
110+
./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(GithubToken) -Description $Description

documentation/development-docs/vm-for-partners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ If you need an Azure Virtual Machine with all the [prerequisites](https://github
126126
Write-Host "==> All done."
127127
```
128128
129-
# Github Settings and Repository Setup
129+
# GitHub Settings and Repository Setup
130130
You will need to set up the GitHub configuration so that commits appear with your GitHub name.
131131
```
132132
git config --global user.email "<Your email on GitHub>"

src/Accounts/Accounts/help/Add-AzEnvironment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ Accept wildcard characters: False
269269
```
270270
271271
### -AzureAttestationServiceEndpointResourceId
272-
The The resource identifier of the Azure Attestation service that is the recipient of the requested token.
272+
The resource identifier of the Azure Attestation service that is the recipient of the requested token.
273273
274274
```yaml
275275
Type: System.String
@@ -389,7 +389,7 @@ Accept wildcard characters: False
389389
```
390390
391391
### -AzureSynapseAnalyticsEndpointResourceId
392-
The The resource identifier of the Azure Synapse Analytics that is the recipient of the requested token.
392+
The resource identifier of the Azure Synapse Analytics that is the recipient of the requested token.
393393
394394
```yaml
395395
Type: System.String

src/ApplicationInsights/ApplicationInsights.Autorest/examples/Get-AzApplicationInsightsWorkbookRevision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ ResourceGroupName Name DisplayName
3535
appinsights-hkrs2v-test f7d7151e-7907-4f46-8a5e-6bf4a4cfedec f7d7151e-7907-4f46-8a5e-6bf4a4cfedec-display westus2 shared workbook
3636
```
3737

38-
This commmand gets a single workbook revision defined by resource id.
38+
This command gets a single workbook revision defined by resource id.

src/ApplicationInsights/ApplicationInsights.Autorest/help/Get-AzApplicationInsightsWorkbookRevision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ResourceGroupName Name DisplayName
7272
appinsights-hkrs2v-test f7d7151e-7907-4f46-8a5e-6bf4a4cfedec f7d7151e-7907-4f46-8a5e-6bf4a4cfedec-display westus2 shared workbook
7373
```
7474

75-
This commmand gets a single workbook revision defined by resource id.
75+
This command gets a single workbook revision defined by resource id.
7676

7777
## PARAMETERS
7878

src/ApplicationInsights/ApplicationInsights/help/Get-AzApplicationInsightsWorkbookRevision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ResourceGroupName Name DisplayName
7272
appinsights-hkrs2v-test f7d7151e-7907-4f46-8a5e-6bf4a4cfedec f7d7151e-7907-4f46-8a5e-6bf4a4cfedec-display westus2 shared workbook
7373
```
7474

75-
This commmand gets a single workbook revision defined by resource id.
75+
This command gets a single workbook revision defined by resource id.
7676

7777
## PARAMETERS
7878

src/Automanage/Automanage.Autorest/examples/Get-AzAutomanageBestPractice.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ AzureBestPracticesProduction
1010
AzureBestPracticesDevTest
1111
```
1212

13-
This commmand lists all Automanage best practices under a subscription.
13+
This command lists all Automanage best practices under a subscription.
1414

1515
### Example 2: Get information about a Automanage best practice by name
1616
```powershell

src/Az.Shared.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1717
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
1818
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
19+
<!-- Suppress known NuGet package vulnerabilities to unblock build as we track this kind of security issues internally. -->
20+
<WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
1921
<WarningsAsErrors />
2022
</PropertyGroup>
2123

src/Az.autorest.hybrid.props

Lines changed: 0 additions & 92 deletions
This file was deleted.

src/CloudService/CloudService.Autorest/examples/Stop-AzCloudService.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
Stop-AzCloudService -ResourceGroupName "ContosOrg" -CloudServiceName "ContosoCS"
55
```
66

7-
This command stops all the role instances that belong to the the cloud service named ContosoCS.
7+
This command stops all the role instances that belong to the cloud service named ContosoCS.

src/CloudService/CloudService/help/Start-AzCloudService.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Starts the cloud service.
3434
Start-AzCloudService -ResourceGroupName "ContosOrg" -CloudServiceName "ContosoCS"
3535
```
3636

37-
This command starts all the role instances that belong to the the cloud service named ContosoCS.
37+
This command starts all the role instances that belong to the cloud service named ContosoCS.
3838

3939
## PARAMETERS
4040

src/Compute/Compute.Management.Sdk/Generated/AvailabilitySetsOperations.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
105105
{
106106
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
107107
}
108-
string apiVersion = "2023-07-01";
108+
string apiVersion = "2023-09-01";
109109
// Tracing
110110
bool _shouldTrace = ServiceClientTracing.IsEnabled;
111111
string _invocationId = null;
@@ -313,7 +313,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
313313
{
314314
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
315315
}
316-
string apiVersion = "2023-07-01";
316+
string apiVersion = "2023-09-01";
317317
// Tracing
318318
bool _shouldTrace = ServiceClientTracing.IsEnabled;
319319
string _invocationId = null;
@@ -511,7 +511,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
511511
{
512512
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
513513
}
514-
string apiVersion = "2023-07-01";
514+
string apiVersion = "2023-09-01";
515515
// Tracing
516516
bool _shouldTrace = ServiceClientTracing.IsEnabled;
517517
string _invocationId = null;
@@ -687,7 +687,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
687687
{
688688
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
689689
}
690-
string apiVersion = "2023-07-01";
690+
string apiVersion = "2023-09-01";
691691
// Tracing
692692
bool _shouldTrace = ServiceClientTracing.IsEnabled;
693693
string _invocationId = null;
@@ -871,7 +871,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
871871
{
872872
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
873873
}
874-
string apiVersion = "2023-07-01";
874+
string apiVersion = "2023-09-01";
875875
// Tracing
876876
bool _shouldTrace = ServiceClientTracing.IsEnabled;
877877
string _invocationId = null;
@@ -1059,7 +1059,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
10591059
{
10601060
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
10611061
}
1062-
string apiVersion = "2023-07-01";
1062+
string apiVersion = "2023-09-01";
10631063
// Tracing
10641064
bool _shouldTrace = ServiceClientTracing.IsEnabled;
10651065
string _invocationId = null;
@@ -1252,7 +1252,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
12521252
{
12531253
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
12541254
}
1255-
string apiVersion = "2023-07-01";
1255+
string apiVersion = "2023-09-01";
12561256
// Tracing
12571257
bool _shouldTrace = ServiceClientTracing.IsEnabled;
12581258
string _invocationId = null;

0 commit comments

Comments
 (0)