Skip to content

Commit f0f90dd

Browse files
jorgecotillojorgecotillo
committed
merge from upstream
2 parents c963b2d + 058a3c6 commit f0f90dd

File tree

3,040 files changed

+220277
-94808
lines changed

Some content is hidden

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

3,040 files changed

+220277
-94808
lines changed

‎.azure-pipelines/sync-tools-folder.yml

Lines changed: 19 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,35 @@
1-
# Variable 'BaseBranch' was defined in the Variables tab
2-
# Variable 'ServiceName' was defined in the Variables tab
3-
# Multi-job configuration must be converted to matrix strategy: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/phases?view=azure-devops&tabs=yaml#multi-job-configuration
41
resources:
52
repositories:
63
- repository: self
74
type: git
85
ref: main
96

10-
pr:
7+
trigger:
118
branches:
129
include:
1310
- main
1411
paths:
1512
include:
16-
- .azure-pipeline
13+
- .azure-pipelines
1714
- tools
1815
- src/lib
16+
17+
variables:
18+
GenerationBranchName: generation
19+
AzureStackBranchName: Azs-tzl
1920

2021
jobs:
21-
- job: Job_1
22-
displayName: 'Service: '
23-
timeoutInMinutes: 90
24-
pool:
25-
name: Hosted VS2017
26-
steps:
27-
- checkout: self
28-
- task: PowerShell@2
29-
displayName: Config git
30-
inputs:
31-
targetType: inline
32-
script: >-
33-
git config --global user.email "[email protected]"
34-
35-
git config --global user.name "azurepowershell"
36-
37-
git checkout generation
38-
pwsh: true
39-
- task: PowerShell@2
40-
displayName: Sync .azure-pipeline folder from main to generation
41-
inputs:
42-
targetType: inline
43-
script: >-
44-
#cp .azure-pipeline .azure-pipeline-tmp -r
45-
46-
rm .azure-pipeline -r
47-
48-
mv .azure-pipeline-tmp .azure-pipeline
49-
50-
git add .azure-pipeline
51-
pwsh: true
52-
- task: PowerShell@2
53-
displayName: Sync src/lib folder from main to generation
54-
inputs:
55-
targetType: inline
56-
script: >-
57-
#cp src/lib src/lib-tmp -r
58-
59-
rm src/lib -r
60-
61-
mv src/lib-tmp src/lib
22+
- job: Sync
23+
displayName: Sync task
24+
condition: succeeded()
25+
strategy:
26+
matrix:
27+
Generation:
28+
BranchName: ${{ variables.GenerationBranchName }}
29+
AzureStack:
30+
BranchName: ${{ variables.AzureStackBranchName }}
6231

63-
git add src/lib
64-
pwsh: true
65-
- task: PowerShell@2
66-
displayName: Sync tools folder from main to generation
67-
inputs:
68-
targetType: inline
69-
script: >-
70-
#cp tools tools-tmp -r
71-
72-
rm tools -r
73-
74-
mv tools-tmp tools
75-
76-
git add tools
77-
78-
git commit -m "Sync tools folder from main branch to generation branch"
79-
80-
git remote set-url origin https://$env:[email protected]/Azure/azure-powershell.git
81-
82-
git push origin syncToolsFolder --force
83-
pwsh: true
84-
...
32+
steps:
33+
- template: util/sync-tools-folder-template.yml
34+
parameters:
35+
BranchName: $(BranchName)

‎.azure-pipelines/util/sync-tools-folder-template.yml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
parameters:
2+
BranchName: ''
3+
4+
steps:
5+
- checkout: self
6+
- task: PowerShell@2
7+
displayName: Save folders need to be sync
8+
inputs:
9+
targetType: inline
10+
script: >-
11+
cp .azure-pipelines .azure-pipelines-tmp -r
12+
13+
cp src/lib src/lib-tmp -r
14+
15+
cp tools tools-tmp -r
16+
pwsh: true
17+
- task: PowerShell@2
18+
displayName: Config git
19+
inputs:
20+
targetType: inline
21+
script: >-
22+
git config --global user.email "[email protected]"
23+
24+
git config --global user.name "azurepowershell"
25+
26+
git checkout -b syncToolsFolder-${{ parameters.BranchName }} origin/${{ parameters.BranchName }}
27+
pwsh: true
28+
- task: PowerShell@2
29+
displayName: Sync .azure-pipelines folder from main to ${{ parameters.BranchName }}
30+
inputs:
31+
targetType: inline
32+
script: >-
33+
rm .azure-pipelines -r
34+
35+
mv .azure-pipelines-tmp .azure-pipelines
36+
37+
git add .azure-pipelines
38+
pwsh: true
39+
- task: PowerShell@2
40+
displayName: Sync src/lib folder from main to ${{ parameters.BranchName }}
41+
inputs:
42+
targetType: inline
43+
script: >-
44+
rm src/lib -r
45+
46+
mv src/lib-tmp src/lib
47+
48+
git add src/lib
49+
pwsh: true
50+
- task: PowerShell@2
51+
displayName: Sync tools folder from main to ${{ parameters.BranchName }}
52+
inputs:
53+
targetType: inline
54+
script: >-
55+
rm tools -r
56+
57+
mv tools-tmp tools
58+
59+
git add tools
60+
61+
git commit -m "Sync tools folder from main branch to ${{ parameters.BranchName }} branch"
62+
63+
git remote set-url origin https://$env:[email protected]/Azure/azure-powershell.git
64+
65+
git push origin syncToolsFolder-${{ parameters.BranchName }} --force
66+
pwsh: true
67+

