Merge branch 'hotfix-4.6.6' into support-4.6

GitVersionConfig.yaml

@@ -0,0 +1 @@
+assemblyVersioningScheme: MajorMinor

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>
 

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>

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;

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);
         }