(cleanup) resharper cleanup

Author: arturcic

src/GitVersionCore.Tests/AssemblyInfoFileUpdaterTests.cs

@@ -503,6 +503,6 @@ private static void VerifyAssemblyInfoFile(
         var config = new TestEffectiveConfiguration(assemblyVersioningScheme: versioningScheme);
         var variables = VariableProvider.GetVariablesFor(version, config, false);
 
-        verify(fileSystem, variables);
+        verify?.Invoke(fileSystem, variables);
     }
 }

src/GitVersionCore.Tests/DefaultConfigFileLocatorTests.cs

@@ -40,7 +40,7 @@ public void WarnOnExistingGitVersionConfigYamlFile(string path)
         {
             configFileLocator.Verify(workingPath, repoPath, fileSystem);
         }
-        var configFileDeprecatedWarning = string.Format("{0}' is deprecated, use '{1}' instead", DefaultConfigFileLocator.ObsoleteFileName, DefaultConfigFileLocator.DefaultFileName);
+        var configFileDeprecatedWarning = $"{DefaultConfigFileLocator.ObsoleteFileName}' is deprecated, use '{DefaultConfigFileLocator.DefaultFileName}' instead";
         logOutput.Contains(configFileDeprecatedWarning).ShouldBe(true);
     }
 
@@ -58,7 +58,7 @@ public void WarnOnAmbiguousConfigFilesAtTheSameProjectRootDirectory(string path)
             configFileLocator.Verify(workingPath, repoPath, fileSystem);
         }
 
-        var configFileDeprecatedWarning = string.Format("Ambiguous config files at '{0}'", path);
+        var configFileDeprecatedWarning = $"Ambiguous config files at '{path}'";
         logOutput.Contains(configFileDeprecatedWarning).ShouldBe(true);
     }
 
@@ -73,7 +73,7 @@ public void ThrowsExceptionOnAmbiguousConfigFileLocation(string repoConfigFile,
 
         WarningException exception = Should.Throw<WarningException>(() => { configFileLocator.Verify(workingPath, repoPath, fileSystem); });
 
-        var expecedMessage = string.Format("Ambiguous config file selection from '{0}' and '{1}'", workingDirectoryConfigFilePath, repositoryConfigFilePath);
+        var expecedMessage = $"Ambiguous config file selection from '{workingDirectoryConfigFilePath}' and '{repositoryConfigFilePath}'";
         exception.Message.ShouldBe(expecedMessage);
     }
 

src/GitVersionCore.Tests/DocumentationTests.cs

@@ -40,7 +40,7 @@ public void ConfigurationDocumentationIsUpToDate()
 
         foreach (var configProperty in configProperties)
         {
-            var formattedConfigProperty = string.Format("### {0}", configProperty);
+            var formattedConfigProperty = $"### {configProperty}";
             configurationDocumentationFile.ShouldContain(formattedConfigProperty,
                                                          Environment.NewLine + configurationDocumentationFile);
         }
@@ -85,7 +85,7 @@ public void DocumentationIndexIsUpToDate()
                 continue;
             }
 
-            documentationIndexFile.ShouldContain(relativePath, () => string.Format("The file '{0}' is not listed in 'mkdocs.yml'.", relativePath));
+            documentationIndexFile.ShouldContain(relativePath, () => $"The file '{relativePath}' is not listed in 'mkdocs.yml'.");
         }
     }
 
@@ -97,7 +97,7 @@ private string ReadDocumentationFile(string relativeDocumentationFilePath)
 
         if (!File.Exists(documentationFilePath))
         {
-            throw new FileNotFoundException(string.Format("The documentation file '{0}' couldn't be found.", documentationFilePath), documentationFilePath);
+            throw new FileNotFoundException($"The documentation file '{documentationFilePath}' couldn't be found.", documentationFilePath);
         }
 
         return File.ReadAllText(documentationFilePath);

src/GitVersionCore.Tests/Helpers/DirectoryHelper.cs

@@ -46,8 +46,7 @@ public static void DeleteDirectory(string directoryPath)
         if (!Directory.Exists(directoryPath))
         {
             Trace.WriteLine(
-                string.Format("Directory '{0}' is missing and can't be removed.",
-                    directoryPath));
+                $"Directory '{directoryPath}' is missing and can't be removed.");
 
             return;
         }

src/GitVersionCore.Tests/Init/InitStepsDefaultResponsesDoNotThrow.cs

@@ -21,7 +21,7 @@ public void Execute(Types data, IConventionResultContext result)
                     var instance = Activator.CreateInstance(t, ctorArguments);
                     try
                     {
-                        resultProperty.GetValue(instance);
+                        if (resultProperty != null) resultProperty.GetValue(instance);
                     }
                     catch (Exception)
                     {
@@ -31,6 +31,6 @@ public void Execute(Types data, IConventionResultContext result)
                 }));
         }
 
