qol: interpolated strings

Disco.Services/Interop/ActiveDirectory/ADDomain.cs

@@ -59,7 +59,7 @@ namespace Disco.Services.Interop.ActiveDirectory
 
             var dc = Domain.FindDomainController();
 
-            string ldapPath = string.Format("LDAP://{0}/", dc.Name);
+            string ldapPath = $"LDAP://{dc.Name}/";
 
             using (var adRootDSE = new DirectoryEntry(ldapPath + "RootDSE"))
             {
@@ -74,7 +74,7 @@ namespace Disco.Services.Interop.ActiveDirectory
 
             using (var configSearchRoot = new DirectoryEntry(ldapPath + "CN=Partitions," + ConfigurationNamingContext))
             {
-                var configSearchFilter = string.Format("(&(objectcategory=Crossref)(dnsRoot={0})(netBIOSName=*))", Name);
+                var configSearchFilter = $"(&(objectcategory=Crossref)(dnsRoot={Name})(netBIOSName=*))";
 
                 using (var configSearcher = new DirectorySearcher(configSearchRoot, configSearchFilter, new string[] { "NetBIOSName" }, System.DirectoryServices.SearchScope.OneLevel))
                 {
@@ -233,7 +233,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                 throw new ArgumentNullException("DistinguishedName");
 
             if (!DistinguishedName.EndsWith(this.DistinguishedName, StringComparison.OrdinalIgnoreCase))
-                throw new ArgumentException(string.Format("The Distinguished Name ({0}) isn't a member of this domain [{1}]", DistinguishedName, Name), "DistinguishedName");
+                throw new ArgumentException($"The Distinguished Name ({DistinguishedName}) isn't a member of this domain [{Name}]", "DistinguishedName");
 
             var dc = GetAvailableDomainController();
 
@@ -309,12 +309,12 @@ namespace Disco.Services.Interop.ActiveDirectory
 
                     // Set offline for DomainControllerUnavailableMinutes
                     domainController.IsAvailable = false;
-                    SystemLog.LogWarning(string.Format("A domain controller [{0}] is offline. It will be retried after {1}. Error: {2} [{3}]", domainController.Name, domainController.AvailableWhen.Value.ToShortTimeString(), ex.Message, ex.GetType().Name));
+                    SystemLog.LogWarning($"A domain controller [{domainController.Name}] is offline. It will be retried after {domainController.AvailableWhen.Value.ToShortTimeString()}. Error: {ex.Message} [{ex.GetType().Name}]");
                 }
             } while (exceptionCount < SearchExceptionRetryMax);
 
             throw new AggregateException(
-                new Exception[] { new Exception(string.Format("Unable to perform Active Directory Search after {0} attempts", exceptionCount)) }
+                new Exception[] { new Exception($"Unable to perform Active Directory Search after {exceptionCount} attempts") }
                 .Concat(exceptions));
         }
 