‎documentation/development-docs/breakingchange-for-autogen-module.md

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
To add breaking changes and preview messages for cmdlets, there are two scenarios to handle.
2+
3+
- For auto gen cmdlets
4+
- For customized cmdlets
5+
6+
# For auto gen cmdlets
7+
8+
Breaking changes and preview messages for auto gen cmdlets are added through directives in readme.md. And following are some common cases.
9+
10+
## Case 1 — Module is deprecated
11+
12+
13+
14+
```yaml
15+
- where:
16+
verb: (.*)
17+
set:
18+
breaking-change:
19+
deprecated-by-version: 5.0.0
20+
change-effective-date: 2055/10/30
21+
```
22+
23+
## Case 2 — Breaking change for a cmdlet
24+
25+
```yaml
26+
- where:
27+
verb: New
28+
subject: VNetPeering
29+
set:
30+
breaking-change:
31+
replacement-cmdlet: New-AzNewVNetPeering
32+
deprecated-by-version: 5.0.0
33+
change-effective-date: 2022/05/30
34+
```
35+
36+
## Case 3 — Breaking change for multiple cmdlets
37+
38+
```yaml
39+
- where:
40+
subject: VNetPeering
41+
set:
42+
breaking-change:
43+
replacement-cmdlet: $.replace("VNetPeering", "VNewNetPeering")
44+
deprecated-by-version: 5.0.0
45+
change-effective-date: 2022/05/30
46+
```
47+
48+
## Case 4 — Breaking change for an output type
49+
50+
```yaml
51+
- where:
52+
verb: New
53+
subject: VNetPeering
54+
set:
55+
breaking-change:
56+
deprecated-cmdlet-output-type: oldtype
57+
replacement-cmdlet-output-type: newtype
58+
deprecated-output-properties:
59+
- propertyA
60+
- PropertyB
61+
new-output-properties:
62+
- PropertyC
63+
- PropertyD
64+
change-description: This is a custom message for the change.
65+
deprecated-by-version: 5.0.0
66+
change-effective-date: 2022/05/11
67+
```
68+
69+
## Case 5 — Breaking change for parameter sets(variants)
70+
71+
```yaml
72+
- where:
73+
verb: Remove
74+
subject: VNetPeering
75+
variant: Delete
76+
set:
77+
breaking-change:
78+
deprecated-by-version: 5.0.0
79+
change-efective-date: 2022/05/30
80+
```
81+
82+
## Case 6 — Breaking change for a parameter
83+
84+
```yaml
85+
- where:
86+
parameter-name: Sku
87+
set:
88+
breaking-change:
89+
old-parameter-type: int
90+
new-parameter-type: boolean
91+
become-mandatory: true
92+
change-description: This is a custom message for the change.
93+
deprecated-by-version: 5.0.0
94+
change-efective-date: 2022/05/30
95+
```
96+
97+
## Case 7 — Preview message
98+
99+
```yaml
100+
- where:
101+
verb: New
102+
subject: VNetPeering
103+
set:
104+
preview-message: This is a test preview message.
105+
```
106+
107+
# For customized cmdlets
108+
109+
To add breaking changes or preview messages for a customized cmdlets, you will need to add related attributes in code directly. And following are some common cases.
110+
111+
**Note: For Case 1/2/3/5, the attributes are applied on the functions. For case 5, the attribute is applied in the parameter. And these examples are based on the databricks module, so you will need to replace it with your module name.**
112+
113+
## Case 1 — Breaking change for a cmdlet
114+
115+
```csharp
116+
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Runtime.CmdletBreakingChangeAttribute("4.0", "2022/05/30", ReplacementCmdletName = 'replace-xxx')
117+
```
118+
119+
## Case 2 — Breaking change for parameter sets(variants)
120+
121+
```csharp
122+
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Runtime.ParameterSetBreakingChangeAttribute(("parametersetname1", "parametersetname2"), "4.0", "2022/05/30")]
123+
```
124+
125+
## Case 3 — Breaking change for an output type
126+
127+
```csharp
128+
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Runtime.OutputBreakingChange("oldtype", "5.0.0", "2022/05/11", ReplacementCmdletOutputType = "newtype", DeprecatedOutputProperties = ("propertyA", "PropertyB"), NewOutputProperties = ("PropertyC", "PropertyD"))]
129+
```
130+
131+
## Case 4 — Breaking change for a parameter
132+
133+
```csharp
134+
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Runtime.ParameterBreakingChangeAttribute("ResourceGroupName", "4.1", "2028/06/18")]
135+
```
136+
137+
## Case 5 — Preview message
138+
139+
```csharp
140+
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Runtime.PreviewMessageAttribute("This is a preview version")]
141+
```