-        public string ConventionReason { get { return "So things do not blow up"; } }
+        public string ConventionReason => "So things do not blow up";
     }
-}
+}

src/GitVersionCore.Tests/IntegrationTests/MainlineDevelopmentMode.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 using System.Text;
 using GitTools.Testing;
@@ -534,14 +534,14 @@ public static void MakeACommit(this RepositoryFixtureBase fixture, string commit
         fixture.Repository.MakeACommit(commitMsg);
         var diagramBuilder = (StringBuilder)typeof(SequenceDiagram)
             .GetField("_diagramBuilder", BindingFlags.Instance | BindingFlags.NonPublic)
-            .GetValue(fixture.SequenceDiagram);
+            ?.GetValue(fixture.SequenceDiagram);
         Func<string, string> getParticipant = participant => (string)typeof(SequenceDiagram)
             .GetMethod("GetParticipant", BindingFlags.Instance | BindingFlags.NonPublic)
-            .Invoke(fixture.SequenceDiagram, new object[]
+            ?.Invoke(fixture.SequenceDiagram, new object[]
             {
                     participant
             });
         diagramBuilder.AppendLineFormat("{0} -> {0}: Commit '{1}'", getParticipant(fixture.Repository.Head.FriendlyName),
             commitMsg);
     }
-}
+}

src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs

@@ -71,8 +71,7 @@ public void GivenARemoteGitRepositoryWhenCheckingOutDetachedhead_UsingExistingIm
                 fixture.LocalRepositoryFixture.Repository.Head.Tip);
 
             Should.Throw<WarningException>(() => fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepositoryFixture.Repository, isForTrackedBranchOnly: false),
-                string.Format("It looks like the branch being examined is a detached Head pointing to commit '{0}'. Without a proper branch name GitVersion cannot determine the build version.",
-                fixture.LocalRepositoryFixture.Repository.Head.Tip.Id.ToString(7)));
+                $"It looks like the branch being examined is a detached Head pointing to commit '{fixture.LocalRepositoryFixture.Repository.Head.Tip.Id.ToString(7)}'. Without a proper branch name GitVersion cannot determine the build version.");
         }
     }
 

src/GitVersionCore.Tests/LoggerTest.cs

@@ -18,7 +18,7 @@ public void LoggerObscuresPassword(string protocol)
             var s = string.Empty;
             Action<string> action = info => { s = info; };
             using (Logger.AddLoggersTemporarily(action, action, action, action))
-                Logger.WriteInfo(string.Format("{0}://{1}:{2}@workspace.visualstudio.com/DefaultCollection/_git/CAS",protocol,username,password));
+                Logger.WriteInfo($"{protocol}://{username}:{password}@workspace.visualstudio.com/DefaultCollection/_git/CAS");
 
             s.Contains(password).ShouldBe(false);
         }

src/GitVersionCore.Tests/Mocks/MockBranch.cs

@@ -8,7 +8,7 @@ public class MockBranch : Branch, ICollection<Commit>
     public MockBranch(string friendlyName)
     {
         this.friendlyName = friendlyName;
-        this.canonicalName = friendlyName;
+        canonicalName = friendlyName;
     }
     public MockBranch(string friendlyName, string canonicalName)
     {
@@ -23,19 +23,16 @@ public MockBranch()
     MockCommitLog commits = new MockCommitLog();
     string friendlyName;
     string canonicalName;
-    public override string FriendlyName { get { return friendlyName; } }
-    public override ICommitLog Commits { get { return commits; } }
-    public override Commit Tip { get { return commits.First(); } }
-    public override bool IsTracking { get { return true; } }
+    public override string FriendlyName => friendlyName;
+    public override ICommitLog Commits => commits;
+    public override Commit Tip => commits.First();
+    public override bool IsTracking => true;
 
-    public override string CanonicalName
-    {
-        get { return canonicalName; }
-    }
+    public override string CanonicalName => canonicalName;
 
     public override int GetHashCode()
     {
-        return this.friendlyName.GetHashCode();
+        return friendlyName.GetHashCode();
     }
 
     public override bool Equals(object obj)
@@ -78,7 +75,7 @@ public bool Remove(Commit item)
         return commits.Remove(item);
     }
 
-    public int Count { get { return commits.Count; } }
+    public int Count => commits.Count;
 
-    public bool IsReadOnly { get { return false; } }
-}
+    public bool IsReadOnly => false;
+}

src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs

@@ -45,12 +45,6 @@ bool ICollection<Branch>.Remove(Branch item)
         return Branches.Remove(item);
     }
 
-    public int Count
-    {
-        get
-        {
-            return Branches.Count;
-        }
-    }
-    public bool IsReadOnly { get { return false; } }
+    public int Count => Branches.Count;
+    public bool IsReadOnly => false;
 }