fix build

Author: ankushbindlish2

src/Graph.Rbac/Version1_6.20190326/ActiveDirectory/ActiveDirectoryClient.cs

@@ -590,7 +590,7 @@ public Guid GetAppObjectIdFromApplicationId(Guid applicationId)
             {
                 throw new InvalidOperationException(string.Format(ProjectResources.ApplicationWithAppIdDoesntExist, applicationId));
             }
-            return app.ObjectId;
+            return app.Id;
         }
 
         public Guid GetAppObjectIdFromDisplayName(string displayName)
@@ -607,7 +607,7 @@ public Guid GetAppObjectIdFromDisplayName(string displayName)
                 throw new InvalidOperationException(string.Format(ProjectResources.MultipleApplicationsWithDisplayNameFound, displayName));
             }
 
-            return app.FirstOrDefault().ObjectId;
+            return app.FirstOrDefault().Id;
         }
 
         public Guid GetUserObjectIdFromDisplayName(string displayName)

src/Graph.Rbac/Version1_6.20190326/ActiveDirectory/ActiveDirectoryClientExtensions.cs

@@ -34,9 +34,8 @@ public static PSADObject ToPSADObject(this ADGroup group)
 
         public static PSADObject AssignObjectId(PSADObject adObj, string objectId)
         {
-            Guid objectIdGuid;
 
-            if (Guid.TryParse(objectId, out objectIdGuid))
+            if (Guid.TryParse(objectId, out Guid objectIdGuid))
             {
                 adObj.Id = objectIdGuid;
             }
@@ -54,33 +53,19 @@ public static PSADObject ToPSADObject(this DirectoryObject obj)
 
             if (obj is User user)
             {
-                var adUser = new PSADUser()
-                {
-                    DisplayName = user.DisplayName,
-                    UserPrincipalName = user.UserPrincipalName
-                };
-
-                return AssignObjectId(adUser, obj.ObjectId);
+                return ToPSADUser(user);
             }
             else if (obj is ADGroup group)
             {
-                var adGroup = new PSADGroup()
-                {
-                    DisplayName = group.DisplayName,
-                    SecurityEnabled = group.SecurityEnabled,
-                    MailNickname = group.Mail
-                };
-                return AssignObjectId(adGroup, obj.ObjectId);
+                return ToPSADGroup(group);
             }
             else if (obj is ServicePrincipal servicePrincipal)
             {
-                var adSp = new PSADServicePrincipal()
-                {
-                    DisplayName = servicePrincipal.DisplayName,
-                    ServicePrincipalNames = servicePrincipal.ServicePrincipalNames.ToArray()
-                };
-
-                return AssignObjectId(adSp, obj.ObjectId);
+                return ToPSADServicePrincipal(servicePrincipal);
+            }
+            else if (obj is Application application)
+            {
+                return ToPSADApplication(application);
             }
 
             throw new NotSupportedException($"{obj.GetType()}");
@@ -137,7 +122,7 @@ public static PSADApplication ToPSADApplication(this Application application)
             {
                 return new PSADApplication()
                 {
-                    ObjectId = Guid.Parse(application.ObjectId),
+                    Id = Guid.Parse(application.ObjectId),
                     DisplayName = application.DisplayName,
                     ApplicationId = Guid.Parse(application.AppId),
                     IdentifierUris = application.IdentifierUris,

src/Graph.Rbac/Version1_6.20190326/ActiveDirectory/PSADApplication.cs

@@ -17,11 +17,8 @@
 
 namespace Microsoft.Azure.Graph.RBAC.Version1_6_20190326.ActiveDirectory
 {
-    public class PSADApplication
+    public class PSADApplication : PSADObject
     {
-        public string DisplayName { get; set; }
-
-        public Guid ObjectId { get; set; }
 
         public IList<string> IdentifierUris { get; set; }