fix merge ocnflicts

Author: darshanhs90

.gitignore

@@ -211,4 +211,5 @@ FakesAssemblies/
 /tools/*.dll
 *.GhostDoc.xml
 pingme.txt
-groupMapping*.json
+groupMapping*.json
+.vscode/

TestMappings.json

@@ -123,6 +123,9 @@
   "src/ResourceManager/StreamAnalytics/": [
     ".\\src\\ResourceManager\\StreamAnalytics\\Commands.StreamAnalytics.Test\\bin\\Debug\\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"
   ],
+  "src/ResourceManager/Subscription/": [
+    ".\\src\\ResourceManager\\Subscription\\Commands.Subscription.Test\\bin\\Debug\\Microsoft.Azure.Commands.Subscription.Test.dll"
+  ],
   "src/ResourceManager/Tags/": [],
   "src/ResourceManager/TrafficManager/": [
     ".\\src\\ResourceManager\\TrafficManager\\Commands.TrafficManager2.Test\\bin\\Debug\\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 
-  <?define productName="Microsoft Azure PowerShell - November 2017" ?>
+  <?define productName="Microsoft Azure PowerShell - December 2017" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="5.0.0" ?>
+  <?define version="5.1.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

setup/azurecmdfiles.wxi

@@ -271,6 +271,9 @@
                         <Component Id="cmp4677B0CE124023330EDD7AA4FECFF45E" Guid="*">
                             <File Id="fil58F144170E43C2EFEC66E5F3DE2FA977" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\AzureRM.Compute.psm1" />
                         </Component>
+                        <Component Id="cmp32CF42EA1F0A7DA716459A5A6A21C24D" Guid="*">
+                            <File Id="fil5AE28BCCEED67270ECF02C93C9688AD5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Azure.Commands.Common.Strategies.dll" />
+                        </Component>
                         <Component Id="cmpFBB75A5451448B356C97E62D2C6C10A0" Guid="*">
                             <File Id="fil24BE7D514EE83ED7D31C68CBFFA8FBB8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Azure.Commands.Compute.dll" />
                         </Component>
@@ -3151,6 +3154,7 @@
             <ComponentRef Id="cmpD2516E302D41812368A84BD6010FB066" />
             <ComponentRef Id="cmp594709EB2E69BD7173BC8833BE2061B4" />
             <ComponentRef Id="cmp4677B0CE124023330EDD7AA4FECFF45E" />
+            <ComponentRef Id="cmp32CF42EA1F0A7DA716459A5A6A21C24D" />
             <ComponentRef Id="cmpFBB75A5451448B356C97E62D2C6C10A0" />
             <ComponentRef Id="cmp1CB1E6D6A2D939FB32D9ACD70681644D" />
             <ComponentRef Id="cmpAA00FCFEE63D9A20C2618B36B1848D7C" />

src/Common/Commands.Common.Network/Commands.Common.Network.csproj

@@ -0,0 +1,93 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.Internal.Network.Version2017_10_01
+{
+    using Microsoft.Rest;
+    using Microsoft.Rest.Azure;
+    using Models;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// Extension methods for AvailableEndpointServicesOperations.
+    /// </summary>
+    public static partial class AvailableEndpointServicesOperationsExtensions
+    {
+            /// <summary>
+            /// List what values of endpoint services are available for use.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='location'>
+            /// The location to check available endpoint services.
+            /// </param>
+            public static IPage<EndpointServiceResult> List(this IAvailableEndpointServicesOperations operations, string location)
+            {
+                return operations.ListAsync(location).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// List what values of endpoint services are available for use.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='location'>
+            /// The location to check available endpoint services.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<IPage<EndpointServiceResult>> ListAsync(this IAvailableEndpointServicesOperations operations, string location, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListWithHttpMessagesAsync(location, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+            /// <summary>
+            /// List what values of endpoint services are available for use.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='nextPageLink'>
+            /// The NextLink from the previous successful call to List operation.
+            /// </param>
+            public static IPage<EndpointServiceResult> ListNext(this IAvailableEndpointServicesOperations operations, string nextPageLink)
+            {
+                return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult();
+            }
+
+            /// <summary>
+            /// List what values of endpoint services are available for use.
+            /// </summary>
+            /// <param name='operations'>
+            /// The operations group for this extension method.
+            /// </param>
+            /// <param name='nextPageLink'>
+            /// The NextLink from the previous successful call to List operation.
+            /// </param>
+            /// <param name='cancellationToken'>
+            /// The cancellation token.
+            /// </param>
+            public static async Task<IPage<EndpointServiceResult>> ListNextAsync(this IAvailableEndpointServicesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken))
+            {
+                using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+                {
+                    return _result.Body;
+                }
+            }
+
+    }
+}