Applied C# 6.0 feature.

Such as string Interpolation and nameof operator.

Author: ob1dev

src/Sitecore.Azure.Diagnostics.UI/sitecore/Shell/Applications/Reports/LogViewer/LogViewerForm.cs

@@ -78,7 +78,7 @@ public void Delete([NotNull] ClientPipelineArgs args)
             var blob = LogStorageManager.GetBlob(blobName); 
             blob.DeleteAsync();
 
-            Log.Audit(string.Format("Delete the '{0}' cloud blob.", blob.Name), this);
+            Log.Audit($"Delete the '{blob.Name}' cloud blob.", this);
             this.SetBlob(string.Empty);
           }
           catch (Exception ex)

src/Sitecore.Azure.Diagnostics/Appenders/AzureBlobStorageAppender.cs

@@ -105,7 +105,7 @@ public AzureBlobStorageAppender()
     /// <param name="loggingEvents">The logging events.</param>
     protected override void SendBuffer(LoggingEvent[] loggingEvents)
     {
-      Sitecore.Diagnostics.Assert.ArgumentNotNull(loggingEvents, "loggingEvents");
+      Sitecore.Diagnostics.Assert.ArgumentNotNull(loggingEvents, nameof(loggingEvents));
 
       var content = new StringBuilder();
 

src/Sitecore.Azure.Diagnostics/Storage/AzureBlobStorageProvider.cs

@@ -209,8 +209,8 @@ protected string Encoding
     /// <param name="config">A collection of the name/value pairs representing the provider-specific attributes specified in the configuration for this provider.</param>
     public override void Initialize(string name, NameValueCollection config)
     {
-      Assert.ArgumentNotNullOrEmpty(name, "name");
-      Assert.ArgumentNotNull(config, "config");
+      Assert.ArgumentNotNullOrEmpty(name, nameof(name));
+      Assert.ArgumentNotNull(config, nameof(config));
 
       base.Initialize(name, config);
 
@@ -226,7 +226,7 @@ public override void Initialize(string name, NameValueCollection config)
     /// <returns>The cloud BLOB container.</returns>
     public virtual CloudBlobContainer GetContainer(string containerName)
     {
-      Assert.ArgumentNotNull(containerName, "containerName");
+      Assert.ArgumentNotNull(containerName, nameof(containerName));
 
       var container = this.CloudBlobClient.GetContainerReference(containerName);
 
@@ -247,12 +247,12 @@ public virtual CloudBlobContainer GetContainer(string containerName)
     /// <returns>The specified cloud blob.</returns>
     public virtual ICloudBlob CreateBlob(string blobName)
     {
-      Assert.ArgumentNotNull(blobName, "blobName");
+      Assert.ArgumentNotNull(blobName, nameof(blobName));
 
       string webRoleRelativeAddress = this.GetWebsiteRelativeAddress();
 
       // Build blob name for a Role Environment using the following format: {DeploymentId}/{RoleInstanceId}/{BlobName}.
-      blobName = string.IsNullOrEmpty(webRoleRelativeAddress) ? blobName : string.Format("{0}/{1}", webRoleRelativeAddress, blobName);
+      blobName = string.IsNullOrEmpty(webRoleRelativeAddress) ? blobName : $"{webRoleRelativeAddress}/{blobName}";
 
       var blob = this.CloudBlobContainer.Exists() ?
         this.CloudBlobContainer.GetAppendBlobReference(blobName) :
@@ -269,7 +269,7 @@ public virtual ICloudBlob CreateBlob(string blobName)
     /// <exception cref="System.NotImplementedException"></exception>
     public virtual ICloudBlob GetBlob(string blobName)
     {
-      Assert.ArgumentNotNull(blobName, "blobName");
+      Assert.ArgumentNotNull(blobName, nameof(blobName));
 
       ICloudBlob blob = this.CloudBlobContainer.Exists() ?
         this.CloudBlobContainer.GetBlobReferenceFromServer(blobName) :
@@ -287,8 +287,8 @@ public virtual ICloudBlob GetBlob(string blobName)
     /// <exception cref="System.NotImplementedException"></exception>
     public virtual ICloudBlob GetBlob(string containerName, string blobName)
     {
-      Assert.ArgumentNotNull(containerName, "containerName");
-      Assert.ArgumentNotNull(blobName, "blobName");
+      Assert.ArgumentNotNull(containerName, nameof(containerName));
+      Assert.ArgumentNotNull(blobName, nameof(blobName));
 
       return this.GetContainer(containerName).GetBlobReferenceFromServer(blobName);
     }
@@ -300,7 +300,7 @@ public virtual ICloudBlob GetBlob(string containerName, string blobName)
     /// <returns>The collection of cloud blobs.</returns>
     public virtual ICollection<ICloudBlob> ListBlobs(string searchPattern)
     {
-      Assert.ArgumentNotNull(searchPattern, "searchPattern");
+      Assert.ArgumentNotNull(searchPattern, nameof(searchPattern));
 
       return this.ListBlobs(this.CloudBlobContainer, searchPattern);
     }
@@ -313,8 +313,8 @@ public virtual ICollection<ICloudBlob> ListBlobs(string searchPattern)
     /// <returns>The collection of cloud blobs.</returns>
     public virtual ICollection<ICloudBlob> ListBlobs(string containerName, string searchPattern)
     {
-      Assert.ArgumentNotNull(containerName, "containerName");
-      Assert.ArgumentNotNull(searchPattern, "searchPattern");
+      Assert.ArgumentNotNull(containerName, nameof(containerName));
+      Assert.ArgumentNotNull(searchPattern, nameof(searchPattern));
 
       var container = this.GetContainer(containerName);
       return this.ListBlobs(container, searchPattern);
@@ -328,8 +328,8 @@ public virtual ICollection<ICloudBlob> ListBlobs(string containerName, string se
     /// <returns>The collection of cloud blobs.</returns>
     public virtual ICollection<ICloudBlob> ListBlobs(CloudBlobContainer container, string searchPattern)
     {
-      Assert.ArgumentNotNull(container, "container");
-      Assert.ArgumentNotNull(searchPattern, "searchPattern");
+      Assert.ArgumentNotNull(container, nameof(container));
+      Assert.ArgumentNotNull(searchPattern, nameof(searchPattern));
 
       string webRoleRelativeAddress = this.GetWebsiteRelativeAddress();
       var blobList = container.ListBlobs(webRoleRelativeAddress, true).Cast<ICloudBlob>().ToList();

src/Sitecore.Azure.Diagnostics/Tasks/BlobCleaner.cs

@@ -37,7 +37,7 @@ public class BlobCleaner : IBlobCleaner
     /// <param name="configNode">The config node.</param>
     public BlobCleaner(XmlNode configNode)
     {
-      Assert.ArgumentNotNull(configNode, "configNode");
+      Assert.ArgumentNotNull(configNode, nameof(configNode));
 
       NameValueCollection configSettings = XmlUtil.GetAttributes(configNode);
 
@@ -51,7 +51,7 @@ public BlobCleaner(XmlNode configNode)
       this.maxAge = DateUtil.ParseTimeSpan(configSettings["maxAge"], TimeSpan.FromDays(7));
       if (this.maxAge == TimeSpan.Zero)
       {
-        Log.Warn(string.Format("Scheduling.BlobsCleanupAgent: The 'maxAge' attribute equals to '{0:dd\\.hh\\:mm\\:ss}'. All blobs will be deleted imitatively.", TimeSpan.Zero), this);
+        Log.Warn($"Scheduling.BlobsCleanupAgent: The 'maxAge' attribute equals to '{TimeSpan.Zero:dd\\.hh\\:mm\\:ss}'. All blobs will be deleted imitatively.", this);
       }
     }
 
@@ -87,7 +87,7 @@ public virtual void Execute()
       }
       else
       {
-        Log.Warn(string.Format("Scheduling.BlobsCleanupAgent: The '{0}' cloud blob container has not been found.", container.Name), this);
+        Log.Warn($"Scheduling.BlobsCleanupAgent: The '{container.Name}' cloud blob container has not been found.", this);
       }
     }
 
@@ -108,7 +108,7 @@ protected void Cleanup(CloudBlobContainer container)
       }
       else
       {
-        Log.Info(string.Format("Scheduling.BlobsCleanupAgent: The '{0}' cloud blob container does not have any out-to-date blobs that match the '{1}' search pattern.", container.Name, this.BlobSearchPattern), this);
+        Log.Info($"Scheduling.BlobsCleanupAgent: The '{container.Name}' cloud blob container does not have any out-to-date blobs that match the '{this.BlobSearchPattern}' search pattern.", this);
       }
     }
 
@@ -124,7 +124,7 @@ protected ICollection<ICloudBlob> GetCandidateBlobs(CloudBlobContainer container
       Assert.ArgumentNotNull(searchPattern, "searchPattern");
 
       var blobList = LogStorageManager.ListBlobs(container, searchPattern);
-      Log.Info(string.Format("Scheduling.BlobsCleanupAgent: The '{0}' cloud blob container includes '{1}' blobs that match the '{2}' search pattern.", container.Name, blobList.Count(), searchPattern), this);
+      Log.Info($"Scheduling.BlobsCleanupAgent: The '{container.Name}' cloud blob container includes '{blobList.Count()}' blobs that match the '{searchPattern}' search pattern.", this);
 
       var candidateBlobList = new List<ICloudBlob>();
 
@@ -143,7 +143,7 @@ protected ICollection<ICloudBlob> GetCandidateBlobs(CloudBlobContainer container
 
       if (candidateBlobList.Any())
       {
-        Log.Info(string.Format("Scheduling.BlobsCleanupAgent: The '{0}' cloud blob container includes '{1}' out-to-date blobs that match the '{2}' search pattern.", container.Name, candidateBlobList.Count(), searchPattern), this);
+        Log.Info($"Scheduling.BlobsCleanupAgent: The '{container.Name}' cloud blob container includes '{candidateBlobList.Count()}' out-to-date blobs that match the '{searchPattern}' search pattern.", this);
       }
 
       return candidateBlobList;
@@ -187,8 +187,7 @@ protected void DeleteBlobs(IEnumerable<ICloudBlob> blobsList)
 
         TimeSpan age = this.GetBlobAge(blob);
 
-        Log.Info(string.Format("Scheduling.BlobsCleanupAgent: The '{0}' cloud blob is being deleted by cleanup task (Last Modified UTC Date: '{1}', Age: '{2:dd\\.hh\\:mm\\:ss}', Max allowed age: '{3}'.", 
-         blob.Name, this.GetBlobLastModifiedDate(blob), age, this.maxAge), this);
+        Log.Info($"Scheduling.BlobsCleanupAgent: The '{blob.Name}' cloud blob is being deleted by cleanup task (Last Modified UTC Date: '{this.GetBlobLastModifiedDate(blob)}', Age: '{age:dd\\.hh\\:mm\\:ss}', Max allowed age: '{this.maxAge}'.", this);        
       }
     }
 

src/Sitecore.Azure.Diagnostics/Tasks/BlobsCleanupAgent.cs

@@ -40,7 +40,7 @@ public BlobsCleanupAgent()
     /// </summary>
     public virtual void Run()
     {
-      this.LogInfo(string.Format("Scheduling.BlobsCleanupAgent: Started. The BlobCleaner count is '{0}'.", this.blobsCleaners.Count));
+      this.LogInfo($"Scheduling.BlobsCleanupAgent: Started. The BlobCleaner count is '{this.blobsCleaners.Count}'.");
 
       foreach (IBlobCleaner cleaner in this.blobsCleaners)
       {
@@ -50,7 +50,7 @@ public virtual void Run()
         }
         catch (Exception exception)
         {
-          Log.Error(string.Format("Scheduling.BlobsCleanupAgent: Exception occurred while cleaning the '{0}' cloud blob container.", cleaner.ContainerName), exception, this);
+          Log.Error($"Scheduling.BlobsCleanupAgent: Exception occurred while cleaning the '{cleaner.ContainerName}' cloud blob container.", exception, this);
         }
       }