Skip to content

Fixes after breaking changes in Express Route Peerings swagger #6036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MikhailTryakhov wants to merge 7 commits into from
Closed

Fixes after breaking changes in Express Route Peerings swagger #6036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8e62af5
Fixes after breaking changes in Express Route Peerings
MikhailTryakhov Apr 24, 2018
84eafbd
Fixed packages version
MikhailTryakhov Apr 24, 2018
f157e4d
fixed wrong model usage
MikhailTryakhov Apr 24, 2018
7f1d43c
fixed package version in netcore
MikhailTryakhov Apr 24, 2018
a255edc
updated package versions
MikhailTryakhov Apr 24, 2018
4a81853
Fixed mistyping in config file
MikhailTryakhov Apr 24, 2018
3c2b575
Added new SDK version locally to test
MikhailTryakhov Apr 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ResourceManager/Common/Commands.Common.Strategies/Common.Strategies.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="17.5.0" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="17.0.0-preview" />
Copy link
Member

@markcowl markcowl May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what are the functional changes that go with these assembly changes?

<PackageReference Include="Microsoft.Azure.Management.Network" Version="18.0.0-preview" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
<Reference Include="Microsoft.Azure.Management.Compute">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.18.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Network, Version=18.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.2.2.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="Microsoft.Azure.Management.Network, Version=18.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Copy link
Member

@markcowl markcowl May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these should all be the same version

<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.ResourceManager">
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network.Test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<package id="Microsoft.Azure.Insights" version="0.13.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Compute" version="18.0.0" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="17.0.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="19.0.0-preview" targetFramework="net452" />
Copy link
Member

@markcowl markcowl May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cannot be different

<package id="Microsoft.Azure.Management.Redis" version="3.1.1-preview" targetFramework="net45" />
<package id="Microsoft.Azure.Management.ResourceManager" version="1.6.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network/Commands.Network.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<ItemGroup >
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="17.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.0-preview" />
Copy link
Member

@markcowl markcowl May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment

</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Network/Commands.Network/Commands.Network.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Copy link
Member

@markcowl markcowl May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment

<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions ...Commands.Network/ExpressRouteCircuit/Peering/AzureExpressRouteCircuitPeeringConfigBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public class AzureExpressRouteCircuitPeeringConfigBase : NetworkBaseCmdlet
HelpMessage = "The PeeringType")]
[ValidateNotNullOrEmpty]
[ValidateSet(
MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering,
MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering,
MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering,
MNM.ExpressRoutePeeringType.AzurePrivatePeering,
MNM.ExpressRoutePeeringType.AzurePublicPeering,
MNM.ExpressRoutePeeringType.MicrosoftPeering,
IgnoreCase = true)]
public string PeeringType { get; set; }

Expand Down
4 changes: 2 additions & 2 deletions ...Network/ExpressRouteCircuit/Peering/RemoveAzureExpressRouteCircuitPeeringConfigCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public override void Execute()
// For example if the peering has only IPv4 properties set and the user tries to remove IPv6 address family peering, we can ignore the remove operation
bool validateAddressFamilyPresent = true;

if ((this.PeerAddressType == IPv4 && peering.PeeringType == MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering && peering.MicrosoftPeeringConfig == null) ||
(this.PeerAddressType == IPv6 && peering.PeeringType == MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering && (peering.Ipv6PeeringConfig == null || peering.Ipv6PeeringConfig.MicrosoftPeeringConfig == null)))
if ((this.PeerAddressType == IPv4 && peering.PeeringType == MNM.ExpressRoutePeeringType.MicrosoftPeering && peering.MicrosoftPeeringConfig == null) ||
(this.PeerAddressType == IPv6 && peering.PeeringType == MNM.ExpressRoutePeeringType.MicrosoftPeering && (peering.Ipv6PeeringConfig == null || peering.Ipv6PeeringConfig.MicrosoftPeeringConfig == null)))
{
validateAddressFamilyPresent = false;
}
Expand Down
6 changes: 3 additions & 3 deletions .../Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitARPTableCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ public class GetAzureExpressRouteCircuitARPTableCommand : NetworkBaseCmdlet
Mandatory = false,
HelpMessage = "The PeeringType")]
[ValidateSet(
MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering,
MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering,
MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering,
MNM.ExpressRoutePeeringType.AzurePrivatePeering,
MNM.ExpressRoutePeeringType.AzurePublicPeering,
MNM.ExpressRoutePeeringType.MicrosoftPeering,
IgnoreCase = true)]
public string PeeringType { get; set; }

