Skip to content

Commit e3f69e8

Browse files
authored
Merge pull request #21829 from Azure/jinlei/release-network-fix-merge
Merge release-network-2022-11-01 to Main
2 parents e52d1b4 + f4b8f5a commit e3f69e8

File tree

1,374 files changed

+75901
-49739
lines changed

Some content is hidden

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

1,374 files changed

+75901
-49739
lines changed

src/Accounts/Accounts/Utilities/CommandMappings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4280,6 +4280,7 @@
42804280
"New-AzOffice365PolicyProperty": {},
42814281
"Get-AzNetworkVirtualApplianceSku": {},
42824282
"New-AzVirtualApplianceSkuProperty": {},
4283+
"New-AzVirtualApplianceAdditionalNicProperty": {},
42834284
"New-AzCustomIpPrefix": {},
42844285
"Update-AzCustomIpPrefix": {},
42854286
"Get-AzCustomIpPrefix": {},

src/Network/Network.Management.Sdk/Generated/Generated/AdminRuleCollectionsOperations.cs renamed to src/Network/Network.Management.Sdk/Generated/AdminRuleCollectionsOperations.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,18 @@ internal AdminRuleCollectionsOperations(NetworkManagementClient client)
112112
{
113113
throw new ValidationException(ValidationRules.CannotBeNull, "configurationName");
114114
}
115-
if (top > 20)
116-
{
117-
throw new ValidationException(ValidationRules.InclusiveMaximum, "top", 20);
118-
}
119-
if (top < 1)
115+
if (top != null)
120116
{
121-
throw new ValidationException(ValidationRules.InclusiveMinimum, "top", 1);
117+
if (top > 20)
118+
{
119+
throw new ValidationException(ValidationRules.InclusiveMaximum, "top", 20);
120+
}
121+
if (top < 1)
122+
{
123+
throw new ValidationException(ValidationRules.InclusiveMinimum, "top", 1);
124+
}
122125
}
123-
string apiVersion = "2022-09-01";
126+
string apiVersion = "2022-11-01";
124127
// Tracing
125128
bool _shouldTrace = ServiceClientTracing.IsEnabled;
126129
string _invocationId = null;
@@ -340,7 +343,7 @@ internal AdminRuleCollectionsOperations(NetworkManagementClient client)
340343
{
341344
throw new ValidationException(ValidationRules.CannotBeNull, "ruleCollectionName");
342345
}
343-
string apiVersion = "2022-09-01";
346+
string apiVersion = "2022-11-01";
344347
// Tracing
345348
bool _shouldTrace = ServiceClientTracing.IsEnabled;
346349
string _invocationId = null;
@@ -563,7 +566,7 @@ internal AdminRuleCollectionsOperations(NetworkManagementClient client)
563566
{
564567
throw new ValidationException(ValidationRules.CannotBeNull, "ruleCollectionName");
565568
}
566-
string apiVersion = "2022-09-01";
569+
string apiVersion = "2022-11-01";
567570
// Tracing
568571
bool _shouldTrace = ServiceClientTracing.IsEnabled;
569572
string _invocationId = null;
@@ -835,7 +838,7 @@ internal AdminRuleCollectionsOperations(NetworkManagementClient client)
835838
{
836839
throw new ValidationException(ValidationRules.CannotBeNull, "ruleCollectionName");
837840
}
838-
string apiVersion = "2022-09-01";
841+
string apiVersion = "2022-11-01";
839842
// Tracing
840843
bool _shouldTrace = ServiceClientTracing.IsEnabled;
841844
string _invocationId = null;

