Merge branch 'master' into release/3.0.0

Author: JakeGinnivan

GitVersionCore/Helpers/ProcessHelper.cs

@@ -36,7 +36,7 @@ public static Process Start(ProcessStartInfo startInfo)
                                                             startInfo.FileName,
                                                             exception);
                         }
-                        
+
                         throw;
                     }
                 }
@@ -70,8 +70,14 @@ public static int Run(Action<string> output, Action<string> errorOutput, TextRea
             };
             foreach (var environmentalVariable in environmentalVariables)
             {
-                if (!psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value != null)
+                if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key))
+                {
+                    psi.EnvironmentVariables[environmentalVariable.Key] = environmentalVariable.Value;
+                }
+                else
+                {
                     psi.EnvironmentVariables.Add(environmentalVariable.Key, environmentalVariable.Value);
+                }
                 if (psi.EnvironmentVariables.ContainsKey(environmentalVariable.Key) && environmentalVariable.Value == null)
                     psi.EnvironmentVariables.Remove(environmentalVariable.Key);
             }

GitVersionExe.Tests/GitVersionHelper.cs

@@ -32,7 +32,8 @@ static ExecutionResults ExecuteIn(ArgumentBuilder arguments)
         var environmentalVariables =
             new[]
             {
-                new KeyValuePair<string, string>("TEAMCITY_VERSION", arguments.IsTeamCity ? "8.0.0" : null)
+                new KeyValuePair<string, string>("TEAMCITY_VERSION", arguments.IsTeamCity ? "8.0.0" : null),
+                new KeyValuePair<string, string>("APPVEYOR", null)
             };
 
         var exitCode = ProcessHelper.Run(

GitVersionExe/AssemblyInfoFileUpdate.cs

@@ -3,6 +3,7 @@ namespace GitVersion
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using System.Linq;
     using GitVersion.Helpers;
 
     class AssemblyInfoFileUpdate : IDisposable
@@ -56,7 +57,8 @@ static IEnumerable<string> GetAssemblyInfoFiles(string workingDirectory, Argumen
                 }
             }
 
-            return fileSystem.DirectoryGetFiles(workingDirectory, "AssemblyInfo.cs", SearchOption.AllDirectories);
+            return fileSystem.DirectoryGetFiles(workingDirectory, "AssemblyInfo.*", SearchOption.AllDirectories)
+                .Where(f => f.EndsWith(".cs", StringComparison.OrdinalIgnoreCase) || f.EndsWith(".vb", StringComparison.OrdinalIgnoreCase));
         }
 
         public void Dispose()

README.md

@@ -60,7 +60,7 @@ Those of you who have tried to do SemVer with Octopus Deploy or consume CI packa
 the problem that the SemVer version does not change each commit.
 
 By default GitVersion is setup for *continuous delivery*, meaning that when you want to release you publish the artifact attached to 
-your CI Build ([read more about what this means](https://github.com/ParticularLabs/GitVersion/wiki/Continuous-Delivery-Mode)).
+your CI Build ([read more about what this means](https://github.com/GitTools/GitVersion/wiki/Continuous-Delivery-Mode)).
 
 If you want to consume packages from you CI server, for instance Octopus Deploy is looking at TeamCity's NuGet feed then you want GitVersion's *continuous deployment mode*. 
 See the [Configuration](#configuration)
@@ -193,7 +193,7 @@ GitVersion has multiple ways it can be consumed.
 We have a bunch of examples in our Wiki, if something is missing, let us know! There are examples for GitHubFlow and GitFlow
 
 ### Who is using GitVersion?
-Find a list of projects who are currently using GitVersion [here](https://github.com/ParticularLabs/GitVersion/wiki/Who-is-using-GitVersion%3F)
+Find a list of projects who are currently using GitVersion [here](https://github.com/GitTools/GitVersion/wiki/Who-is-using-GitVersion%3F)
 
 ## Additional Links
 
@@ -207,7 +207,7 @@ Find a list of projects who are currently using GitVersion [here](https://github
 
 Have questions?  Come join in the chat room:
 
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ParticularLabs/GitVersion?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/GitTools/GitVersion?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Icon
 <a href="http://thenounproject.com/noun/tree/#icon-No13389" target="_blank">Tree</a> designed by <a href="http://thenounproject.com/david.chapman" target="_blank">David Chapman</a> from The Noun Project

appveyor.yml

@@ -0,0 +1,27 @@
+assembly_info:
+  patch: false
+
+platform:
+  - Any CPU
+
+configuration:
+  - Debug
+ 
+build_script:
+  - cmd: nuget restore
+  
+  - cmd: msbuild GitVersion.sln "/p:Configuration=%CONFIGURATION%;Platform=%PLATFORM%"
+  - ps: .\NuGetCommandLineBuild\Tools\GitVersion.exe /l console /output buildserver /updateAssemblyInfo
+  - cmd: msbuild GitVersion.sln "/p:Configuration=%CONFIGURATION%;Platform=%PLATFORM%"
+
+  - cmd: appveyor PushArtifact "NuGetExeBuild/GitVersion.Portable.%GitVersion_NuGetVersion%.nupkg"
+  
+  - cmd: appveyor PushArtifact "NuGetCommandLineBuild/GitVersion.CommandLine.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: appveyor PushArtifact "NuGetRefBuild/GitVersion.%GitVersion_NuGetVersion%.nupkg"
+  - cmd: appveyor PushArtifact "NuGetTaskBuild/GitVersionTask.%GitVersion_NuGetVersion%.nupkg"
+  
+  - cmd: 7z a "GitVersion_%GitVersion_NuGetVersion%.zip" .\NuGetCommandLineBuild\Tools\*.*
+  - cmd: appveyor PushArtifact "GitVersion_%GitVersion_NuGetVersion%.zip"
+
+test_script:
+  - nunit-console "GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll" /noshadow