Skip to content

Commit

Permalink
Merge pull request #278 from Particular/prepare-rtm
Browse files Browse the repository at this point in the history
Prepare RTM
  • Loading branch information
bording authored May 15, 2018
2 parents 1be07a0 + 8d8e9f0 commit a8ff58c
Show file tree
Hide file tree
Showing 16 changed files with 106 additions and 54 deletions.
5 changes: 3 additions & 2 deletions src/AcceptanceTestsHolder/AcceptanceTestsHolder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="NServiceBus.AcceptanceTesting, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
<HintPath>..\packages\NServiceBus.AcceptanceTesting.7.0.0-rc0001\lib\net452\NServiceBus.AcceptanceTesting.dll</HintPath>
<HintPath>..\packages\NServiceBus.AcceptanceTesting.7.0.0\lib\net452\NServiceBus.AcceptanceTesting.dll</HintPath>
</Reference>
<Reference Include="NServiceBus.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
<HintPath>..\packages\NServiceBus.7.0.0-rc0001\lib\net452\NServiceBus.Core.dll</HintPath>
<HintPath>..\packages\NServiceBus.7.0.0\lib\net452\NServiceBus.Core.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
Expand Down Expand Up @@ -196,6 +196,7 @@
<Compile Include="App_Packages\NSB.AcceptanceTests\Serialization\When_serializing_a_message.cs" />
<Compile Include="App_Packages\NSB.AcceptanceTests\Serialization\When_skip_wrapping_xml.cs" />
<Compile Include="App_Packages\NSB.AcceptanceTests\Serialization\When_wrapping_is_not_skipped.cs" />
<Compile Include="App_Packages\NSB.AcceptanceTests\Serialization\When_xml_serializer_processes_message_without_type_header.cs" />
<Compile Include="App_Packages\NSB.AcceptanceTests\Serialization\When_xml_serializer_used_with_unobtrusive_mode.cs" />
<Compile Include="App_Packages\NSB.AcceptanceTests\TimeToBeReceived\When_TimeToBeReceived_has_expired.cs" />
<Compile Include="App_Packages\NSB.AcceptanceTests\TimeToBeReceived\When_TimeToBeReceived_has_expired_convention.cs" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
namespace NServiceBus.AcceptanceTests.Serialization
{
using System;
using System.Threading.Tasks;
using AcceptanceTesting;
using EndpointTemplates;
using NServiceBus.Pipeline;
using NUnit.Framework;

public class When_xml_serializer_processes_message_without_type_header : NServiceBusAcceptanceTest
{
[Test]
public async Task Should_work_in_unobtrusive()
{
var context = await Scenario.Define<Context>()
.WithEndpoint<Sender>(c => c.When(s => s.SendLocal(new MessageToBeDetectedByRootNodeName())))
.Done(c => c.WasCalled)
.Run();

Assert.True(context.WasCalled);
}

public class Context : ScenarioContext
{
public bool WasCalled { get; set; }
}

public class Sender : EndpointConfigurationBuilder
{
public Sender()
{
EndpointSetup<DefaultServer>(c =>
{
c.Conventions().DefiningMessagesAs(t => t == typeof(MessageToBeDetectedByRootNodeName));
c.Pipeline.Register(typeof(RemoveTheTypeHeader), "Removes the message type header to simulate receiving a native message");
c.UseSerialization<XmlSerializer>();
})
//Need to include the message since it can't be nested inside the test class, see below
.IncludeType<MessageToBeDetectedByRootNodeName>();
}

public class MyMessageHandler : IHandleMessages<MessageToBeDetectedByRootNodeName>
{
public Context Context { get; set; }

public Task Handle(MessageToBeDetectedByRootNodeName message, IMessageHandlerContext context)
{
Context.WasCalled = true;
return Task.FromResult(0);
}
}

public class RemoveTheTypeHeader : Behavior<IDispatchContext>
{
public override Task Invoke(IDispatchContext context, Func<Task> next)
{
foreach (var op in context.Operations)
{
op.Message.Headers.Remove(Headers.EnclosedMessageTypes);
}

return next();
}
}
}
}

//Can't be nested inside the test class since the xml serializer can't deal with nested types
public class MessageToBeDetectedByRootNodeName
{
public int Data { get; set; }
}
}
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
namespace NServiceBus.AcceptanceTests.Serialization
{
using System;
using System.Threading.Tasks;
using AcceptanceTesting;
using AcceptanceTesting.Customization;
using EndpointTemplates;
using NUnit.Framework;

public class When_xml_serializer_used_with_unobtrusive_mode : NServiceBusAcceptanceTest
{
[Test]
public async Task Message_should_be_received_with_deserialized_payload()
public async Task Should_deserialize_message()
{
var expectedData = 1;

var context = await Scenario.Define<Context>()
.WithEndpoint<Sender>(c => c.When(s => s.Send(new MyCommand
.WithEndpoint<Sender>(c => c.When(s => s.SendLocal(new MyMessage
{
Data = expectedData
})))
.WithEndpoint<Receiver>()
.Done(c => c.WasCalled)
.Run(TimeSpan.FromSeconds(10));
.Run();

Assert.AreEqual(expectedData, context.Data);
}
Expand All @@ -38,43 +35,25 @@ public Sender()
{
EndpointSetup<DefaultServer>(c =>
{
c.Conventions().DefiningCommandsAs(t => t.Namespace != null && t.FullName.EndsWith("Command"));
c.Conventions().DefiningMessagesAs(t => t == typeof(MyMessage));
c.UseSerialization<XmlSerializer>();
c.ConfigureTransport().Routing().RouteToEndpoint(typeof(MyCommand), typeof(Receiver));
}).ExcludeType<MyCommand>(); // remove that type from assembly scanning to simulate what would happen with true unobtrusive mode
});
}
}

public class Receiver : EndpointConfigurationBuilder
{
public Receiver()
{
EndpointSetup<DefaultServer>(c =>
{
c.Conventions().DefiningCommandsAs(t => t.Namespace != null && t.FullName.EndsWith("Command"));
c.UseSerialization<XmlSerializer>();
})
.ExcludeType<MyCommand>(); // remove that type from assembly scanning to simulate what would happen with true unobtrusive mode
}

public class MyMessageHandler : IHandleMessages<ICommand>
public class MyMessageHandler : IHandleMessages<MyMessage>
{
public Context Context { get; set; }

public Task Handle(ICommand message, IMessageHandlerContext context)
public Task Handle(MyMessage message, IMessageHandlerContext context)
{
Context.Data = ((MyCommand) message).Data;
Context.Data = message.Data;
Context.WasCalled = true;
return Task.FromResult(0);
}
}
}

public interface ICommand
{
}

public class MyCommand : ICommand
public class MyMessage
{
public int Data { get; set; }
}
Expand Down
6 changes: 3 additions & 3 deletions src/AcceptanceTestsHolder/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NServiceBus" version="7.0.0-rc0001" targetFramework="net46" />
<package id="NServiceBus.AcceptanceTesting" version="7.0.0-rc0001" targetFramework="net46" />
<package id="NServiceBus.AcceptanceTests.Sources" version="7.0.0-rc0001" targetFramework="net46" />
<package id="NServiceBus" version="7.0.0" targetFramework="net46" />
<package id="NServiceBus.AcceptanceTesting" version="7.0.0" targetFramework="net46" />
<package id="NServiceBus.AcceptanceTests.Sources" version="7.0.0" targetFramework="net46" />
<package id="NUnit" version="3.7.1" targetFramework="net46" />
</packages>
4 changes: 2 additions & 2 deletions src/Integration/Shared/Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.*" />
<PackageReference Include="NServiceBus" Version="7.0.0-rc0001" />
<PackageReference Include="NServiceBus" Version="7.0.0" />
<PackageReference Include="NServiceBus.Persistence.Sql" Version="$(IntegrationVersion)" />
<PackageReference Include="NServiceBus.Persistence.Sql.MsBuild" Version="$(IntegrationVersion)" />
<PackageReference Include="NServiceBus.Transport.Msmq" Version="1.0.0-rc0001" />
<PackageReference Include="NServiceBus.Transport.Msmq" Version="1.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/MsSqlAcceptanceTests/MsSqlAcceptanceTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0-rc0001" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0" />
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MySqlAcceptanceTests/MySqlAcceptanceTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0-rc0001" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0" />
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/OracleAcceptanceTests/OracleAcceptanceTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0-rc0001" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0" />
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0-rc0001" />
<PackageReference Include="NServiceBus.AcceptanceTesting" Version="7.0.0" />
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
</ItemGroup>
Expand Down
9 changes: 4 additions & 5 deletions src/ScriptBuilder.Tests/Saga/SagaDefinitionReaderTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Mono.Cecil;
using NServiceBus;
using NServiceBus.Persistence.Sql;
using NServiceBus.Persistence.Sql.ScriptBuilder;
using NUnit.Framework;
#if NET452
using ApprovalTests;
Expand All @@ -28,7 +27,7 @@ public void WithGeneric()
var sagaType = module.GetTypeDefinition<WithGenericSaga<int>>();
var exception = Assert.Throws<ErrorsException>(() =>
{
SagaDefinitionReader.TryGetSqlSagaDefinition(sagaType, out SagaDefinition _);
SagaDefinitionReader.TryGetSqlSagaDefinition(sagaType, out _);
});
Assert.IsNotNull(exception.Message);
#if NET452
Expand Down Expand Up @@ -57,7 +56,7 @@ public void Abstract()
var sagaType = module.GetTypeDefinition<AbstractSaga>();
var exception = Assert.Throws<ErrorsException>(() =>
{
SagaDefinitionReader.TryGetSqlSagaDefinition(sagaType, out SagaDefinition _);
SagaDefinitionReader.TryGetSqlSagaDefinition(sagaType, out _);
});
Assert.IsNotNull(exception.Message);
#if NET452
Expand All @@ -79,7 +78,7 @@ public void NonSqlSaga()
var sagaType = module.GetTypeDefinition<NonSqlSagaSaga>();
var exception = Assert.Throws<ErrorsException>(() =>
{
SagaDefinitionReader.TryGetSqlSagaDefinition(sagaType, out SagaDefinition _);
SagaDefinitionReader.TryGetSqlSagaDefinition(sagaType, out _);
});
Assert.IsNotNull(exception.Message);
#if NET452
Expand Down Expand Up @@ -133,7 +132,7 @@ public void WithReadonlyProperty()
var sagaType = module.GetTypeDefinition<WithReadonlyPropertySaga>();
var exception = Assert.Throws<ErrorsException>(() =>
{
SagaDefinitionReader.TryGetSqlSagaDefinition(sagaType, out SagaDefinition _);
SagaDefinitionReader.TryGetSqlSagaDefinition(sagaType, out _);
});
Assert.IsNotNull(exception.Message);
#if NET452
Expand Down
8 changes: 4 additions & 4 deletions src/ScriptBuilderTask/ScriptBuilderTask.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="Microsoft.Build" Version="15.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build" Version="15.6.85" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Framework" Version="15.6.85" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.6.85" PrivateAssets="All" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.6.85" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SqlPersistence.Tests/SqlPersistence.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="NServiceBus.SqlServer" Version="4.0.0-beta0006" />
<PackageReference Include="NServiceBus.SqlServer" Version="4.0.0" />
<PackageReference Include="NUnit" Version="3.7.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SqlPersistence/SqlPersistence.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="[10.0.1, 11.0.0)" />
<PackageReference Include="NServiceBus" Version="[7.0.0-rc0001, 8.0.0)" />
<PackageReference Include="NServiceBus" Version="[7.0.0, 8.0.0)" />
<PackageReference Include="Fody" Version="2.1.2" PrivateAssets="All" />
<PackageReference Include="Obsolete.Fody" Version="4.3.2" PrivateAssets="All" />
<PackageReference Include="Particular.Packaging" Version="0.1.0" PrivateAssets="All" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SqlPersistence/Subscription/SubscriptionPersister.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void ClearForMessageType(MessageType messageType)
{
if (cacheKey.Contains(keyPart))
{
Cache.TryRemove(cacheKey, out CacheItem _);
Cache.TryRemove(cacheKey, out _);
}
}
}
Expand Down

0 comments on commit a8ff58c

Please sign in to comment.