Skip to content

Commit

Permalink
Backport of dotnet5 test targets (#6063)
Browse files Browse the repository at this point in the history 
* Update test targets for net5

* Revert editor config changes

* Add 452 exclusions

* Fix approval file

* Fix typo
  • Loading branch information
@WilliamBZA
WilliamBZA authored May 18, 2021
1 parent 74a7a8d commit d122de8
Show file tree
Hide file tree
Showing 20 changed files with 201 additions and 26 deletions.
3 changes: 2 additions & 1 deletion src/NServiceBus.AcceptanceTesting/NServiceBus.AcceptanceTesting.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netstandard2.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\NServiceBus.snk</AssemblyOriginatorKeyFile>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
66 changes: 66 additions & 0 deletions ...tanceTests/ApprovalFiles/When_pipelines_are_built.Should_preserve_order.net5.approved.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
context0 => value(NServiceBus.EnforcePublishBestPracticesBehavior).Invoke(context0, value(System.Func`2[NServiceBus.Pipeline.IOutgoingPublishContext,System.Threading.Tasks.Task])),
context1 => value(NServiceBus.UnicastPublishConnector).Invoke(context1, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context2 => value(NServiceBus.AttachCausationHeadersBehavior).Invoke(context2, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context3 => value(NServiceBus.AttachCorrelationIdBehavior).Invoke(context3, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context4 => value(NServiceBus.MutateOutgoingMessageBehavior).Invoke(context4, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context5 => value(NServiceBus.ApplyTimeToBeReceivedBehavior).Invoke(context5, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context6 => value(NServiceBus.ApplyReplyToAddressBehavior).Invoke(context6, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context7 => value(NServiceBus.AddHostInfoHeadersBehavior).Invoke(context7, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context8 => value(NServiceBus.SerializeMessageConnector).Invoke(context8, value(System.Func`2[NServiceBus.Pipeline.IOutgoingPhysicalMessageContext,System.Threading.Tasks.Task])),
context9 => value(NServiceBus.MutateOutgoingTransportMessageBehavior).Invoke(context9, value(System.Func`2[NServiceBus.Pipeline.IOutgoingPhysicalMessageContext,System.Threading.Tasks.Task])),
context10 => value(NServiceBus.OutgoingPhysicalToRoutingConnector).Invoke(context10, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context11 => value(NServiceBus.ThrowIfCannotDeferMessageBehavior).Invoke(context11, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context12 => value(NServiceBus.AttachSenderRelatedInfoOnMessageBehavior).Invoke(context12, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context13 => value(NServiceBus.RoutingToDispatchConnector).Invoke(context13, value(System.Func`2[NServiceBus.Pipeline.IDispatchContext,System.Threading.Tasks.Task])),
context14 => value(NServiceBus.ImmediateDispatchTerminator).Invoke(context14, value(System.Func`2[NServiceBus.Pipeline.PipelineTerminator`1+ITerminatingContext[NServiceBus.Pipeline.IDispatchContext],System.Threading.Tasks.Task`1[System.Threading.Tasks.VoidTaskResult]])),

context0 => value(NServiceBus.EnforceSendBestPracticesBehavior).Invoke(context0, value(System.Func`2[NServiceBus.Pipeline.IOutgoingSendContext,System.Threading.Tasks.Task])),
context1 => value(NServiceBus.SendConnector).Invoke(context1, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context2 => value(NServiceBus.AttachCausationHeadersBehavior).Invoke(context2, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context3 => value(NServiceBus.AttachCorrelationIdBehavior).Invoke(context3, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context4 => value(NServiceBus.MutateOutgoingMessageBehavior).Invoke(context4, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context5 => value(NServiceBus.ApplyTimeToBeReceivedBehavior).Invoke(context5, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context6 => value(NServiceBus.ApplyReplyToAddressBehavior).Invoke(context6, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context7 => value(NServiceBus.AddHostInfoHeadersBehavior).Invoke(context7, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context8 => value(NServiceBus.SerializeMessageConnector).Invoke(context8, value(System.Func`2[NServiceBus.Pipeline.IOutgoingPhysicalMessageContext,System.Threading.Tasks.Task])),
context9 => value(NServiceBus.MutateOutgoingTransportMessageBehavior).Invoke(context9, value(System.Func`2[NServiceBus.Pipeline.IOutgoingPhysicalMessageContext,System.Threading.Tasks.Task])),
context10 => value(NServiceBus.OutgoingPhysicalToRoutingConnector).Invoke(context10, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context11 => value(NServiceBus.ThrowIfCannotDeferMessageBehavior).Invoke(context11, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context12 => value(NServiceBus.AttachSenderRelatedInfoOnMessageBehavior).Invoke(context12, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context13 => value(NServiceBus.RoutingToDispatchConnector).Invoke(context13, value(System.Func`2[NServiceBus.Pipeline.IDispatchContext,System.Threading.Tasks.Task])),
context14 => value(NServiceBus.ImmediateDispatchTerminator).Invoke(context14, value(System.Func`2[NServiceBus.Pipeline.PipelineTerminator`1+ITerminatingContext[NServiceBus.Pipeline.IDispatchContext],System.Threading.Tasks.Task`1[System.Threading.Tasks.VoidTaskResult]])),

context0 => value(NServiceBus.PopulateAutoCorrelationHeadersForRepliesBehavior).Invoke(context0, value(System.Func`2[NServiceBus.Pipeline.IOutgoingReplyContext,System.Threading.Tasks.Task])),
context1 => value(NServiceBus.EnforceReplyBestPracticesBehavior).Invoke(context1, value(System.Func`2[NServiceBus.Pipeline.IOutgoingReplyContext,System.Threading.Tasks.Task])),
context2 => value(NServiceBus.ReplyConnector).Invoke(context2, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context3 => value(NServiceBus.AttachCausationHeadersBehavior).Invoke(context3, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context4 => value(NServiceBus.AttachCorrelationIdBehavior).Invoke(context4, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context5 => value(NServiceBus.MutateOutgoingMessageBehavior).Invoke(context5, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context6 => value(NServiceBus.ApplyTimeToBeReceivedBehavior).Invoke(context6, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context7 => value(NServiceBus.ApplyReplyToAddressBehavior).Invoke(context7, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context8 => value(NServiceBus.AddHostInfoHeadersBehavior).Invoke(context8, value(System.Func`2[NServiceBus.Pipeline.IOutgoingLogicalMessageContext,System.Threading.Tasks.Task])),
context9 => value(NServiceBus.SerializeMessageConnector).Invoke(context9, value(System.Func`2[NServiceBus.Pipeline.IOutgoingPhysicalMessageContext,System.Threading.Tasks.Task])),
context10 => value(NServiceBus.MutateOutgoingTransportMessageBehavior).Invoke(context10, value(System.Func`2[NServiceBus.Pipeline.IOutgoingPhysicalMessageContext,System.Threading.Tasks.Task])),
context11 => value(NServiceBus.OutgoingPhysicalToRoutingConnector).Invoke(context11, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context12 => value(NServiceBus.ThrowIfCannotDeferMessageBehavior).Invoke(context12, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context13 => value(NServiceBus.AttachSenderRelatedInfoOnMessageBehavior).Invoke(context13, value(System.Func`2[NServiceBus.Pipeline.IRoutingContext,System.Threading.Tasks.Task])),
context14 => value(NServiceBus.RoutingToDispatchConnector).Invoke(context14, value(System.Func`2[NServiceBus.Pipeline.IDispatchContext,System.Threading.Tasks.Task])),
context15 => value(NServiceBus.ImmediateDispatchTerminator).Invoke(context15, value(System.Func`2[NServiceBus.Pipeline.PipelineTerminator`1+ITerminatingContext[NServiceBus.Pipeline.IDispatchContext],System.Threading.Tasks.Task`1[System.Threading.Tasks.VoidTaskResult]])),

context0 => value(NServiceBus.EnforceSubscribeBestPracticesBehavior).Invoke(context0, value(System.Func`2[NServiceBus.Pipeline.ISubscribeContext,System.Threading.Tasks.Task])),
context1 => value(NServiceBus.MessageDrivenSubscribeTerminator).Invoke(context1, value(System.Func`2[NServiceBus.Pipeline.PipelineTerminator`1+ITerminatingContext[NServiceBus.Pipeline.ISubscribeContext],System.Threading.Tasks.Task`1[System.Threading.Tasks.VoidTaskResult]])),

context0 => value(NServiceBus.EnforceUnsubscribeBestPracticesBehavior).Invoke(context0, value(System.Func`2[NServiceBus.Pipeline.IUnsubscribeContext,System.Threading.Tasks.Task])),
context1 => value(NServiceBus.MessageDrivenUnsubscribeTerminator).Invoke(context1, value(System.Func`2[NServiceBus.Pipeline.PipelineTerminator`1+ITerminatingContext[NServiceBus.Pipeline.IUnsubscribeContext],System.Threading.Tasks.Task`1[System.Threading.Tasks.VoidTaskResult]])),

context0 => value(NServiceBus.AcceptanceTesting.Support.CaptureExceptionBehavior).Invoke(context0, value(System.Func`2[NServiceBus.Pipeline.ITransportReceiveContext,System.Threading.Tasks.Task])),
context1 => value(NServiceBus.TransportReceiveToPhysicalMessageConnector).Invoke(context1, value(System.Func`2[NServiceBus.Pipeline.IIncomingPhysicalMessageContext,System.Threading.Tasks.Task])),
context2 => value(NServiceBus.ProcessingStatisticsBehavior).Invoke(context2, value(System.Func`2[NServiceBus.Pipeline.IIncomingPhysicalMessageContext,System.Threading.Tasks.Task])),
context3 => value(NServiceBus.MutateIncomingTransportMessageBehavior).Invoke(context3, value(System.Func`2[NServiceBus.Pipeline.IIncomingPhysicalMessageContext,System.Threading.Tasks.Task])),
context4 => value(NServiceBus.SubscriptionReceiverBehavior).Invoke(context4, value(System.Func`2[NServiceBus.Pipeline.IIncomingPhysicalMessageContext,System.Threading.Tasks.Task])),
context5 => value(NServiceBus.UnitOfWorkBehavior).Invoke(context5, value(System.Func`2[NServiceBus.Pipeline.IIncomingPhysicalMessageContext,System.Threading.Tasks.Task])),
context6 => value(NServiceBus.DeserializeMessageConnector).Invoke(context6, value(System.Func`2[NServiceBus.Pipeline.IIncomingLogicalMessageContext,System.Threading.Tasks.Task])),
context7 => value(NServiceBus.MutateIncomingMessageBehavior).Invoke(context7, value(System.Func`2[NServiceBus.Pipeline.IIncomingLogicalMessageContext,System.Threading.Tasks.Task])),
context8 => value(NServiceBus.InferredMessageTypeEnricherBehavior).Invoke(context8, value(System.Func`2[NServiceBus.Pipeline.IIncomingLogicalMessageContext,System.Threading.Tasks.Task])),
context9 => value(NServiceBus.LoadHandlersConnector).Invoke(context9, value(System.Func`2[NServiceBus.Pipeline.IInvokeHandlerContext,System.Threading.Tasks.Task])),
context10 => value(NServiceBus.InvokeHandlerTerminator).Invoke(context10, value(System.Func`2[NServiceBus.Pipeline.PipelineTerminator`1+ITerminatingContext[NServiceBus.Pipeline.IInvokeHandlerContext],System.Threading.Tasks.Task`1[System.Threading.Tasks.VoidTaskResult]])),
3 changes: 2 additions & 1 deletion src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netcoreapp3.1</TargetFrameworks>
<LangVersion>8.0</LangVersion>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>

Expand Down
5 changes: 2 additions & 3 deletions src/NServiceBus.AcceptanceTests/Serialization/When_registering_additional_deserializers.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using System.Threading.Tasks;
using AcceptanceTesting;
using AcceptanceTesting.Customization;
Expand Down Expand Up @@ -109,7 +108,7 @@ public MyCustomMessageSerializer(Context context, string valueFromSettings)

public void Serialize(object message, Stream stream)
{
var serializer = new BinaryFormatter();
var serializer = new System.Xml.Serialization.XmlSerializer(typeof(MyRequest));

context.SerializeCalled = true;

Expand All @@ -118,7 +117,7 @@ public void Serialize(object message, Stream stream)

public object[] Deserialize(Stream stream, IList<Type> messageTypes = null)
{
var serializer = new BinaryFormatter();
var serializer = new System.Xml.Serialization.XmlSerializer(typeof(MyRequest));

stream.Position = 0;
var msg = serializer.Deserialize(stream);
Expand Down
6 changes: 3 additions & 3 deletions src/NServiceBus.AcceptanceTests/Serialization/When_registering_custom_serializer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using System.Threading.Tasks;
using AcceptanceTesting;
using Configuration.AdvancedExtensibility;
Expand Down Expand Up @@ -87,13 +86,14 @@ public void Serialize(object message, Stream stream)
{
context.SerializeCalled = true;

var serializer = new BinaryFormatter();
var serializer = new System.Xml.Serialization.XmlSerializer(typeof(MyRequest));

serializer.Serialize(stream, message);
}

public object[] Deserialize(Stream stream, IList<Type> messageTypes = null)
{
var serializer = new BinaryFormatter();
var serializer = new System.Xml.Serialization.XmlSerializer(typeof(MyRequest));

stream.Position = 0;
var msg = serializer.Deserialize(stream);
Expand Down
5 changes: 2 additions & 3 deletions ...NServiceBus.AcceptanceTests/Serialization/When_registering_deserializers_with_settings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ namespace NServiceBus.AcceptanceTests.Serialization
using System;
using System.Collections.Generic;
using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using System.Threading.Tasks;
using AcceptanceTesting;
using Configuration.AdvancedExtensibility;
Expand Down Expand Up @@ -102,7 +101,7 @@ public MyCustomMessageSerializer(string valueFromSettings, Context context)

public void Serialize(object message, Stream stream)
{
var serializer = new BinaryFormatter();
var serializer = new System.Xml.Serialization.XmlSerializer(typeof(MyRequest));

context.SerializeCalled = true;
context.ValueFromSettingsForMainSerializer = valueFromSettings;
Expand All @@ -112,7 +111,7 @@ public void Serialize(object message, Stream stream)

public object[] Deserialize(Stream stream, IList<Type> messageTypes = null)
{
var serializer = new BinaryFormatter();
var serializer = new System.Xml.Serialization.XmlSerializer(typeof(MyRequest));

stream.Position = 0;
var msg = serializer.Deserialize(stream);
Expand Down
5 changes: 4 additions & 1 deletion src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netcoreapp3.1</TargetFrameworks>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Test.snk</AssemblyOriginatorKeyFile>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/NServiceBus.Core.Analyzer.Tests/NServiceBus.Core.Analyzer.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net5.0;net452;netcoreapp3.1</TargetFrameworks>
<NoWarn>$(NoWarn);NU1701</NoWarn>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions ....Core.Tests/ApprovalFiles/PipelineTests.ShouldCreateCachedExecutionPlan.net5.approved.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
context0 => value(NServiceBus.Core.Tests.Pipeline.PipelineTests+StageFork).Invoke(context0, value(System.Func`2[NServiceBus.Pipeline.IIncomingPhysicalMessageContext,System.Threading.Tasks.Task])),
context1 => value(NServiceBus.Core.Tests.Pipeline.PipelineTests+Behavior1).Invoke(context1, value(System.Func`2[NServiceBus.Pipeline.IIncomingPhysicalMessageContext,System.Threading.Tasks.Task])),
context2 => value(NServiceBus.Core.Tests.Pipeline.PipelineTests+Stage1).Invoke(context2, value(System.Func`2[NServiceBus.Pipeline.IIncomingLogicalMessageContext,System.Threading.Tasks.Task])),
context3 => value(NServiceBus.Core.Tests.Pipeline.PipelineTests+Behavior2).Invoke(context3, value(System.Func`2[NServiceBus.Pipeline.IIncomingLogicalMessageContext,System.Threading.Tasks.Task])),
context4 => value(NServiceBus.Core.Tests.Pipeline.PipelineTests+Stage2).Invoke(context4, value(System.Func`2[NServiceBus.Pipeline.IDispatchContext,System.Threading.Tasks.Task])),
context5 => value(NServiceBus.Core.Tests.Pipeline.PipelineTests+Terminator).Invoke(context5, value(System.Func`2[NServiceBus.Pipeline.PipelineTerminator`1+ITerminatingContext[NServiceBus.Pipeline.IDispatchContext],System.Threading.Tasks.Task`1[System.Int32]])),
5 changes: 4 additions & 1 deletion src/NServiceBus.Core.Tests/ArgumentExceptionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ public class ArgumentExceptionTests
public void WriteAllPublicMembersWithNoArgumentChecking()
{
var stringWriter = new StringWriter();
#if NET452
var codeBase = typeof(Endpoint).Assembly.CodeBase;
var uri = new UriBuilder(codeBase);
var path = Uri.UnescapeDataString(uri.Path);

#else
var path = AppContext.BaseDirectory + Path.GetFileName(typeof(Endpoint).Assembly.Location);
#endif
var readerParameters = new ReaderParameters
{
ReadSymbols = true
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core.Tests/AssemblyScanner/When_scanning_top_level_only.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void Should_not_find_assembly_in_sub_directory()
var allEncounteredFileNames =
results.Assemblies
.Where(x => !x.IsDynamic)
.Select(a => a.CodeBase)
.Select(a => a.Location)
.Concat(results.SkippedFiles.Select(s => s.FilePath))
.ToList();

Expand Down
Loading

0 comments on commit d122de8

Please sign in to comment.