Merge pull request Azure#3243 from NonStatic2014/swagger_update

markcowl · web-flow · commit 5209d244eabc · 2016-12-07T14:53:38.000-08:00
Consume the latest .Net SDK NuGet package.
diff --git a/src/ResourceManager/MachineLearning/ChangeLog.md b/src/ResourceManager/MachineLearning/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Serialization and deserialization improvements for all cmdlets
 
 ## Version 0.11.1
 * Add support for Azure Machine Learning Committment Plans
diff --git a/src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/Commands.MachineLearning.Test.csproj b/src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/Commands.MachineLearning.Test.csproj
@@ -59,7 +59,7 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="..\..\..\packages\Microsoft.Azure.Management.MachineLearning.0.9.5-preview\lib\net45\Microsoft.Azure.Management.MachineLearning.dll">
+    <Reference Include="..\..\..\packages\Microsoft.Azure.Management.MachineLearning.0.9.6-preview\lib\net45\Microsoft.Azure.Management.MachineLearning.dll">
       <Name>Microsoft.Azure.Management.MachineLearning</Name>
       <Private>True</Private>
     </Reference>
diff --git a/src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/packages.config b/src/ResourceManager/MachineLearning/Commands.MachineLearning.Test/packages.config
@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.MachineLearning" version="0.9.5-preview" />
+  <package id="Microsoft.Azure.Management.MachineLearning" version="0.9.6-preview" />
   <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview"  targetFramework="net45" />
diff --git a/src/ResourceManager/MachineLearning/Commands.MachineLearning/Commands.MachineLearning.csproj b/src/ResourceManager/MachineLearning/Commands.MachineLearning/Commands.MachineLearning.csproj
@@ -59,7 +59,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.MachineLearning, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.MachineLearning.0.9.5-preview\lib\net45\Microsoft.Azure.Management.MachineLearning.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.MachineLearning.0.9.6-preview\lib\net45\Microsoft.Azure.Management.MachineLearning.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
diff --git a/src/ResourceManager/MachineLearning/Commands.MachineLearning/Utilities/WebServicesClient.cs b/src/ResourceManager/MachineLearning/Commands.MachineLearning/Utilities/WebServicesClient.cs
@@ -95,15 +95,16 @@ public async Task<ResponseWithContinuation<WebService[]>>
         {
             string skipToken = WebServicesClient.GetSkipTokenFromLink(nextLink);
             var cancellationTokenParam = cancellationToken ?? CancellationToken.None;
-            var paginatedResponse = await this.apiClient.WebServices.ListInResourceGroupAsync(
+            var paginatedResponse = await this.apiClient.WebServices.ListByResourceGroupWithHttpMessagesAsync(
                                                                         resourceGroupName,
                                                                         skipToken,
+                                                                        null,
                                                                         cancellationTokenParam).ConfigureAwait(false);
 
             return new ResponseWithContinuation<WebService[]>
             {
-                Value = paginatedResponse.Value.ToArray(),
-                NextLink = paginatedResponse.NextLink
+                Value = paginatedResponse.Body.ToArray(),
+                NextLink = paginatedResponse.Body.NextPageLink
             };
         }
 
@@ -116,14 +117,15 @@ public async Task<ResponseWithContinuation<WebService[]>>
             var cancellationTokenParam = cancellationToken ?? CancellationToken.None;
 
             var paginatedResponse =
-                    await this.apiClient.WebServices.ListAsync(
+                    await this.apiClient.WebServices.ListWithHttpMessagesAsync(
                                                         skipToken,
+                                                        null,
                                                         cancellationTokenParam).ConfigureAwait(false);
 
             return new ResponseWithContinuation<WebService[]>
             {
-                Value = paginatedResponse.Value.ToArray(),
-                NextLink = paginatedResponse.NextLink
+                Value = paginatedResponse.Body.ToArray(),
+                NextLink = paginatedResponse.Body.NextPageLink
             };
         }
     }
diff --git a/src/ResourceManager/MachineLearning/Commands.MachineLearning/packages.config b/src/ResourceManager/MachineLearning/Commands.MachineLearning/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.2" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.MachineLearning" version="0.9.5-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.MachineLearning" version="0.9.6-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
   <package id="Microsoft.Rest.ClientRuntime" version="2.3.2" targetFramework="net45" />
   <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.2" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -95,15 +95,16 @@ public async Task<ResponseWithContinuation<WebService[]>>`
`95`	`95`	`{`
`96`	`96`	`string skipToken = WebServicesClient.GetSkipTokenFromLink(nextLink);`
`97`	`97`	`var cancellationTokenParam = cancellationToken ?? CancellationToken.None;`
`98`		`- var paginatedResponse = await this.apiClient.WebServices.ListInResourceGroupAsync(`
	`98`	`+ var paginatedResponse = await this.apiClient.WebServices.ListByResourceGroupWithHttpMessagesAsync(`
`99`	`99`	`resourceGroupName,`
`100`	`100`	`skipToken,`
	`101`	`+ null,`
`101`	`102`	`cancellationTokenParam).ConfigureAwait(false);`
`102`	`103`
`103`	`104`	`return new ResponseWithContinuation<WebService[]>`
`104`	`105`	`{`
`105`		`- Value = paginatedResponse.Value.ToArray(),`
`106`		`- NextLink = paginatedResponse.NextLink`
	`106`	`+ Value = paginatedResponse.Body.ToArray(),`
	`107`	`+ NextLink = paginatedResponse.Body.NextPageLink`
`107`	`108`	`};`
`108`	`109`	`}`
`109`	`110`
`@@ -116,14 +117,15 @@ public async Task<ResponseWithContinuation<WebService[]>>`
`116`	`117`	`var cancellationTokenParam = cancellationToken ?? CancellationToken.None;`
`117`	`118`
`118`	`119`	`var paginatedResponse =`
`119`		`- await this.apiClient.WebServices.ListAsync(`
	`120`	`+ await this.apiClient.WebServices.ListWithHttpMessagesAsync(`
`120`	`121`	`skipToken,`
	`122`	`+ null,`
`121`	`123`	`cancellationTokenParam).ConfigureAwait(false);`
`122`	`124`
`123`	`125`	`return new ResponseWithContinuation<WebService[]>`
`124`	`126`	`{`
`125`		`- Value = paginatedResponse.Value.ToArray(),`
`126`		`- NextLink = paginatedResponse.NextLink`
	`127`	`+ Value = paginatedResponse.Body.ToArray(),`
	`128`	`+ NextLink = paginatedResponse.Body.NextPageLink`
`127`	`129`	`};`
`128`	`130`	`}`
`129`	`131`	`}`