Merge pull request #8284 from cormacpayne/update-authorization-sdk

cormacpayne · web-flow · commit 4f7e36bfc2c1 · 2019-01-11T14:03:18.000-08:00
Update version of Authorization SDK used in Resources
diff --git a/src/Resources/Resources.Test/Resources.Test.csproj b/src/Resources/Resources.Test/Resources.Test.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.5.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.9.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.11.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.ManagementGroups" Version="1.1.1-preview" />
   </ItemGroup>
 
diff --git a/src/Resources/Resources/Models.Authorization/AuthorizationClientExtensions.cs b/src/Resources/Resources/Models.Authorization/AuthorizationClientExtensions.cs
@@ -214,7 +214,7 @@ private static IEnumerable<PSPrincipal> ToPSPrincipals(this IEnumerable<Principa
                 }
                 else
                 {
-                    var adObject = adObjects.SingleOrDefault(o => string.Equals(o.Id, p.Id)) ?? new PSADObject() { Id = p.Id };
+                    var adObject = adObjects.SingleOrDefault(o => o.Id == pid.ToString()) ?? new PSADObject() { Id = pid.ToString() };
 
                     if ((adObject is PSADUser)
                         || (adObject is PSADGroup)
diff --git a/src/Resources/Resources/Resources.csproj b/src/Resources/Resources/Resources.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.5.0-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.9.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.Authorization" Version="2.11.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.ManagementGroups" Version="1.1.1-preview" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ private static IEnumerable<PSPrincipal> ToPSPrincipals(this IEnumerable<Principa`
`214`	`214`	`}`
`215`	`215`	`else`
`216`	`216`	`{`
`217`		`- var adObject = adObjects.SingleOrDefault(o => string.Equals(o.Id, p.Id)) ?? new PSADObject() { Id = p.Id };`
	`217`	`+ var adObject = adObjects.SingleOrDefault(o => o.Id == pid.ToString()) ?? new PSADObject() { Id = pid.ToString() };`
`218`	`218`
`219`	`219`	`if ((adObject is PSADUser)`
`220`	`220`	`\|\| (adObject is PSADGroup)`