Merge branch 'hotfix-4.3.10' into support-4.3

Particular · Mar 31, 2015 · cb3b97b · cb3b97b
2 parents c5c0ac3 + 4df40a9
commit cb3b97b
Show file tree

Hide file tree

Showing 37 changed files with 124 additions and 318 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/.nuget/packages.config b/src/.nuget/packages.config
diff --git a/src/NServiceBus.AcceptanceTesting/NServiceBus.AcceptanceTesting.csproj b/src/NServiceBus.AcceptanceTesting/NServiceBus.AcceptanceTesting.csproj
@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <NuGetPackageImportStamp>1575b2cc</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>58ff1a06</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -83,9 +83,11 @@
     <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\NuGetPackagerLite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.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
@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <NuGetPackageImportStamp>a9705156</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>4125899f</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -244,13 +244,15 @@
     </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\NuGetPackagerLite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.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
@@ -14,7 +14,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <NuGetPackageImportStamp>15644d81</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>df926bdd</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,9 +43,6 @@
     <None Include="FodyWeavers.xml">
       <SubType>Designer</SubType>
     </None>
-    <Reference Include="Autofac">
-      <HintPath>..\packages\Autofac\lib\net40\Autofac.dll</HintPath>
-    </Reference>
     <Reference Include="Autofac, Version=3.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Autofac.3.1.5\lib\net40\Autofac.dll</HintPath>
@@ -652,10 +649,10 @@
       <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\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\NuGetPackagerLite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.4.5\build\NuGetPackagerLite.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" />