Merge branch 'hotfix-1.5.3'

Particular · Jun 10, 2015 · 5e0d302 · 5e0d302
2 parents 6b79b0b + e5f468a
commit 5e0d302
Show file tree

Hide file tree

Showing 60 changed files with 380 additions and 274 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,3 +70,5 @@ _NCrunch_*
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
+nugets/
+chocos/
diff --git a/buildsupport/FubuCore.dll b/buildsupport/FubuCore.dll
diff --git a/buildsupport/GitVersionTask/Build/GitVersionTask.targets b/buildsupport/GitVersionTask/Build/GitVersionTask.targets
diff --git a/buildsupport/GitVersionTask/GitVersionCore.dll b/buildsupport/GitVersionTask/GitVersionCore.dll
diff --git a/buildsupport/GitVersionTask/GitVersionTask.dll b/buildsupport/GitVersionTask/GitVersionTask.dll
diff --git a/buildsupport/GitVersionTask/LibGit2Sharp.dll b/buildsupport/GitVersionTask/LibGit2Sharp.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll
diff --git a/buildsupport/MSBuild.Community.Tasks.dll b/buildsupport/MSBuild.Community.Tasks.dll
diff --git a/buildsupport/Microsoft.Web.XmlTransform.dll b/buildsupport/Microsoft.Web.XmlTransform.dll
diff --git a/buildsupport/NuGet.Core.dll b/buildsupport/NuGet.Core.dll
diff --git a/buildsupport/PepitaPackage.dll b/buildsupport/PepitaPackage.dll
diff --git a/buildsupport/RippleRestoreTask.dll b/buildsupport/RippleRestoreTask.dll
diff --git a/buildsupport/RippleRestoreTask.targets b/buildsupport/RippleRestoreTask.targets
diff --git a/buildsupport/ripple.exe b/buildsupport/ripple.exe
diff --git a/gitversionconfig.yaml b/gitversionconfig.yaml
@@ -0,0 +1 @@
+assembly-versioning-scheme: MajorMinorPatch
diff --git a/installer/res-binary/aicustact.dll b/installer/res-binary/aicustact.dll
diff --git a/octopus/Deploy.ps1 b/octopus/Deploy.ps1
diff --git a/octopus/Particular.ServiceControl.nuspec b/octopus/Particular.ServiceControl.nuspec
diff --git a/octopus/ReleaseNotesCompiler.CLI.exe b/octopus/ReleaseNotesCompiler.CLI.exe
diff --git a/octopus/footer.md b/octopus/footer.md
diff --git a/octopus/octopus.csproj b/octopus/octopus.csproj
diff --git a/octopus/octopus.sln b/octopus/octopus.sln
diff --git a/octopus/packages.config b/octopus/packages.config
diff --git a/packaging/chocolatey/Setup.install.nuspec b/packaging/chocolatey/Setup.install.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>ServiceControl.install</id>
+    <version>$version$</version>
+    <title>ServiceControl.install (Install)</title>
+    <authors>Particular Software</authors>
+    <owners>Particular Software</owners>
+    <projectUrl>http://particular.net</projectUrl>
+    <licenseUrl>http://particular.net/LicenseAgreement</licenseUrl>
+    <iconUrl>http://s3.amazonaws.com/nuget.images/ServiceControl_128.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Management extension to NServiceBus</description>
+    <summary></summary>
+    <tags>nservicebus particular chocolatey servicecontrol</tags>
+    <dependencies>
+      <dependency id="chocolatey" version="0.9.9" />
+      <dependency id="DotNet4.5" version="4.5.20120822"  />
+      <dependency id="nservicebus.perfcounters.install" />
+    </dependencies>
+  </metadata>
+   <files>
+      <file src="Chocolatey\chocolateyInstall.ps1" target="Tools" />
+      <file src="Chocolatey\chocolateyUninstall.ps1" target="Tools" />
+      <file src="Chocolatey\elevatedUninstall.ps1" target="Tools" />
+    </files>
+</package>
diff --git a/src/ServiceControl.AcceptanceTests/App.config b/src/ServiceControl.AcceptanceTests/App.config
@@ -12,11 +12,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.2.0" newVersion="5.6.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.2.0" newVersion="5.6.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NServiceBus.Core" publicKeyToken="9fc386479f8a226c" culture="neutral" />
@@ -40,7 +40,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.6.2.0" newVersion="5.6.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/...ontrol.AcceptanceTests/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs b/...ontrol.AcceptanceTests/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs
@@ -76,7 +76,7 @@ public void Should_show_up_as_resolved_when_doing_a_multi_retry()
                         return true;
                     }
 
-                    IssueRetry(c, () => Post(String.Format("/api/errors/retry"), new List<string> { c.UniqueMessageId }));
+                    IssueRetry(c, () => Post("/api/errors/retry", new List<string> { c.UniqueMessageId }));
 
                     return false;
                 })
@@ -106,7 +106,7 @@ public void Should_show_up_as_resolved_when_doing_a_retry_all()
                         return true;
                     }
 
-                    IssueRetry(c, () => Post<object>(String.Format("/api/errors/retry/all")));
+                    IssueRetry(c, () => Post<object>("/api/errors/retry/all"));
 
                     return false;
                 })

diff --git a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>94a6e4db</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -225,6 +226,12 @@
       <Name>ServiceControl</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\BuildSupport\GitVersionTask\Build\GitVersionTask.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\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.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
+  </Target>
 </Project>
diff --git a/src/ServiceControl.AcceptanceTests/packages.config b/src/ServiceControl.AcceptanceTests/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
   <package id="Microsoft.AspNet.SignalR.Client" version="1.1.3" targetFramework="net45" />
   <package id="Microsoft.Data.Edm" version="5.6.3" targetFramework="net45" />
   <package id="Microsoft.Data.OData" version="5.6.3" targetFramework="net45" />

diff --git a/src/ServiceControl.Install.CustomActions/ServiceControl.Install.CustomActions.csproj b/src/ServiceControl.Install.CustomActions/ServiceControl.Install.CustomActions.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>510fc157</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup>
     <WixToolPath>..\..\lib\WiX\3.7\</WixToolPath>
@@ -61,6 +62,16 @@
   <ItemGroup>
     <Content Include="CustomAction.config" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(WixCATargetsPath)" />
+  <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\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.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
+  </Target>
 </Project>
diff --git a/src/ServiceControl.Install.CustomActions/packages.config b/src/ServiceControl.Install.CustomActions/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="GitVersionTask" version="2.0.1" targetFramework="net40" developmentDependency="true" />
+</packages>
diff --git a/src/ServiceControl.IntegrationDemo/ServiceControl.IntegrationDemo.csproj b/src/ServiceControl.IntegrationDemo/ServiceControl.IntegrationDemo.csproj
@@ -62,7 +62,6 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)..\BuildSupport\GitVersionTask\Build\GitVersionTask.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <StartAction>Program</StartAction>