Skip to content

Commit

Permalink
Merge pull request #1 from Azure/main
Browse files Browse the repository at this point in the history 
merge
  • Loading branch information
@Jingshu918
Jingshu918 authored Dec 27, 2023
2 parents 235bc8f + 4deb9e9 commit 17c6450
Show file tree
Hide file tree
Showing 4,156 changed files with 681,494 additions and 259,540 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
56 changes: 31 additions & 25 deletions .azure-pipelines/code-gen.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,36 @@ jobs:
}
git checkout src/${{ parameters.ServiceName }};
git checkout -b codegen/${{ parameters.ServiceName }} origin/${{ parameters.TargetBranch }};
- pwsh: |
#Uninstall-Module -Name PackageManagement -AllVersions
Install-Module -Name PowerShellGet -RequiredVersion 2.2.3 -Force;
Install-Module -Name platyPS -RequiredVersion 0.14.2 -Force;
Install-Module -Name Az.Accounts -Force;
Import-Module .\tools\Gen2Master\MoveFromGeneration2Master.ps1;
Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
git config user.email "65331932+azure-powershell-bot@users.noreply.github.com";
git config user.name "azure-powershell-bot";
git add ./src;
git add tools/CreateMappings_rules.json;
git commit -m "Move ${{ parameters.ServiceName }} to ${{ parameters.TargetBranch }}";
git remote set-url origin https://azure-powershell-bot:$(GithubToken)@github.com/Azure/azure-powershell.git;
git push origin codegen/${{ parameters.ServiceName }} --force;
- task: PowerShell@2.232.1
displayName: Create codegen/${{ parameters.ServiceName }} branch
- pwsh: |
$SourceBranch = "$(Build.SourceBranch)"
$SourceBranch = $SourceBranch.Replace("refs/heads/", "")
$Title = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}"
$HeadBranch = "codegen/${{ parameters.ServiceName }}"
$BaseBranch = "${{ parameters.TargetBranch }}"
$Description = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}
The last commit of src/${{ parameters.ServiceName }} in $SourceBranch is:
$(git log -1 origin/$SourceBranch -- ./src/${{ parameters.ServiceName }})
"
./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(GithubToken) -Description $Description
inputs:
targetType: inline
script: >-
#Uninstall-Module -Name PackageManagement -AllVersions
Install-Module -Name PowerShellGet -RequiredVersion 2.2.3 -Force;
Install-Module -Name platyPS -RequiredVersion 0.14.2 -Force;
Install-Module -Name Az.Accounts -Force;
Import-Module .\tools\Gen2Master\MoveFromGeneration2Master.ps1;
Move-Generation2Master -SourcePath .\artifacts\src\${{ parameters.ServiceName }} -DestPath .\src\${{ parameters.ServiceName }};
git config user.email "65331932+azure-powershell-bot@users.noreply.github.com";
git config user.name "azure-powershell-bot";
git add ./src;
git add tools/CreateMappings_rules.json;
git commit -m "Move ${{ parameters.ServiceName }} to ${{ parameters.TargetBranch }}";
git remote set-url origin https://azure-powershell-bot:$(GithubToken)@github.com/Azure/azure-powershell.git;
git push origin codegen/${{ parameters.ServiceName }} --force;
- task: PowerShell@2
displayName: Create PR to main branch
inputs:
targetType: inline
script: >-
$SourceBranch = "$(Build.SourceBranch)"
$SourceBranch = $SourceBranch.Replace("refs/heads/", "")
$Title = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}"
$HeadBranch = "codegen/${{ parameters.ServiceName }}"
$BaseBranch = "${{ parameters.TargetBranch }}"
$Description = "Migrate ${{ parameters.ServiceName }} from $SourceBranch to ${{ parameters.TargetBranch }}
The last commit of src/${{ parameters.ServiceName }} in $SourceBranch is:
$(git log -1 origin/$SourceBranch -- ./src/${{ parameters.ServiceName }})
"
./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(GithubToken) -Description $Description
2 changes: 1 addition & 1 deletion documentation/development-docs/vm-for-partners.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ If you need an Azure Virtual Machine with all the [prerequisites](https://github
Write-Host "==> All done."
```

# Github Settings and Repository Setup
# GitHub Settings and Repository Setup
You will need to set up the GitHub configuration so that commits appear with your GitHub name.
```
git config --global user.email "<Your email on GitHub>"
Expand Down
4 changes: 2 additions & 2 deletions src/Accounts/Accounts/help/Add-AzEnvironment.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ Accept wildcard characters: False
```
### -AzureAttestationServiceEndpointResourceId
The The resource identifier of the Azure Attestation service that is the recipient of the requested token.
The resource identifier of the Azure Attestation service that is the recipient of the requested token.
```yaml
Type: System.String
Expand Down Expand Up @@ -389,7 +389,7 @@ Accept wildcard characters: False
```
### -AzureSynapseAnalyticsEndpointResourceId
The The resource identifier of the Azure Synapse Analytics that is the recipient of the requested token.
The resource identifier of the Azure Synapse Analytics that is the recipient of the requested token.
```yaml
Type: System.String
Expand Down
2 changes: 1 addition & 1 deletion ...licationInsights.Autorest/examples/Get-AzApplicationInsightsWorkbookRevision.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ ResourceGroupName Name DisplayName
appinsights-hkrs2v-test f7d7151e-7907-4f46-8a5e-6bf4a4cfedec f7d7151e-7907-4f46-8a5e-6bf4a4cfedec-display westus2 shared workbook
```

This commmand gets a single workbook revision defined by resource id.
This command gets a single workbook revision defined by resource id.
2 changes: 1 addition & 1 deletion .../ApplicationInsights.Autorest/help/Get-AzApplicationInsightsWorkbookRevision.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ ResourceGroupName Name DisplayName
appinsights-hkrs2v-test f7d7151e-7907-4f46-8a5e-6bf4a4cfedec f7d7151e-7907-4f46-8a5e-6bf4a4cfedec-display westus2 shared workbook
```

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

## PARAMETERS

Expand Down
2 changes: 1 addition & 1 deletion ...nInsights/ApplicationInsights/help/Get-AzApplicationInsightsWorkbookRevision.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ ResourceGroupName Name DisplayName
appinsights-hkrs2v-test f7d7151e-7907-4f46-8a5e-6bf4a4cfedec f7d7151e-7907-4f46-8a5e-6bf4a4cfedec-display westus2 shared workbook
```

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

## PARAMETERS

Expand Down
2 changes: 1 addition & 1 deletion src/Automanage/Automanage.Autorest/examples/Get-AzAutomanageBestPractice.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ AzureBestPracticesProduction
AzureBestPracticesDevTest
```

This commmand lists all Automanage best practices under a subscription.
This command lists all Automanage best practices under a subscription.

### Example 2: Get information about a Automanage best practice by name
```powershell
Expand Down
2 changes: 2 additions & 0 deletions src/Az.Shared.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<!-- Suppress known NuGet package vulnerabilities to unblock build as we track this kind of security issues internally. -->
<WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
<WarningsAsErrors />
</PropertyGroup>

Expand Down
92 changes: 0 additions & 92 deletions src/Az.autorest.hybrid.props
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/CloudService/CloudService.Autorest/examples/Stop-AzCloudService.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
Stop-AzCloudService -ResourceGroupName "ContosOrg" -CloudServiceName "ContosoCS"
```

This command stops all the role instances that belong to the the cloud service named ContosoCS.
This command stops all the role instances that belong to the cloud service named ContosoCS.
2 changes: 1 addition & 1 deletion src/CloudService/CloudService/help/Start-AzCloudService.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Starts the cloud service.
Start-AzCloudService -ResourceGroupName "ContosOrg" -CloudServiceName "ContosoCS"
```

This command starts all the role instances that belong to the the cloud service named ContosoCS.
This command starts all the role instances that belong to the cloud service named ContosoCS.

## PARAMETERS

Expand Down
14 changes: 7 additions & 7 deletions src/Compute/Compute.Management.Sdk/Generated/AvailabilitySetsOperations.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
string apiVersion = "2023-07-01";
string apiVersion = "2023-09-01";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -313,7 +313,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
string apiVersion = "2023-07-01";
string apiVersion = "2023-09-01";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -511,7 +511,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
string apiVersion = "2023-07-01";
string apiVersion = "2023-09-01";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -687,7 +687,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
string apiVersion = "2023-07-01";
string apiVersion = "2023-09-01";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -871,7 +871,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
string apiVersion = "2023-07-01";
string apiVersion = "2023-09-01";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -1059,7 +1059,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
string apiVersion = "2023-07-01";
string apiVersion = "2023-09-01";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down Expand Up @@ -1252,7 +1252,7 @@ internal AvailabilitySetsOperations(ComputeManagementClient client)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
string apiVersion = "2023-07-01";
string apiVersion = "2023-09-01";
// Tracing
bool _shouldTrace = ServiceClientTracing.IsEnabled;
string _invocationId = null;
Expand Down
Loading

0 comments on commit 17c6450

Please sign in to comment.