Merge pull request #1 from JakeGinnivan/BackportFixes

Backported some fixes from GitVersion into GitTools.Testing

Author: JakeGinnivan

src/GitTools.Testing.NET4/Fixtures/RepositoryFixtureBase.cs

@@ -12,8 +12,8 @@ namespace GitTools.Testing
     /// </summary>
     public abstract class RepositoryFixtureBase : IDisposable
     {
-        private static readonly ILog Logger = LogProvider.For<RepositoryFixtureBase>();
-        private readonly SequenceDiagram _sequenceDiagram;
+        static readonly ILog Logger = LogProvider.For<RepositoryFixtureBase>();
+        readonly SequenceDiagram _sequenceDiagram;
 
         protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder)
             : this(repoBuilder(PathHelper.GetTempPath()))

src/GitTools.Testing.NET4/GitTestExtensions.cs

@@ -9,9 +9,9 @@ public static class GitTestExtensions
     {
         static int _pad = 1;
 
-        public static Commit MakeACommit(this IRepository repository)
+        public static Commit MakeACommit(this IRepository repository, string commitMessage = null)
         {
-            return CreateFileAndCommit(repository, Guid.NewGuid().ToString());
+            return CreateFileAndCommit(repository, Guid.NewGuid().ToString(), commitMessage);
         }
 
         public static void MergeNoFF(this IRepository repository, string branch)
@@ -34,7 +34,7 @@ public static Commit[] MakeCommits(this IRepository repository, int numCommitsTo
                              .ToArray();
         }
 
-        public static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName)
+        public static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName, string commitMessage = null)
         {
             var randomFile = Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
             if (File.Exists(randomFile))
@@ -48,7 +48,7 @@ public static Commit CreateFileAndCommit(this IRepository repository, string rel
 
             repository.Stage(randomFile);
 
-            return repository.Commit(string.Format("Test Commit for file '{0}'", relativeFileName),
+            return repository.Commit(string.Format("Test Commit for file '{0}' - {1}", relativeFileName, commitMessage),
                 Generate.SignatureNow(), Generate.SignatureNow());
         }
 

src/GitTools.Testing.sln.DotSettings

@@ -37,7 +37,7 @@
       </Entry.Match>
     </Entry>
     <Entry DisplayName="All other members" />
-    <Entry DisplayName="Test Methods" Priority="100">
+    <Entry Priority="100" DisplayName="Test Methods">
       <Entry.Match>
         <And>
           <Kind Is="Method" />
@@ -50,7 +50,7 @@
     </Entry>
   </TypePattern>
   <TypePattern DisplayName="Default Pattern" RemoveRegions="All">
-    <Entry DisplayName="Public Delegates" Priority="100">
+    <Entry Priority="100" DisplayName="Public Delegates">
       <Entry.Match>
         <And>
           <Access Is="Public" />
@@ -61,7 +61,7 @@
         <Name />
       </Entry.SortBy>
     </Entry>
-    <Entry DisplayName="Public Enums" Priority="100">
+    <Entry Priority="100" DisplayName="Public Enums">
       <Entry.Match>
         <And>
           <Access Is="Public" />
@@ -116,7 +116,7 @@
         </Or>
       </Entry.Match>
     </Entry>
-    <Entry DisplayName="Interface Implementations" Priority="100">
+    <Entry Priority="100" DisplayName="Interface Implementations">
       <Entry.Match>
         <And>
           <Kind Is="Member" />
@@ -137,4 +137,5 @@
 &lt;/Patterns&gt;</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>