Skip to content

Commit 5b730f5

Browse files
anamikapananamikapan
authored
Merge branch 'Azure:main' into main
2 parents 3ebe98f + 70e6ee7 commit 5b730f5

File tree

9 files changed

+77
-35
lines changed

9 files changed

+77
-35
lines changed

‎src/ManagedServices/ManagedServices.Autorest/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
2121
[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
2222
[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - ManagedServices")]
23-
[assembly: System.Reflection.AssemblyFileVersionAttribute("3.1.0")]
24-
[assembly: System.Reflection.AssemblyVersionAttribute("3.1.0")]
23+
[assembly: System.Reflection.AssemblyFileVersionAttribute("3.1.1")]
24+
[assembly: System.Reflection.AssemblyVersionAttribute("3.1.1")]
2525
[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
2626
[assembly: System.CLSCompliantAttribute(false)]

‎src/ManagedServices/ManagedServices.Autorest/README.md

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,80 @@ use-extension:
4848

4949
directive:
5050
- where:
51-
verb: Get
51+
verb: New|Get
5252
subject: RegistrationAssignment
5353
set:
5454
breaking-change:
55-
change-description: "The types of the properties 'Authorization' and 'EligibleAuthorization' will be changed to 'List'."
55+
deprecated-output-properties:
56+
- Authorization[]
57+
- EligibleAuthorization[]
58+
new-output-properties:
59+
- List[Authorization]
60+
- List[EligibleAuthorization]
5661
deprecated-by-version: 9.0.0
5762
deprecated-by-azversion: 15.0.0
5863
change-effective-date: 2025/11/03
59-
6064
- where:
65+
verb: New
6166
subject: RegistrationDefinition
6267
set:
6368
breaking-change:
64-
change-description: "The types of the properties 'Authorization' and 'EligibleAuthorization' will be changed to 'List'."
69+
deprecated-output-properties:
70+
- Authorization
71+
- EligibleAuthorization
72+
- DelegatedRoleDefinitionId[]
73+
- JustInTimeAccessPolicyManagedByTenantApprover[]
74+
new-output-properties:
75+
- List[Authorization]
76+
- List[EligibleAuthorization]
77+
- List[DelegatedRoleDefinitionId]
78+
- List[JustInTimeAccessPolicyManagedByTenantApprover]
6579
deprecated-by-version: 9.0.0
6680
deprecated-by-azversion: 15.0.0
6781
change-effective-date: 2025/11/03
6882
- where:
69-
verb: New
83+
verb: Get
7084
subject: RegistrationDefinition
7185
set:
7286
breaking-change:
73-
change-description: "The types of the properties 'DelegatedRoleDefinitionId' and 'JustInTimeAccessPolicyManagedByTenantApprover' will be changed to 'List'."
87+
deprecated-output-properties:
88+
- Authorization[]
89+
- EligibleAuthorization[]
90+
new-output-properties:
91+
- List[Authorization]
92+
- List[EligibleAuthorization]
7493
deprecated-by-version: 9.0.0
7594
deprecated-by-azversion: 15.0.0
7695
change-effective-date: 2025/11/03
77-
7896
- where:
97+
verb: New|Get
7998
subject: MarketplaceRegistrationDefinition
8099
set:
81100
breaking-change:
82-
change-description: "The types of the properties 'Authorization' and 'EligibleAuthorization' will be changed to 'List'."
101+
deprecated-output-properties:
102+
- Authorization[]
103+
- EligibleAuthorization[]
104+
new-output-properties:
105+
- List[Authorization]
106+
- List[EligibleAuthorization]
107+
deprecated-by-version: 9.0.0
108+
deprecated-by-azversion: 15.0.0
109+
change-effective-date: 2025/11/03
110+
- where:
111+
parameter-name: Authorization
112+
set:
113+
breaking-change:
114+
old-parameter-type: Array
115+
new-parameter-type: List
116+
deprecated-by-version: 9.0.0
117+
deprecated-by-azversion: 15.0.0
118+
change-effective-date: 2025/11/03
119+
- where:
120+
parameter-name: EligibleAuthorization
121+
set:
122+
breaking-change:
123+
old-parameter-type: Array
124+
new-parameter-type: List
83125
deprecated-by-version: 9.0.0
84126
deprecated-by-azversion: 15.0.0
85127
change-effective-date: 2025/11/03
@@ -128,7 +170,7 @@ directive:
128170

129171
# Generate memory object as parameter of the cmelet.
130172
- model-cmdlet:
131-
- Authorization
173+
# - Authorization
132174
- EligibleApprover
133175
# Need custom that add ArgumentCompleterAttribute for JustInTimeAccessPolicyMultiFactorAuthProvider parameter.
134176
# - EligibleAuthorization

‎src/ManagedServices/ManagedServices.Autorest/custom/autogen-model-cmdlets/New-AzManagedServicesAuthorizationObject.ps1 renamed to ‎src/ManagedServices/ManagedServices.Autorest/custom/New-AzManagedServicesAuthorizationObject.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function New-AzManagedServicesAuthorizationObject {
2929
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.ManagedServices.Models.Api20200201Preview.Authorization')]
3030
[CmdletBinding(PositionalBinding=$false)]
3131
Param(
32-
32+
[Microsoft.Azure.PowerShell.Cmdlets.ManagedServices.Runtime.ParameterBreakingChangeAttribute("DelegatedRoleDefinitionId", "15.0.0", "9.0.0", "2025/11/03", OldParamaterType="Array", NewParameterType="List")]
3333
[Parameter(HelpMessage="The delegatedRoleDefinitionIds field is required when the roleDefinitionId refers to the User Access Administrator Role. It is the list of role definition ids which define all the permissions that the user in the authorization can assign to other principals.")]
3434
[string[]]
3535
$DelegatedRoleDefinitionId,

‎src/ManagedServices/ManagedServices.Autorest/custom/New-AzManagedServicesEligibleAuthorizationObject.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@
2626
#>
2727
function New-AzManagedServicesEligibleAuthorizationObject {
2828
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.ManagedServices.Models.Api20200201Preview.EligibleAuthorization')]
29-
[Microsoft.Azure.PowerShell.Cmdlets.ManagedServices.Runtime.CmdletBreakingChange("15.0.0", "9.0.0", "2025/11/03", ChangeDescription="The type of the property 'DelegatedRoleDefinitionId' will be changed from Array to List.")]
3029
[CmdletBinding(PositionalBinding=$false)]
3130
Param(
32-
31+
[Microsoft.Azure.PowerShell.Cmdlets.ManagedServices.Runtime.ParameterBreakingChangeAttribute("JustInTimeAccessPolicyManagedByTenantApprover", "15.0.0", "9.0.0", "2025/11/03", OldParamaterType="Array", NewParameterType="List")]
3332
[Parameter(HelpMessage="The list of managedByTenant approvers for the eligible authorization.")]
3433
[Microsoft.Azure.PowerShell.Cmdlets.ManagedServices.Models.Api20200201Preview.IEligibleApprover[]]
3534
$JustInTimeAccessPolicyManagedByTenantApprover,

‎src/ManagedServices/ManagedServices.Autorest/docs/Az.ManagedServices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
Module Name: Az.ManagedServices
3-
Module Guid: 54366ec5-1955-4a40-b1df-da4057a89b87
3+
Module Guid: 61496bfd-6bc7-48fb-8803-05ad306368f3
44
Download Help Link: https://learn.microsoft.com/powershell/module/az.managedservices
55
Help Version: 1.0.0.0
66
Locale: en-US

‎src/ManagedServices/ManagedServices.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": "a44353e0-7b2f-43c6-bfd0-09c44cfabaa5"
2+
"generate_Id": "511731e3-01e0-46da-aeab-958f3336d646"
33
}

‎src/ManagedServices/ManagedServices.sln

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedServices", "ManagedS
2121
EndProject
2222
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ManagedServices.Autorest", "ManagedServices.Autorest", "{2D84CE50-F89B-94FD-0D1C-E1015598E8EB}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ManagedServices", "..\..\generated\ManagedServices\ManagedServices.Autorest\Az.ManagedServices.csproj", "{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}"
24+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.ManagedServices", "..\..\generated\ManagedServices\ManagedServices.Autorest\Az.ManagedServices.csproj", "{EAAF3FF5-C462-450B-9156-FFDB3899DA62}"
2525
EndProject
2626
Global
2727
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -117,18 +117,18 @@ Global
117117
{F18ADD45-27F3-48D1-98C9-632575DB58D9}.Release|x64.Build.0 = Release|Any CPU
118118
{F18ADD45-27F3-48D1-98C9-632575DB58D9}.Release|x86.ActiveCfg = Release|Any CPU
119119
{F18ADD45-27F3-48D1-98C9-632575DB58D9}.Release|x86.Build.0 = Release|Any CPU
120-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
122-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Debug|x64.ActiveCfg = Debug|Any CPU
123-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Debug|x64.Build.0 = Debug|Any CPU
124-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Debug|x86.ActiveCfg = Debug|Any CPU
125-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Debug|x86.Build.0 = Debug|Any CPU
126-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
127-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Release|Any CPU.Build.0 = Release|Any CPU
128-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Release|x64.ActiveCfg = Release|Any CPU
129-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Release|x64.Build.0 = Release|Any CPU
130-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Release|x86.ActiveCfg = Release|Any CPU
131-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC}.Release|x86.Build.0 = Release|Any CPU
120+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
121+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Debug|Any CPU.Build.0 = Debug|Any CPU
122+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Debug|x64.ActiveCfg = Debug|Any CPU
123+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Debug|x64.Build.0 = Debug|Any CPU
124+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Debug|x86.ActiveCfg = Debug|Any CPU
125+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Debug|x86.Build.0 = Debug|Any CPU
126+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Release|Any CPU.ActiveCfg = Release|Any CPU
127+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Release|Any CPU.Build.0 = Release|Any CPU
128+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Release|x64.ActiveCfg = Release|Any CPU
129+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Release|x64.Build.0 = Release|Any CPU
130+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Release|x86.ActiveCfg = Release|Any CPU
131+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62}.Release|x86.Build.0 = Release|Any CPU
132132
EndGlobalSection
133133
GlobalSection(SolutionProperties) = preSolution
134134
HideSolutionNode = FALSE
@@ -140,6 +140,6 @@ Global
140140
{9C8C8F4B-359B-448F-88CB-7F4F1B94709E} = {3A8A3FE9-7C8D-43B9-AC12-8FAA83CD977C}
141141
{C7AE743C-7AA2-4D4C-B1C3-CBAA389F7431} = {3A8A3FE9-7C8D-43B9-AC12-8FAA83CD977C}
142142
{BA824808-A1F8-4F51-AADD-B0CEDB4215B7} = {3A8A3FE9-7C8D-43B9-AC12-8FAA83CD977C}
143-
{BE60008E-9050-4526-BE3E-8A2C4CC5A9EC} = {2D84CE50-F89B-94FD-0D1C-E1015598E8EB}
143+
{EAAF3FF5-C462-450B-9156-FFDB3899DA62} = {2D84CE50-F89B-94FD-0D1C-E1015598E8EB}
144144
EndGlobalSection
145145
EndGlobal

‎src/ManagedServices/ManagedServices/Az.ManagedServices.psd1

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

99
@{
@@ -57,10 +57,10 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '5.1.1'; })
5757
RequiredAssemblies = 'ManagedServices.Autorest/bin/Az.ManagedServices.private.dll'
5858

5959
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
60-
# ScriptsToProcess = @()
60+
ScriptsToProcess = @()
6161

6262
# Type files (.ps1xml) to be loaded when importing this module
63-
# TypesToProcess = @()
63+
TypesToProcess = @()
6464

6565
# Format files (.ps1xml) to be loaded when importing this module
6666
FormatsToProcess = 'ManagedServices.Autorest/Az.ManagedServices.format.ps1xml'
@@ -104,7 +104,7 @@ PrivateData = @{
104104
PSData = @{
105105

106106
# Tags applied to this module. These help with module discovery in online galleries.
107-
Tags = 'Azure','ResourceManager','ARM','PSModule','ManagedServices'
107+
Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'ManagedServices'
108108

109109
# A URL to the license for this module.
110110
LicenseUri = 'https://aka.ms/azps-license'
@@ -137,7 +137,7 @@ PrivateData = @{
137137

138138
} # End of PSData hashtable
139139

140-
} # End of PrivateData hashtable
140+
} # End of PrivateData hashtable
141141

142142
# HelpInfo URI of this module
143143
# HelpInfoURI = ''

‎src/ManagedServices/ManagedServices/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Update the outputs of breaking change announcements.
2122

2223
## Version 3.1.1
2324
* Added breaking change announcement for below commands from array or single object to list.

0 commit comments

Comments
 (0)