cleanup

SimonCropp · SimonCropp · commit 54f6d0d5d9a0 · 2014-07-03T12:15:44.000+10:00
diff --git a/AcceptanceTests/CommitCountingRepoFixture.cs b/AcceptanceTests/CommitCountingRepoFixture.cs
@@ -10,7 +10,7 @@ public CommitCountingRepoFixture() :
             base(CloneTestRepo)
         { }
 
-        private static IRepository CloneTestRepo(string path)
+        static IRepository CloneTestRepo(string path)
         {
             const string repoName = "commit_counting_wd";
             var source = new DirectoryInfo(@"../../Resources/" + repoName);
diff --git a/AcceptanceTests/EmptyRepositoryFixture.cs b/AcceptanceTests/EmptyRepositoryFixture.cs
@@ -9,7 +9,7 @@ public EmptyRepositoryFixture() :
             base(CreateNewRepository)
         { }
 
-        private static IRepository CreateNewRepository(string path)
+        static IRepository CreateNewRepository(string path)
         {
             LibGit2Sharp.Repository.Init(path);
             Console.WriteLine("Created git repository at '{0}'", path);
diff --git a/AcceptanceTests/RepositoryFixtureBase.cs b/AcceptanceTests/RepositoryFixtureBase.cs
@@ -7,8 +7,8 @@ namespace AcceptanceTests
 
     public abstract class RepositoryFixtureBase : IDisposable
     {
-        public readonly string RepositoryPath;
-        public readonly IRepository Repository;
+        public string RepositoryPath;
+        public IRepository Repository;
 
         protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder)
         {
diff --git a/GitVersionCore/BuildServers/TeamCity.cs b/GitVersionCore/BuildServers/TeamCity.cs
@@ -4,7 +4,7 @@
 
     public class TeamCity : BuildServerBase
     {
-        readonly Arguments arguments;
+        Arguments arguments;
 
         public TeamCity(Arguments arguments)
         {
diff --git a/GitVersionCore/LambdaEqualityHelper.cs b/GitVersionCore/LambdaEqualityHelper.cs
@@ -5,10 +5,9 @@ namespace GitVersion
     // From the LibGit2Sharp project (libgit2sharp.com)
     // MIT License - Copyright (c) 2011-2014 LibGit2Sharp contributors
     // see https://github.com/libgit2/libgit2sharp/blob/7af5c60f22f9bd6064204f84467cfa62bedd1147/LibGit2Sharp/Core/LambdaEqualityHelper.cs
-
-    internal class LambdaEqualityHelper<T>
+    class LambdaEqualityHelper<T>
     {
-        private readonly Func<T, object>[] equalityContributorAccessors;
+        Func<T, object>[] equalityContributorAccessors;
 
         public LambdaEqualityHelper(params Func<T, object>[] equalityContributorAccessors)
         {
diff --git a/GitVersionCore/ReleaseDate.cs b/GitVersionCore/ReleaseDate.cs
@@ -8,7 +8,7 @@ public class ReleaseDate : IEquatable<ReleaseDate>
     public DateTimeOffset Date;
     public string CommitSha;
 
-    private static readonly LambdaEqualityHelper<ReleaseDate> equalityHelper =
+    static LambdaEqualityHelper<ReleaseDate> equalityHelper =
            new LambdaEqualityHelper<ReleaseDate>(x => x.OriginalDate, x => x.OriginalCommitSha, x => x.Date, x => x.CommitSha);
 
     public override bool Equals(object obj)
diff --git a/GitVersionCore/SemanticVersion.cs b/GitVersionCore/SemanticVersion.cs
@@ -5,7 +5,7 @@ namespace GitVersion
 
     public class SemanticVersion : IFormattable, IComparable<SemanticVersion>
     {
-        static readonly Regex ParseSemVer = new Regex(
+        static Regex ParseSemVer = new Regex(
             @"[vV]?(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))?(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]*))?(\+(?<BuildMetaData>.*))?",
             RegexOptions.Compiled);
 
diff --git a/GitVersionCore/SemanticVersionBuildMetaData.cs b/GitVersionCore/SemanticVersionBuildMetaData.cs
@@ -5,11 +5,11 @@ namespace GitVersion
 
     public class SemanticVersionBuildMetaData : IFormattable, IEquatable<SemanticVersionBuildMetaData>
     {
-        static readonly Regex ParseRegex = new Regex(
+        static Regex ParseRegex = new Regex(
             @"(?<BuildNumber>\d+)?(\.?Branch(Name)?\.(?<BranchName>[^\.]+))?(\.?Sha?\.(?<Sha>[^\.]+))?(?<Other>.*)",
             RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static readonly LambdaEqualityHelper<SemanticVersionBuildMetaData> equalityHelper =
+        static LambdaEqualityHelper<SemanticVersionBuildMetaData> equalityHelper =
            new LambdaEqualityHelper<SemanticVersionBuildMetaData>(x => x.CommitsSinceTag, x => x.Branch, x => x.Sha, x => x.ReleaseDate);
 
         public int? CommitsSinceTag;
diff --git a/GitVersionCore/SemanticVersionPreReleaseTag.cs b/GitVersionCore/SemanticVersionPreReleaseTag.cs
@@ -9,7 +9,7 @@ public class SemanticVersionPreReleaseTag :
         public string Name;
         public int? Number;
 
-        private static readonly LambdaEqualityHelper<SemanticVersionPreReleaseTag> equalityHelper =
+        static LambdaEqualityHelper<SemanticVersionPreReleaseTag> equalityHelper =
            new LambdaEqualityHelper<SemanticVersionPreReleaseTag>(x => x.Name, x => x.Number);
 
         public SemanticVersionPreReleaseTag()
diff --git a/GitVersionExe/AssemblyInfoFileUpdate.cs b/GitVersionExe/AssemblyInfoFileUpdate.cs
@@ -4,10 +4,10 @@ namespace GitVersion
     using System.Collections.Generic;
     using System.IO;
 
-    internal class AssemblyInfoFileUpdate : IDisposable
+    class AssemblyInfoFileUpdate : IDisposable
     {
-        private readonly List<Action> _restoreBackupTasks = new List<Action>();
-        private readonly List<Action> _cleanupBackupTasks = new List<Action>();
+        List<Action> restoreBackupTasks = new List<Action>();
+        List<Action> cleanupBackupTasks = new List<Action>();
 
         public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, Dictionary<string, string> variables)
         {
@@ -24,13 +24,13 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, Dictionar
                 var backupAssemblyInfo = assemblyInfoFile + ".bak";
                 var localAssemblyInfo = assemblyInfoFile;
                 File.Copy(assemblyInfoFile, backupAssemblyInfo, true);
-                _restoreBackupTasks.Add(() =>
+                restoreBackupTasks.Add(() =>
                 {
                     if (File.Exists(localAssemblyInfo))
                         File.Delete(localAssemblyInfo);
                     File.Move(backupAssemblyInfo, localAssemblyInfo);
                 });
-                _cleanupBackupTasks.Add(() => File.Delete(backupAssemblyInfo));
+                cleanupBackupTasks.Add(() => File.Delete(backupAssemblyInfo));
 
                 var assemblyVersion = string.Format("{0}.{1}.0.0", variables[VariableProvider.Major], variables[VariableProvider.Minor]);
                 var assemblyInfoVersion = variables[VariableProvider.InformationalVersion];
@@ -46,23 +46,23 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, Dictionar
 
         public void Dispose()
         {
-            foreach (var restoreBackup in _restoreBackupTasks)
+            foreach (var restoreBackup in restoreBackupTasks)
             {
                 restoreBackup();
             }
 
-            _cleanupBackupTasks.Clear();
-            _restoreBackupTasks.Clear();
+            cleanupBackupTasks.Clear();
+            restoreBackupTasks.Clear();
         }
 
         public void DoNotRestoreAssemblyInfo()
         {
-            foreach (var cleanupBackupTask in _cleanupBackupTasks)
+            foreach (var cleanupBackupTask in cleanupBackupTasks)
             {
                 cleanupBackupTask();
             }
-            _cleanupBackupTasks.Clear();
-            _restoreBackupTasks.Clear();
+            cleanupBackupTasks.Clear();
+            restoreBackupTasks.Clear();
         }
     }
 }
diff --git a/GitVersionExe/GitPreparer.cs b/GitVersionExe/GitPreparer.cs
@@ -5,7 +5,7 @@
 
     public class GitPreparer
     {
-        readonly Arguments arguments;
+        Arguments arguments;
 
         public GitPreparer(Arguments arguments)
         {
diff --git a/Tests/LambdaEqualityHelperFixture.cs b/Tests/LambdaEqualityHelperFixture.cs
@@ -38,7 +38,7 @@ public void EqualityHelperCanTestNullInHashCode()
 
     private class ObjectWithEquality : GitObject
     {
-        private readonly ObjectId id;
+        ObjectId id;
 
         public ObjectWithEquality(ObjectId id = null)
         {
diff --git a/Tests/Mocks/MockCommitLog.cs b/Tests/Mocks/MockCommitLog.cs
@@ -16,7 +16,7 @@ IEnumerator IEnumerable.GetEnumerator()
         return GetEnumerator();
     }
 
-    public CommitSortStrategies SortedBy { get; private set; }
+    public CommitSortStrategies SortedBy { get; set; }
     public void Add(Commit item)
     {
         Commits.Add(item);
diff --git a/Tests/Mocks/MockRepository.cs b/Tests/Mocks/MockRepository.cs
@@ -60,7 +60,7 @@ public Commit Commit(string message, Signature author, Signature committer, Comm
         throw new NotImplementedException();
     }
 
-    public Dictionary<string, GitObject> LookupResults { get; private set; }
+    public Dictionary<string, GitObject> LookupResults { get; set; }
 
     public Commit Commit(string message, Signature author, Signature committer, bool amendPreviousCommit = false)
     {
@@ -108,24 +108,24 @@ public BlameHunkCollection Blame(string path, BlameOptions options = null)
     }
 
     public Branch Head { get; set; }
-    public Configuration Config { get; private set; }
-    public Index Index { get; private set; }
+    public Configuration Config { get; set; }
+    public Index Index { get; set; }
     public ReferenceCollection Refs { get; set; }
     public IQueryableCommitLog Commits { get; set; }
     public BranchCollection Branches { get; set; }
     public TagCollection Tags { get; set; }
-    public RepositoryInformation Info { get; private set; }
-    public Diff Diff { get; private set; }
-    public ObjectDatabase ObjectDatabase { get; private set; }
-    public NoteCollection Notes { get; private set; }
-    public SubmoduleCollection Submodules { get; private set; }
+    public RepositoryInformation Info { get; set; }
+    public Diff Diff { get; set; }
+    public ObjectDatabase ObjectDatabase { get; set; }
+    public NoteCollection Notes { get; set; }
+    public SubmoduleCollection Submodules { get; set; }
 
     public Ignore Ignore
     {
         get { throw new NotImplementedException(); }
     }
 
-    public Network Network { get; private set; }
+    public Network Network { get; set; }
 
     public StashCollection Stashes
     {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public CommitCountingRepoFixture() :`
`10`	`10`	`base(CloneTestRepo)`
`11`	`11`	`{ }`
`12`	`12`
`13`		`- private static IRepository CloneTestRepo(string path)`
	`13`	`+ static IRepository CloneTestRepo(string path)`
`14`	`14`	`{`
`15`	`15`	`const string repoName = "commit_counting_wd";`
`16`	`16`	`var source = new DirectoryInfo(@"../../Resources/" + repoName);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public EmptyRepositoryFixture() :`
`9`	`9`	`base(CreateNewRepository)`
`10`	`10`	`{ }`
`11`	`11`
`12`		`- private static IRepository CreateNewRepository(string path)`
	`12`	`+ static IRepository CreateNewRepository(string path)`
`13`	`13`	`{`
`14`	`14`	`LibGit2Sharp.Repository.Init(path);`
`15`	`15`	`Console.WriteLine("Created git repository at '{0}'", path);`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ namespace AcceptanceTests`
`7`	`7`
`8`	`8`	`public abstract class RepositoryFixtureBase : IDisposable`
`9`	`9`	`{`
`10`		`- public readonly string RepositoryPath;`
`11`		`- public readonly IRepository Repository;`
	`10`	`+ public string RepositoryPath;`
	`11`	`+ public IRepository Repository;`
`12`	`12`
`13`	`13`	`protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder)`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`public class TeamCity : BuildServerBase`
`6`	`6`	`{`
`7`		`- readonly Arguments arguments;`
	`7`	`+ Arguments arguments;`
`8`	`8`
`9`	`9`	`public TeamCity(Arguments arguments)`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,9 @@ namespace GitVersion`
`5`	`5`	`// From the LibGit2Sharp project (libgit2sharp.com)`
`6`	`6`	`// MIT License - Copyright (c) 2011-2014 LibGit2Sharp contributors`
`7`	`7`	`// see https://github.com/libgit2/libgit2sharp/blob/7af5c60f22f9bd6064204f84467cfa62bedd1147/LibGit2Sharp/Core/LambdaEqualityHelper.cs`
`8`		`-`
`9`		`- internal class LambdaEqualityHelper<T>`
	`8`	`+ class LambdaEqualityHelper<T>`
`10`	`9`	`{`
`11`		`- private readonly Func<T, object>[] equalityContributorAccessors;`
	`10`	`+ Func<T, object>[] equalityContributorAccessors;`
`12`	`11`
`13`	`12`	`public LambdaEqualityHelper(params Func<T, object>[] equalityContributorAccessors)`
`14`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace GitVersion`
`5`	`5`
`6`	`6`	`public class SemanticVersion : IFormattable, IComparable<SemanticVersion>`
`7`	`7`	`{`
`8`		`- static readonly Regex ParseSemVer = new Regex(`
	`8`	`+ static Regex ParseSemVer = new Regex(`
`9`	`9`	`@"[vV]?(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))?(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]))?(\+(?<BuildMetaData>.))?",`
`10`	`10`	`RegexOptions.Compiled);`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ namespace GitVersion`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`	`using System.IO;`
`6`	`6`
`7`		`- internal class AssemblyInfoFileUpdate : IDisposable`
	`7`	`+ class AssemblyInfoFileUpdate : IDisposable`
`8`	`8`	`{`
`9`		`- private readonly List<Action> _restoreBackupTasks = new List<Action>();`
`10`		`- private readonly List<Action> _cleanupBackupTasks = new List<Action>();`
	`9`	`+ List<Action> restoreBackupTasks = new List<Action>();`
	`10`	`+ List<Action> cleanupBackupTasks = new List<Action>();`
`11`	`11`
`12`	`12`	`public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, Dictionary<string, string> variables)`
`13`	`13`	`{`
`@@ -24,13 +24,13 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, Dictionar`
`24`	`24`	`var backupAssemblyInfo = assemblyInfoFile + ".bak";`
`25`	`25`	`var localAssemblyInfo = assemblyInfoFile;`
`26`	`26`	`File.Copy(assemblyInfoFile, backupAssemblyInfo, true);`
`27`		`- _restoreBackupTasks.Add(() =>`
	`27`	`+ restoreBackupTasks.Add(() =>`
`28`	`28`	`{`
`29`	`29`	`if (File.Exists(localAssemblyInfo))`
`30`	`30`	`File.Delete(localAssemblyInfo);`
`31`	`31`	`File.Move(backupAssemblyInfo, localAssemblyInfo);`
`32`	`32`	`});`
`33`		`- _cleanupBackupTasks.Add(() => File.Delete(backupAssemblyInfo));`
	`33`	`+ cleanupBackupTasks.Add(() => File.Delete(backupAssemblyInfo));`
`34`	`34`
`35`	`35`	`var assemblyVersion = string.Format("{0}.{1}.0.0", variables[VariableProvider.Major], variables[VariableProvider.Minor]);`
`36`	`36`	`var assemblyInfoVersion = variables[VariableProvider.InformationalVersion];`
`@@ -46,23 +46,23 @@ public AssemblyInfoFileUpdate(Arguments args, string workingDirectory, Dictionar`
`46`	`46`
`47`	`47`	`public void Dispose()`
`48`	`48`	`{`
`49`		`- foreach (var restoreBackup in _restoreBackupTasks)`
	`49`	`+ foreach (var restoreBackup in restoreBackupTasks)`
`50`	`50`	`{`
`51`	`51`	`restoreBackup();`
`52`	`52`	`}`
`53`	`53`
`54`		`- _cleanupBackupTasks.Clear();`
`55`		`- _restoreBackupTasks.Clear();`
	`54`	`+ cleanupBackupTasks.Clear();`
	`55`	`+ restoreBackupTasks.Clear();`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public void DoNotRestoreAssemblyInfo()`
`59`	`59`	`{`
`60`		`- foreach (var cleanupBackupTask in _cleanupBackupTasks)`
	`60`	`+ foreach (var cleanupBackupTask in cleanupBackupTasks)`
`61`	`61`	`{`
`62`	`62`	`cleanupBackupTask();`
`63`	`63`	`}`
`64`		`- _cleanupBackupTasks.Clear();`
`65`		`- _restoreBackupTasks.Clear();`
	`64`	`+ cleanupBackupTasks.Clear();`
	`65`	`+ restoreBackupTasks.Clear();`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`