Skip to content

Commit 9aa31a4

Browse files
committed
Merge pull request #21 from Azure/dev
.
2 parents 4c82e45 + 5bc82b7 commit 9aa31a4

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Extensions/JTokenExtensions.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ internal static PSObject ToPsObject(this JToken jtoken, ResourceObjectFormat obj
6666
var jobject = (JObject)jtoken;
6767
var psObject = new PSObject();
6868

69-
if (jobject.CanConvertTo<Resource<JToken>>())
70-
{
71-
return jobject.ToResource().ToPsObject(objectFormat);
72-
}
73-
7469
if (!string.IsNullOrWhiteSpace(objectType))
7570
{
7671
psObject.TypeNames.Add(objectType);

src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/GetAzureResourceCmdlet.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -578,11 +578,6 @@ private Task<ResponseWithContinuation<Permission[]>> GetPermissions(string permi
578578
/// <param name="resources">The resource.</param>
579579
private async Task<Resource<JToken>[]> GetPopulatedResource(IEnumerable<Resource<JToken>> resources)
580580
{
581-
if (this.IsResourceGroupLevelResourceGet())
582-
{
583-
return new Resource<JToken>[0];
584-
}
585-
586581
return await resources
587582
.Select(resource => this.GetPopulatedResource(resource))
588583
.WhenAllForAwait()

0 commit comments

Comments
 (0)