‎src/CloudService/Az.CloudService.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 7/8/2021
6+
# Generated on: 2021/7/8
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
RootModule = './Az.CloudService.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.3.0'
15+
ModuleVersion = '0.4.0'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
@@ -127,7 +127,7 @@ PrivateData = @{
127127
# IconUri = ''
128128

129129
# ReleaseNotes of this module
130-
# ReleaseNotes = ''
130+
ReleaseNotes = '* Introduced 2 additional parameter sets for ''New-AzCloudService''.'
131131

132132
# Prerelease string of this module
133133
# Prerelease = ''

‎src/CloudService/Changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
22+
## Version 0.4.0
2123
* Introduced 2 additional parameter sets for `New-AzCloudService`.
2224

2325
## Version 0.3.0

‎src/CloudService/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@
2424
[assembly: ComVisible(false)]
2525
[assembly: CLSCompliant(false)]
2626
[assembly: Guid("1fe4b4c7-44d2-4800-a935-733381e663ae")]
27-
[assembly: AssemblyVersion("0.3.0")]
28-
[assembly: AssemblyFileVersion("0.3.0")]
27+
[assembly: AssemblyVersion("0.4.0")]
28+
[assembly: AssemblyFileVersion("0.4.0")]

‎src/CloudService/custom/New-AzCloudService.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ function New-AzCloudService {
327327

328328
# Perform action
329329
Write-Host("Creating the Cloud Service resource.")
330-
Az.CloudService.internal\New-AzCloudService @PSBoundParameters
330+
Az.CloudService\New-AzCloudService @PSBoundParameters
331331
}
332332

333333
}
@@ -642,4 +642,4 @@ function validation
642642
throw "The provided Storage Account: '" + $storageAccount + "' does not exist."
643643
}
644644
}
645-
}
645+
}

‎src/CognitiveServices/CognitiveServices/ChangeLog.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222
* [Breaking Change] Changed type of PSCognitiveServicesAccount.Sku.Tier from SkuTier to string.
2323
* [Breaking Change] Removed ActionRequired from PrivateLinkServiceConnectionState.
2424
* Updated PowerShell to use 2021-04-30 version.
25-
* Add `Undo-AzCognitiveServicesAccountRemoval` cmdlet.
26-
* `New-AzureCognitiveServicesAccount` add `-RestrictOutboundNetworkAccess`, `-AllowedFqdnList`, `-DisableLocalAuth`, `-KeyVaultIdentityClientId`, `-IdentityType`, `-UserAssignedIdentityId`.
27-
* `Set-AzureCognitiveServicesAccount` add `-RestrictOutboundNetworkAccess`, `-AllowedFqdnList`, `-DisableLocalAuth`, `-KeyVaultIdentityClientId`, `-IdentityType`, `-UserAssignedIdentityId`.
28-
* `Remove-AzureCognitiveServicesAccount` add `-InRemovedState`, `-Location`.
29-
* `Get-AzureCognitiveServicesAccount` add `-InRemovedState`, `-Location`.
25+
* Added `Undo-AzCognitiveServicesAccountRemoval` cmdlet.
26+
* Added parameters `-RestrictOutboundNetworkAccess`, `-AllowedFqdnList`, `-DisableLocalAuth`, `-KeyVaultIdentityClientId`, `-IdentityType`, `-UserAssignedIdentityId` to `New-AzureCognitiveServicesAccount` and `Set-AzureCognitiveServicesAccount`.
27+
* Added parameters `-InRemovedState`, `-Location` to `Remove-AzureCognitiveServicesAccount` and `Get-AzureCognitiveServicesAccount`.
3028

3129
## Version 1.8.0
3230

‎src/Compute/Compute.Test/Compute.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="47.0.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="48.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
1717
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.5.0" />
1818
</ItemGroup>

0 commit comments

Comments
 (0)