diff --git a/.gitignore b/.gitignore index 86bdc17724..cf159a3b2a 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ _NCrunch_* _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user +nugets/ +chocos/ \ No newline at end of file diff --git a/buildsupport/FubuCore.dll b/buildsupport/FubuCore.dll deleted file mode 100644 index de611bc014..0000000000 Binary files a/buildsupport/FubuCore.dll and /dev/null differ diff --git a/buildsupport/GitVersionTask/Build/GitVersionTask.targets b/buildsupport/GitVersionTask/Build/GitVersionTask.targets deleted file mode 100644 index a00a677818..0000000000 --- a/buildsupport/GitVersionTask/Build/GitVersionTask.targets +++ /dev/null @@ -1,51 +0,0 @@ - - - - $(MSBuildProjectDirectory)..\ - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buildsupport/GitVersionTask/GitVersionCore.dll b/buildsupport/GitVersionTask/GitVersionCore.dll deleted file mode 100644 index a4342bd7da..0000000000 Binary files a/buildsupport/GitVersionTask/GitVersionCore.dll and /dev/null differ diff --git a/buildsupport/GitVersionTask/GitVersionTask.dll b/buildsupport/GitVersionTask/GitVersionTask.dll deleted file mode 100644 index 079924a095..0000000000 Binary files a/buildsupport/GitVersionTask/GitVersionTask.dll and /dev/null differ diff --git a/buildsupport/GitVersionTask/LibGit2Sharp.dll b/buildsupport/GitVersionTask/LibGit2Sharp.dll deleted file mode 100644 index e45661bd83..0000000000 Binary files a/buildsupport/GitVersionTask/LibGit2Sharp.dll and /dev/null differ diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll deleted file mode 100644 index 639b55ef41..0000000000 Binary files a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll and /dev/null differ diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll deleted file mode 100644 index 1ceb3b2ec3..0000000000 Binary files a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll and /dev/null differ diff --git a/buildsupport/MSBuild.Community.Tasks.dll b/buildsupport/MSBuild.Community.Tasks.dll deleted file mode 100644 index 6d43c0e5bc..0000000000 Binary files a/buildsupport/MSBuild.Community.Tasks.dll and /dev/null differ diff --git a/buildsupport/Microsoft.Web.XmlTransform.dll b/buildsupport/Microsoft.Web.XmlTransform.dll deleted file mode 100644 index 65769fa50c..0000000000 Binary files a/buildsupport/Microsoft.Web.XmlTransform.dll and /dev/null differ diff --git a/buildsupport/NuGet.Core.dll b/buildsupport/NuGet.Core.dll deleted file mode 100644 index a5787205f1..0000000000 Binary files a/buildsupport/NuGet.Core.dll and /dev/null differ diff --git a/buildsupport/PepitaPackage.dll b/buildsupport/PepitaPackage.dll deleted file mode 100644 index d1509d1b2b..0000000000 Binary files a/buildsupport/PepitaPackage.dll and /dev/null differ diff --git a/buildsupport/RippleRestoreTask.dll b/buildsupport/RippleRestoreTask.dll deleted file mode 100644 index e443473c54..0000000000 Binary files a/buildsupport/RippleRestoreTask.dll and /dev/null differ diff --git a/buildsupport/RippleRestoreTask.targets b/buildsupport/RippleRestoreTask.targets deleted file mode 100644 index cb3f1b8399..0000000000 --- a/buildsupport/RippleRestoreTask.targets +++ /dev/null @@ -1,28 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - RippleRestoreTarget; - $(BuildDependsOn); - - - - - - - - - - - - - - - - - - - diff --git a/buildsupport/ripple.exe b/buildsupport/ripple.exe deleted file mode 100644 index f2b3de2683..0000000000 Binary files a/buildsupport/ripple.exe and /dev/null differ diff --git a/gitversionconfig.yaml b/gitversionconfig.yaml new file mode 100644 index 0000000000..4efe93410a --- /dev/null +++ b/gitversionconfig.yaml @@ -0,0 +1 @@ +assembly-versioning-scheme: MajorMinorPatch \ No newline at end of file diff --git a/installer/res-binary/aicustact.dll b/installer/res-binary/aicustact.dll deleted file mode 100644 index 0a668bf9e2..0000000000 Binary files a/installer/res-binary/aicustact.dll and /dev/null differ diff --git a/octopus/Deploy.ps1 b/octopus/Deploy.ps1 deleted file mode 100644 index f17dc1eabc..0000000000 --- a/octopus/Deploy.ps1 +++ /dev/null @@ -1,30 +0,0 @@ -#ensure a powershell error sends exitcode to Octopus -trap { - Write-Host $_ - Exit 1 -} - -# Passed from Octopus -$requiredvariables = "ghusername", "ghpassword", "mygetkey" -$requiredvariables | % { - if (!(Test-Path "variable:$_")) { - throw "Variable $_ has not been set in Octopus config" - } -} - -#content folder in nuget package contains files to upload -push-location .\content - -#rename .zip files back to .nupkg -Get-ChildItem -Path ".\*" -Include "*.nzip" | Rename-Item -NewName { $_.BaseName } - -Write-Host "Creating release for milestone {{milestone}} ..." - -& "..\tools\ReleaseNotesCompiler.CLI.exe" $ghusername $ghpassword "particular" "servicecontrol" "{{milestone}}" "Particular.ServiceControl-{{milestone}}.exe" - -$files = Get-ChildItem -Path ".\*" -Include "*.nupkg" -foreach ($file in $files) { - $fileName = $file.Name - - & "..\tools\NuGet.exe" push $fileName $mygetkey -Source https://www.myget.org/F/particular-chocolatey/api/v2/package -} diff --git a/octopus/Particular.ServiceControl.nuspec b/octopus/Particular.ServiceControl.nuspec deleted file mode 100644 index ec542a10c0..0000000000 --- a/octopus/Particular.ServiceControl.nuspec +++ /dev/null @@ -1,22 +0,0 @@ - - - - Particular.ServiceControl - $version$ - Particular.ServiceControl - Particular Software Ltd - Particular Software Ltd - http://particular.net/ - http://particular.net/ - false - Service Control Deployment Package - - - - - - - - - - diff --git a/octopus/ReleaseNotesCompiler.CLI.exe b/octopus/ReleaseNotesCompiler.CLI.exe deleted file mode 100644 index 1ed622eb7b..0000000000 Binary files a/octopus/ReleaseNotesCompiler.CLI.exe and /dev/null differ diff --git a/octopus/footer.md b/octopus/footer.md deleted file mode 100644 index e4454b84a6..0000000000 --- a/octopus/footer.md +++ /dev/null @@ -1,4 +0,0 @@ -## Where to get it -You can download this release from: -- Our [website](http://particular.net/downloads) -- Or [chocolatey](http://chocolatey.org/packages/ServiceControl.install) \ No newline at end of file diff --git a/octopus/octopus.csproj b/octopus/octopus.csproj deleted file mode 100644 index a5affbdc03..0000000000 --- a/octopus/octopus.csproj +++ /dev/null @@ -1,75 +0,0 @@ - - - - $(MSBuildProjectDirectory)\ - - - - - - - - - - - - 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}. - - - - - - - - - - - - $(ProjectDir)Build\ - $(SolutionDir)..\nugets - - $(SolutionDir)packages\NuGet.CommandLine.2.8.2\tools\NuGet.exe - - "$(NuGetExePath)" - mono --runtime=v4.0.30319 "$(NuGetExePath)" - - $(NuGetCommand) pack "$(BuildFolder)Particular.ServiceControl.nuspec" - $(BuildCommand) -Version $(LegacySemVerPadded) - $(BuildCommand) -OutputDirectory "$(OutputFolder)" - $(BuildCommand) -NoPackageAnalysis - $(BuildCommand) -NonInteractive - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/octopus/octopus.sln b/octopus/octopus.sln deleted file mode 100644 index 0634f1b899..0000000000 --- a/octopus/octopus.sln +++ /dev/null @@ -1,19 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "octopus", "octopus.csproj", "{219A366B-FE81-4A78-B2D3-6F23DB1112C8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {219A366B-FE81-4A78-B2D3-6F23DB1112C8}.Debug|x86.ActiveCfg = Debug|x86 - {219A366B-FE81-4A78-B2D3-6F23DB1112C8}.Debug|x86.Build.0 = Debug|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/octopus/packages.config b/octopus/packages.config deleted file mode 100644 index 0901fded19..0000000000 --- a/octopus/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/packaging/chocolatey/Setup.install.nuspec b/packaging/chocolatey/Setup.install.nuspec new file mode 100644 index 0000000000..8b2947023a --- /dev/null +++ b/packaging/chocolatey/Setup.install.nuspec @@ -0,0 +1,27 @@ + + + + ServiceControl.install + $version$ + ServiceControl.install (Install) + Particular Software + Particular Software + http://particular.net + http://particular.net/LicenseAgreement + http://s3.amazonaws.com/nuget.images/ServiceControl_128.png + false + Management extension to NServiceBus + + nservicebus particular chocolatey servicecontrol + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/App.config b/src/ServiceControl.AcceptanceTests/App.config index 7d3a89f35e..8169dcc4ca 100644 --- a/src/ServiceControl.AcceptanceTests/App.config +++ b/src/ServiceControl.AcceptanceTests/App.config @@ -12,11 +12,11 @@ - + - + @@ -40,7 +40,7 @@ - + diff --git a/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs b/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs index b1dd892a89..87cf84e43f 100644 --- a/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs +++ b/src/ServiceControl.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 { c.UniqueMessageId })); + IssueRetry(c, () => Post("/api/errors/retry", new List { 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(String.Format("/api/errors/retry/all"))); + IssueRetry(c, () => Post("/api/errors/retry/all")); return false; }) diff --git a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj index 2ff0a3a6ac..ef74691dd7 100644 --- a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj +++ b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj @@ -12,6 +12,7 @@ v4.5 512 + 94a6e4db true @@ -225,6 +226,12 @@ ServiceControl - + + + + 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}. + + + \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/packages.config b/src/ServiceControl.AcceptanceTests/packages.config index 210a7feb5e..a0b81cdc99 100644 --- a/src/ServiceControl.AcceptanceTests/packages.config +++ b/src/ServiceControl.AcceptanceTests/packages.config @@ -1,5 +1,6 @@  + diff --git a/src/ServiceControl.Install.CustomActions/ServiceControl.Install.CustomActions.csproj b/src/ServiceControl.Install.CustomActions/ServiceControl.Install.CustomActions.csproj index 62d286b9b8..7ba031116d 100644 --- a/src/ServiceControl.Install.CustomActions/ServiceControl.Install.CustomActions.csproj +++ b/src/ServiceControl.Install.CustomActions/ServiceControl.Install.CustomActions.csproj @@ -12,6 +12,7 @@ v4.0 512 + 510fc157 ..\..\lib\WiX\3.7\ @@ -61,6 +62,16 @@ + + + + + + + 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}. + + + \ No newline at end of file diff --git a/src/ServiceControl.Install.CustomActions/packages.config b/src/ServiceControl.Install.CustomActions/packages.config new file mode 100644 index 0000000000..b8b188797d --- /dev/null +++ b/src/ServiceControl.Install.CustomActions/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/ServiceControl.IntegrationDemo/ServiceControl.IntegrationDemo.csproj b/src/ServiceControl.IntegrationDemo/ServiceControl.IntegrationDemo.csproj index 03ba1559e3..be502ca5d9 100644 --- a/src/ServiceControl.IntegrationDemo/ServiceControl.IntegrationDemo.csproj +++ b/src/ServiceControl.IntegrationDemo/ServiceControl.IntegrationDemo.csproj @@ -62,7 +62,6 @@ - Program diff --git a/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj b/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj index 886c09a359..0d52456829 100644 --- a/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj +++ b/src/ServiceControl.UnitTests/ServiceControl.UnitTests.csproj @@ -11,6 +11,7 @@ ServiceControl.UnitTests v4.5 512 + 3bd3be21 true @@ -119,5 +120,11 @@ - + + + + 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}. + + + \ No newline at end of file diff --git a/src/ServiceControl.UnitTests/app.config b/src/ServiceControl.UnitTests/app.config index 52008f7b20..3b1c77b849 100644 --- a/src/ServiceControl.UnitTests/app.config +++ b/src/ServiceControl.UnitTests/app.config @@ -28,7 +28,7 @@ - + diff --git a/src/ServiceControl.UnitTests/packages.config b/src/ServiceControl.UnitTests/packages.config index f1cd435f09..e8ba2d269a 100644 --- a/src/ServiceControl.UnitTests/packages.config +++ b/src/ServiceControl.UnitTests/packages.config @@ -1,5 +1,6 @@  + diff --git a/src/ServiceControl.sln b/src/ServiceControl.sln index 9200c11d49..a5569c0236 100644 --- a/src/ServiceControl.sln +++ b/src/ServiceControl.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceControl.UnitTests", "ServiceControl.UnitTests\ServiceControl.UnitTests.csproj", "{4F65FAE1-4C51-4BEF-956E-97C6A96807F9}" EndProject @@ -9,12 +9,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceControl", "ServiceCo EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceControl.AcceptanceTests", "ServiceControl.AcceptanceTests\ServiceControl.AcceptanceTests.csproj", "{A1E60657-039F-4BAB-B031-2515F86B0C3D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chocolatey", "Chocolatey\Chocolatey.csproj", "{63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceControl.Install.CustomActions", "ServiceControl.Install.CustomActions\ServiceControl.Install.CustomActions.csproj", "{7E47B904-EF48-4F26-AAB5-BE435BCDC696}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceControl.IntegrationDemo", "ServiceControl.IntegrationDemo\ServiceControl.IntegrationDemo.csproj", "{3C3F3C5B-E7B0-49E9-8905-AD23F7BFF217}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Setup", "Setup\Setup.csproj", "{FA2792B9-B82D-4936-871E-16812FA60D13}" + ProjectSection(ProjectDependencies) = postProject + {4C6B71B2-74EF-4B9E-88FF-C56532727C6D} = {4C6B71B2-74EF-4B9E-88FF-C56532727C6D} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{55C388DD-2B39-4C2F-AEBD-AFD3444815F1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Chocolatey", "Chocolatey", "{2191194C-6B5A-44DD-B799-11E1FB038DFA}" + ProjectSection(SolutionItems) = preProject + ..\packaging\chocolatey\Setup.install.nuspec = ..\packaging\chocolatey\Setup.install.nuspec + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,10 +43,6 @@ Global {A1E60657-039F-4BAB-B031-2515F86B0C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1E60657-039F-4BAB-B031-2515F86B0C3D}.Release|Any CPU.ActiveCfg = Release|Any CPU {A1E60657-039F-4BAB-B031-2515F86B0C3D}.Release|Any CPU.Build.0 = Release|Any CPU - {63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {63786CE5-D899-43DF-AD4E-C2CA3BAC3FC2}.Release|Any CPU.Build.0 = Release|Any CPU {7E47B904-EF48-4F26-AAB5-BE435BCDC696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7E47B904-EF48-4F26-AAB5-BE435BCDC696}.Debug|Any CPU.Build.0 = Debug|Any CPU {7E47B904-EF48-4F26-AAB5-BE435BCDC696}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -45,8 +51,15 @@ Global {3C3F3C5B-E7B0-49E9-8905-AD23F7BFF217}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C3F3C5B-E7B0-49E9-8905-AD23F7BFF217}.Release|Any CPU.ActiveCfg = Release|Any CPU {3C3F3C5B-E7B0-49E9-8905-AD23F7BFF217}.Release|Any CPU.Build.0 = Release|Any CPU + {FA2792B9-B82D-4936-871E-16812FA60D13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA2792B9-B82D-4936-871E-16812FA60D13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA2792B9-B82D-4936-871E-16812FA60D13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA2792B9-B82D-4936-871E-16812FA60D13}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {FA2792B9-B82D-4936-871E-16812FA60D13} = {55C388DD-2B39-4C2F-AEBD-AFD3444815F1} + EndGlobalSection EndGlobal diff --git a/src/ServiceControl.sln.DotSettings b/src/ServiceControl.sln.DotSettings index 7244d3c82c..2154b918d9 100644 --- a/src/ServiceControl.sln.DotSettings +++ b/src/ServiceControl.sln.DotSettings @@ -580,6 +580,7 @@ II.2.12 <HandlesEvent /> <Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> True + True True True True diff --git a/src/ServiceControl/Bootstrapper.cs b/src/ServiceControl/Bootstrapper.cs index 330f665dce..31499300e8 100644 --- a/src/ServiceControl/Bootstrapper.cs +++ b/src/ServiceControl/Bootstrapper.cs @@ -37,7 +37,7 @@ public Bootstrapper(ServiceBase host = null, HostArguments hostArguments = null) Feature.Disable(); Configure.Serialization.Json(); - Configure.Transactions.Advanced(t => t.DisableDistributedTransactions()); + Configure.Transactions.Advanced(t => t.DisableDistributedTransactions().DoNotWrapHandlersExecutionInATransactionScope()); Feature.EnableByDefault(); Configure.ScaleOut(s => s.UseSingleBrokerQueue()); diff --git a/src/ServiceControl/Operations/AuditQueueImport.cs b/src/ServiceControl/Operations/AuditQueueImport.cs index 47fc375e30..84f1d4bed7 100644 --- a/src/ServiceControl/Operations/AuditQueueImport.cs +++ b/src/ServiceControl/Operations/AuditQueueImport.cs @@ -90,7 +90,7 @@ bool TerminateIfForwardingIsEnabledButQueueNotWritable() catch (Exception messageForwardingException) { //This call to RaiseCriticalError has to be on a seperate thread otherwise it deadlocks and doesn't stop correctly. - ThreadPool.QueueUserWorkItem(state => Configure.Instance.RaiseCriticalError(string.Format("Audit Import cannot start"), messageForwardingException)); + ThreadPool.QueueUserWorkItem(state => Configure.Instance.RaiseCriticalError("Audit Import cannot start", messageForwardingException)); return true; } } diff --git a/src/ServiceControl/Operations/BodyStorage/RavenAttachments/GetBodyById.cs b/src/ServiceControl/Operations/BodyStorage/RavenAttachments/GetBodyById.cs index fd84a7da6f..0a40e17195 100644 --- a/src/ServiceControl/Operations/BodyStorage/RavenAttachments/GetBodyById.cs +++ b/src/ServiceControl/Operations/BodyStorage/RavenAttachments/GetBodyById.cs @@ -6,6 +6,8 @@ using CompositeViews.Messages; using System.Text; using Nancy; + using Raven.Abstractions.Data; + using Raven.Client; using ServiceBus.Management.Infrastructure.Nancy.Modules; public class GetBodyById : BaseModule @@ -24,12 +26,15 @@ public GetBodyById() string contentType; int bodySize; var attachment = Store.DatabaseCommands.GetAttachment("messagebodies/" + messageId); + Etag currentEtag; if (attachment == null) { using (var session = Store.OpenSession()) { + RavenQueryStatistics stats; var message = session.Query() + .Statistics(out stats) .TransformWith() .FirstOrDefault(f => f.MessageId == messageId); @@ -46,6 +51,7 @@ public GetBodyById() contents = stream => stream.Write(data, 0, data.Length); contentType = message.ContentType; bodySize = message.BodySize; + currentEtag = stats.IndexEtag; } } else @@ -53,12 +59,14 @@ public GetBodyById() contents = stream => attachment.Data().CopyTo(stream); contentType = attachment.Metadata["ContentType"].Value(); bodySize = attachment.Metadata["ContentLength"].Value(); + currentEtag = attachment.Etag; } return new Response { Contents = contents } .WithContentType(contentType) .WithHeader("Expires", DateTime.UtcNow.AddYears(1).ToUniversalTime().ToString("R")) .WithHeader("Content-Length", bodySize.ToString()) + .WithHeader("ETag", currentEtag) .WithStatusCode(HttpStatusCode.OK); }; } diff --git a/src/ServiceControl/Operations/ErrorQueueImport.cs b/src/ServiceControl/Operations/ErrorQueueImport.cs index b6a9742d8e..81623f27b8 100644 --- a/src/ServiceControl/Operations/ErrorQueueImport.cs +++ b/src/ServiceControl/Operations/ErrorQueueImport.cs @@ -101,7 +101,7 @@ bool TerminateIfForwardingQueueNotWritable() catch (Exception messageForwardingException) { //This call to RaiseCriticalError has to be on a seperate thread otherwise it deadlocks and doesn't stop correctly. - ThreadPool.QueueUserWorkItem(state => Configure.Instance.RaiseCriticalError(string.Format("Error Import cannot start"), messageForwardingException)); + ThreadPool.QueueUserWorkItem(state => Configure.Instance.RaiseCriticalError("Error Import cannot start", messageForwardingException)); return true; } } diff --git a/src/ServiceControl/Operations/Msmq/MsmqAuditQueueImporter.cs b/src/ServiceControl/Operations/Msmq/MsmqAuditQueueImporter.cs index 14a3a9d5ed..adf8b77fbf 100644 --- a/src/ServiceControl/Operations/Msmq/MsmqAuditQueueImporter.cs +++ b/src/ServiceControl/Operations/Msmq/MsmqAuditQueueImporter.cs @@ -116,7 +116,7 @@ bool TerminateIfForwardingIsEnabledButQueueNotWritable() catch (Exception messageForwardingException) { //This call to RaiseCriticalError has to be on a seperate thread otherwise it deadlocks and doesn't stop correctly. - ThreadPool.QueueUserWorkItem(state => Configure.Instance.RaiseCriticalError(string.Format("Audit Import cannot start"), messageForwardingException)); + ThreadPool.QueueUserWorkItem(state => Configure.Instance.RaiseCriticalError("Audit Import cannot start", messageForwardingException)); return true; } } diff --git a/src/ServiceControl/Properties/AssemblyInfo.cs b/src/ServiceControl/Properties/AssemblyInfo.cs index 900175ffc4..08aee46630 100644 --- a/src/ServiceControl/Properties/AssemblyInfo.cs +++ b/src/ServiceControl/Properties/AssemblyInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyTitle("Particular.ServiceControl")] [assembly: AssemblyProduct("Particular ServiceControl")] -[assembly: AssemblyCopyright("Copyright 2010-2014 NServiceBus. All rights reserved")] +[assembly: AssemblyCopyright("Copyright 2010-2015 NServiceBus. All rights reserved")] [assembly: AssemblyCompany("NServiceBus Ltd.")] [assembly: AssemblyDescription("Management extension to NServiceBus.")] \ No newline at end of file diff --git a/src/ServiceControl/SagaAudit/ApiModule.cs b/src/ServiceControl/SagaAudit/ApiModule.cs index 954e197f1f..4493a8ce8b 100644 --- a/src/ServiceControl/SagaAudit/ApiModule.cs +++ b/src/ServiceControl/SagaAudit/ApiModule.cs @@ -57,10 +57,13 @@ public class SagaListView : AbstractTransformerCreationTask { public class Result { + // ReSharper disable once NotAccessedField.Global public Guid Id; + // ReSharper disable once NotAccessedField.Global public string Uri; + // ReSharper disable once NotAccessedField.Global public string SagaType; } public SagaListView() diff --git a/src/ServiceControl/ServiceControl.csproj b/src/ServiceControl/ServiceControl.csproj index f6b05f6fca..006fc0bee0 100644 --- a/src/ServiceControl/ServiceControl.csproj +++ b/src/ServiceControl/ServiceControl.csproj @@ -12,6 +12,9 @@ v4.5 512 + 1.0.0.%2a + false + fecce876 publish\ true Disk @@ -24,7 +27,6 @@ true 0 1.0.0.%2a - false false true @@ -82,7 +84,7 @@ False ..\packages\Microsoft.Data.OData.5.6.3\lib\net40\Microsoft.Data.OData.dll - + False ..\packages\Microsoft.Data.Services.Client.5.6.3\lib\net40\Microsoft.Data.Services.Client.dll @@ -102,8 +104,8 @@ ..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll - False ..\packages\WindowsAzure.Storage.2.1.0.4\lib\net40\Microsoft.WindowsAzure.Storage.dll + True ..\packages\Nancy.0.22.2\lib\net40\Nancy.dll @@ -138,20 +140,20 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll - False - ..\packages\RavenDB.Client.2.5.2939\lib\net45\Raven.Abstractions.dll + ..\packages\RavenDB.Database.2.5.2939\lib\net45\Raven.Abstractions.dll + True - False ..\packages\RavenDB.Embedded.2.5.2939\lib\net45\Raven.Client.Embedded.dll + True False ..\packages\RavenDB.Client.2.5.2939\lib\net45\Raven.Client.Lightweight.dll - False ..\packages\RavenDB.Database.2.5.2939\lib\net45\Raven.Database.dll + True False @@ -487,6 +489,12 @@ false - + + + + 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}. + + + \ No newline at end of file diff --git a/src/ServiceControl/packages.config b/src/ServiceControl/packages.config index b2b9849f53..ccc19ce485 100644 --- a/src/ServiceControl/packages.config +++ b/src/ServiceControl/packages.config @@ -1,6 +1,7 @@  + @@ -36,5 +37,5 @@ - + \ No newline at end of file diff --git a/installer/License.rtf b/src/Setup/License.rtf similarity index 100% rename from installer/License.rtf rename to src/Setup/License.rtf diff --git a/src/Setup/ServiceControl-cache/cacheIndex.txt b/src/Setup/ServiceControl-cache/cacheIndex.txt new file mode 100644 index 0000000000..a603ff06b8 Binary files /dev/null and b/src/Setup/ServiceControl-cache/cacheIndex.txt differ diff --git a/src/Setup/ServiceControl-cache/part2/disk1.cab b/src/Setup/ServiceControl-cache/part2/disk1.cab new file mode 100644 index 0000000000..30fc20f211 Binary files /dev/null and b/src/Setup/ServiceControl-cache/part2/disk1.cab differ diff --git a/src/Setup/ServiceControl-cache/part2/output-info.ini b/src/Setup/ServiceControl-cache/part2/output-info.ini new file mode 100644 index 0000000000..4ebfadf67a Binary files /dev/null and b/src/Setup/ServiceControl-cache/part2/output-info.ini differ diff --git a/installer/ServiceControl.aip b/src/Setup/ServiceControl.aip similarity index 68% rename from installer/ServiceControl.aip rename to src/Setup/ServiceControl.aip index b373c811df..78a73b6c64 100644 --- a/installer/ServiceControl.aip +++ b/src/Setup/ServiceControl.aip @@ -55,25 +55,163 @@ + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -111,7 +249,7 @@ - + @@ -172,7 +310,7 @@ - + @@ -328,8 +466,8 @@ - - + + @@ -354,8 +492,8 @@ - - + + @@ -438,6 +576,6 @@ - + diff --git a/src/Setup/Setup.csproj b/src/Setup/Setup.csproj new file mode 100644 index 0000000000..1888dffae4 --- /dev/null +++ b/src/Setup/Setup.csproj @@ -0,0 +1,80 @@ + + + + + Debug + AnyCPU + {FA2792B9-B82D-4936-871E-16812FA60D13} + Library + Properties + Setup + Setup + v4.5 + 512 + 341be3d1 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Caphyon\Advanced Installer@Advanced Installer Path) + "$(AdvancedInstallerPath)bin\x86\AdvancedInstaller.com" + + + + + + + + + + + + + + + + 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}. + + + + + + + \ No newline at end of file diff --git a/src/Setup/chocolatey/chocolateyInstall.ps1 b/src/Setup/chocolatey/chocolateyInstall.ps1 new file mode 100644 index 0000000000..a16530a00a --- /dev/null +++ b/src/Setup/chocolatey/chocolateyInstall.ps1 @@ -0,0 +1,3 @@ +$productName = "ServiceControl" +$url = "https://github.com/Particular/$productName/releases/download/$env:chocolateyPackageVersion/Particular.$productName-$env:chocolateyPackageVersion.exe" +Install-ChocolateyPackage $productName 'exe' '/quiet' $url \ No newline at end of file diff --git a/src/Setup/chocolatey/chocolateyUninstall.ps1 b/src/Setup/chocolatey/chocolateyUninstall.ps1 new file mode 100644 index 0000000000..3346b9419b --- /dev/null +++ b/src/Setup/chocolatey/chocolateyUninstall.ps1 @@ -0,0 +1,2 @@ +$psFile = Join-Path "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" 'elevatedUninstall.ps1' +Start-ChocolateyProcessAsAdmin "& `'$psFile`'" \ No newline at end of file diff --git a/src/Setup/chocolatey/elevatedUninstall.ps1 b/src/Setup/chocolatey/elevatedUninstall.ps1 new file mode 100644 index 0000000000..54aa96eaae --- /dev/null +++ b/src/Setup/chocolatey/elevatedUninstall.ps1 @@ -0,0 +1,17 @@ +$productName = "ServiceControl"; + +$app = Get-WmiObject -Class Win32_Product | Where-Object { $_.Name -like "*$productName*" -and ($_.Version -eq "$env:chocolateyPackageVersion") } +if($app -eq $null) +{ + Write-Warning "Could not find an installed program for $productName matching version $env:chocolateyPackageVersion to uninstall. It may have been manualy removed. To check the cuurent status ensure that no instance of $productName exists in 'Programs and Features'." +} +else +{ + Write "Attempting to uninstall $productName $env:chocolateyPackageVersion from Programs." + $result = $app.Uninstall(); + $returnValue = [int]$result.ReturnValue + if ($returnValue -ne 0) + { + Write-Error "Could not uninstall $productName $env:chocolateyPackageVersion. The return code was $returnValue. For information on error codes see http://msdn.microsoft.com/en-us/library/aa372835 http://msdn.microsoft.com/en-us/library/aa376931." + } +} \ No newline at end of file diff --git a/src/Setup/packages.config b/src/Setup/packages.config new file mode 100644 index 0000000000..b8576e45c8 --- /dev/null +++ b/src/Setup/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/installer/res/Operations-logo.png b/src/Setup/res/Operations-logo.png similarity index 100% rename from installer/res/Operations-logo.png rename to src/Setup/res/Operations-logo.png diff --git a/installer/res/Operations.ico b/src/Setup/res/Operations.ico similarity index 100% rename from installer/res/Operations.ico rename to src/Setup/res/Operations.ico diff --git a/src/Setup/res/Particular_NServiceBus_White.png b/src/Setup/res/Particular_NServiceBus_White.png new file mode 100644 index 0000000000..530694741f Binary files /dev/null and b/src/Setup/res/Particular_NServiceBus_White.png differ diff --git a/src/Setup/res/Particular_ServiceBus_all.ico b/src/Setup/res/Particular_ServiceBus_all.ico new file mode 100644 index 0000000000..01b125632e Binary files /dev/null and b/src/Setup/res/Particular_ServiceBus_all.ico differ