@@ -335,14 +335,14 @@ namespace Disco.Services.Interop.ActiveDirectory
         {
             get
             {
-                return string.Format("CN=Computers,{0}", DistinguishedName);
+                return $"CN=Computers,{DistinguishedName}";
             }
         }
 
         public string FriendlyDistinguishedNamePath(string DistinguishedName)
         {
             if (!DistinguishedName.EndsWith(this.DistinguishedName, StringComparison.OrdinalIgnoreCase))
-                throw new ArgumentException(string.Format("The Distinguished Name [{0}] doesn't exist within this domain [{1}]", DistinguishedName, this.DistinguishedName));
+                throw new ArgumentException($"The Distinguished Name [{DistinguishedName}] doesn't exist within this domain [{this.DistinguishedName}]");
 
             StringBuilder name = new StringBuilder();
 
@@ -365,7 +365,7 @@ namespace Disco.Services.Interop.ActiveDirectory
 
         public override string ToString()
         {
-            return string.Format("{0} [{1}]", Name, NetBiosName);
+            return $"{Name} [{NetBiosName}]";
         }
 
         public override bool Equals(object obj)

Disco.Services/Interop/ActiveDirectory/ADDomainController.cs

@@ -65,7 +65,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                 throw new ArgumentNullException("DistinguishedName");
 
             if (!DistinguishedName.EndsWith(Domain.DistinguishedName, StringComparison.OrdinalIgnoreCase))
-                throw new ArgumentException(string.Format("The Distinguished Name ({0}) isn't a member of this domain [{1}]", DistinguishedName, Domain.Name), "DistinguishedName");
+                throw new ArgumentException($"The Distinguished Name ({DistinguishedName}) isn't a member of this domain [{Domain.Name}]", "DistinguishedName");
 
             var entry = new DirectoryEntry(string.Format(LdapPathTemplate, Name, ADHelpers.EscapeDistinguishedName(DistinguishedName)));
 
@@ -225,7 +225,7 @@ namespace Disco.Services.Interop.ActiveDirectory
             if (SecurityIdentifier == null)
                 throw new ArgumentNullException("SecurityIdentifier");
             if (!SecurityIdentifier.IsEqualDomainSid(Domain.SecurityIdentifier))
-                throw new ArgumentException(string.Format("The specified Security Identifier [{0}] does not belong to this domain [{1}]", SecurityIdentifier.ToString(), Domain.Name), "SecurityIdentifier");
+                throw new ArgumentException($"The specified Security Identifier [{SecurityIdentifier.ToString()}] does not belong to this domain [{Domain.Name}]", "SecurityIdentifier");
 
             var sidBinaryString = SecurityIdentifier.ToBinaryString();
 
@@ -373,12 +373,12 @@ namespace Disco.Services.Interop.ActiveDirectory
                     using (var deOU = RetrieveDirectoryEntry(OrganisationalUnit, new string[] { "distinguishedName" }))
                     {
                         if (deOU == null)
-                            throw new Exception(string.Format("OU's Directory Entry couldn't be found at [{0}]", OrganisationalUnit));
+                            throw new Exception($"OU's Directory Entry couldn't be found at [{OrganisationalUnit}]");
                     }
                 }
                 catch (Exception ex)
                 {
-                    throw new ArgumentException(string.Format("An error occurred while trying to locate the specified OU: {0}", OrganisationalUnit), "OrganisationalUnit", ex);
+                    throw new ArgumentException($"An error occurred while trying to locate the specified OU: {OrganisationalUnit}", "OrganisationalUnit", ex);
                 }
             }
 
@@ -386,14 +386,8 @@ namespace Disco.Services.Interop.ActiveDirectory
                 MachineAccount.DeleteAccount(this);
 
             string tempFileName = System.IO.Path.GetTempFileName();
-            string argumentOU = (!string.IsNullOrWhiteSpace(OrganisationalUnit)) ? string.Format(" /MACHINEOU \"{0}\"", OrganisationalUnit) : string.Empty;
-            string arguments = string.Format("/PROVISION /DOMAIN \"{0}\" /DCNAME \"{1}\" /MACHINE \"{2}\"{3} /REUSE /SAVEFILE \"{4}\"",
-                Domain.Name,
-                Name,
-                ComputerSamAccountName,
-                argumentOU,
-                tempFileName
-            );
+            string argumentOU = (!string.IsNullOrWhiteSpace(OrganisationalUnit)) ? $" /MACHINEOU \"{OrganisationalUnit}\"" : string.Empty;
+            string arguments = $"/PROVISION /DOMAIN \"{Domain.Name}\" /DCNAME \"{Name}\" /MACHINE \"{ComputerSamAccountName}\"{argumentOU} /REUSE /SAVEFILE \"{tempFileName}\"";
             ProcessStartInfo commandStarter = new ProcessStartInfo("DJOIN.EXE", arguments)
             {
                 CreateNoWindow = true,
@@ -403,7 +397,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                 RedirectStandardError = true,
                 UseShellExecute = false
             };
-            diagnosticInfo.AppendFormat("{0} {1}", "DJOIN.EXE", arguments);
+            diagnosticInfo.AppendFormat($"DJOIN.EXE {arguments}");
             diagnosticInfo.AppendLine();
 
             string stdOutput;

Disco.Services/Interop/ActiveDirectory/ADGroup.cs

@@ -17,7 +17,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public string DistinguishedName { get; private set; }
         public SecurityIdentifier SecurityIdentifier { get; private set; }
 
-        public string Id { get { return string.Format(@"{0}\{1}", Domain.NetBiosName, SamAccountName); } }
+        public string Id { get { return $@"{Domain.NetBiosName}\{SamAccountName}"; } }
         public string SamAccountName { get; private set; }
 
         public string Name { get; private set; }

Disco.Services/Interop/ActiveDirectory/ADMachineAccount.cs

@@ -73,7 +73,7 @@ namespace Disco.Services.Interop.ActiveDirectory
 
             var dNSName = SearchResult.Value<string>("dNSHostName");
             if (dNSName == null)
