qol: interpolated strings

Disco.Services/Users/UserExtensions.cs

@@ -18,7 +18,7 @@ namespace Disco.Services
 
         public static string ToStringFriendly(this User u)
         {
-            return string.Format("{0} ({1})", u.DisplayName, u.FriendlyId());
+            return $"{u.DisplayName} ({u.FriendlyId()})";
         }
 
         public static string FriendlyId(this User u)

Disco.Services/Users/UserFlags/UserFlagService.cs

@@ -100,7 +100,7 @@ namespace Disco.Services.Users.UserFlags
             Interop.ActiveDirectory.ActiveDirectory.Context.ManagedGroups.Remove(UserFlagUsersManagedGroup.GetKey(flag));
 
             // Delete Assignments
-            Status.UpdateStatus(0, string.Format("Removing '{0}' [{1}] User Flag", flag.Name, flag.Id), "Starting");
+            Status.UpdateStatus(0, $"Removing '{flag.Name}' [{flag.Id}] User Flag", "Starting");
             List<UserFlagAssignment> flagAssignments = Database.UserFlagAssignments.Where(fa => fa.UserFlagId == flag.Id).ToList();
             if (flagAssignments.Count > 0)
             {
@@ -117,7 +117,7 @@ namespace Disco.Services.Users.UserFlags
             // Remove from Cache
             _cache.Remove(UserFlagId);
 
-            Status.Finished(string.Format("Successfully Deleted User Flag: '{0}' [{1}]", flag.Name, flag.Id));
+            Status.Finished($"Successfully Deleted User Flag: '{flag.Name}' [{flag.Id}]");
         }
         #endregion
 
@@ -140,7 +140,7 @@ namespace Disco.Services.Users.UserFlags
 
                     var chunkResults = chunk.Select((user, index) =>
                     {
-                        Status.UpdateStatus((chunkIndexOffset + index) * progressInterval, string.Format("Assigning Flag: {0}", user.ToString()));
+                        Status.UpdateStatus((chunkIndexOffset + index) * progressInterval, $"Assigning Flag: {user.ToString()}");
 
                         return user.OnAddUserFlag(Database, UserFlag, Technician, comments);
                     }).ToList();
@@ -151,7 +151,7 @@ namespace Disco.Services.Users.UserFlags
                     return chunkResults;
                 }).Where(fa => fa != null).ToList();
 
-                Status.SetFinishedMessage(string.Format("{0} Users/s Added; {1} User/s Skipped", addUsers.Count, (Users.Count - addUsers.Count)));
+                Status.SetFinishedMessage($"{addUsers.Count} Users/s Added; {(Users.Count - addUsers.Count)} User/s Skipped");
 
                 return addedUserAssignments;
             }
@@ -186,7 +186,7 @@ namespace Disco.Services.Users.UserFlags
 
                     var chunkResults = chunk.Select((flagAssignment, index) =>
                     {
-                        Status.UpdateStatus((chunkIndexOffset + index) * progressInterval, string.Format("Removing Flag: {0}", flagAssignment.User.ToString()));
+                        Status.UpdateStatus((chunkIndexOffset + index) * progressInterval, $"Removing Flag: {flagAssignment.User.ToString()}");
 
                         flagAssignment.OnRemoveUnsafe(Database, Technician);
                         
@@ -206,7 +206,7 @@ namespace Disco.Services.Users.UserFlags
 
                     var chunkResults = chunk.Select((user, index) =>
                     {
-                        Status.UpdateStatus((chunkIndexOffset + index) * progressInterval, string.Format("Assigning Flag: {0}", user.ToString()));
+                        Status.UpdateStatus((chunkIndexOffset + index) * progressInterval, $"Assigning Flag: {user.ToString()}");
 
                         return user.OnAddUserFlag(Database, UserFlag, Technician, comments);
                     }).ToList();
@@ -217,7 +217,7 @@ namespace Disco.Services.Users.UserFlags
                     return chunkResults;
                 }).ToList();
 
-                Status.SetFinishedMessage(string.Format("{0} Users/s Added; {1} User/s Removed; {2} User/s Skipped", addUsers.Count, removeAssignments.Count, (Users.Count - addUsers.Count)));
+                Status.SetFinishedMessage($"{addUsers.Count} Users/s Added; {removeAssignments.Count} User/s Removed; {(Users.Count - addUsers.Count)} User/s Skipped");
 
                 return addedUserAssignments;
             }

Disco.Services/Users/UserFlags/UserFlagsBulkAssignTask.cs

@@ -32,7 +32,7 @@ namespace Disco.Services.Users.UserFlags
                 if (userFlag == null)
                     throw new Exception("Invalid User Flag Id");
 
-                Status.UpdateStatus(0, string.Format("Bulk Assigning Users to User Flag: {0}", userFlag.Name), "Preparing to start");
+                Status.UpdateStatus(0, $"Bulk Assigning Users to User Flag: {userFlag.Name}", "Preparing to start");
 
                 // Load Technician
                 var technician = Database.Users.FirstOrDefault(user => user.UserId == TechnicianUserId);
@@ -56,7 +56,7 @@ namespace Disco.Services.Users.UserFlags
                     for (int index = 0; index < missingUserIds.Count; index++)
                     {
                         var userId = missingUserIds[index];
-                        Status.UpdateStatus(20 + (index * ((double)30 / missingUserIds.Count)), string.Format("Loading user from Active Directory: {0}", userId));
+                        Status.UpdateStatus(20 + (index * ((double)30 / missingUserIds.Count)), $"Loading user from Active Directory: {userId}");
                         try
                         {
                             users.Add(UserService.GetUser(userId, Database, true));
@@ -68,7 +68,7 @@ namespace Disco.Services.Users.UserFlags
                     }
 
                     if (invalidUsersIds.Count > 0)
-                        throw new InvalidOperationException(string.Format("Bulk assignment aborted, invalid User Ids: {0}", string.Join(", ", invalidUsersIds)));
+                        throw new InvalidOperationException($"Bulk assignment aborted, invalid User Ids: {string.Join(", ", invalidUsersIds)}");
                 }
                 users = users.OrderBy(u => u.UserId).ToList();