-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #343 from Particular/release-8.1
Release 8.1
- Loading branch information
Showing
60 changed files
with
554 additions
and
464 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
...viceBus.NHibernate.AcceptanceTests-SqlTransport/ConfigureEndpointNHibernatePersistence.cs
This file was deleted.
Oops, something went wrong.
47 changes: 47 additions & 0 deletions
47
...us.NHibernate.AcceptanceTests-SqlTransportTests/ConfigureEndpointNHibernatePersistence.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using NHibernate.Cfg; | ||
| using NHibernate.Cfg.MappingSchema; | ||
| using NHibernate.Dialect; | ||
| using NServiceBus; | ||
| using NServiceBus.AcceptanceTesting.Support; | ||
| using NServiceBus.Persistence; | ||
|
|
||
| public class ConfigureEndpointNHibernatePersistence : EndpointConfigurer | ||
| { | ||
| public override Task Configure(string endpointName, EndpointConfiguration configuration, RunSettings settings, PublisherMetadata publisherMetadata) | ||
| { | ||
| var cfg = new Configuration | ||
| { | ||
| Properties = | ||
| { | ||
| {Environment.ConnectionString, ConnectionString}, | ||
| {Environment.Dialect, typeof(MsSql2008Dialect).FullName}, | ||
| }, | ||
| }; | ||
|
|
||
| cfg.BeforeBindMapping += (sender, e) => PrefixMapping(e, "sqlTest_"); | ||
|
|
||
| configuration.UsePersistence<NHibernatePersistence>() | ||
| .UseConfiguration(cfg); | ||
|
|
||
| return Task.CompletedTask; | ||
| } | ||
|
|
||
| static void PrefixMapping(BindMappingEventArgs e, string prefix) | ||
| { | ||
| var c = e.Mapping.RootClasses.Single(); | ||
|
|
||
| c.table = prefix + (c.table ?? c.Name); | ||
| foreach (var prop in c.Properties.OfType<HbmProperty>()) | ||
| { | ||
| foreach (var column in prop.Columns) | ||
| { | ||
| if (!string.IsNullOrEmpty(column.index)) | ||
| { | ||
| column.index = prefix + column.index; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
src/NServiceBus.NHibernate.AcceptanceTests-SqlTransportTests/NServiceBusAcceptanceTest.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| namespace NServiceBus.AcceptanceTests | ||
| { | ||
| using NUnit.Framework; | ||
|
|
||
| public abstract partial class NServiceBusAcceptanceTest | ||
| { | ||
| [SetUp] | ||
| public void SetUp2() | ||
| { | ||
| if (TestContext.CurrentContext?.Test?.FullName == "NServiceBus.AcceptanceTests.DelayedDelivery.When_deferring_to_non_local.Message_should_be_received") | ||
| { | ||
| Assert.Ignore("This is a flaky time-dependent test. It's ignored for now."); | ||
| } | ||
| } | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/NServiceBus.NHibernate.Tests/ApprovalFiles/DDL.MySaga.approved.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| using ApprovalTests.Reporters; | ||
| #if NETFRAMEWORK | ||
| [assembly: UseReporter(typeof(DiffReporter), typeof(AllFailingTestsClipboardReporter))] | ||
|
|
||
| #else | ||
| [assembly: UseReporter(typeof(NUnitReporter))] | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| namespace NServiceBus.NHibernate.Tests | ||
| { | ||
| static class Consts | ||
| { | ||
| const string @default = @"Data Source=.\SQLEXPRESS;Initial Catalog=nservicebus;Integrated Security=True;"; | ||
|
|
||
| public static string SqlConnectionString | ||
| { | ||
| get | ||
| { | ||
| var env = System.Environment.GetEnvironmentVariable("SQLServerConnectionString"); | ||
| if (!string.IsNullOrEmpty(env)) | ||
| { | ||
| return env; | ||
| } | ||
|
|
||
| return @default; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.