-                dNSName = string.Format("{0}.{1}", sAMAccountName.TrimEnd('$'), SearchResult.Domain.Name);
+                dNSName = $"{sAMAccountName.TrimEnd('$')}.{SearchResult.Domain.Name}";
 
             var userAccountControl = (ADUserAccountControlFlags)SearchResult.Value<int>("userAccountControl");
             var isCriticalSystemObject = SearchResult.Value<bool>("isCriticalSystemObject");
@@ -123,7 +123,7 @@ namespace Disco.Services.Interop.ActiveDirectory
 
             var dNSName = properties.Value<string>("dNSHostName");
             if (dNSName == null)
-                dNSName = string.Format("{0}.{1}", sAMAccountName.TrimEnd('$'), directoryEntry.Domain.Name);
+                dNSName = $"{sAMAccountName.TrimEnd('$')}.{directoryEntry.Domain.Name}";
 
             var userAccountControl = (ADUserAccountControlFlags)properties.Value<int>("userAccountControl");
             var isCriticalSystemObject = properties.Value<bool>("isCriticalSystemObject");
@@ -208,10 +208,10 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void DeleteAccount(ADDomainController WritableDomainController)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account [{0}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account [{DistinguishedName}] is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (!WritableDomainController.IsWritable)
-                throw new InvalidOperationException(string.Format("The domain controller [{0}] is not writable. This action (Delete Account) requires a writable domain controller.", Name));
+                throw new InvalidOperationException($"The domain controller [{Name}] is not writable. This action (Delete Account) requires a writable domain controller.");
 
             using (ADDirectoryEntry entry = WritableDomainController.RetrieveDirectoryEntry(DistinguishedName))
             {
@@ -226,7 +226,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         private void SetNetbootGUID(ADDomainController WritableDomainController, Guid updatedNetbootGUID)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (NetbootGUID != updatedNetbootGUID)
             {
@@ -247,7 +247,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void SetDescription(ADDomainController WritableDomainController, string Description)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (this.Description != Description)
             {
@@ -320,7 +320,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void DisableAccount(ADDomainController WritableDomainController)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (!IsDisabled)
             {
@@ -348,7 +348,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void EnableAccount(ADDomainController WritableDomainController)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (IsDisabled)
             {
@@ -376,7 +376,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public bool UpdateNetbootGUID(ADDomainController WritableDomainController, string UUID, string MACAddress)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             Guid netbootGUID = Guid.Empty;
 
@@ -414,7 +414,7 @@ namespace Disco.Services.Interop.ActiveDirectory
             Guid NetbootGUIDFromMACAddress;
             if (flag)
             {
-                Guid guid = new Guid(string.Format("00000000-0000-0000-0000-{0}", strippedMACAddress));
+                Guid guid = new Guid($"00000000-0000-0000-0000-{strippedMACAddress}");
                 NetbootGUIDFromMACAddress = guid;
             }
             else
@@ -427,7 +427,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void MoveOrganisationalUnit(ADDomainController WritableDomainController, string NewOrganisationUnit)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             var parentDistinguishedName = ParentDistinguishedName;
 
@@ -438,7 +438,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                     NewOrganisationUnit = Domain.DefaultComputerContainer;
 
                 if (!NewOrganisationUnit.EndsWith(Domain.DistinguishedName, StringComparison.OrdinalIgnoreCase))
-                    throw new InvalidOperationException(string.Format("Unable to move AD Account from one domain [{0}] to another [{1}].", DistinguishedName, NewOrganisationUnit));
+                    throw new InvalidOperationException($"Unable to move AD Account from one domain [{DistinguishedName}] to another [{NewOrganisationUnit}].");
 
                 using (ADDirectoryEntry ou = WritableDomainController.RetrieveDirectoryEntry(NewOrganisationUnit))
                 {

Disco.Services/Interop/ActiveDirectory/ADManagedGroupsSyncTask.cs

@@ -35,7 +35,7 @@ namespace Disco.Services.Interop.ActiveDirectory
             changeCount = ActiveDirectory.Context.ManagedGroups.SyncManagedGroups(managedGroups, Status);
 
             Status.LogInformation($"Synchronised Active Directory Managed Groups, {changeCount:N0} changes made");
-            Status.SetFinishedMessage(string.Format("Made {0} Changes to Active Directory Groups", changeCount));
+            Status.SetFinishedMessage($"Made {changeCount} Changes to Active Directory Groups");
         }
 
         public static ScheduledTaskStatus ScheduleSync(ADManagedGroup ManagedGroup)

Disco.Services/Interop/ActiveDirectory/ADNetworkLogonDatesUpdateTask.cs

@@ -33,7 +33,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                 UpdateLastNetworkLogonDates(database, Status);
                 Status.UpdateStatus(95, "Updating Database", "Writing last network logon dates to the Database");
                 changeCount = database.SaveChanges();
-                Status.Finished(string.Format("{0} Device last network logon dates updated", changeCount), "/Config/SystemConfig");
+                Status.Finished($"{changeCount} Device last network logon dates updated", "/Config/SystemConfig");
             }
 
             Status.LogInformation($"Updated LastNetworkLogon Device Property for Device/s, {changeCount:N0} changes");
@@ -144,7 +144,7 @@ namespace Disco.Services.Interop.ActiveDirectory
 
                 // Update Status
                 double progress = 5 + (queryIndex * (90 / scopedQueries.Count));
-                status.UpdateStatus(progress, string.Format("Querying Domain [{0}] using controller [{1}]", domain.NetBiosName, domainController.Name), string.Format("Searching: {0}", searchRoot));
+                status.UpdateStatus(progress, $"Querying Domain [{domain.NetBiosName}] using controller [{domainController.Name}]", $"Searching: {searchRoot}");
 
                 // Perform Query
                 var directoryResults = domainController.SearchInternal(searchRoot, ldapFilter, ldapProperties, null);
@@ -163,7 +163,7 @@ namespace Disco.Services.Interop.ActiveDirectory
 
                     if (highedValue > 0)
                     {
-                        var computerName = string.Format(@"{0}\{1}", domain.NetBiosName, samAccountName.TrimEnd('$'));
+                        var computerName = $@"{domain.NetBiosName}\{samAccountName.TrimEnd('$')}";
                         var lastLogon = new DateTime((DateTime.FromFileTime(highedValue).Ticks / 10000000L) * 10000000L);
                         return Tuple.Create(computerName, lastLogon);
                     }

Disco.Services/Interop/ActiveDirectory/ADUserAccount.cs

@@ -19,7 +19,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public string DistinguishedName { get; private set; }
         public SecurityIdentifier SecurityIdentifier { get; private set; }
 
-        public string Id { get { return string.Format(@"{0}\{1}", Domain.NetBiosName, SamAccountName); } }
+        public string Id { get { return $@"{Domain.NetBiosName}\{SamAccountName}"; } }
         public string SamAccountName { get; private set; }
 
         public string Name { get; private set; }
@@ -250,10 +250,10 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void DeleteAccount(ADDomainController WritableDomainController)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account [{0}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account [{DistinguishedName}] is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (!WritableDomainController.IsWritable)
-                throw new InvalidOperationException(string.Format("The domain controller [{0}] is not writable. This action (Delete Account) requires a writable domain controller.", Name));
+                throw new InvalidOperationException($"The domain controller [{Name}] is not writable. This action (Delete Account) requires a writable domain controller.");
 
             using (ADDirectoryEntry entry = WritableDomainController.RetrieveDirectoryEntry(DistinguishedName))
             {
@@ -268,7 +268,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void DisableAccount(ADDomainController WritableDomainController)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (!IsDisabled)
             {
@@ -296,7 +296,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void EnableAccount(ADDomainController WritableDomainController)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (IsDisabled)
             {
@@ -324,7 +324,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void SetDisplayName(ADDomainController WritableDomainController, string DisplayName)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (this.DisplayName != DisplayName)
             {
@@ -357,7 +357,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void SetSurname(ADDomainController WritableDomainController, string Surname)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (this.Surname != Surname)
             {
@@ -390,7 +390,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void SetGivenName(ADDomainController WritableDomainController, string GivenName)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (this.GivenName != GivenName)
             {
@@ -423,7 +423,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void SetEmail(ADDomainController WritableDomainController, string Email)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (this.Email != Email)
             {
@@ -456,7 +456,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         public void SetPhone(ADDomainController WritableDomainController, string Phone)
         {
             if (IsCriticalSystemObject)
-                throw new InvalidOperationException(string.Format("This account {0} is a Critical System Active Directory Object and Disco ICT refuses to modify it", DistinguishedName));
+                throw new InvalidOperationException($"This account {DistinguishedName} is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
             if (this.Phone != Phone)
             {

Disco.Services/Interop/ActiveDirectory/ActiveDirectoryContext.cs

@@ -139,7 +139,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         {
             ADDomain domain;
             if (!TryGetDomainFromDistinguishedName(DistinguishedName, out domain))
-                throw new ArgumentException(string.Format("The distinguished name is from an unknown domain: [{0}]", DistinguishedName), "DistinguishedName");
+                throw new ArgumentException($"The distinguished name is from an unknown domain: [{DistinguishedName}]", "DistinguishedName");
             return domain;
         }
 
@@ -152,7 +152,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         {
             ADDomain domain;
             if (!TryGetDomainByNetBiosName(NetBiosName, out domain))
-                throw new ArgumentException(string.Format("The domain for specified NetBios name is unknown [{0}]", NetBiosName), "NetBiosName");
+                throw new ArgumentException($"The domain for specified NetBios name is unknown [{NetBiosName}]", "NetBiosName");
             return domain;
         }
 
@@ -165,7 +165,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         {
             ADDomain domain;
             if (!TryGetDomainByName(Name, out domain))
-                throw new ArgumentException(string.Format("The domain for specified DNS name is unknown [{0}]", Name), "Name");
+                throw new ArgumentException($"The domain for specified DNS name is unknown [{Name}]", "Name");
             return domain;
         }
 
@@ -178,7 +178,7 @@ namespace Disco.Services.Interop.ActiveDirectory
         {
             ADDomain domain;
             if (!TryGetDomainFromSecurityIdentifier(SecurityIdentifier, out domain))
-                throw new ArgumentException(string.Format("The domain for specified Security Identifier is unknown [{0}]", SecurityIdentifier.ToString()), "SecurityIdentifier");
+                throw new ArgumentException($"The domain for specified Security Identifier is unknown [{SecurityIdentifier.ToString()}]", "SecurityIdentifier");
             return domain;
         }
 
@@ -190,7 +190,7 @@ namespace Disco.Services.Interop.ActiveDirectory
             var slashIndex = Id.IndexOf('\\');
 
             if (slashIndex < 0)
-                throw new ArgumentException(string.Format("The Id must include the Domain [{0}]", Id), "Id");
+                throw new ArgumentException($"The Id must include the Domain [{Id}]", "Id");
 
             return TryGetDomainByNetBiosName(Id.Substring(0, slashIndex), out Domain);
         }
@@ -202,7 +202,7 @@ namespace Disco.Services.Interop.ActiveDirectory
             var slashIndex = Id.IndexOf('\\');
 
             if (slashIndex < 0)
-                throw new ArgumentException(string.Format("The Id must include the Domain [{0}]", Id), "Id");
+                throw new ArgumentException($"The Id must include the Domain [{Id}]", "Id");
 
             return GetDomainByNetBiosName(Id.Substring(0, slashIndex));
         }

Disco.Services/Interop/ActiveDirectory/ActiveDirectoryManagedGroups.cs

@@ -41,7 +41,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                 .FirstOrDefault(g => g.Configuration.GroupId.Equals(ManagedGroup.Configuration.GroupId, StringComparison.OrdinalIgnoreCase));
 
             if (existingGroup != null)
-                throw new ArgumentException(string.Format("[{0}] cannot manage this group [{1}] because is already managed by [{2}]", ManagedGroup.Key, ManagedGroup.Configuration.GroupId, existingGroup.Key), "ManagedGroup");
+                throw new ArgumentException($"[{ManagedGroup.Key}] cannot manage this group [{ManagedGroup.Configuration.GroupId}] because is already managed by [{existingGroup.Key}]", "ManagedGroup");
 
             managedGroups.AddOrUpdate(key, ManagedGroup, (itemKey, item) =>
             {
@@ -93,9 +93,9 @@ namespace Disco.Services.Interop.ActiveDirectory
         {
             var group = ActiveDirectory.RetrieveADGroup(GroupId, "isCriticalSystemObject");
             if (group == null)
-                throw new ArgumentException(string.Format("The group [{0}] wasn't found", GroupId), "DevicesLinkedGroup");
+                throw new ArgumentException($"The group [{GroupId}] wasn't found", "DevicesLinkedGroup");
             if (group.GetPropertyValue<bool>("isCriticalSystemObject"))
-                throw new ArgumentException(string.Format("The group [{0}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", group.DistinguishedName), "DevicesLinkedGroup");
+                throw new ArgumentException($"The group [{group.DistinguishedName}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", "DevicesLinkedGroup");
 
             GroupId = group.Id;
 
@@ -103,7 +103,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                 .Where(g => g.Key != IgnoreManagedGroupKey)
                 .FirstOrDefault(g => g.Configuration.GroupId.Equals(GroupId, StringComparison.OrdinalIgnoreCase));
             if (otherManagedGroup != null)
-                throw new ArgumentException(string.Format("Cannot manage this group [{0}] because is already managed by [{1}]", GroupId, otherManagedGroup.Key), "DevicesLinkedGroup");
+                throw new ArgumentException($"Cannot manage this group [{GroupId}] because is already managed by [{otherManagedGroup.Key}]", "DevicesLinkedGroup");
 
             return GroupId;
         }
@@ -160,7 +160,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                     var scopeAccounts = ActiveDirectory.Context.SearchScope("(|(objectCategory=computer)(objectCategory=person))", adSearchLoadProperties);
                     foreach (var scopeAccount in scopeAccounts)
                     {
-                        var id = string.Format(@"{0}\{1}", scopeAccount.Domain.NetBiosName, scopeAccount.Value<string>("sAMAccountName"));
+                        var id = $@"{scopeAccount.Domain.NetBiosName}\{scopeAccount.Value<string>("sAMAccountName")}";
                         accountDNCache[id] = scopeAccount.Value<string>("distinguishedName");
                     }
                 }
@@ -182,7 +182,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                                 return null;
                             }
 
-                            var ldapFilter = string.Format("(&(|(objectCategory=computer)(objectCategory=person))(sAMAccountName={0}))", memberUsername);
+                            var ldapFilter = $"(&(|(objectCategory=computer)(objectCategory=person))(sAMAccountName={memberUsername}))";
 
                             var adSearchResult = memberDomain.SearchEntireDomain(ldapFilter, adSearchLoadProperties, ActiveDirectory.SingleSearchResult).FirstOrDefault();
                             if (adSearchResult != null)
@@ -234,7 +234,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                             using (var adGroupEntry = ActiveDirectory.Context.RetrieveDirectoryEntry(adGroup.DistinguishedName, new string[] { "member", "isCriticalSystemObject" }))
                             {
                                 if (adGroupEntry.Entry.Properties.Value<bool>("isCriticalSystemObject"))
-                                    throw new InvalidOperationException(string.Format("This group [{0}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", adGroup.DistinguishedName));
+                                    throw new InvalidOperationException($"This group [{adGroup.DistinguishedName}] is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
                                 var adGroupEntryMembers = adGroupEntry.Entry.Properties["member"];
                                 foreach (var item in actionItems)
@@ -291,7 +291,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                 {
                     Status.UpdateStatus(
                         ((double)30 / managedGroups.Count) * index, // 0 -> 30
-                        string.Format("Determining Group Members: {0} [{1}]", g.GroupDescription, g.Configuration.GroupId));
+                        $"Determining Group Members: {g.GroupDescription} [{g.Configuration.GroupId}]");
                     return Tuple.Create(
                         g,
                         g.DetermineMembers(Database).Select(m =>
@@ -316,7 +316,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                     var scopeAccounts = ActiveDirectory.Context.SearchScope("(|(objectCategory=computer)(objectCategory=person))", adSearchLoadProperties);
                     foreach (var scopeAccount in scopeAccounts)
                     {
-                        var id = string.Format(@"{0}\{1}", scopeAccount.Domain.NetBiosName, scopeAccount.Value<string>("sAMAccountName"));
+                        var id = $@"{scopeAccount.Domain.NetBiosName}\{scopeAccount.Value<string>("sAMAccountName")}";
                         accountDNCache[id] = Tuple.Create(scopeAccount.Value<string>("distinguishedName"), scopeAccount.Value<string>("displayName") ?? scopeAccount.Value<string>("name"));
                     }
                 }
@@ -325,7 +325,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                 {
                     Status.UpdateStatus(
                         30 + (((double)30 / actionGroups.Count) * index), // 30 -> 60
-                        string.Format("Resolving {0} Group Members: {1} [{2}]", g.Item2.Count, g.Item1.GroupDescription, g.Item1.Configuration.GroupId));
+                        $"Resolving {g.Item2.Count} Group Members: {g.Item1.GroupDescription} [{g.Item1.Configuration.GroupId}]");
 
                     // Resolve Member Ids to AD Distinguished Names
                     //   Discard non-existent users
@@ -344,7 +344,7 @@ namespace Disco.Services.Interop.ActiveDirectory
                                         return null;
                                     }
 
-                                    var ldapFilter = string.Format("(&(|(objectCategory=computer)(objectCategory=person))(sAMAccountName={0}))", memberUsername);
+                                    var ldapFilter = $"(&(|(objectCategory=computer)(objectCategory=person))(sAMAccountName={memberUsername}))";
 
                                     var adSearchResult = memberDomain.SearchEntireDomain(ldapFilter, adSearchLoadProperties, ActiveDirectory.SingleSearchResult).FirstOrDefault();
                                     if (adSearchResult != null)
@@ -379,15 +379,15 @@ namespace Disco.Services.Interop.ActiveDirectory
 
                 Status.UpdateStatus(
                         60 + (((double)40 / actionGroups.Count) * actionGroups.IndexOf(actionGroup)), // 60 -> 100
-                        string.Format("Synchronizing {0} Group Members: {1} [{2}]", actionGroup.Item2.Count, actionGroup.Item1.GroupDescription, actionGroup.Item1.Configuration.GroupId));
+                        $"Synchronizing {actionGroup.Item2.Count} Group Members: {actionGroup.Item1.GroupDescription} [{actionGroup.Item1.Configuration.GroupId}]");
 
                 using (var adGroupEntry = ActiveDirectory.Context.RetrieveDirectoryEntry(adGroup.DistinguishedName, new string[] { "isCriticalSystemObject", "description", "member" }))
                 {
                     if (adGroupEntry.Entry.Properties.Value<bool>("isCriticalSystemObject"))
-                        throw new InvalidOperationException(string.Format("This group [{0}] is a Critical System Active Directory Object and Disco ICT refuses to modify it", adGroup.DistinguishedName));
+                        throw new InvalidOperationException($"This group [{adGroup.DistinguishedName}] is a Critical System Active Directory Object and Disco ICT refuses to modify it");
 
                     // Update Description
-                    var groupDescription = string.Format("Disco ICT: {0}", actionGroup.Item1.GroupDescription);
+                    var groupDescription = $"Disco ICT: {actionGroup.Item1.GroupDescription}";
                     if (adGroupEntry.Entry.Properties.Value<string>("description") != groupDescription)
                     {
                         var adGroupEntryDescription = adGroupEntry.Entry.Properties["description"];

Disco.Services/Interop/DiscoServices/Jobs.cs

@@ -51,15 +51,15 @@ namespace Disco.Services.Interop.DiscoServices
                             .ToList()
                             .ForEach(a =>
                             {
-                                formData.Add(new StringContent(a.Attachment.Filename), string.Format("Attachments[{0}].Filename", a.Index));
-                                formData.Add(new StringContent(a.Attachment.MimeType), string.Format("Attachments[{0}].MimeType", a.Index));
-                                formData.Add(new StringContent(a.Attachment.Timestamp.ToISO8601()), string.Format("Attachments[{0}].CreatedDate", a.Index));
+                                formData.Add(new StringContent(a.Attachment.Filename), $"Attachments[{a.Index}].Filename");
+                                formData.Add(new StringContent(a.Attachment.MimeType), $"Attachments[{a.Index}].MimeType");
+                                formData.Add(new StringContent(a.Attachment.Timestamp.ToISO8601()), $"Attachments[{a.Index}].CreatedDate");
                                 if (a.Attachment.DocumentTemplateId != null)
-                                    formData.Add(new StringContent(a.Attachment.DocumentTemplateId), string.Format("Attachments[{0}].DocumentTemplateId", a.Index));
+                                    formData.Add(new StringContent(a.Attachment.DocumentTemplateId), $"Attachments[{a.Index}].DocumentTemplateId");
                                 if (a.Attachment.Comments != null)
-                                    formData.Add(new StringContent(a.Attachment.Comments), string.Format("Attachments[{0}].Comments", a.Index));
+                                    formData.Add(new StringContent(a.Attachment.Comments), $"Attachments[{a.Index}].Comments");
 
-                                formData.Add(new ByteArrayContent(File.ReadAllBytes(a.Filename)), string.Format("Attachments[{0}].File", a.Index), a.Attachment.Filename);
+                                formData.Add(new ByteArrayContent(File.ReadAllBytes(a.Filename)), $"Attachments[{a.Index}].File", a.Attachment.Filename);
                             });
                     }
 

Disco.Services/Interop/DiscoServices/PluginLibrary.cs

@@ -63,10 +63,10 @@ namespace Disco.Services.Interop.DiscoServices
                         return new PluginIncompatibility() { PluginId = r.PluginId, Version = rVersion, Reason = "This plugin release is blocked by Disco ICT Online Services" };
 
                     if (r.HostMinVersion != null && hostVersion < Version.Parse(r.HostMinVersion))
-                        return new PluginIncompatibility() { PluginId = r.PluginId, Version = rVersion, Reason = string.Format("This plugin requires v{0} or newer", r.HostMinVersion) };
+                        return new PluginIncompatibility() { PluginId = r.PluginId, Version = rVersion, Reason = $"This plugin requires v{r.HostMinVersion} or newer" };
 
                     if (r.HostMaxVersion != null && hostVersion > Version.Parse(r.HostMaxVersion))
-                        return new PluginIncompatibility() { PluginId = r.PluginId, Version = rVersion, Reason = string.Format("This plugin requires v{0} or older", r.HostMaxVersion) };
+                        return new PluginIncompatibility() { PluginId = r.PluginId, Version = rVersion, Reason = $"This plugin requires v{r.HostMaxVersion} or older" };
 
                     return null;
                 }).Where(i => i != null).ToList()

Disco.Services/Interop/DiscoServices/UpdateQuery.cs

@@ -39,7 +39,7 @@ namespace Disco.Services.Interop.DiscoServices
 
         public static string FormatVersion(Version Version)
         {
-            return string.Format("{0}.{1}.{2:0000}.{3:0000}", Version.Major, Version.Minor, Version.Build, Version.Revision);
+            return $"{Version.Major}.{Version.Minor}.{Version.Build:0000}.{Version.Revision:0000}";
         }
 
         public static string HashDeploymentData(DiscoDataContext Database, string Data)
@@ -79,7 +79,7 @@ namespace Disco.Services.Interop.DiscoServices
 
             request.ContentType = "application/json; charset=utf-8; encoding=gzip";
             request.Method = WebRequestMethods.Http.Post;
-            request.UserAgent = string.Format("Disco/{0} (Update)", discoVersion);
+            request.UserAgent = $"Disco/{discoVersion} (Update)";
 
             using (var requestStream = request.GetRequestStream())
             {
@@ -117,13 +117,13 @@ namespace Disco.Services.Interop.DiscoServices
                     Database.DiscoConfiguration.UpdateLastCheckResponse = updateResult;
                     Database.SaveChanges();
 
-                    Status.SetFinishedMessage(string.Format("The update server reported Version {0} is the latest.", updateResult.LatestVersion));
+                    Status.SetFinishedMessage($"The update server reported Version {updateResult.LatestVersion} is the latest.");
 
                     return updateResult;
                 }
                 else
                 {
-                    Status.SetTaskException(new WebException(string.Format("Server responded with: [{0}] {1}", response.StatusCode, response.StatusDescription)));
+                    Status.SetTaskException(new WebException($"Server responded with: [{response.StatusCode}] {response.StatusDescription}"));
                     return null;
                 }
             }
@@ -216,7 +216,7 @@ namespace Disco.Services.Interop.DiscoServices
                     DeviceIdentifier = HashDeploymentData(Database, j.DeviceSerialNumber),
                     UserIdentifier = HashDeploymentData(Database, j.UserId),
                     TechnicianIdentifier = HashDeploymentData(Database, j.JobTechnicianId),
-                    DeviceModel = string.Format("{0};{1}", j.DeviceModelManufacturer, j.DeviceModelModel),
+                    DeviceModel = $"{j.DeviceModelManufacturer};{j.DeviceModelModel}",
                     Repairer = j.JobType == JobType.JobTypeIds.HWar ? j.WarrantyRepairer : j.Repairer,
                     RepairerLogged = j.JobType == JobType.JobTypeIds.HWar ? j.WarrantyRepairerLoggedDate : j.RepairerLoggedDate,
                     RepairerCompleted = j.JobType == JobType.JobTypeIds.HWar ? j.WarrantyRepairerCompletedDate : j.RepairerCompletedDate

Disco.Services/Interop/VicEduDept/VicSmart.cs

@@ -59,7 +59,7 @@ namespace Disco.Services.Interop.VicEduDept
                     wReq.Proxy = new WebProxy(); // Empty Proxy Config
                 wReq.Method = WebRequestMethods.Http.Post;
                 wReq.ContentType = "application/x-www-form-urlencoded";
-                wReq.UserAgent = string.Format("Disco/{0}", DiscoBIVersion);
+                wReq.UserAgent = $"Disco/{DiscoBIVersion}";
                 using (var wrStream = wReq.GetRequestStream())
                 {
                     using (var wrStreamWriter = new StreamWriter(wrStream))