diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
new file mode 100644
index 0000000000..58a4debd01
--- /dev/null
+++ b/GitVersionConfig.yaml
@@ -0,0 +1 @@
+assemblyVersioningScheme: MajorMinor
\ No newline at end of file
diff --git a/buildsupport/GitVersionTask/Build/GitVersionTask.targets b/buildsupport/GitVersionTask/Build/GitVersionTask.targets
index 9fc759ae1c..63b215b495 100644
--- a/buildsupport/GitVersionTask/Build/GitVersionTask.targets
+++ b/buildsupport/GitVersionTask/Build/GitVersionTask.targets
@@ -4,7 +4,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
   </PropertyGroup>
   <PropertyGroup>
-    <GitVersionAppendRevision Condition="$(GitVersionAppendRevision) == '' Or $(GitVersionAppendRevision) == '*Undefined*'">false</GitVersionAppendRevision>
+    <GitVersionAssemblyVersioningScheme Condition="$(GitVersionAssemblyVersioningScheme) == '' Or $(GitVersionAssemblyVersioningScheme) == '*Undefined*'"></GitVersionAssemblyVersioningScheme>
   </PropertyGroup>
 
   <UsingTask
@@ -25,7 +25,7 @@
     <UpdateAssemblyInfo
       SolutionDirectory="$(SolutionDir)"
       ProjectFile="$(ProjectPath)"
-      AppendRevision="$(GitVersionAppendRevision)"
+      AssemblyVersioningScheme="$(GitVersionAssemblyVersioningScheme)"
       CompileFiles ="@(Compile)">
       <Output
         TaskParameter="AssemblyInfoTempFilePath"
@@ -51,13 +51,12 @@
       <Output TaskParameter="LegacySemVerPadded" PropertyName="GfvLegacySemVerPadded" />
       <Output TaskParameter="FullSemVer" PropertyName="GfvFullSemVer" />
       <Output TaskParameter="AssemblySemVer" PropertyName="GfvAssemblySemVer" />
+      <Output TaskParameter="NuGetVersion" PropertyName="GfvNuGetVersion" />
       <Output TaskParameter="ClassicVersion" PropertyName="GfvClassicVersion" />
       <Output TaskParameter="ClassicVersionWithTag" PropertyName="GfvClassicVersionWithTag" />
       <Output TaskParameter="PreReleaseTag" PropertyName="GfvPreReleaseTag" />
       <Output TaskParameter="PreReleaseTagWithDash" PropertyName="GfvPreReleaseTagWithDash" />
       <Output TaskParameter="InformationalVersion" PropertyName="GfvInformationalVersion" />
-      <Output TaskParameter="AssemblyVersion" PropertyName="GfvAssemblyVersion" />
-      <Output TaskParameter="AssemblyFileVersion" PropertyName="GfvAssemblyFileVersion" />
       <Output TaskParameter="OriginalRelease" PropertyName="GfvOriginalRelease" />
     </GetVersion>
 
diff --git a/buildsupport/GitVersionTask/GitVersionTask.dll b/buildsupport/GitVersionTask/GitVersionTask.dll
index cb27d44c58..9cff55ae46 100644
Binary files a/buildsupport/GitVersionTask/GitVersionTask.dll and b/buildsupport/GitVersionTask/GitVersionTask.dll differ
diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll
deleted file mode 100644
index 5af4cbce4d..0000000000
Binary files a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-90befde.dll and /dev/null differ
diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll
deleted file mode 100644
index 086bfda98a..0000000000
Binary files a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-90befde.dll and /dev/null differ
diff --git a/ripple.config b/ripple.config
index b8acf258f1..3fe0fdd0ea 100644
--- a/ripple.config
+++ b/ripple.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ripple xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ripple xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>NServiceBus</Name>
   <NugetSpecFolder>packaging/nuget</NugetSpecFolder>
   <SourceFolder>src</SourceFolder>
@@ -58,4 +58,4 @@
     <Nuspec File="nservicebus.testing.nuspec" Project="nservicebus.testing" />
     <Nuspec File="nservicebus.unity.nuspec" Project="ObjectBuilder.unity" />
   </Nuspecs>
-</ripple>
+</ripple>
\ No newline at end of file
diff --git a/src/NServiceBus.Core/GitFlowVersion.cs b/src/NServiceBus.Core/GitFlowVersion.cs
index 477af7c728..8845450ddf 100644
--- a/src/NServiceBus.Core/GitFlowVersion.cs
+++ b/src/NServiceBus.Core/GitFlowVersion.cs
@@ -8,10 +8,12 @@ static GitFlowVersion()
         {
             var assembly = typeof(GitFlowVersion).Assembly;
             var gitFlowVersionInformationType = assembly.GetType("GitVersionInformation", true);
-            var fieldInfo = gitFlowVersionInformationType.GetField("AssemblyFileVersion");
-            var assemblyFileVersion = Version.Parse((string)fieldInfo.GetValue(null));
-            MajorMinor = assemblyFileVersion.ToString(2);
-            MajorMinorPatch = assemblyFileVersion.ToString(3);
+            var fieldInfo = gitFlowVersionInformationType.GetField("MajorMinorPatch");
+
+            var version = Version.Parse((string) fieldInfo.GetValue(null));
+
+            MajorMinor = version.ToString(2);
+            MajorMinorPatch = version.ToString(3);
         }
 
         public static string MajorMinor;
diff --git a/src/NServiceBus/NServiceBusVersion.cs b/src/NServiceBus/NServiceBusVersion.cs
index a26134182a..ee7452b01a 100644
--- a/src/NServiceBus/NServiceBusVersion.cs
+++ b/src/NServiceBus/NServiceBusVersion.cs
@@ -11,7 +11,7 @@ static NServiceBusVersion()
         {
             var assembly = typeof(NServiceBusVersion).Assembly;
             var gitFlowVersionInformationType = assembly.GetType("GitVersionInformation", true);
-            var fieldInfo = gitFlowVersionInformationType.GetField("AssemblyFileVersion");
+            var fieldInfo = gitFlowVersionInformationType.GetField("MajorMinorPatch");
             var assemblyFileVersion = System.Version.Parse((string)fieldInfo.GetValue(null));
             Version = assemblyFileVersion.ToString(3);
         }