Remove CancellationToken.

Author: sergey-shandar

src/ResourceManager/Common/Commands.Common.Strategies.UnitTest/AsyncCmdletExtensionsTest.cs

@@ -4,6 +4,7 @@
 using Microsoft.Rest;
 using Xunit;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using System.Threading;
 
 namespace Microsoft.Azure.Commands.Common.Strategies.UnitTest
 {
@@ -48,6 +49,9 @@ public async Task<ResourceConfig<RG>> CreateConfigAsync()
 
         class AsyncCmdlet : IAsyncCmdlet
         {
+            public CancellationToken CancellationToken { get; } 
+                = new CancellationToken();
+
             public IEnumerable<KeyValuePair<string, object>> Parameters
             {
                 get
@@ -93,7 +97,7 @@ public async Task TestVerboseStream()
             var parameters = new Parameters();
             var asyncCmdlet = new AsyncCmdlet();
 
-            await client.RunAsync("subscriptionId", parameters, asyncCmdlet, new System.Threading.CancellationToken());
+            await client.RunAsync("subscriptionId", parameters, asyncCmdlet);
         }
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/AsyncCmdletExtensions.cs

@@ -46,14 +46,13 @@ public static async Task<TModel> RunAsync<TModel>(
             this IClient client,
             string subscriptionId,
             IParameters<TModel> parameters,
-            IAsyncCmdlet asyncCmdlet,
-            CancellationToken cancellationToken)
+            IAsyncCmdlet asyncCmdlet)
             where TModel : class
         {
             // create a DAG of configs.
             var config = await parameters.CreateConfigAsync();
             // read current Azure state.
-            var current = await config.GetStateAsync(client, cancellationToken);
+            var current = await config.GetStateAsync(client, asyncCmdlet.CancellationToken);
             // update location.
             parameters.Location = current.UpdateLocation(parameters.Location, config);
             // update a DAG of configs.
@@ -71,7 +70,7 @@ public static async Task<TModel> RunAsync<TModel>(
             var newState = await config.UpdateStateAsync(
                 client,
                 target,
-                cancellationToken,
+                asyncCmdlet.CancellationToken,
                 new ShouldProcess(asyncCmdlet),
                 asyncCmdlet.ReportTaskProgress);
             // return a resource model
@@ -185,6 +184,9 @@ sealed class AsyncCmdlet : IAsyncCmdlet
             public IEnumerable<KeyValuePair<string, object>> Parameters
                 => Cmdlet.Parameters;
 
+            public CancellationToken CancellationToken { get; }
+                = new CancellationToken();
+
             public AsyncCmdlet(ICmdlet cmdlet)
             {
                 Cmdlet = cmdlet;
@@ -201,6 +203,8 @@ public void WriteObject(object value)
 
             public void ReportTaskProgress(ITaskProgress taskProgress)
                 => Scheduler.BeginInvoke(() => TaskProgressList.Add(taskProgress));
+
+
         }
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/IAsyncCmdlet.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Microsoft.Azure.Commands.Common.Strategies
@@ -54,5 +55,10 @@ public interface IAsyncCmdlet
         /// A `New` verb.
         /// </summary>
         string VerbsNew { get; }
+
+        /// <summary>
+        /// Cancellation token for asynchonous operations.
+        /// </summary>
+        CancellationToken CancellationToken { get; }
     }
 }

src/ResourceManager/Compute/Commands.Compute/Manual/VirtualMachineScaleSetCreateOrUpdateMethod.cs

@@ -267,8 +267,7 @@ async Task SimpleParameterSetExecuteCmdlet(IAsyncCmdlet asyncCmdlet)
 
             var parameters = new Parameters(this, client);
 
-            var result = await client.RunAsync(
-                client.SubscriptionId, parameters, asyncCmdlet, new CancellationToken());
+            var result = await client.RunAsync(client.SubscriptionId, parameters, asyncCmdlet);
 
             if (result != null)
             {

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs

@@ -423,8 +423,7 @@ async Task StrategyExecuteCmdletAsync(IAsyncCmdlet asyncCmdlet)
                 }
             }
 
-            var result = await client.RunAsync(
-                client.SubscriptionId, parameters, asyncCmdlet, new CancellationToken());
+            var result = await client.RunAsync(client.SubscriptionId, parameters, asyncCmdlet);
 
             if (result != null)
             {