Merge branch 'hotfix-4.1.7' into support-4.1

Particular · Apr 1, 2015 · b7ea8c0 · b7ea8c0
2 parents cb44123 + 044d1e6
commit b7ea8c0
Show file tree

Hide file tree

Showing 35 changed files with 121 additions and 279 deletions.
diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
@@ -1 +1 @@
-assemblyVersioningScheme: MajorMinor
+assembly-versioning-scheme: MajorMinor
diff --git a/Octopus/DeploymentProcess.json b/Octopus/DeploymentProcess.json
diff --git a/Octopus/Project.json b/Octopus/Project.json
diff --git a/src/NServiceBus.AcceptanceTesting/NServiceBus.AcceptanceTesting.csproj b/src/NServiceBus.AcceptanceTesting/NServiceBus.AcceptanceTesting.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <NuGetPackageImportStamp>5cce4646</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>bfea8a98</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -83,7 +84,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets'))" />
     <Error Condition="!Exists('..\packages\NuGetPackager.0.4.5\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.4.5\build\NuGetPackager.targets'))" />
+
+    <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets'))" />
   </Target>
-  <Import Project="..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets')" />
-  <Import Project="..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.targets" Condition="Exists('..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.targets')" />
+
+  <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
+  <Import Project="..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets')" />
 </Project>
diff --git a/src/NServiceBus.AcceptanceTesting/packages.config b/src/NServiceBus.AcceptanceTesting/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitVersionTask" version="1.3.2" targetFramework="net40" developmentDependency="true" />
-  <package id="NuGetPackager" version="0.4.5" targetFramework="net40" developmentDependency="true" />
+  <package id="GitVersionTask" version="2.0.1" targetFramework="net40" developmentDependency="true" />
+  <package id="NuGetPackager" version="0.5.4" targetFramework="net40" developmentDependency="true" />
 </packages>
diff --git a/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj b/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <NuGetPackageImportStamp>a8e5a88f</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>b1f80192</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -228,13 +229,17 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets'))" />
     <Error Condition="!Exists('..\packages\NuGetPackager.0.4.5\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.4.5\build\NuGetPackager.targets'))" />
+
+    <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets'))" />
   </Target>
-  <Import Project="..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.targets" Condition="Exists('..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.targets')" />
+
+  <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
+  <Import Project="..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets')" />
 </Project>
diff --git a/src/NServiceBus.AcceptanceTests/packages.config b/src/NServiceBus.AcceptanceTests/packages.config
@@ -5,14 +5,14 @@
   <package id="Castle.Windsor" version="3.2.1" targetFramework="net40" />
   <package id="Common.Logging" version="1.2.0" targetFramework="net40" />
   <package id="CommonServiceLocator" version="1.0" targetFramework="net40" />
-  <package id="GitVersionTask" version="1.3.2" targetFramework="net40" developmentDependency="true" />
+  <package id="GitVersionTask" version="2.0.1" targetFramework="net40" developmentDependency="true" />
   <package id="Iesi.Collections" version="3.4.0.4000" targetFramework="net40" />
   <package id="log4net" version="1.2.10" targetFramework="net40" />
   <package id="NHibernate" version="3.3.3.4000" targetFramework="net40" />
   <package id="Ninject" version="3.0.1.10" targetFramework="net40" />
   <package id="Ninject.Extensions.ContextPreservation" version="3.0.0.8" targetFramework="net40" />
   <package id="Ninject.Extensions.NamedScope" version="3.0.0.5" targetFramework="net40" />
-  <package id="NuGetPackager" version="0.4.5" targetFramework="net40" developmentDependency="true" />
+  <package id="NuGetPackager" version="0.5.4" targetFramework="net40" developmentDependency="true" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
   <package id="RavenDB.Client" version="2.0.2375" targetFramework="net40" />
   <package id="Spring.Core" version="1.3.2" targetFramework="net40" />

diff --git a/src/NServiceBus.Core/NServiceBus.Core.csproj b/src/NServiceBus.Core/NServiceBus.Core.csproj
@@ -15,6 +15,7 @@
     <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <NuGetPackageImportStamp>84794008</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>c0675ec3</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -611,8 +612,12 @@
     <Error Condition="!Exists('..\packages\Fody.1.25.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.25.0\build\Fody.targets'))" />
     <Error Condition="!Exists('..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets'))" />
     <Error Condition="!Exists('..\packages\NuGetPackager.0.4.5\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.4.5\build\NuGetPackager.targets'))" />
+
+    <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets'))" />
   </Target>
   <Import Project="..\packages\Fody.1.25.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.25.0\build\Fody.targets')" />
-  <Import Project="..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.1.3.2\Build\GitVersionTask.targets')" />
-  <Import Project="..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.targets" Condition="Exists('..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.targets')" />
+
+  <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
+  <Import Project="..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.5.4\build\NuGetPackager.targets')" />
 </Project>
diff --git a/src/NServiceBus.Core/packages.config b/src/NServiceBus.Core/packages.config
@@ -3,11 +3,11 @@
   <package id="Autofac" version="3.1.5" targetFramework="net40" />
   <package id="Costura.Fody" version="0.5.3.0" targetFramework="net40" />
   <package id="Fody" version="1.25.0" targetFramework="net40" developmentDependency="true" />
-  <package id="GitVersionTask" version="1.3.2" targetFramework="net40" developmentDependency="true" />
+  <package id="GitVersionTask" version="2.0.1" targetFramework="net40" developmentDependency="true" />
   <package id="Janitor.Fody" version="1.1.0.0" targetFramework="net40" developmentDependency="true" />
   <package id="log4net" version="1.2.10" targetFramework="net40" />
   <package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
-  <package id="NuGetPackager" version="0.4.5" targetFramework="net40" developmentDependency="true" />
+  <package id="NuGetPackager" version="0.5.4" targetFramework="net40" developmentDependency="true" />
   <package id="Obsolete.Fody" version="3.1.0.0" targetFramework="net40" developmentDependency="true" />
   <package id="Particular.Licensing.Sources" version="0.1.54" targetFramework="net40" />
   <package id="RavenDB.Client" version="2.0.2375" targetFramework="net40" />

diff --git a/src/NServiceBus.Deploy/NServiceBus.Deploy.csproj b/src/NServiceBus.Deploy/NServiceBus.Deploy.csproj
diff --git a/src/NServiceBus.Deploy/packages.config b/src/NServiceBus.Deploy/packages.config