Expand Down
6 changes: 3 additions & 3 deletions ...ommands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ public class GetAzureRmExpressRouteCircuitRouteTable : NetworkBaseCmdlet
Mandatory = false,
HelpMessage = "The PeeringType")]
[ValidateSet(
MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering,
MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering,
MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering,
MNM.ExpressRoutePeeringType.AzurePrivatePeering,
MNM.ExpressRoutePeeringType.AzurePublicPeering,
MNM.ExpressRoutePeeringType.MicrosoftPeering,
IgnoreCase = true)]
public string PeeringType { get; set; }

Expand Down
6 changes: 3 additions & 3 deletions ....Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteCircuitRouteTableSummaryCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ public class GetAzureRmExpressRouteCircuitRouteTableSummaryCommand : NetworkBase
Mandatory = false,
HelpMessage = "The PeeringType")]
[ValidateSet(
MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering,
MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering,
MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering,
MNM.ExpressRoutePeeringType.AzurePrivatePeering,
MNM.ExpressRoutePeeringType.AzurePublicPeering,
MNM.ExpressRoutePeeringType.MicrosoftPeering,
IgnoreCase = true)]
public string PeeringType { get; set; }

Expand Down
6 changes: 3 additions & 3 deletions ...er/Network/Commands.Network/ExpressRouteCircuit/Stats/GetAzureExpressRouteStatsCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public class GetAzureExpressRouteCircuitStatsCommand : NetworkBaseCmdlet
Mandatory = false,
HelpMessage = "The PeeringType")]
[ValidateSet(
MNM.ExpressRouteCircuitPeeringType.AzurePrivatePeering,
MNM.ExpressRouteCircuitPeeringType.AzurePublicPeering,
MNM.ExpressRouteCircuitPeeringType.MicrosoftPeering,
MNM.ExpressRoutePeeringType.AzurePrivatePeering,
MNM.ExpressRoutePeeringType.AzurePublicPeering,
MNM.ExpressRoutePeeringType.MicrosoftPeering,
IgnoreCase = true)]
public string PeeringType { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
<package id="Microsoft.Azure.Management.Network" version="17.0.0-preview" targetFramework="net452" />
<package id="Microsoft.Azure.Management.Network" version="19.0.0-preview" targetFramework="net452" />
Copy link
Member

@markcowl markcowl May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comment

</packages>
4 changes: 2 additions & 2 deletions ...Backup/Commands.RecoveryServices.Backup.Test/Commands.RecoveryServices.Backup.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.18.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Network, Version=18.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion ...esourceManager/ServiceFabric/Commands.ServiceFabric/Commands.ServiceFabric.Netcore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="2.0.7" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="17.5.0" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.3.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="17.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="18.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.ServiceFabric" Version="1.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Network, Version=17.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Network, Version=18.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.18.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
Copy link
Member

@markcowl markcowl May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: the network version needs to be published before we can accept it in preview

<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Sql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
Binary file added tools/LocalFeed/Microsoft.Azure.Management.Network.19.0.0.nupkg
View file
Open in desktop
Binary file not shown.
Binary file added tools/LocalFeed/Microsoft.Azure.Management.Network.19.0.0.symbols.nupkg
View file
Open in desktop
Binary file not shown.