Skip to content

Commit 71f206c

Browse files
anton-evseevanton-evseev
committed
Update after rebase
1 parent 82060fc commit 71f206c

File tree

29 files changed

+2858
-3012
lines changed

29 files changed

+2858
-3012
lines changed

‎src/ApiManagement/ApiManagement.ServiceManagement/Commands/GetAzureApiManagementAuthorizationServer.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
1717
using System;
1818
using System.Management.Automation;
1919
using Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models;
20-
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
2120

22-
[GenericBreakingChange("Output changed: ClientSecret will not be returned anymore. Additional cmdlet will be added to retrieve ClientSecret.")]
2321
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementAuthorizationServer", DefaultParameterSetName = ContextParameterSet)]
2422
[OutputType(typeof(PsApiManagementOAuth2AuthorizationServer))]
2523
public class GetAzureApiManagementAuthorizationServer : AzureApiManagementCmdletBase

‎src/ApiManagement/ApiManagement.ServiceManagement/Commands/GetAzureApiManagementIdentityProvider.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
1717
using System;
1818
using System.Management.Automation;
1919
using Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models;
20-
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
2120

22-
[GenericBreakingChange("Output changed: ClientSecret will not be returned anymore. Additional cmdlet will be added to retrieve ClientSecret.")]
2321
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementIdentityProvider", DefaultParameterSetName = AllIdentityProviders)]
2422
[OutputType(typeof(PsApiManagementIdentityProvider))]
2523
public class GetAzureApiManagementIdentityProvider : AzureApiManagementCmdletBase

‎src/ApiManagement/ApiManagement.ServiceManagement/Commands/GetAzureApiManagementOpenIdConnectProvider.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
1616
{
1717
using Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models;
18-
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1918
using System;
2019
using System.Management.Automation;
2120

22-
[GenericBreakingChange("Output changed: ClientSecret will not be returned anymore. Additional cmdlet will be added to retrieve ClientSecret.")]
2321
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementOpenIdConnectProvider", DefaultParameterSetName = GetAll)]
2422
[OutputType(typeof(PsApiManagementOpenIdConnectProvider))]
2523
public class GetAzureApiManagementOpenIdConnectProvider : AzureApiManagementCmdletBase

‎src/ApiManagement/ApiManagement.ServiceManagement/Commands/GetAzureApiManagementSubscription.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
1616
{
1717
using Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models;
18-
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1918
using System;
2019
using System.Management.Automation;
2120

22-
[GenericBreakingChange("Output changed: Subscription keys will not be returned anymore. Additional cmdlet will be added to retrieve subscription keys.")]
2321
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementSubscription", DefaultParameterSetName = GetAll)]
2422
[OutputType(typeof(PsApiManagementSubscription), ParameterSetName = new[] { GetAll, GetBySubscriptionId, GetByUserId, GetByScope, GetByProductIdAndUser, GetByProductId })]
2523
public class GetAzureApiManagementSubscription : AzureApiManagementCmdletBase

‎src/ApiManagement/ApiManagement.ServiceManagement/Commands/GetAzureRmApiManagementTenantAccess.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
1616
{
1717
using Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models;
18-
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1918
using System.Management.Automation;
2019

21-
[GenericBreakingChange("Output changed: Keys will not be returned anymore. Additional cmdlet will be added to retrieve the keys.")]
2220
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementTenantAccess")]
2321
[OutputType(typeof(PsApiManagementAccessInformation))]
2422
public class GetAzureRmApiManagementTenantAccess : AzureApiManagementCmdletBase

‎src/ApiManagement/ApiManagement.ServiceManagement/Commands/GetAzureRmApiManagementTenantGitAccess.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@
1515
namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Commands
1616
{
1717
using Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models;
18-
using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
1918
using System.Management.Automation;
2019

21-
[GenericBreakingChange("Output changed: Keys will not be returned anymore. Additional cmdlet will be added to retrieve the keys.")]
2220
[Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ApiManagementTenantGitAccess")]
2321
[OutputType(typeof(PsApiManagementAccessInformation))]
2422
public class GetAzureRmApiManagementTenantGitAccess : AzureApiManagementCmdletBase

‎src/CognitiveServices/CognitiveServices.Test/CognitiveServices.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.Management.CognitiveServices" Version="7.1.0-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.20.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
1616
</ItemGroup>
1717

1818
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.20.1-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<PsModuleName>CosmosDB</PsModuleName>
44
</PropertyGroup>
55
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
66
<ItemGroup>
77
<PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="1.1.1" />
8-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.20.0-preview" />
8+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
99
</ItemGroup>
1010
</Project>

‎src/DataLakeStore/DataLakeStore.Test/DataLakeStore.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.Management.DataLake.Store" Version="2.4.2-preview" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.20.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Dns/Dns.Test/Dns.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.Management.Dns" Version="3.0.1" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.20.1-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
1616
</ItemGroup>
1717

1818
</Project>

‎src/HPCCache/HPCCache.Test/HPCCache.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.11.0-preview" />
1919
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="14.5.0" />
20-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
20+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
2121
<PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
2222
</ItemGroup>
2323

‎src/IotHub/IotHub/IotHub/DataPlane/Models/PSConfigurationMetricType.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,11 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
<<<<<<< HEAD:src/IotHub/IotHub/IotHub/DataPlane/Models/PSConfigurationMetricType.cs
1615
namespace Microsoft.Azure.Commands.Management.IotHub.Models
1716
{
1817
public enum PSConfigurationMetricType
1918
{
2019
Custom,
2120
System
22-
=======
23-
namespace Microsoft.Azure.Commands.Aks.Models
24-
{
25-
public class PSResourceReference
26-
{
27-
public string Id { get; set; }
28-
>>>>>>> d970c735cf... Sync Network dev branch with master (#11638):src/Aks/Aks/Models/PSResourceReference.cs
2921
}
30-
}
22+
}

‎src/KeyVault/KeyVault.Test/KeyVault.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
1515
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.20.1-preview" />
17+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Monitor/Monitor.Test/Monitor.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<PsModuleName>Monitor</PsModuleName>
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.Monitor" Version="0.25.1-preview" />
1515
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.2.0-preview" />
16-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.20.0-preview" />
16+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
1717
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.19.0-preview" />
1818
</ItemGroup>
1919

‎src/NetAppFiles/NetAppFiles.Test/NetAppFiles.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.Management.NetApp" Version="1.4.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.20.0-preview" />
15+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
1616
</ItemGroup>
1717

1818
</Project>

0 commit comments

Comments
 (0)