src/Network/Network.Management.Sdk/Generated/Generated/AdminRulesOperations.cs renamed to src/Network/Network.Management.Sdk/Generated/AdminRulesOperations.cs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,18 @@ internal AdminRulesOperations(NetworkManagementClient client)
118118
{
119119
throw new ValidationException(ValidationRules.CannotBeNull, "ruleCollectionName");
120120
}
121-
if (top > 20)
122-
{
123-
throw new ValidationException(ValidationRules.InclusiveMaximum, "top", 20);
124-
}
125-
if (top < 1)
121+
if (top != null)
126122
{
127-
throw new ValidationException(ValidationRules.InclusiveMinimum, "top", 1);
123+
if (top > 20)
124+
{
125+
throw new ValidationException(ValidationRules.InclusiveMaximum, "top", 20);
126+
}
127+
if (top < 1)
128+
{
129+
throw new ValidationException(ValidationRules.InclusiveMinimum, "top", 1);
130+
}
128131
}
129-
string apiVersion = "2022-09-01";
132+
string apiVersion = "2022-11-01";
130133
// Tracing
131134
bool _shouldTrace = ServiceClientTracing.IsEnabled;
132135
string _invocationId = null;
@@ -355,7 +358,7 @@ internal AdminRulesOperations(NetworkManagementClient client)
355358
{
356359
throw new ValidationException(ValidationRules.CannotBeNull, "ruleName");
357360
}
358-
string apiVersion = "2022-09-01";
361+
string apiVersion = "2022-11-01";
359362
// Tracing
360363
bool _shouldTrace = ServiceClientTracing.IsEnabled;
361364
string _invocationId = null;
@@ -583,7 +586,7 @@ internal AdminRulesOperations(NetworkManagementClient client)
583586
{
584587
throw new ValidationException(ValidationRules.CannotBeNull, "ruleName");
585588
}
586-
string apiVersion = "2022-09-01";
589+
string apiVersion = "2022-11-01";
587590
// Tracing
588591
bool _shouldTrace = ServiceClientTracing.IsEnabled;
589592
string _invocationId = null;
@@ -867,7 +870,7 @@ internal AdminRulesOperations(NetworkManagementClient client)
867870
{
868871
throw new ValidationException(ValidationRules.CannotBeNull, "ruleName");
869872
}
870-
string apiVersion = "2022-09-01";
873+
string apiVersion = "2022-11-01";
871874
// Tracing
872875
bool _shouldTrace = ServiceClientTracing.IsEnabled;
873876
string _invocationId = null;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ internal ApplicationGatewayPrivateEndpointConnectionsOperations(NetworkManagemen
155155
{
156156
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
157157
}
158-
string apiVersion = "2022-09-01";
158+
string apiVersion = "2022-11-01";
159159
// Tracing
160160
bool _shouldTrace = ServiceClientTracing.IsEnabled;
161161
string _invocationId = null;
@@ -351,7 +351,7 @@ internal ApplicationGatewayPrivateEndpointConnectionsOperations(NetworkManagemen
351351
{
352352
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
353353
}
354-
string apiVersion = "2022-09-01";
354+
string apiVersion = "2022-11-01";
355355
// Tracing
356356
bool _shouldTrace = ServiceClientTracing.IsEnabled;
357357
string _invocationId = null;
@@ -549,7 +549,7 @@ internal ApplicationGatewayPrivateEndpointConnectionsOperations(NetworkManagemen
549549
{
550550
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
551551
}
552-
string apiVersion = "2022-09-01";
552+
string apiVersion = "2022-11-01";
553553
// Tracing
554554
bool _shouldTrace = ServiceClientTracing.IsEnabled;
555555
string _invocationId = null;
@@ -742,7 +742,7 @@ internal ApplicationGatewayPrivateEndpointConnectionsOperations(NetworkManagemen
742742
{
743743
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
744744
}
745-
string apiVersion = "2022-09-01";
745+
string apiVersion = "2022-11-01";
746746
// Tracing
747747
bool _shouldTrace = ServiceClientTracing.IsEnabled;
748748
string _invocationId = null;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ internal ApplicationGatewayPrivateLinkResourcesOperations(NetworkManagementClien
9494
{
9595
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
9696
}
97-
string apiVersion = "2022-09-01";
97+
string apiVersion = "2022-11-01";
9898
// Tracing
9999
bool _shouldTrace = ServiceClientTracing.IsEnabled;
100100
string _invocationId = null;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ internal ApplicationGatewayWafDynamicManifestsDefaultOperations(NetworkManagemen
8787
{
8888
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
8989
}
90-
string apiVersion = "2022-09-01";
90+
string apiVersion = "2022-11-01";
9191
// Tracing
9292
bool _shouldTrace = ServiceClientTracing.IsEnabled;
9393
string _invocationId = null;

0 commit comments

Comments
 (0)