Merge remote-tracking branch 'upstream/support/3.6.0'

JakeGinnivan · JakeGinnivan · commit b5b359e7a467 · 2016-09-03T10:53:30.000+08:00
diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -42,8 +42,8 @@
       <HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
+    <Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
   <package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
+  <package id="GitTools.Core" version="1.2.0" targetFramework="net45" />
   <package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
   <package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
diff --git a/src/GitVersionCore/GitVersionCacheKeyFactory.cs b/src/GitVersionCore/GitVersionCacheKeyFactory.cs
@@ -1,6 +1,6 @@
 ﻿namespace GitVersion
 {
-    using GitVersion.Helpers;
+    using Helpers;
     using System;
     using System.Collections.Generic;
     using System.IO;
@@ -12,7 +12,7 @@ class GitVersionCacheKeyFactory
     {
         public static GitVersionCacheKey Create(IFileSystem fileSystem, GitPreparer gitPreparer, Config overrideConfig)
         {
-            var gitSystemHash = GetGitSystemHash(gitPreparer, fileSystem);
+            var gitSystemHash = GetGitSystemHash(gitPreparer);
             var configFileHash = GetConfigFileHash(fileSystem, gitPreparer);
             var repositorySnapshotHash = GetRepositorySnapshotHash(gitPreparer);
             var overrideConfigHash = GetOverrideConfigHash(overrideConfig);
@@ -21,7 +21,7 @@ public static GitVersionCacheKey Create(IFileSystem fileSystem, GitPreparer gitP
             return new GitVersionCacheKey(compositeHash);
         }
 
-        private static string GetGitSystemHash(GitPreparer gitPreparer, IFileSystem fileSystem)
+        static string GetGitSystemHash(GitPreparer gitPreparer)
         {
             var dotGitDirectory = gitPreparer.GetDotGitDirectory();
 
@@ -32,7 +32,7 @@ private static string GetGitSystemHash(GitPreparer gitPreparer, IFileSystem file
         }
 
         // based on https://msdn.microsoft.com/en-us/library/bb513869.aspx
-        private static List<string> CalculateDirectoryContents(string root)
+        static List<string> CalculateDirectoryContents(string root)
         {
             var result = new List<string>();
 
@@ -95,7 +95,7 @@ private static List<string> CalculateDirectoryContents(string root)
                     continue;
                 }
 
-                foreach (string file in files)
+                foreach (var file in files)
                 {
                     try
                     {
@@ -106,14 +106,13 @@ private static List<string> CalculateDirectoryContents(string root)
                     catch (IOException e)
                     {
                         Logger.WriteError(e.Message);
-                        continue;
                     }
                 }
 
                 // Push the subdirectories onto the stack for traversal.
                 // This could also be done before handing the files.
                 // push in reverse order
-                for (int i = subDirs.Length - 1; i >= 0; i--)
+                for (var i = subDirs.Length - 1; i >= 0; i--)
                 {
                     dirs.Push(subDirs[i]);
                 }
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
@@ -39,8 +39,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
+    <Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
diff --git a/src/GitVersionCore/packages.config b/src/GitVersionCore/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
   <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
+  <package id="GitTools.Core" version="1.2.0" targetFramework="net40" />
   <package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
   <package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net40" />
diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
@@ -35,8 +35,8 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
+    <Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/src/GitVersionExe.Tests/packages.config b/src/GitVersionExe.Tests/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
+  <package id="GitTools.Core" version="1.2.0" targetFramework="net45" />
   <package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
   <package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
@@ -41,8 +41,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
+    <Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
@@ -147,21 +147,19 @@
       <TempFiles Include="$(TargetDir)ILMergeTemp\*.*" />
       <NativeBinaries Include="$(TargetDir)lib\**\*.*" />
       <WindowsBinaries Include="$(TargetDir)lib\**\*.dll" />
-	  <LibGit2SharpFiles Include="$(TargetDir)LibGit2Sharp.*" Exclude="$(TargetDir)LibGit2Sharp.xml" />
+      <LibGit2SharpFiles Include="$(TargetDir)LibGit2Sharp.*" Exclude="$(TargetDir)LibGit2Sharp.xml" />
     </ItemGroup>
-
     <!-- Repack without LibGit2Sharp for NugetCommandLineBuild -->
     <Exec Command="$(Runtime) &quot;$(SolutionDir)packages\ILRepack.2.0.10\tools\ILRepack.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot;  &quot;$(TargetDir)GitTools.Core.dll&quot;  &quot;$(TargetDir)YamlDotNet.dll&quot; /target:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
     <!-- NugetCommandLineBuild -->
     <MakeDir Directories="$(BuildDir)NuGetCommandLineBuild" />
     <Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)NuGetCommandLineBuild\tools\lib\%(RecursiveDir)%(Filename)%(Extension)')" />
-	<Copy SourceFiles="@(LibGit2SharpFiles)" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
+    <Copy SourceFiles="@(LibGit2SharpFiles)" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
     <Copy SourceFiles="$(OutputPath)GitVersion.pdb" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" Condition="Exists('$(OutputPath)GitVersion.pdb')" />
     <Copy SourceFiles="$(OutputPath)GitVersion.exe.mdb" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" Condition="Exists('$(OutputPath)GitVersion.exe.mdb')" />
     <Copy SourceFiles="$(OutputPath)ILMergeTemp\GitVersion.exe" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
     <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.CommandLine.nuspec" DestinationFolder="$(BuildDir)NuGetCommandLineBuild" />
     <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetCommandLineBuild" MetadataAssembly="$(OutputPath)ILMergeTemp\GitVersion.exe" Version="$(GitVersion_NuGetVersion)" />
-
     <!-- Repack with LibGit2Sharp for NugetCommandLineBuild -->
     <Exec Command="$(Runtime) &quot;$(SolutionDir)packages\ILRepack.2.0.10\tools\ILRepack.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot;  &quot;$(TargetDir)GitTools.Core.dll&quot; &quot;$(TargetDir)LibGit2Sharp.dll&quot;  &quot;$(TargetDir)YamlDotNet.dll&quot; /target:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
     <!-- NugetExeBuild -->
@@ -174,7 +172,6 @@
     <Copy SourceFiles="$(ProjectDir)NugetAssets\chocolateyUninstall.ps1" DestinationFolder="$(BuildDir)NuGetExeBuild\tools" />
     <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.Portable.nuspec" DestinationFolder="$(BuildDir)NuGetExeBuild" />
     <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetExeBuild" MetadataAssembly="$(OutputPath)ILMergeTemp\GitVersion.exe" Version="$(GitVersion_NuGetVersion)" />
-
     <!-- TfsBuildTask -->
     <Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\lib\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\extension-icon.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
@@ -190,7 +187,6 @@
     <ReplaceFileText InputFilename="$(BuildDir)GitVersionTfsTaskBuild\manifest.json" OutputFilename="$(BuildDir)GitVersionTfsTaskBuild\manifest.json" MatchExpression="\$version\$" ReplacementText="$(GitVersion_SemVer)" Condition="'$(GitVersion_SemVer)' != ''" />
     <Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)GitVersionTfsTask\Update-GitVersionTfsTaskVersion.ps1 $(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\task.json $(GitVersion_MajorMinorPatch)&quot;" WorkingDirectory="$(BuildDir)" Condition="'$(GitVersion_MajorMinorPatch)' != ''" />
     <Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)GitVersionTfsTask\Create-Vsix.ps1 $(BuildDir)GitVersionTfsTaskBuild&quot;" Condition="'$(GitVersion_SemVer)' != ''" />
-
     <!-- Gem -->
     <MakeDir Directories="$(BuildDir)GemBuild" />
     <!-- Gem can only treat files it knows about, so it throws an error for .so and .dylib files when building on Windows -->
@@ -214,7 +210,6 @@
     </PropertyGroup>
     <ReplaceFileText InputFilename="$(BuildDir)GemBuild\gitversion.gemspec" OutputFilename="$(BuildDir)GemBuild\gitversion.gemspec" MatchExpression="\$version\$" ReplacementText="$(GemVersion)" Condition="'$(GitVersion_SemVer)' != ''" />
     <Exec Command="gem build gitversion.gemspec" ContinueOnError="True" WorkingDirectory="$(BuildDir)GemBuild" Condition="'$(GitVersion_SemVer)' != ''" />
-
     <!-- Cleanup -->
     <RemoveDir Directories="$(TargetDir)ILMergeTemp\" />
   </Target>
diff --git a/src/GitVersionExe/packages.config b/src/GitVersionExe/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
   <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
+  <package id="GitTools.Core" version="1.2.0" targetFramework="net40" />
   <package id="ILRepack" version="2.0.10" targetFramework="net40" />
   <package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
   <package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -56,8 +56,8 @@
       <HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
+    <Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config
@@ -4,7 +4,7 @@
   <package id="ApprovalUtilities" version="3.0.11" targetFramework="net45" />
   <package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
   <package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
+  <package id="GitTools.Core" version="1.2.0" targetFramework="net45" />
   <package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
   <package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj
@@ -39,8 +39,8 @@
     <NoWarn>1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
+    <Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
diff --git a/src/GitVersionTask/packages.config b/src/GitVersionTask/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
   <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
-  <package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
+  <package id="GitTools.Core" version="1.2.0" targetFramework="net40" />
   <package id="ILRepack" version="2.0.10" targetFramework="net40" />
   <package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
   <package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net40" />

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace GitVersion`
`2`	`2`	`{`
`3`		`- using GitVersion.Helpers;`
	`3`	`+ using Helpers;`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.IO;`
`@@ -12,7 +12,7 @@ class GitVersionCacheKeyFactory`
`12`	`12`	`{`
`13`	`13`	`public static GitVersionCacheKey Create(IFileSystem fileSystem, GitPreparer gitPreparer, Config overrideConfig)`
`14`	`14`	`{`
`15`		`- var gitSystemHash = GetGitSystemHash(gitPreparer, fileSystem);`
	`15`	`+ var gitSystemHash = GetGitSystemHash(gitPreparer);`
`16`	`16`	`var configFileHash = GetConfigFileHash(fileSystem, gitPreparer);`
`17`	`17`	`var repositorySnapshotHash = GetRepositorySnapshotHash(gitPreparer);`
`18`	`18`	`var overrideConfigHash = GetOverrideConfigHash(overrideConfig);`
`@@ -21,7 +21,7 @@ public static GitVersionCacheKey Create(IFileSystem fileSystem, GitPreparer gitP`
`21`	`21`	`return new GitVersionCacheKey(compositeHash);`
`22`	`22`	`}`
`23`	`23`
`24`		`- private static string GetGitSystemHash(GitPreparer gitPreparer, IFileSystem fileSystem)`
	`24`	`+ static string GetGitSystemHash(GitPreparer gitPreparer)`
`25`	`25`	`{`
`26`	`26`	`var dotGitDirectory = gitPreparer.GetDotGitDirectory();`
`27`	`27`
`@@ -32,7 +32,7 @@ private static string GetGitSystemHash(GitPreparer gitPreparer, IFileSystem file`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// based on https://msdn.microsoft.com/en-us/library/bb513869.aspx`
`35`		`- private static List<string> CalculateDirectoryContents(string root)`
	`35`	`+ static List<string> CalculateDirectoryContents(string root)`
`36`	`36`	`{`
`37`	`37`	`var result = new List<string>();`
`38`	`38`
`@@ -95,7 +95,7 @@ private static List<string> CalculateDirectoryContents(string root)`
`95`	`95`	`continue;`
`96`	`96`	`}`
`97`	`97`
`98`		`- foreach (string file in files)`
	`98`	`+ foreach (var file in files)`
`99`	`99`	`{`
`100`	`100`	`try`
`101`	`101`	`{`
`@@ -106,14 +106,13 @@ private static List<string> CalculateDirectoryContents(string root)`
`106`	`106`	`catch (IOException e)`
`107`	`107`	`{`
`108`	`108`	`Logger.WriteError(e.Message);`
`109`		`- continue;`
`110`	`109`	`}`
`111`	`110`	`}`
`112`	`111`
`113`	`112`	`// Push the subdirectories onto the stack for traversal.`
`114`	`113`	`// This could also be done before handing the files.`
`115`	`114`	`// push in reverse order`
`116`		`- for (int i = subDirs.Length - 1; i >= 0; i--)`
	`115`	`+ for (var i = subDirs.Length - 1; i >= 0; i--)`
`117`	`116`	`{`
`118`	`117`	`dirs.Push(subDirs[i]);`
`119`	`118`	`}`