Skip to content

Merge 3.4.0 Master into Develop #1535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boblangley merged 9 commits into from
Dec 12, 2018
Merged

Merge 3.4.0 Master into Develop #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
beef48b
Update NSB 7.1.6
danielmarbach Dec 11, 2018
cf6cba0
Merge pull request #1531 from Particular/update-core
SzymonPobiega Dec 11, 2018
05043b2
Attempt to fix When_multiple_messages_are_emitted_by_a_saga test
SzymonPobiega Dec 11, 2018
e188362
Bump Monitoring refs to 2.0.3
danielmarbach Dec 11, 2018
833df15
Merge pull request #1532 from Particular/update-monitoring
SzymonPobiega Dec 11, 2018
41674a2
Fix inspections
SzymonPobiega Dec 11, 2018
60c3b81
Merge branch 'release-3.4'
SzymonPobiega Dec 11, 2018
07a2efe
Fix learning transport packaging
danielmarbach Dec 11, 2018
c3fda1b
Merge pull request #1534 from Particular/release-3.4
boblangley Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 13 additions & 27 deletions src/ServiceControl.AcceptanceTests/SagaAudit/When_multiple_messages_are_emitted_by_a_saga.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using EndpointTemplates;
using Infrastructure.Settings;
Expand Down Expand Up @@ -104,7 +103,8 @@ public Task Handle(MessageReplyBySaga message, IMessageHandlerContext context)
{
Context.SagaId = message.SagaId;
}
Context.Done1();

Context.Replied = true;
return Task.FromResult(0);
}
}
Expand All @@ -119,7 +119,8 @@ public Task Handle(MessagePublishedBySaga message, IMessageHandlerContext contex
{
Context.SagaId = message.SagaId;
}
Context.Done2();

Context.Published = true;
return Task.FromResult(0);
}
}
Expand All @@ -134,7 +135,8 @@ public Task Handle(MessageReplyToOriginatorBySaga message, IMessageHandlerContex
{
Context.SagaId = message.SagaId;
}
Context.Done3();

Context.RepliedToOriginator = true;
return Task.FromResult(0);
}
}
Expand All @@ -149,7 +151,8 @@ public Task Handle(MessageSentBySaga message, IMessageHandlerContext context)
{
Context.SagaId = message.SagaId;
}
Context.Done4();

Context.Sent = true;
return Task.FromResult(0);
}
}
Expand Down Expand Up @@ -182,29 +185,12 @@ public class MessageReplyToOriginatorBySaga : IMessage

public class MyContext : ScenarioContext
{
long steps;

public void Done1()
{
Interlocked.Increment(ref steps);
}

public void Done2()
{
Interlocked.Increment(ref steps);
}

public void Done3()
{
Interlocked.Increment(ref steps);
}

public void Done4()
{
Interlocked.Increment(ref steps);
}
public bool Sent { get; set; }
public bool Replied { get; set; }
public bool RepliedToOriginator { get; set; }
public bool Published { get; set; }

public bool Done => Interlocked.Read(ref steps) >= 4;
public bool Done => Sent && Replied && RepliedToOriginator && Published;
public Guid? SagaId { get; set; }
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl.LoadTests.Messages/ServiceControl.LoadTests.Messages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NServiceBus" Version="7.1.5" />
<PackageReference Include="NServiceBus" Version="7.1.6" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/ServiceControl.LoadTests.Reporter/ServiceControl.LoadTests.Reporter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NServiceBus" Version="7.1.5" />
<PackageReference Include="NServiceBus" Version="7.1.6" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceControl/ServiceControl.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageReference Include="Nancy.Bootstrappers.Autofac" Version="1.4.1" />
<PackageReference Include="Nancy.Owin" Version="1.4.1" />
<PackageReference Include="RavenDB.Database" Version="3.5.7" />
<PackageReference Include="NServiceBus" Version="7.1.5" />
<PackageReference Include="NServiceBus" Version="7.1.6" />
<PackageReference Include="NServiceBus.Autofac" Version="7.0.0" />
<PackageReference Include="NServiceBus.CustomChecks" Version="3.0.0" />
<PackageReference Include="NServiceBus.Newtonsoft.Json" Version="2.1.0" />
Expand Down
3 changes: 2 additions & 1 deletion src/ServiceControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\ServiceControl.Transports.Learning\ServiceControl.Transports.Learning.csproj" />
<ProjectReference Include="..\ServiceControl.Transports.SQS\ServiceControl.Transports.SQS.csproj" />
<ProjectReference Include="..\ServiceControl\ServiceControl.csproj" />
<ProjectReference Include="..\ServiceControl.Transports.ASB\ServiceControl.Transports.ASB.csproj" />
Expand All @@ -16,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Packaging.ServiceControl.Monitoring" Version="2.0.2" PrivateAssets="All" />
<PackageReference Include="Packaging.ServiceControl.Monitoring" Version="2.0.3" PrivateAssets="All" />
</ItemGroup>

<UsingTask AssemblyFile="..\..\buildsupport\DeploymentZipTask.Dll" TaskName="DeploymentZipTask.AddToZip" />
Expand Down