Skip to content

Fix nextLink json value for ARM APIs. This will change the nextLink k… #1381

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

Merged
yugangw-msft merged 1 commit into from
Aug 19, 2015
Merged

Fix nextLink json value for ARM APIs. This will change the nextLink k… #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions ...ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperationOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,11 +547,11 @@ public async Task<DeploymentOperationsListResult> ListAsync(string resourceGroup
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -765,11 +765,11 @@ public async Task<DeploymentOperationsListResult> ListNextAsync(string nextLink,
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/ResourceManagement/Resource/ResourceManagement/Generated/DeploymentOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1930,11 +1930,11 @@ public async Task<DeploymentListResult> ListAsync(string resourceGroupName, Depl
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -2322,11 +2322,11 @@ public async Task<DeploymentListResult> ListNextAsync(string nextLink, Cancellat
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down
32 changes: 16 additions & 16 deletions src/ResourceManagement/Resource/ResourceManagement/Generated/Features.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,11 @@ public async Task<FeatureOperationsListResult> ListAsync(string resourceProvider
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -602,11 +602,11 @@ public async Task<FeatureOperationsListResult> ListAllAsync(CancellationToken ca
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -778,11 +778,11 @@ public async Task<FeatureOperationsListResult> ListAllNextAsync(string nextLink,
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -954,11 +954,11 @@ public async Task<FeatureOperationsListResult> ListNextAsync(string nextLink, Ca
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down
32 changes: 16 additions & 16 deletions src/ResourceManagement/Resource/ResourceManagement/Generated/ManagementLockOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,11 +1616,11 @@ public async Task<ManagementLockListResult> ListAtResourceGroupLevelAsync(string
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -1882,11 +1882,11 @@ public async Task<ManagementLockListResult> ListAtResourceLevelAsync(string reso
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -2092,11 +2092,11 @@ public async Task<ManagementLockListResult> ListAtSubscriptionLevelAsync(Managem
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -2275,11 +2275,11 @@ public async Task<ManagementLockListResult> ListNextAsync(string nextLink, Cance
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/ResourceManagement/Resource/ResourceManagement/Generated/ProviderOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,11 +468,11 @@ public async Task<ProviderListResult> ListAsync(ProviderListParameters parameter
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -676,11 +676,11 @@ public async Task<ProviderListResult> ListNextAsync(string nextLink, Cancellatio
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceGroupOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,11 +1110,11 @@ public async Task<ResourceGroupListResult> ListAsync(ResourceGroupListParameters
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -1308,11 +1308,11 @@ public async Task<ResourceGroupListResult> ListNextAsync(string nextLink, Cancel
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/ResourceManagement/Resource/ResourceManagement/Generated/ResourceOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,11 +1329,11 @@ public async Task<ResourceListResult> ListAsync(ResourceListParameters parameter
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -1569,11 +1569,11 @@ public async Task<ResourceListResult> ListNextAsync(string nextLink, Cancellatio
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/ResourceManagement/Resource/ResourceManagement/Generated/TagOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,11 +956,11 @@ public async Task<TagsListResult> ListAsync(CancellationToken cancellationToken)
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down Expand Up @@ -1177,11 +1177,11 @@ public async Task<TagsListResult> ListNextAsync(string nextLink, CancellationTok
}
}

JToken odatanextLinkValue = responseDoc["@odata.nextLink"];
if (odatanextLinkValue != null && odatanextLinkValue.Type != JTokenType.Null)
JToken nextLinkValue = responseDoc["nextLink"];
if (nextLinkValue != null && nextLinkValue.Type != JTokenType.Null)
{
string odatanextLinkInstance = ((string)odatanextLinkValue);
result.NextLink = odatanextLinkInstance;
string nextLinkInstance = ((string)nextLinkValue);
result.NextLink = nextLinkInstance;
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...rceManagement/Resource/ResourceManagement/Microsoft.Azure.Management.Resources.nuget.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Microsoft.Azure.Management.Resources
-->
<SdkNuGetPackage Include="Microsoft.Azure.Management.Resources">
<PackageVersion>2.18.6-preview</PackageVersion>
<PackageVersion>2.18.7-preview</PackageVersion>
<Folder>$(MSBuildThisFileDirectory)</Folder>
</SdkNuGetPackage>
</ItemGroup>
Expand Down
Loading