From 4d0ec566e32ddde50129f7ded55e06c5f88efda6 Mon Sep 17 00:00:00 2001 From: Tomasz Masternak Date: Tue, 11 Oct 2016 10:32:27 +0200 Subject: [PATCH] updarting core and nhibernate to rtm (#316) * updarting core and nhibernate to rtm * fixing broken ATT --- packaging/nuget/NServiceBus.SqlServer.nuspec | 2 +- .../Routing/SubscriptionBehaviorExtensions.cs | 19 - .../When_extending_sendoptions.cs | 6 +- .../When_extending_the_publish_api.cs | 6 +- .../Audit/When_a_message_is_audited.cs | 0 .../Audit/When_a_replymessage_is_audited.cs | 0 .../Audit/When_audit_is_overridden_in_code.cs | 0 .../Audit/When_auditing.cs | 0 ..._auditing_message_with_TimeToBeReceived.cs | 0 .../Basic/When_aborting_the_behavior_chain.cs | 0 .../Basic/When_deferring_to_non_local.cs | 0 .../Basic/When_depending_on_typed_feature.cs | 0 .../When_depending_on_untyped_feature.cs | 0 .../Basic/When_extending_behavior_context.cs | 6 +- .../When_handling_current_message_later.cs | 0 ...ng_message_with_several_messagehandlers.cs | 0 .../Basic/When_multiple_mappings_exists.cs | 0 .../Basic/When_no_content_type.cs | 0 ...ing_unobtrusive_message_without_handler.cs | 0 ...ving_with_catch_all_handlers_registered.cs | 0 .../When_registering_handlers_explicitly.cs | 0 .../Basic/When_sending_from_a_send_only.cs | 0 ...ding_interface_message_with_conventions.cs | 0 .../Basic/When_sending_to_another_endpoint.cs | 0 .../Basic/When_sending_with_conventions.cs | 0 .../Basic/When_using_a_greedy_convention.cs | 0 .../BestPractices/When_publishing_command.cs | 0 ...blishing_command_bestpractices_disabled.cs | 0 ...mand_bestpractices_disabled_on_endpoint.cs | 0 .../BestPractices/When_sending_event.cs | 0 ...n_sending_events_bestpractices_disabled.cs | 0 ...ents_bestpractices_disabled_on_endpoint.cs | 0 .../When_subscribing_to_command.cs | 0 ...mand_bestpractices_disabled_on_endpoint.cs | 0 .../When_unsubscribing_to_command.cs | 0 ...mand_bestpractices_disabled_on_endpoint.cs | 0 .../Causation/When_a_message_is_audited.cs | 0 .../Causation/When_a_message_is_faulted.cs | 0 .../Causation/When_a_message_is_sent.cs | 0 ...injecting_message_session_into_handlers.cs | 0 ..._only_abstract_config_override_is_found.cs | 0 .../Config/When_startup_is_complete.cs | 0 .../ConfigureEndpointInMemoryPersistence.cs | 0 .../ConfigureEndpointMsmqTransport.cs | 0 .../ConventionEnforcementTests.cs | 0 ..._received_message_without_correlationid.cs | 0 .../When_sending_with_no_correlation_id.cs | 0 .../When_using_a_custom_correlation_id.cs | 0 .../When_raising_critical_error.cs | 0 .../When_sending_databus_properties.cs | 0 ...ing_databus_properties_with_unobtrusive.cs | 0 .../DataBus/When_using_custom_IDataBus.cs | 0 .../When_TimeoutManager_is_disabled.cs | 0 .../When_timeout_dispatch_fails.cs | 8 +- ..._dispatch_fails_on_timeout_data_removal.cs | 8 +- .../When_timeout_storage_fails.cs | 0 .../When_using_external_timeout_manager.cs | 76 +++ .../When_Deferring_a_message.cs | 0 .../When_deferring_a_message_to_the_past.cs | 0 .../DeterministicGuid.cs | 0 .../When_using_Rijndael_with_config.cs | 0 .../When_using_Rijndael_with_custom.cs | 0 .../When_using_Rijndael_with_multikey.cs | 0 ...en_using_Rijndael_with_unobtrusive_mode.cs | 0 ...ijndael_without_incoming_key_identifier.cs | 0 ...en_using_encryption_with_custom_service.cs | 0 .../EndpointTemplates/ConfigureExtensions.cs | 0 .../EndpointTemplates/DefaultPublisher.cs | 0 .../EndpointTemplates/DefaultServer.cs | 0 ...intCustomizationConfigurationExtensions.cs | 0 ...rverWithNoDefaultPersistenceDefinitions.cs | 0 ...n_forwarding_is_configured_for_endpoint.cs | 0 ...When_requesting_message_to_be_forwarded.cs | 0 .../Hosting/When_a_message_is_audited.cs | 0 .../Hosting/When_a_message_is_faulted.cs | 0 .../Hosting/When_feature_overrides_hostid.cs | 0 .../When_feature_overrides_hostinfo.cs | 0 .../When_overriding_input_queue_name.cs | 0 .../When_sending_ensure_proper_headers.cs | 0 .../Licensing/When_a_message_is_audited.cs | 0 .../MessageDrivenPubSubRoutingExtensions.cs | 0 .../When_message_has_empty_id_header.cs | 10 +- .../When_message_has_no_id_header.cs | 10 +- .../Mutators/Issue_1980.cs | 0 ...When_defining_outgoing_message_mutators.cs | 0 ...n_incoming_mutator_changes_message_type.cs | 0 .../Mutators/When_mutating.cs | 0 ...When_outgoing_mutator_replaces_instance.cs | 0 .../When_using_outgoing_tm_mutator.cs | 0 .../NServiceBusAcceptanceTest.cs | 0 .../NonTx/When_sending_inside_ambient_tx.cs | 6 +- .../CriticalTime/When_CriticalTime_enabled.cs | 0 .../CriticalTime/When_deferring_a_message.cs | 0 .../When_slow_with_CriticalTime_enabled.cs | 0 .../SLA/When_sending_slow_with_SLA_enabled.cs | 0 .../SLA/When_sending_with_SLA_enabled.cs | 0 .../When_TimeToBeReceived_has_expired.cs | 0 ...TimeToBeReceived_has_expired_convention.cs | 0 .../When_TimeToBeReceived_has_not_expired.cs | 0 ...ToBeReceived_used_with_unobtrusive_mode.cs | 0 .../Performance/When_message_is_audited.cs | 0 .../Performance/When_message_is_faulted.cs | 0 .../Pipeline/When_replacing_behavior.cs | 12 +- ...using_per_uow_component_in_the_pipeline.cs | 6 +- .../Retries/When_Subscribing_to_errors.cs | 0 ...hen_custom_policy_always_moves_to_error.cs | 0 ...ngle_delayed_retry_before_move_to_error.cs | 0 .../Retries/When_custom_policy_executed.cs | 0 .../Retries/When_custom_policy_provided.cs | 0 .../When_delayed_retries_and_counting.cs | 0 ...retries_with_immediate_retries_disabled.cs | 0 ..._delayed_retries_with_regular_exception.cs | 0 ...ed_retries_with_serialization_exception.cs | 0 .../When_fails_with_retries_set_to_0.cs | 0 ...immediate_retries_with_default_settings.cs | 0 .../When_immediate_retries_with_dtc_on.cs | 0 ...ediate_retries_with_native_transactions.cs | 0 .../Retries/When_message_fails_retries.cs | 0 ...s_deferred_by_delayed_retries_using_dtc.cs | 0 .../Retries/when_immediate_retries_fail.cs | 0 ..._policy_moves_to_overridden_error_queue.cs | 0 .../When_error_is_overridden_in_code.cs | 0 .../When_message_is_moved_to_error_queue.cs | 6 +- ...ssage_is_moved_to_error_queue_using_dtc.cs | 0 ..._error_queue_with_header_customizations.cs | 0 ...hen_message_with_TimeToBeReceived_fails.cs | 0 .../When_a_duplicate_message_arrives.cs | 0 .../Outbox/When_a_message_is_audited.cs | 12 +- .../When_blowing_up_just_after_dispatch.cs | 8 +- .../Outbox/When_clearing_saga_timeouts.cs | 0 .../When_dispatching_forwarded_messages.cs | 12 +- .../Outbox/When_receiving_a_message.cs | 0 .../When_sending_from_a_non_dtc_endpoint.cs | 0 .../When_starting_an_endpoint_with_a_saga.cs | 6 +- ...oint_with_a_saga_autosubscribe_disabled.cs | 6 +- ...starting_an_endpoint_with_autoSubscribe.cs | 6 +- .../When_extending_event_routing.cs | 0 ...ulti_subscribing_to_a_polymorphic_event.cs | 0 .../When_publishing_from_sendonly.cs | 0 ...en_publishing_to_scaled_out_subscribers.cs | 0 .../When_subscribing_to_a_base_event.cs | 0 ..._event_with_a_route_for_a_derived_event.cs | 0 ...with_routes_to_base_and_specific_events.cs | 0 .../When_subscribing_to_a_derived_event.cs | 0 ...When_subscribing_to_multiple_publishers.cs | 2 +- ...hen_subscribing_to_scaled_out_publisher.cs | 0 ...n_unsubscribing_to_scaled_out_publisher.cs | 71 +++ ...embly_level_message_mapping_for_pub_sub.cs | 0 ...scribe_with_missing_routing_information.cs | 0 ...When_using_legacy_routing_configuration.cs | 0 ...ulti_subscribing_to_a_polymorphic_event.cs | 0 ...en_publishing_to_scaled_out_subscribers.cs | 0 .../Routing/SubscriptionBehavior.cs | 26 +- .../Routing/SubscriptionBehaviorExtensions.cs | 26 + .../Routing/SubscriptionEventArgs.cs | 0 .../When_base_event_from_2_publishers.cs | 0 ...nfigure_routes_for_unobtrusive_messages.cs | 0 .../Routing/When_extending_command_routing.cs | 0 .../Routing/When_overriding_local_address.cs | 0 .../Routing/When_publishing.cs | 0 ...t_implementing_two_unrelated_interfaces.cs | 0 .../Routing/When_publishing_an_interface.cs | 12 +- ...ublishing_an_interface_with_unobtrusive.cs | 12 +- .../When_publishing_using_root_type.cs | 0 ...lishing_with_only_local_messagehandlers.cs | 0 ...ublishing_with_overridden_local_address.cs | 0 ...g_publishers_unobtrusive_messages_code.cs} | 53 +- ..._publishers_unobtrusive_messages_config.cs | 76 +++ .../Routing/When_replying_to_message.cs | 0 ..._message_with_interface_and_unobtrusive.cs | 0 .../Routing/When_sending_a_base_command.cs | 0 ...age_with_routing_configured_by_assembly.cs | 0 ...message_with_routing_configured_by_type.cs | 0 ...ge_with_routing_configured_via_mappings.cs | 0 .../Routing/When_using_instance_ids.cs | 0 ..._to_a_message_sent_to_specific_instance.cs | 0 .../RunDescriptorExtensions.cs | 0 ..._base_class_mapped_is_handled_by_a_saga.cs | 0 ...When_a_base_class_message_starts_a_saga.cs | 0 .../When_a_existing_saga_instance_exists.cs | 0 .../Sagas/When_a_finder_exists.cs | 0 ...er_exists_and_context_information_added.cs | 10 +- .../When_a_finder_exists_and_found_saga.cs | 0 .../When_an_endpoint_replies_to_a_saga.cs | 0 ...hen_auto_correlated_property_is_changed.cs | 0 ...en_doing_request_response_between_sagas.cs | 0 ..._between_sagas_first_handler_responding.cs | 0 ...tween_sagas_response_from_noninitiating.cs | 0 ...est_response_between_sagas_with_timeout.cs | 0 .../When_forgetting_to_set_a_corr_property.cs | 0 .../Sagas/When_message_has_a_saga_id.cs | 0 .../When_receiving_that_completes_the_saga.cs | 0 ...When_receiving_that_should_start_a_saga.cs | 0 ...t_should_start_a_saga_with_interception.cs | 0 ...hould_start_a_saga_without_interception.cs | 0 ..._replies_to_message_published_by_a_saga.cs | 0 .../When_saga_handles_unmapped_message.cs | 0 .../When_saga_has_a_non_empty_constructor.cs | 0 .../Sagas/When_saga_id_changed.cs | 0 ...en_saga_is_mapped_to_complex_expression.cs | 0 ...ga_message_goes_through_delayed_retries.cs | 0 .../Sagas/When_saga_started_concurrently.cs | 150 ++++++ .../Sagas/When_sagas_cant_be_found.cs | 0 .../Sagas/When_sending_from_a_saga_handle.cs | 0 .../Sagas/When_sending_from_a_saga_timeout.cs | 0 ...n_started_by_base_event_from_other_saga.cs | 0 ...When_started_by_event_from_another_saga.cs | 0 .../Sagas/When_timeout_hit_not_found_saga.cs | 0 ...n_two_sagas_subscribe_to_the_same_event.cs | 0 ..._updating_existing_correlation_property.cs | 0 .../Sagas/When_using_ReplyToOriginator.cs | 0 ...en_using_a_received_message_for_timeout.cs | 0 .../Sagas/When_using_contain_saga_data.cs | 0 .../Sagas/when_receiving_multiple_timeouts.cs | 0 .../when_reply_from_saga_not_found_handler.cs | 0 .../Satellites/When_a_message_is_available.cs | 0 .../AllOutboxCapableStorages.cs | 0 .../ScenarioDescriptors/AllTransports.cs | 0 .../ScenarioDescriptors/Builders.cs | 0 .../ScenarioDescriptors/EnvironmentHelper.cs | 0 .../ScenarioDescriptors/Persistence.cs | 0 .../ScenarioDescriptors/Serializers.cs | 0 .../ScenarioDescriptors/Transports.cs | 0 .../When_scheduling_a_recurring_task.cs | 0 .../When_running_saga_tests.cs | 0 .../When_configuring_custom_xml_namespace.cs | 2 +- ...en_registering_additional_deserializers.cs | 0 .../When_registering_custom_serializer.cs | 0 ...registering_deserializers_with_settings.cs | 0 .../When_sanitizing_xml_messages.cs | 0 .../Serialization/When_skip_wrapping_xml.cs | 0 .../When_wrapping_is_not_skipped.cs | 0 ...l_serializer_used_with_unobtrusive_mode.cs | 0 .../Timeout/CyclingOutageTimeoutPersister.cs | 0 ...eout_storage_is_unavailable_temporarily.cs | 0 .../Tx/FakePromotableResourceManager.cs | 0 ...immediate_dispatch_using_scope_suppress.cs | 2 +- ...g_immediate_dispatch_with_at_least_once.cs | 0 ...ng_immediate_dispatch_with_at_most_once.cs | 0 ...ng_immediate_dispatch_with_exactly_once.cs | 0 .../Tx/Issue_2481.cs | 0 .../Tx/When_receiving_with_dtc_enabled.cs | 0 ...ing_with_native_multi_queue_transaction.cs | 0 ...hen_receiving_with_the_default_settings.cs | 0 ...n_sending_within_an_ambient_transaction.cs | 0 .../UnicastRoutingExtensions.cs | 0 ...iple_versions_of_a_message_is_published.cs | 0 ...erviceBus.SqlServer.AcceptanceTests.csproj | 490 +++++++++--------- .../packages.config | 6 +- ...rviceBus.SqlServer.IntegrationTests.csproj | 4 +- .../packages.config | 4 +- .../IConfigureTransportInfrastructure.cs | 0 .../NServiceBusTransportTest.cs | 0 .../TransportConfigurationResult.cs | 0 .../TypeScanner.cs | 0 .../When_failure_happens_after_send.cs | 0 .../When_message_is_available.cs | 0 .../When_on_error_throws.cs | 0 .../When_on_message_throws.cs | 0 ...n_on_message_throws_after_delayed_retry.cs | 0 ...on_message_throws_after_immediate_retry.cs | 0 .../When_requesting_immediate_retry.cs | 0 .../When_scope_dispose_throws.cs | 0 .../When_sending_from_on_error.cs | 0 .../When_user_aborts_processing.cs | 0 .../When_using_non_durable_delivery.cs | 0 ...ServiceBus.SqlServer.TransportTests.csproj | 32 +- .../packages.config | 4 +- .../NServiceBus.SqlServer.UnitTests.csproj | 2 +- .../packages.config | 2 +- .../NServiceBus.SqlServer.csproj | 2 +- src/NServiceBus.SqlServer/packages.config | 2 +- 272 files changed, 786 insertions(+), 435 deletions(-) delete mode 100644 src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionBehaviorExtensions.cs rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ApiExtension/When_extending_sendoptions.cs (90%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ApiExtension/When_extending_the_publish_api.cs (92%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Audit/When_a_message_is_audited.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Audit/When_a_replymessage_is_audited.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Audit/When_audit_is_overridden_in_code.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Audit/When_auditing.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Audit/When_auditing_message_with_TimeToBeReceived.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_aborting_the_behavior_chain.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_deferring_to_non_local.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_depending_on_typed_feature.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_depending_on_untyped_feature.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_extending_behavior_context.cs (90%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_handling_current_message_later.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_handling_message_with_several_messagehandlers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_multiple_mappings_exists.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_no_content_type.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_receiving_unobtrusive_message_without_handler.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_receiving_with_catch_all_handlers_registered.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_registering_handlers_explicitly.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_sending_from_a_send_only.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_sending_interface_message_with_conventions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_sending_to_another_endpoint.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_sending_with_conventions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Basic/When_using_a_greedy_convention.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_publishing_command.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_publishing_command_bestpractices_disabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_publishing_command_bestpractices_disabled_on_endpoint.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_sending_event.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_sending_events_bestpractices_disabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_sending_events_bestpractices_disabled_on_endpoint.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_subscribing_to_command.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_subscribing_to_command_bestpractices_disabled_on_endpoint.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_unsubscribing_to_command.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/BestPractices/When_unsubscribing_to_command_bestpractices_disabled_on_endpoint.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Causation/When_a_message_is_audited.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Causation/When_a_message_is_faulted.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Causation/When_a_message_is_sent.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Config/When_injecting_message_session_into_handlers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Config/When_only_abstract_config_override_is_found.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Config/When_startup_is_complete.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ConfigureEndpointInMemoryPersistence.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ConfigureEndpointMsmqTransport.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ConventionEnforcementTests.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Correlation/When_replying_to_received_message_without_correlationid.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Correlation/When_sending_with_no_correlation_id.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Correlation/When_using_a_custom_correlation_id.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/CriticalError/When_raising_critical_error.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DataBus/When_sending_databus_properties.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DataBus/When_sending_databus_properties_with_unobtrusive.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DataBus/When_using_custom_IDataBus.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DelayedDelivery/TimeoutManager/When_TimeoutManager_is_disabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails.cs (94%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails_on_timeout_data_removal.cs (94%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DelayedDelivery/TimeoutManager/When_timeout_storage_fails.cs (100%) create mode 100644 src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_using_external_timeout_manager.cs rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DelayedDelivery/When_Deferring_a_message.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DelayedDelivery/When_deferring_a_message_to_the_past.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/DeterministicGuid.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Encryption/When_using_Rijndael_with_config.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Encryption/When_using_Rijndael_with_custom.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Encryption/When_using_Rijndael_with_multikey.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Encryption/When_using_Rijndael_with_unobtrusive_mode.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Encryption/When_using_Rijndael_without_incoming_key_identifier.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Encryption/When_using_encryption_with_custom_service.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/EndpointTemplates/ConfigureExtensions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/EndpointTemplates/DefaultPublisher.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/EndpointTemplates/DefaultServer.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/EndpointTemplates/ServerWithNoDefaultPersistenceDefinitions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Forwarding/When_forwarding_is_configured_for_endpoint.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Forwarding/When_requesting_message_to_be_forwarded.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Hosting/When_a_message_is_audited.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Hosting/When_a_message_is_faulted.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Hosting/When_feature_overrides_hostid.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Hosting/When_feature_overrides_hostinfo.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Hosting/When_overriding_input_queue_name.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Hosting/When_sending_ensure_proper_headers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Licensing/When_a_message_is_audited.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/MessageDrivenPubSubRoutingExtensions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/MessageId/When_message_has_empty_id_header.cs (87%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/MessageId/When_message_has_no_id_header.cs (85%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Mutators/Issue_1980.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Mutators/When_defining_outgoing_message_mutators.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Mutators/When_incoming_mutator_changes_message_type.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Mutators/When_mutating.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Mutators/When_outgoing_mutator_replaces_instance.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Mutators/When_using_outgoing_tm_mutator.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/NServiceBusAcceptanceTest.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/NonTx/When_sending_inside_ambient_tx.cs (91%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/PerfMon/CriticalTime/When_CriticalTime_enabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/PerfMon/CriticalTime/When_deferring_a_message.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/PerfMon/CriticalTime/When_slow_with_CriticalTime_enabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/PerfMon/SLA/When_sending_slow_with_SLA_enabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/PerfMon/SLA/When_sending_with_SLA_enabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired_convention.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Performance/TimeToBeReceived/When_TimeToBeReceived_has_not_expired.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Performance/TimeToBeReceived/When_TimeToBeReceived_used_with_unobtrusive_mode.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Performance/When_message_is_audited.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Performance/When_message_is_faulted.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Pipeline/When_replacing_behavior.cs (84%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Pipeline/When_using_per_uow_component_in_the_pipeline.cs (93%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_Subscribing_to_errors.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_custom_policy_always_moves_to_error.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_custom_policy_does_single_delayed_retry_before_move_to_error.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_custom_policy_executed.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_custom_policy_provided.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_delayed_retries_and_counting.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_delayed_retries_with_immediate_retries_disabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_delayed_retries_with_regular_exception.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_delayed_retries_with_serialization_exception.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_fails_with_retries_set_to_0.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_immediate_retries_with_default_settings.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_immediate_retries_with_dtc_on.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_immediate_retries_with_native_transactions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_message_fails_retries.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/When_message_is_deferred_by_delayed_retries_using_dtc.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/Retries/when_immediate_retries_fail.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/When_custom_policy_moves_to_overridden_error_queue.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/When_error_is_overridden_in_code.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/When_message_is_moved_to_error_queue.cs (96%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/When_message_is_moved_to_error_queue_using_dtc.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/When_message_is_moved_to_error_queue_with_header_customizations.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Recoverability/When_message_with_TimeToBeReceived_fails.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Reliability/Outbox/When_a_duplicate_message_arrives.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Reliability/Outbox/When_a_message_is_audited.cs (86%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Reliability/Outbox/When_blowing_up_just_after_dispatch.cs (90%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Reliability/Outbox/When_clearing_saga_timeouts.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Reliability/Outbox/When_dispatching_forwarded_messages.cs (87%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Reliability/Outbox/When_receiving_a_message.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Reliability/Outbox/When_sending_from_a_non_dtc_endpoint.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs (93%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs (94%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_autoSubscribe.cs (94%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_extending_event_routing.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_multi_subscribing_to_a_polymorphic_event.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_publishing_from_sendonly.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_publishing_to_scaled_out_subscribers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_a_route_for_a_derived_event.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_routes_to_base_and_specific_events.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_derived_event.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_subscribing_to_multiple_publishers.cs (99%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_subscribing_to_scaled_out_publisher.cs (100%) create mode 100644 src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_unsubscribing_to_scaled_out_publisher.cs rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_using_assembly_level_message_mapping_for_pub_sub.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_using_autosubscribe_with_missing_routing_information.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/MessageDrivenSubscriptions/When_using_legacy_routing_configuration.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/NativePublishSubscribe/When_multi_subscribing_to_a_polymorphic_event.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/NativePublishSubscribe/When_publishing_to_scaled_out_subscribers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/SubscriptionBehavior.cs (55%) create mode 100644 src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionBehaviorExtensions.cs rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/SubscriptionEventArgs.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_base_event_from_2_publishers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_configure_routes_for_unobtrusive_messages.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_extending_command_routing.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_overriding_local_address.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_publishing.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_publishing_an_event_implementing_two_unrelated_interfaces.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_publishing_an_interface.cs (87%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_publishing_an_interface_with_unobtrusive.cs (88%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_publishing_using_root_type.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_publishing_with_only_local_messagehandlers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_publishing_with_overridden_local_address.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_registering_publishers_unobtrusive_messages.cs => NSB.AcceptanceTests.6.0.0/Routing/When_registering_publishers_unobtrusive_messages_code.cs} (56%) create mode 100644 src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_registering_publishers_unobtrusive_messages_config.cs rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_replying_to_message.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_replying_to_message_with_interface_and_unobtrusive.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_sending_a_base_command.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_sending_non_message_with_routing_configured_by_assembly.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_sending_non_message_with_routing_configured_by_type.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_sending_non_message_with_routing_configured_via_mappings.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/When_using_instance_ids.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Routing/when_replying_to_a_message_sent_to_specific_instance.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/RunDescriptorExtensions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_a_base_class_mapped_is_handled_by_a_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_a_base_class_message_starts_a_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_a_existing_saga_instance_exists.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_a_finder_exists.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_a_finder_exists_and_context_information_added.cs (89%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_a_finder_exists_and_found_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_an_endpoint_replies_to_a_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_auto_correlated_property_is_changed.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_doing_request_response_between_sagas.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_doing_request_response_between_sagas_first_handler_responding.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_doing_request_response_between_sagas_response_from_noninitiating.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_doing_request_response_between_sagas_with_timeout.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_forgetting_to_set_a_corr_property.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_message_has_a_saga_id.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_receiving_that_completes_the_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_receiving_that_should_start_a_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_receiving_that_should_start_a_saga_with_interception.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_receiving_that_should_start_a_saga_without_interception.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_replies_to_message_published_by_a_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_saga_handles_unmapped_message.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_saga_has_a_non_empty_constructor.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_saga_id_changed.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_saga_is_mapped_to_complex_expression.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_saga_message_goes_through_delayed_retries.cs (100%) create mode 100644 src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_started_concurrently.cs rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_sagas_cant_be_found.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_sending_from_a_saga_handle.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_sending_from_a_saga_timeout.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_started_by_base_event_from_other_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_started_by_event_from_another_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_timeout_hit_not_found_saga.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_two_sagas_subscribe_to_the_same_event.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_updating_existing_correlation_property.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_using_ReplyToOriginator.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_using_a_received_message_for_timeout.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/When_using_contain_saga_data.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/when_receiving_multiple_timeouts.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Sagas/when_reply_from_saga_not_found_handler.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Satellites/When_a_message_is_available.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ScenarioDescriptors/AllOutboxCapableStorages.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ScenarioDescriptors/AllTransports.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ScenarioDescriptors/Builders.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ScenarioDescriptors/EnvironmentHelper.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ScenarioDescriptors/Persistence.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ScenarioDescriptors/Serializers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/ScenarioDescriptors/Transports.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Scheduling/When_scheduling_a_recurring_task.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/SelfVerification/When_running_saga_tests.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Serialization/When_configuring_custom_xml_namespace.cs (97%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Serialization/When_registering_additional_deserializers.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Serialization/When_registering_custom_serializer.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Serialization/When_registering_deserializers_with_settings.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Serialization/When_sanitizing_xml_messages.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Serialization/When_skip_wrapping_xml.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Serialization/When_wrapping_is_not_skipped.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Serialization/When_xml_serializer_used_with_unobtrusive_mode.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Timeout/CyclingOutageTimeoutPersister.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Timeout/When_timeout_storage_is_unavailable_temporarily.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/FakePromotableResourceManager.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_using_scope_suppress.cs (95%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_least_once.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_most_once.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_exactly_once.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/Issue_2481.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/When_receiving_with_dtc_enabled.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/When_receiving_with_native_multi_queue_transaction.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/When_receiving_with_the_default_settings.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Tx/When_sending_within_an_ambient_transaction.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/UnicastRoutingExtensions.cs (100%) rename src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/{NSB.AcceptanceTests.6.0.0-rc0001 => NSB.AcceptanceTests.6.0.0}/Versioning/When_multiple_versions_of_a_message_is_published.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/IConfigureTransportInfrastructure.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/NServiceBusTransportTest.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/TransportConfigurationResult.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/TypeScanner.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_failure_happens_after_send.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_message_is_available.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_on_error_throws.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_on_message_throws.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_on_message_throws_after_delayed_retry.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_on_message_throws_after_immediate_retry.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_requesting_immediate_retry.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_scope_dispose_throws.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_sending_from_on_error.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_user_aborts_processing.cs (100%) rename src/NServiceBus.SqlServer.TransportTests/App_Packages/{NSB.TransportTests.6.0.0-rc0001 => NSB.TransportTests.6.0.0}/When_using_non_durable_delivery.cs (100%) diff --git a/packaging/nuget/NServiceBus.SqlServer.nuspec b/packaging/nuget/NServiceBus.SqlServer.nuspec index 77eb938b5..d8c3f48dd 100644 --- a/packaging/nuget/NServiceBus.SqlServer.nuspec +++ b/packaging/nuget/NServiceBus.SqlServer.nuspec @@ -15,7 +15,7 @@ $tags$ - + diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionBehaviorExtensions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionBehaviorExtensions.cs deleted file mode 100644 index e7f8346fb..000000000 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionBehaviorExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace NServiceBus.AcceptanceTests.Routing -{ - using System; - using AcceptanceTesting; - - static class SubscriptionBehaviorExtensions - { - public static void OnEndpointSubscribed(this EndpointConfiguration b, Action action) where TContext : ScenarioContext - { - b.Pipeline.Register.Registration>(); - - b.RegisterComponents(c => c.ConfigureComponent(builder => - { - var context = builder.Build(); - return new SubscriptionBehavior(action, context); - }, DependencyLifecycle.InstancePerCall)); - } - } -} \ No newline at end of file diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ApiExtension/When_extending_sendoptions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ApiExtension/When_extending_sendoptions.cs similarity index 90% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ApiExtension/When_extending_sendoptions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ApiExtension/When_extending_sendoptions.cs index ec8c3e3fb..0ce0fc1c4 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ApiExtension/When_extending_sendoptions.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ApiExtension/When_extending_sendoptions.cs @@ -57,9 +57,9 @@ public Task Handle(SendMessage message, IMessageHandlerContext context) } } - public class TestingSendOptionsExtensionBehavior : Behavior + public class TestingSendOptionsExtensionBehavior : IBehavior { - public override Task Invoke(IOutgoingLogicalMessageContext context, Func next) + public Task Invoke(IOutgoingLogicalMessageContext context, Func next) { Context data; if (context.Extensions.TryGet(out data)) @@ -70,7 +70,7 @@ public override Task Invoke(IOutgoingLogicalMessageContext context, Func n }); } - return next(); + return next(context); } public class Context diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ApiExtension/When_extending_the_publish_api.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ApiExtension/When_extending_the_publish_api.cs similarity index 92% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ApiExtension/When_extending_the_publish_api.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ApiExtension/When_extending_the_publish_api.cs index 65d872968..575af173d 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ApiExtension/When_extending_the_publish_api.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ApiExtension/When_extending_the_publish_api.cs @@ -63,9 +63,9 @@ public Publisher() }); } - public class PublishExtensionBehavior : Behavior + public class PublishExtensionBehavior : IBehavior { - public override Task Invoke(IOutgoingLogicalMessageContext context, Func next) + public Task Invoke(IOutgoingLogicalMessageContext context, Func next) { Context data; @@ -78,7 +78,7 @@ public override Task Invoke(IOutgoingLogicalMessageContext context, Func n Assert.Fail("Expected to find the data"); } - return next(); + return next(context); } public class Context diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_a_message_is_audited.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_a_message_is_audited.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_a_message_is_audited.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_a_message_is_audited.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_a_replymessage_is_audited.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_a_replymessage_is_audited.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_a_replymessage_is_audited.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_a_replymessage_is_audited.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_audit_is_overridden_in_code.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_audit_is_overridden_in_code.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_audit_is_overridden_in_code.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_audit_is_overridden_in_code.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_auditing.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_auditing.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_auditing.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_auditing.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_auditing_message_with_TimeToBeReceived.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_auditing_message_with_TimeToBeReceived.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Audit/When_auditing_message_with_TimeToBeReceived.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Audit/When_auditing_message_with_TimeToBeReceived.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_aborting_the_behavior_chain.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_aborting_the_behavior_chain.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_aborting_the_behavior_chain.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_aborting_the_behavior_chain.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_deferring_to_non_local.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_deferring_to_non_local.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_deferring_to_non_local.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_deferring_to_non_local.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_depending_on_typed_feature.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_depending_on_typed_feature.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_depending_on_typed_feature.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_depending_on_typed_feature.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_depending_on_untyped_feature.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_depending_on_untyped_feature.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_depending_on_untyped_feature.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_depending_on_untyped_feature.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_extending_behavior_context.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_extending_behavior_context.cs similarity index 90% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_extending_behavior_context.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_extending_behavior_context.cs index a7a9e48da..03f557d9a 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_extending_behavior_context.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_extending_behavior_context.cs @@ -68,12 +68,12 @@ public Task Handle(SomeMessage message, IMessageHandlerContext context) } } - class CustomContextExtensionBehavior : Behavior + class CustomContextExtensionBehavior : IBehavior { - public override Task Invoke(IIncomingLogicalMessageContext context, Func next) + public Task Invoke(IIncomingLogicalMessageContext context, Func next) { context.Extensions.Set("CustomExtension", ExtensionValue); - return next(); + return next(context); } } } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_handling_current_message_later.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_handling_current_message_later.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_handling_current_message_later.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_handling_current_message_later.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_handling_message_with_several_messagehandlers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_handling_message_with_several_messagehandlers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_handling_message_with_several_messagehandlers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_handling_message_with_several_messagehandlers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_multiple_mappings_exists.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_multiple_mappings_exists.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_multiple_mappings_exists.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_multiple_mappings_exists.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_no_content_type.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_no_content_type.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_no_content_type.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_no_content_type.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_receiving_unobtrusive_message_without_handler.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_receiving_unobtrusive_message_without_handler.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_receiving_unobtrusive_message_without_handler.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_receiving_unobtrusive_message_without_handler.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_receiving_with_catch_all_handlers_registered.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_receiving_with_catch_all_handlers_registered.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_receiving_with_catch_all_handlers_registered.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_receiving_with_catch_all_handlers_registered.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_registering_handlers_explicitly.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_registering_handlers_explicitly.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_registering_handlers_explicitly.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_registering_handlers_explicitly.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_sending_from_a_send_only.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_sending_from_a_send_only.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_sending_from_a_send_only.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_sending_from_a_send_only.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_sending_interface_message_with_conventions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_sending_interface_message_with_conventions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_sending_interface_message_with_conventions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_sending_interface_message_with_conventions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_sending_to_another_endpoint.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_sending_to_another_endpoint.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_sending_to_another_endpoint.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_sending_to_another_endpoint.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_sending_with_conventions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_sending_with_conventions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_sending_with_conventions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_sending_with_conventions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_using_a_greedy_convention.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_using_a_greedy_convention.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Basic/When_using_a_greedy_convention.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Basic/When_using_a_greedy_convention.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_publishing_command.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_publishing_command.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_publishing_command.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_publishing_command.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_publishing_command_bestpractices_disabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_publishing_command_bestpractices_disabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_publishing_command_bestpractices_disabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_publishing_command_bestpractices_disabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_publishing_command_bestpractices_disabled_on_endpoint.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_publishing_command_bestpractices_disabled_on_endpoint.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_publishing_command_bestpractices_disabled_on_endpoint.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_publishing_command_bestpractices_disabled_on_endpoint.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_sending_event.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_sending_event.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_sending_event.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_sending_event.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_sending_events_bestpractices_disabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_sending_events_bestpractices_disabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_sending_events_bestpractices_disabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_sending_events_bestpractices_disabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_sending_events_bestpractices_disabled_on_endpoint.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_sending_events_bestpractices_disabled_on_endpoint.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_sending_events_bestpractices_disabled_on_endpoint.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_sending_events_bestpractices_disabled_on_endpoint.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_subscribing_to_command.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_subscribing_to_command.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_subscribing_to_command.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_subscribing_to_command.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_subscribing_to_command_bestpractices_disabled_on_endpoint.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_subscribing_to_command_bestpractices_disabled_on_endpoint.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_subscribing_to_command_bestpractices_disabled_on_endpoint.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_subscribing_to_command_bestpractices_disabled_on_endpoint.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_unsubscribing_to_command.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_unsubscribing_to_command.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_unsubscribing_to_command.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_unsubscribing_to_command.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_unsubscribing_to_command_bestpractices_disabled_on_endpoint.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_unsubscribing_to_command_bestpractices_disabled_on_endpoint.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/BestPractices/When_unsubscribing_to_command_bestpractices_disabled_on_endpoint.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/BestPractices/When_unsubscribing_to_command_bestpractices_disabled_on_endpoint.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Causation/When_a_message_is_audited.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Causation/When_a_message_is_audited.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Causation/When_a_message_is_audited.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Causation/When_a_message_is_audited.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Causation/When_a_message_is_faulted.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Causation/When_a_message_is_faulted.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Causation/When_a_message_is_faulted.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Causation/When_a_message_is_faulted.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Causation/When_a_message_is_sent.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Causation/When_a_message_is_sent.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Causation/When_a_message_is_sent.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Causation/When_a_message_is_sent.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Config/When_injecting_message_session_into_handlers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Config/When_injecting_message_session_into_handlers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Config/When_injecting_message_session_into_handlers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Config/When_injecting_message_session_into_handlers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Config/When_only_abstract_config_override_is_found.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Config/When_only_abstract_config_override_is_found.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Config/When_only_abstract_config_override_is_found.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Config/When_only_abstract_config_override_is_found.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Config/When_startup_is_complete.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Config/When_startup_is_complete.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Config/When_startup_is_complete.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Config/When_startup_is_complete.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ConfigureEndpointInMemoryPersistence.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ConfigureEndpointInMemoryPersistence.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ConfigureEndpointInMemoryPersistence.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ConfigureEndpointInMemoryPersistence.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ConfigureEndpointMsmqTransport.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ConfigureEndpointMsmqTransport.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ConfigureEndpointMsmqTransport.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ConfigureEndpointMsmqTransport.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ConventionEnforcementTests.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ConventionEnforcementTests.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ConventionEnforcementTests.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ConventionEnforcementTests.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Correlation/When_replying_to_received_message_without_correlationid.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Correlation/When_replying_to_received_message_without_correlationid.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Correlation/When_replying_to_received_message_without_correlationid.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Correlation/When_replying_to_received_message_without_correlationid.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Correlation/When_sending_with_no_correlation_id.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Correlation/When_sending_with_no_correlation_id.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Correlation/When_sending_with_no_correlation_id.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Correlation/When_sending_with_no_correlation_id.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Correlation/When_using_a_custom_correlation_id.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Correlation/When_using_a_custom_correlation_id.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Correlation/When_using_a_custom_correlation_id.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Correlation/When_using_a_custom_correlation_id.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/CriticalError/When_raising_critical_error.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/CriticalError/When_raising_critical_error.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/CriticalError/When_raising_critical_error.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/CriticalError/When_raising_critical_error.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DataBus/When_sending_databus_properties.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DataBus/When_sending_databus_properties.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DataBus/When_sending_databus_properties.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DataBus/When_sending_databus_properties.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DataBus/When_sending_databus_properties_with_unobtrusive.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DataBus/When_sending_databus_properties_with_unobtrusive.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DataBus/When_sending_databus_properties_with_unobtrusive.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DataBus/When_sending_databus_properties_with_unobtrusive.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DataBus/When_using_custom_IDataBus.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DataBus/When_using_custom_IDataBus.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DataBus/When_using_custom_IDataBus.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DataBus/When_using_custom_IDataBus.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_TimeoutManager_is_disabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_TimeoutManager_is_disabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_TimeoutManager_is_disabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_TimeoutManager_is_disabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails.cs similarity index 94% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails.cs index 9b6810359..0541f12e2 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails.cs @@ -133,20 +133,20 @@ public Task GetNextChunk(DateTime startSlice) TimeoutData timeoutData; } - class BehaviorThatLogsControlMessageDelivery : Behavior + class BehaviorThatLogsControlMessageDelivery : IBehavior { public Context TestContext { get; set; } - public override async Task Invoke(ITransportReceiveContext context, Func next) + public Task Invoke(ITransportReceiveContext context, Func next) { if (context.Message.Headers.ContainsKey(Headers.ControlMessageHeader) && context.Message.Headers["Timeout.Id"] == TestContext.TestRunId.ToString()) { TestContext.FailedTimeoutMovedToError = true; - return; + return Task.FromResult(0); } - await next().ConfigureAwait(false); + return next(context); } public class Registration : RegisterStep diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails_on_timeout_data_removal.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails_on_timeout_data_removal.cs similarity index 94% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails_on_timeout_data_removal.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails_on_timeout_data_removal.cs index c1410b447..5118b49b7 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails_on_timeout_data_removal.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_timeout_dispatch_fails_on_timeout_data_removal.cs @@ -135,20 +135,20 @@ public Task GetNextChunk(DateTime startSlice) TimeoutData timeoutData; } - class BehaviorThatLogsControlMessageDelivery : Behavior + class BehaviorThatLogsControlMessageDelivery : IBehavior { public Context TestContext { get; set; } - public override async Task Invoke(ITransportReceiveContext context, Func next) + public Task Invoke(ITransportReceiveContext context, Func next) { if (context.Message.Headers.ContainsKey(Headers.ControlMessageHeader) && context.Message.Headers["Timeout.Id"] == TestContext.TestRunId.ToString()) { TestContext.FailedTimeoutMovedToError = true; - return; + return Task.FromResult(0); } - await next().ConfigureAwait(false); + return next(context); } public class Registration : RegisterStep diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_timeout_storage_fails.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_timeout_storage_fails.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/TimeoutManager/When_timeout_storage_fails.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_timeout_storage_fails.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_using_external_timeout_manager.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_using_external_timeout_manager.cs new file mode 100644 index 000000000..7a5b77203 --- /dev/null +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/TimeoutManager/When_using_external_timeout_manager.cs @@ -0,0 +1,76 @@ +namespace NServiceBus.AcceptanceTests.DelayedDelivery +{ + using System; + using System.Threading.Tasks; + using AcceptanceTesting; + using AcceptanceTesting.Customization; + using EndpointTemplates; + using Features; + using NServiceBus.Config; + using NUnit.Framework; + using ScenarioDescriptors; + + public class When_using_external_timeout_manager : NServiceBusAcceptanceTest + { + [Test] + public async Task Should_delay_delivery() + { + await Scenario.Define() + .WithEndpoint() + .WithEndpoint(b => b.When((session, c) => + { + var options = new SendOptions(); + + options.DelayDeliveryWith(TimeSpan.FromMilliseconds(2000)); + options.RouteToThisEndpoint(); + + return session.Send(new MyMessage(), options); + })) + .Done(c => c.WasCalled) + .Repeat(r => r.For()) + .Should(c => { Assert.IsTrue(c.TimeoutManagerHeaderDetected); }) + .Run(); + } + + public class Context : ScenarioContext + { + public bool TimeoutManagerHeaderDetected { get; set; } + public bool WasCalled { get; set; } + } + + public class Endpoint : EndpointConfigurationBuilder + { + public Endpoint() + { + var address = Conventions.EndpointNamingConvention(typeof(EndpointWithTimeoutManager)) + ".Timeouts"; + + EndpointSetup(config => config.DisableFeature()) + .WithConfig(c => { c.TimeoutManagerAddress = address; }); + } + + public class MyMessageHandler : IHandleMessages + { + public Context Context { get; set; } + + public Task Handle(MyMessage message, IMessageHandlerContext context) + { + Context.TimeoutManagerHeaderDetected = context.MessageHeaders.ContainsKey("NServiceBus.Timeout.Expire"); + Context.WasCalled = true; + return Task.FromResult(0); + } + } + } + + public class EndpointWithTimeoutManager : EndpointConfigurationBuilder + { + public EndpointWithTimeoutManager() + { + EndpointSetup(config => config.EnableFeature()); + } + } + + public class MyMessage : IMessage + { + } + } +} diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/When_Deferring_a_message.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/When_Deferring_a_message.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/When_Deferring_a_message.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/When_Deferring_a_message.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/When_deferring_a_message_to_the_past.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/When_deferring_a_message_to_the_past.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DelayedDelivery/When_deferring_a_message_to_the_past.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DelayedDelivery/When_deferring_a_message_to_the_past.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DeterministicGuid.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DeterministicGuid.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/DeterministicGuid.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/DeterministicGuid.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_with_config.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_with_config.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_with_config.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_with_config.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_with_custom.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_with_custom.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_with_custom.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_with_custom.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_with_multikey.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_with_multikey.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_with_multikey.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_with_multikey.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_with_unobtrusive_mode.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_with_unobtrusive_mode.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_with_unobtrusive_mode.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_with_unobtrusive_mode.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_without_incoming_key_identifier.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_without_incoming_key_identifier.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_Rijndael_without_incoming_key_identifier.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_Rijndael_without_incoming_key_identifier.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_encryption_with_custom_service.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_encryption_with_custom_service.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Encryption/When_using_encryption_with_custom_service.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Encryption/When_using_encryption_with_custom_service.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/ConfigureExtensions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/ConfigureExtensions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/ConfigureExtensions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/ConfigureExtensions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/DefaultPublisher.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/DefaultPublisher.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/DefaultPublisher.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/DefaultPublisher.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/DefaultServer.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/DefaultServer.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/DefaultServer.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/DefaultServer.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/ServerWithNoDefaultPersistenceDefinitions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/ServerWithNoDefaultPersistenceDefinitions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/EndpointTemplates/ServerWithNoDefaultPersistenceDefinitions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/EndpointTemplates/ServerWithNoDefaultPersistenceDefinitions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Forwarding/When_forwarding_is_configured_for_endpoint.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Forwarding/When_forwarding_is_configured_for_endpoint.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Forwarding/When_forwarding_is_configured_for_endpoint.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Forwarding/When_forwarding_is_configured_for_endpoint.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Forwarding/When_requesting_message_to_be_forwarded.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Forwarding/When_requesting_message_to_be_forwarded.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Forwarding/When_requesting_message_to_be_forwarded.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Forwarding/When_requesting_message_to_be_forwarded.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_a_message_is_audited.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_a_message_is_audited.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_a_message_is_audited.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_a_message_is_audited.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_a_message_is_faulted.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_a_message_is_faulted.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_a_message_is_faulted.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_a_message_is_faulted.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_feature_overrides_hostid.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_feature_overrides_hostid.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_feature_overrides_hostid.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_feature_overrides_hostid.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_feature_overrides_hostinfo.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_feature_overrides_hostinfo.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_feature_overrides_hostinfo.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_feature_overrides_hostinfo.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_overriding_input_queue_name.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_overriding_input_queue_name.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_overriding_input_queue_name.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_overriding_input_queue_name.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_sending_ensure_proper_headers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_sending_ensure_proper_headers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Hosting/When_sending_ensure_proper_headers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Hosting/When_sending_ensure_proper_headers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Licensing/When_a_message_is_audited.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Licensing/When_a_message_is_audited.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Licensing/When_a_message_is_audited.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Licensing/When_a_message_is_audited.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/MessageDrivenPubSubRoutingExtensions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/MessageDrivenPubSubRoutingExtensions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/MessageDrivenPubSubRoutingExtensions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/MessageDrivenPubSubRoutingExtensions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/MessageId/When_message_has_empty_id_header.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/MessageId/When_message_has_empty_id_header.cs similarity index 87% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/MessageId/When_message_has_empty_id_header.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/MessageId/When_message_has_empty_id_header.cs index 7bc3a3e81..1c55e28f1 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/MessageId/When_message_has_empty_id_header.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/MessageId/When_message_has_empty_id_header.cs @@ -23,24 +23,24 @@ public async Task A_message_id_is_generated_by_the_transport_layer() Assert.AreEqual(context.MessageId, context.Headers[Headers.MessageId], "Should populate the NServiceBus.MessageId header with the new value"); } - public class CorruptionBehavior : Behavior + class CorruptionBehavior : IBehavior { - public override Task Invoke(IDispatchContext context, Func next) + public Task Invoke(IDispatchContext context, Func next) { context.Operations.First().Message.Headers[Headers.MessageId] = ""; - return next(); + return next(context); } } - public class Context : ScenarioContext + class Context : ScenarioContext { public bool MessageReceived { get; set; } public string MessageId { get; set; } public IReadOnlyDictionary Headers { get; set; } } - public class Endpoint : EndpointConfigurationBuilder + class Endpoint : EndpointConfigurationBuilder { public Endpoint() { diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/MessageId/When_message_has_no_id_header.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/MessageId/When_message_has_no_id_header.cs similarity index 85% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/MessageId/When_message_has_no_id_header.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/MessageId/When_message_has_no_id_header.cs index bbdffa0cc..ccff3e7d6 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/MessageId/When_message_has_no_id_header.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/MessageId/When_message_has_no_id_header.cs @@ -21,23 +21,23 @@ public async Task A_message_id_is_generated_by_the_transport_layer_on_receiving_ Assert.IsFalse(string.IsNullOrWhiteSpace(context.MessageId)); } - public class CorruptionBehavior : Behavior + class CorruptionBehavior : IBehavior { - public override Task Invoke(IDispatchContext context, Func next) + public Task Invoke(IDispatchContext context, Func next) { context.Operations.First().Message.Headers[Headers.MessageId] = null; - return next(); + return next(context); } } - public class Context : ScenarioContext + class Context : ScenarioContext { public bool MessageReceived { get; set; } public string MessageId { get; set; } } - public class Endpoint : EndpointConfigurationBuilder + class Endpoint : EndpointConfigurationBuilder { public Endpoint() { diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/Issue_1980.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/Issue_1980.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/Issue_1980.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/Issue_1980.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_defining_outgoing_message_mutators.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_defining_outgoing_message_mutators.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_defining_outgoing_message_mutators.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_defining_outgoing_message_mutators.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_incoming_mutator_changes_message_type.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_incoming_mutator_changes_message_type.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_incoming_mutator_changes_message_type.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_incoming_mutator_changes_message_type.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_mutating.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_mutating.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_mutating.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_mutating.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_outgoing_mutator_replaces_instance.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_outgoing_mutator_replaces_instance.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_outgoing_mutator_replaces_instance.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_outgoing_mutator_replaces_instance.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_using_outgoing_tm_mutator.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_using_outgoing_tm_mutator.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Mutators/When_using_outgoing_tm_mutator.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Mutators/When_using_outgoing_tm_mutator.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/NServiceBusAcceptanceTest.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/NServiceBusAcceptanceTest.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/NServiceBusAcceptanceTest.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/NServiceBusAcceptanceTest.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/NonTx/When_sending_inside_ambient_tx.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/NonTx/When_sending_inside_ambient_tx.cs similarity index 91% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/NonTx/When_sending_inside_ambient_tx.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/NonTx/When_sending_inside_ambient_tx.cs index 9e4436d4d..b431c446d 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/NonTx/When_sending_inside_ambient_tx.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/NonTx/When_sending_inside_ambient_tx.cs @@ -42,13 +42,13 @@ public NonTransactionalEndpoint() }); } - class WrapHandlersInScope : Behavior + class WrapHandlersInScope : IBehavior { - public override async Task Invoke(IIncomingLogicalMessageContext context, Func next) + public async Task Invoke(IIncomingLogicalMessageContext context, Func next) { using (var tx = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled)) { - await next(); + await next(context).ConfigureAwait(false); tx.Complete(); } } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/CriticalTime/When_CriticalTime_enabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/CriticalTime/When_CriticalTime_enabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/CriticalTime/When_CriticalTime_enabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/CriticalTime/When_CriticalTime_enabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/CriticalTime/When_deferring_a_message.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/CriticalTime/When_deferring_a_message.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/CriticalTime/When_deferring_a_message.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/CriticalTime/When_deferring_a_message.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/CriticalTime/When_slow_with_CriticalTime_enabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/CriticalTime/When_slow_with_CriticalTime_enabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/CriticalTime/When_slow_with_CriticalTime_enabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/CriticalTime/When_slow_with_CriticalTime_enabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/SLA/When_sending_slow_with_SLA_enabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/SLA/When_sending_slow_with_SLA_enabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/SLA/When_sending_slow_with_SLA_enabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/SLA/When_sending_slow_with_SLA_enabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/SLA/When_sending_with_SLA_enabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/SLA/When_sending_with_SLA_enabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/PerfMon/SLA/When_sending_with_SLA_enabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/PerfMon/SLA/When_sending_with_SLA_enabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired_convention.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired_convention.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired_convention.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/TimeToBeReceived/When_TimeToBeReceived_has_expired_convention.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/TimeToBeReceived/When_TimeToBeReceived_has_not_expired.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/TimeToBeReceived/When_TimeToBeReceived_has_not_expired.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/TimeToBeReceived/When_TimeToBeReceived_has_not_expired.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/TimeToBeReceived/When_TimeToBeReceived_has_not_expired.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/TimeToBeReceived/When_TimeToBeReceived_used_with_unobtrusive_mode.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/TimeToBeReceived/When_TimeToBeReceived_used_with_unobtrusive_mode.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/TimeToBeReceived/When_TimeToBeReceived_used_with_unobtrusive_mode.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/TimeToBeReceived/When_TimeToBeReceived_used_with_unobtrusive_mode.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/When_message_is_audited.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/When_message_is_audited.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/When_message_is_audited.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/When_message_is_audited.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/When_message_is_faulted.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/When_message_is_faulted.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Performance/When_message_is_faulted.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Performance/When_message_is_faulted.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Pipeline/When_replacing_behavior.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Pipeline/When_replacing_behavior.cs similarity index 84% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Pipeline/When_replacing_behavior.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Pipeline/When_replacing_behavior.cs index dde327ace..320975e7d 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Pipeline/When_replacing_behavior.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Pipeline/When_replacing_behavior.cs @@ -30,33 +30,33 @@ class Context : ScenarioContext public bool MessageHandled { get; set; } } - class OriginalBehavior : Behavior + class OriginalBehavior : IBehavior { public OriginalBehavior(Context testContext) { this.testContext = testContext; } - public override Task Invoke(ITransportReceiveContext context, Func next) + public Task Invoke(ITransportReceiveContext context, Func next) { testContext.OriginalBehaviorInvoked = true; - return next(); + return next(context); } Context testContext; } - class ReplacementBehavior : Behavior + class ReplacementBehavior : IBehavior { public ReplacementBehavior(Context testContext) { this.testContext = testContext; } - public override Task Invoke(ITransportReceiveContext context, Func next) + public Task Invoke(ITransportReceiveContext context, Func next) { testContext.ReplacementBehaviorInvoked = true; - return next(); + return next(context); } Context testContext; diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Pipeline/When_using_per_uow_component_in_the_pipeline.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Pipeline/When_using_per_uow_component_in_the_pipeline.cs similarity index 93% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Pipeline/When_using_per_uow_component_in_the_pipeline.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Pipeline/When_using_per_uow_component_in_the_pipeline.cs index 32f28c5c8..1f0e18c4f 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Pipeline/When_using_per_uow_component_in_the_pipeline.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Pipeline/When_using_per_uow_component_in_the_pipeline.cs @@ -67,7 +67,7 @@ public Endpoint() }); } - class HeaderProcessingBehavior : Behavior + class HeaderProcessingBehavior : IBehavior { Context testContext; @@ -76,13 +76,13 @@ public HeaderProcessingBehavior(Context testContext) this.testContext = testContext; } - public override Task Invoke(IIncomingLogicalMessageContext context, Func next) + public Task Invoke(IIncomingLogicalMessageContext context, Func next) { var uowScopeComponent = context.Builder.Build(); testContext.ValueAlreadyInitialized |= uowScopeComponent.ValueFromHeader != null; uowScopeComponent.ValueFromHeader = context.MessageHeaders["Value"]; - return next(); + return next(context); } } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_Subscribing_to_errors.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_Subscribing_to_errors.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_Subscribing_to_errors.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_Subscribing_to_errors.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_custom_policy_always_moves_to_error.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_custom_policy_always_moves_to_error.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_custom_policy_always_moves_to_error.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_custom_policy_always_moves_to_error.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_custom_policy_does_single_delayed_retry_before_move_to_error.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_custom_policy_does_single_delayed_retry_before_move_to_error.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_custom_policy_does_single_delayed_retry_before_move_to_error.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_custom_policy_does_single_delayed_retry_before_move_to_error.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_custom_policy_executed.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_custom_policy_executed.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_custom_policy_executed.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_custom_policy_executed.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_custom_policy_provided.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_custom_policy_provided.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_custom_policy_provided.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_custom_policy_provided.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_delayed_retries_and_counting.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_delayed_retries_and_counting.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_delayed_retries_and_counting.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_delayed_retries_and_counting.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_delayed_retries_with_immediate_retries_disabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_delayed_retries_with_immediate_retries_disabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_delayed_retries_with_immediate_retries_disabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_delayed_retries_with_immediate_retries_disabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_delayed_retries_with_regular_exception.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_delayed_retries_with_regular_exception.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_delayed_retries_with_regular_exception.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_delayed_retries_with_regular_exception.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_delayed_retries_with_serialization_exception.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_delayed_retries_with_serialization_exception.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_delayed_retries_with_serialization_exception.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_delayed_retries_with_serialization_exception.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_fails_with_retries_set_to_0.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_fails_with_retries_set_to_0.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_fails_with_retries_set_to_0.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_fails_with_retries_set_to_0.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_immediate_retries_with_default_settings.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_immediate_retries_with_default_settings.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_immediate_retries_with_default_settings.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_immediate_retries_with_default_settings.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_immediate_retries_with_dtc_on.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_immediate_retries_with_dtc_on.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_immediate_retries_with_dtc_on.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_immediate_retries_with_dtc_on.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_immediate_retries_with_native_transactions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_immediate_retries_with_native_transactions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_immediate_retries_with_native_transactions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_immediate_retries_with_native_transactions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_message_fails_retries.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_message_fails_retries.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_message_fails_retries.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_message_fails_retries.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_message_is_deferred_by_delayed_retries_using_dtc.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_message_is_deferred_by_delayed_retries_using_dtc.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/When_message_is_deferred_by_delayed_retries_using_dtc.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/When_message_is_deferred_by_delayed_retries_using_dtc.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/when_immediate_retries_fail.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/when_immediate_retries_fail.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/Retries/when_immediate_retries_fail.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/Retries/when_immediate_retries_fail.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_custom_policy_moves_to_overridden_error_queue.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_custom_policy_moves_to_overridden_error_queue.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_custom_policy_moves_to_overridden_error_queue.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_custom_policy_moves_to_overridden_error_queue.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_error_is_overridden_in_code.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_error_is_overridden_in_code.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_error_is_overridden_in_code.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_error_is_overridden_in_code.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_is_moved_to_error_queue.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_is_moved_to_error_queue.cs similarity index 96% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_is_moved_to_error_queue.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_is_moved_to_error_queue.cs index e3fe7b2e9..17db41da9 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_is_moved_to_error_queue.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_is_moved_to_error_queue.cs @@ -157,11 +157,11 @@ public Task Handle(SubsequentMessage message, IMessageHandlerContext context) } } - class ThrowingBehavior : Behavior + class ThrowingBehavior : IBehavior { - public override async Task Invoke(ITransportReceiveContext context, Func next) + public async Task Invoke(ITransportReceiveContext context, Func next) { - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); throw new SimulatedException(); } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_is_moved_to_error_queue_using_dtc.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_is_moved_to_error_queue_using_dtc.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_is_moved_to_error_queue_using_dtc.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_is_moved_to_error_queue_using_dtc.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_is_moved_to_error_queue_with_header_customizations.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_is_moved_to_error_queue_with_header_customizations.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_is_moved_to_error_queue_with_header_customizations.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_is_moved_to_error_queue_with_header_customizations.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_with_TimeToBeReceived_fails.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_with_TimeToBeReceived_fails.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Recoverability/When_message_with_TimeToBeReceived_fails.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Recoverability/When_message_with_TimeToBeReceived_fails.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_a_duplicate_message_arrives.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_a_duplicate_message_arrives.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_a_duplicate_message_arrives.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_a_duplicate_message_arrives.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_a_message_is_audited.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_a_message_is_audited.cs similarity index 86% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_a_message_is_audited.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_a_message_is_audited.cs index 4c6e26279..751fc3a6e 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_a_message_is_audited.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_a_message_is_audited.cs @@ -26,12 +26,12 @@ public Task Should_be_dispatched_immediately() .Run(); } - public class Context : ScenarioContext + class Context : ScenarioContext { public bool MessageAudited { get; set; } } - public class EndpointWithAuditOn : EndpointConfigurationBuilder + class EndpointWithAuditOn : EndpointConfigurationBuilder { public EndpointWithAuditOn() { @@ -45,17 +45,17 @@ public EndpointWithAuditOn() .AuditTo(); } - class BlowUpAfterDispatchBehavior : Behavior + class BlowUpAfterDispatchBehavior : IBehavior { - public override async Task Invoke(IBatchDispatchContext context, Func next) + public async Task Invoke(IBatchDispatchContext context, Func next) { if (!context.Operations.Any(op => op.Message.Headers[Headers.EnclosedMessageTypes].Contains(typeof(MessageToBeAudited).Name))) { - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); return; } - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); throw new SimulatedException(); } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_blowing_up_just_after_dispatch.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_blowing_up_just_after_dispatch.cs similarity index 90% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_blowing_up_just_after_dispatch.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_blowing_up_just_after_dispatch.cs index cdf15d0c8..c9a81c238 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_blowing_up_just_after_dispatch.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_blowing_up_just_after_dispatch.cs @@ -41,13 +41,13 @@ public NonDtcReceivingEndpoint() }); } - class BlowUpAfterDispatchBehavior : Behavior + class BlowUpAfterDispatchBehavior : IBehavior { - public override async Task Invoke(IBatchDispatchContext context, Func next) + public async Task Invoke(IBatchDispatchContext context, Func next) { if (!context.Operations.Any(op => op.Message.Headers[Headers.EnclosedMessageTypes].Contains(typeof(PlaceOrder).Name))) { - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); return; } @@ -57,7 +57,7 @@ public override async Task Invoke(IBatchDispatchContext context, Func next return; } - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); called = true; diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_clearing_saga_timeouts.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_clearing_saga_timeouts.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_clearing_saga_timeouts.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_clearing_saga_timeouts.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_dispatching_forwarded_messages.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_dispatching_forwarded_messages.cs similarity index 87% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_dispatching_forwarded_messages.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_dispatching_forwarded_messages.cs index 2322f139b..9cfc9a1f9 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_dispatching_forwarded_messages.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_dispatching_forwarded_messages.cs @@ -26,12 +26,12 @@ public Task Should_be_dispatched_immediately() .Run(); } - public class Context : ScenarioContext + class Context : ScenarioContext { public bool Done { get; set; } } - public class EndpointWithAuditOn : EndpointConfigurationBuilder + class EndpointWithAuditOn : EndpointConfigurationBuilder { public EndpointWithAuditOn() { @@ -45,17 +45,17 @@ public EndpointWithAuditOn() }); } - class BlowUpAfterDispatchBehavior : Behavior + class BlowUpAfterDispatchBehavior : IBehavior { - public override async Task Invoke(IBatchDispatchContext context, Func next) + public async Task Invoke(IBatchDispatchContext context, Func next) { if (!context.Operations.Any(op => op.Message.Headers[Headers.EnclosedMessageTypes].Contains(typeof(MessageToBeForwarded).Name))) { - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); return; } - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); throw new SimulatedException(); } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_receiving_a_message.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_receiving_a_message.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_receiving_a_message.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_receiving_a_message.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_sending_from_a_non_dtc_endpoint.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_sending_from_a_non_dtc_endpoint.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Reliability/Outbox/When_sending_from_a_non_dtc_endpoint.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Reliability/Outbox/When_sending_from_a_non_dtc_endpoint.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs similarity index 93% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs index fabb59667..da10612a1 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga.cs @@ -42,16 +42,16 @@ public Subscriber() .AddMapping(typeof(Subscriber)); //just map to our self for this test } - class SubscriptionSpy : Behavior + class SubscriptionSpy : IBehavior { public SubscriptionSpy(Context testContext) { this.testContext = testContext; } - public override async Task Invoke(ISubscribeContext context, Func next) + public async Task Invoke(ISubscribeContext context, Func next) { - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); testContext.EventsSubscribedTo.Add(context.EventType); } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs similarity index 94% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs index 9556fe8e7..05e829bf3 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_a_saga_autosubscribe_disabled.cs @@ -42,16 +42,16 @@ public Subscriber() .AddMapping(typeof(Subscriber)); //just map to our self for this test } - class SubscriptionSpy : Behavior + class SubscriptionSpy : IBehavior { public SubscriptionSpy(Context testContext) { this.testContext = testContext; } - public override async Task Invoke(ISubscribeContext context, Func next) + public async Task Invoke(ISubscribeContext context, Func next) { - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); testContext.EventsSubscribedTo.Add(context.EventType); } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_autoSubscribe.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_autoSubscribe.cs similarity index 94% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_autoSubscribe.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_autoSubscribe.cs index cc6a36b52..1645c02b3 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_autoSubscribe.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/AutomaticSubscriptions/When_starting_an_endpoint_with_autoSubscribe.cs @@ -48,16 +48,16 @@ public Subscriber() .AddMapping(typeof(Subscriber)); //just map to our self for this test } - class SubscriptionSpy : Behavior + class SubscriptionSpy : IBehavior { public SubscriptionSpy(Context testContext) { this.testContext = testContext; } - public override async Task Invoke(ISubscribeContext context, Func next) + public async Task Invoke(ISubscribeContext context, Func next) { - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); testContext.EventsSubscribedTo.Add(context.EventType); } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_extending_event_routing.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_extending_event_routing.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_extending_event_routing.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_extending_event_routing.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_multi_subscribing_to_a_polymorphic_event.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_multi_subscribing_to_a_polymorphic_event.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_multi_subscribing_to_a_polymorphic_event.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_multi_subscribing_to_a_polymorphic_event.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_publishing_from_sendonly.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_publishing_from_sendonly.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_publishing_from_sendonly.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_publishing_from_sendonly.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_publishing_to_scaled_out_subscribers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_publishing_to_scaled_out_subscribers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_publishing_to_scaled_out_subscribers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_publishing_to_scaled_out_subscribers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_a_route_for_a_derived_event.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_a_route_for_a_derived_event.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_a_route_for_a_derived_event.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_a_route_for_a_derived_event.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_routes_to_base_and_specific_events.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_routes_to_base_and_specific_events.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_routes_to_base_and_specific_events.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_base_event_with_routes_to_base_and_specific_events.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_derived_event.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_derived_event.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_derived_event.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_a_derived_event.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_multiple_publishers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_multiple_publishers.cs similarity index 99% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_multiple_publishers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_multiple_publishers.cs index e44c049a5..40b0f989d 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_multiple_publishers.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_multiple_publishers.cs @@ -69,4 +69,4 @@ class SomeEvent : IEvent { } } -} \ No newline at end of file +} diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_scaled_out_publisher.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_scaled_out_publisher.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_subscribing_to_scaled_out_publisher.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_subscribing_to_scaled_out_publisher.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_unsubscribing_to_scaled_out_publisher.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_unsubscribing_to_scaled_out_publisher.cs new file mode 100644 index 000000000..7220f8b55 --- /dev/null +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_unsubscribing_to_scaled_out_publisher.cs @@ -0,0 +1,71 @@ +namespace NServiceBus.AcceptanceTests.Routing.MessageDrivenSubscriptions +{ + using System.Collections.Generic; + using System.Threading.Tasks; + using AcceptanceTesting; + using AcceptanceTesting.Customization; + using Configuration.AdvanceExtensibility; + using EndpointTemplates; + using NServiceBus.Routing; + using NUnit.Framework; + using ScenarioDescriptors; + + public class When_unsubscribing_to_scaled_out_publisher : NServiceBusAcceptanceTest + { + [Test] + public Task Should_send_unsubscribe_message_to_each_instance() + { + return Scenario.Define() + .WithEndpoint(b => b.CustomConfig(c => c.MakeInstanceUniquelyAddressable("1"))) + .WithEndpoint(b => b.CustomConfig(c => c.MakeInstanceUniquelyAddressable("2"))) + .WithEndpoint(b => b.When(s => s.Unsubscribe())) + .Done(c => c.PublisherReceivedUnsubscribeMessage.Count >= 2) + .Repeat(r => r.For()) + .Should(c => + { + // each instance should receive an unsubscribe message + Assert.That(c.PublisherReceivedUnsubscribeMessage, Does.Contain("1")); + Assert.That(c.PublisherReceivedUnsubscribeMessage, Does.Contain("2")); + Assert.That(c.PublisherReceivedUnsubscribeMessage.Count, Is.EqualTo(2)); + }) + .Run(); + } + + class Context : ScenarioContext + { + public List PublisherReceivedUnsubscribeMessage { get; } = new List(); + } + + class ScaledOutPublisher : EndpointConfigurationBuilder + { + public ScaledOutPublisher() + { + // store the instance discriminator of each instance receiving a unsubscribe message: + EndpointSetup(c => + { + c.OnEndpointUnsubscribed((subscription, context) => + context.PublisherReceivedUnsubscribeMessage.Add(c.GetSettings().Get("EndpointInstanceDiscriminator"))); + }); + } + } + + class Unsubscriber : EndpointConfigurationBuilder + { + public Unsubscriber() + { + EndpointSetup((c, r) => + { + // configure the scaled out publisher instances: + var publisherName = Conventions.EndpointNamingConvention(typeof(ScaledOutPublisher)); + var routing = c.UseTransport(r.GetTransportType()).Routing(); + c.MessageDrivenPubSubRouting().RegisterPublisher(typeof(MyEvent), publisherName); + routing.RegisterEndpointInstances(new EndpointInstance(publisherName, "1"), new EndpointInstance(publisherName, "2")); + }); + } + } + + class MyEvent : IEvent + { + } + } +} \ No newline at end of file diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_using_assembly_level_message_mapping_for_pub_sub.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_using_assembly_level_message_mapping_for_pub_sub.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_using_assembly_level_message_mapping_for_pub_sub.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_using_assembly_level_message_mapping_for_pub_sub.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_using_autosubscribe_with_missing_routing_information.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_using_autosubscribe_with_missing_routing_information.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_using_autosubscribe_with_missing_routing_information.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_using_autosubscribe_with_missing_routing_information.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_using_legacy_routing_configuration.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_using_legacy_routing_configuration.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/MessageDrivenSubscriptions/When_using_legacy_routing_configuration.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/MessageDrivenSubscriptions/When_using_legacy_routing_configuration.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/NativePublishSubscribe/When_multi_subscribing_to_a_polymorphic_event.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/NativePublishSubscribe/When_multi_subscribing_to_a_polymorphic_event.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/NativePublishSubscribe/When_multi_subscribing_to_a_polymorphic_event.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/NativePublishSubscribe/When_multi_subscribing_to_a_polymorphic_event.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/NativePublishSubscribe/When_publishing_to_scaled_out_subscribers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/NativePublishSubscribe/When_publishing_to_scaled_out_subscribers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/NativePublishSubscribe/When_publishing_to_scaled_out_subscribers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/NativePublishSubscribe/When_publishing_to_scaled_out_subscribers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionBehavior.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionBehavior.cs similarity index 55% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionBehavior.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionBehavior.cs index e2949e3fc..e54a6360d 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionBehavior.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionBehavior.cs @@ -1,23 +1,24 @@ namespace NServiceBus.AcceptanceTests.Routing { using System; - using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; using NServiceBus.Pipeline; + using ObjectBuilder; using Transport; - class SubscriptionBehavior : Behavior where TContext : ScenarioContext + class SubscriptionBehavior : IBehavior where TContext : ScenarioContext { - public SubscriptionBehavior(Action action, TContext scenarioContext) + public SubscriptionBehavior(Action action, TContext scenarioContext, MessageIntentEnum intentToHandle) { this.action = action; this.scenarioContext = scenarioContext; + this.intentToHandle = intentToHandle; } - public override async Task Invoke(IIncomingPhysicalMessageContext context, Func next) + public async Task Invoke(IIncomingPhysicalMessageContext context, Func next) { - await next().ConfigureAwait(false); + await next(context).ConfigureAwait(false); var subscriptionMessageType = GetSubscriptionMessageTypeFrom(context.Message); if (subscriptionMessageType != null) { @@ -26,6 +27,13 @@ public override async Task Invoke(IIncomingPhysicalMessageContext context, Func< { context.Message.Headers.TryGetValue(Headers.ReplyToAddress, out returnAddress); } + + var intent = (MessageIntentEnum)Enum.Parse(typeof(MessageIntentEnum), context.Message.Headers[Headers.MessageIntent], true); + if (intent != intentToHandle) + { + return; + } + action(new SubscriptionEventArgs { MessageType = subscriptionMessageType, @@ -36,16 +44,18 @@ public override async Task Invoke(IIncomingPhysicalMessageContext context, Func< static string GetSubscriptionMessageTypeFrom(IncomingMessage msg) { - return (from header in msg.Headers where header.Key == Headers.SubscriptionMessageType select header.Value).FirstOrDefault(); + string headerValue; + return msg.Headers.TryGetValue(Headers.SubscriptionMessageType, out headerValue) ? headerValue : null; } Action action; TContext scenarioContext; + MessageIntentEnum intentToHandle; internal class Registration : RegisterStep { - public Registration() - : base("SubscriptionBehavior", typeof(SubscriptionBehavior), "So we can get subscription events") + public Registration(string id, Func behaviorFactory) + : base(id, typeof(SubscriptionBehavior), "notify subscription events", behaviorFactory) { InsertBeforeIfExists("ProcessSubscriptionRequests"); } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionBehaviorExtensions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionBehaviorExtensions.cs new file mode 100644 index 000000000..e184ef5b4 --- /dev/null +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionBehaviorExtensions.cs @@ -0,0 +1,26 @@ +namespace NServiceBus.AcceptanceTests.Routing +{ + using System; + using AcceptanceTesting; + + static class SubscriptionBehaviorExtensions + { + public static void OnEndpointSubscribed(this EndpointConfiguration configuration, Action action) where TContext : ScenarioContext + { + configuration.Pipeline.Register(new SubscriptionBehavior.Registration("NotifySubscriptionBehavior", builder => + { + var context = builder.Build(); + return new SubscriptionBehavior(action, context, MessageIntentEnum.Subscribe); + })); + } + + public static void OnEndpointUnsubscribed(this EndpointConfiguration configuration, Action action) where TContext : ScenarioContext + { + configuration.Pipeline.Register(new SubscriptionBehavior.Registration("NotifyUnsubscriptionBehavior", builder => + { + var context = builder.Build(); + return new SubscriptionBehavior(action, context, MessageIntentEnum.Unsubscribe); + })); + } + } +} \ No newline at end of file diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionEventArgs.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionEventArgs.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/SubscriptionEventArgs.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/SubscriptionEventArgs.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_base_event_from_2_publishers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_base_event_from_2_publishers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_base_event_from_2_publishers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_base_event_from_2_publishers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_configure_routes_for_unobtrusive_messages.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_configure_routes_for_unobtrusive_messages.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_configure_routes_for_unobtrusive_messages.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_configure_routes_for_unobtrusive_messages.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_extending_command_routing.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_extending_command_routing.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_extending_command_routing.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_extending_command_routing.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_overriding_local_address.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_overriding_local_address.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_overriding_local_address.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_overriding_local_address.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_an_event_implementing_two_unrelated_interfaces.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_an_event_implementing_two_unrelated_interfaces.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_an_event_implementing_two_unrelated_interfaces.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_an_event_implementing_two_unrelated_interfaces.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_an_interface.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_an_interface.cs similarity index 87% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_an_interface.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_an_interface.cs index 94ff75aeb..f4c02f68f 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_an_interface.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_an_interface.cs @@ -35,14 +35,14 @@ await Scenario.Define() .Run(); } - public class Context : ScenarioContext + class Context : ScenarioContext { public bool GotTheEvent { get; set; } public bool Subscribed { get; set; } public Type EventTypePassedToRouting { get; set; } } - public class Publisher : EndpointConfigurationBuilder + class Publisher : EndpointConfigurationBuilder { public Publisher() { @@ -59,24 +59,24 @@ public Publisher() }); } - class EventTypeSpy : Behavior + class EventTypeSpy : IBehavior { public EventTypeSpy(Context testContext) { this.testContext = testContext; } - public override Task Invoke(IOutgoingLogicalMessageContext context, Func next) + public Task Invoke(IOutgoingLogicalMessageContext context, Func next) { testContext.EventTypePassedToRouting = context.Message.MessageType; - return next(); + return next(context); } Context testContext; } } - public class Subscriber : EndpointConfigurationBuilder + class Subscriber : EndpointConfigurationBuilder { public Subscriber() { diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_an_interface_with_unobtrusive.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_an_interface_with_unobtrusive.cs similarity index 88% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_an_interface_with_unobtrusive.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_an_interface_with_unobtrusive.cs index 3f8c10fed..0b8f552a1 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_an_interface_with_unobtrusive.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_an_interface_with_unobtrusive.cs @@ -35,14 +35,14 @@ await Scenario.Define() .Run(); } - public class Context : ScenarioContext + class Context : ScenarioContext { public bool GotTheEvent { get; set; } public bool Subscribed { get; set; } public Type EventTypePassedToRouting { get; set; } } - public class Publisher : EndpointConfigurationBuilder + class Publisher : EndpointConfigurationBuilder { public Publisher() { @@ -60,24 +60,24 @@ public Publisher() }).ExcludeType(); // remove that type from assembly scanning to simulate what would happen with true unobtrusive mode } - class EventTypeSpy : Behavior + class EventTypeSpy : IBehavior { public EventTypeSpy(Context testContext) { this.testContext = testContext; } - public override Task Invoke(IOutgoingLogicalMessageContext context, Func next) + public Task Invoke(IOutgoingLogicalMessageContext context, Func next) { testContext.EventTypePassedToRouting = context.Message.MessageType; - return next(); + return next(context); } Context testContext; } } - public class Subscriber : EndpointConfigurationBuilder + class Subscriber : EndpointConfigurationBuilder { public Subscriber() { diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_using_root_type.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_using_root_type.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_using_root_type.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_using_root_type.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_with_only_local_messagehandlers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_with_only_local_messagehandlers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_with_only_local_messagehandlers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_with_only_local_messagehandlers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_with_overridden_local_address.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_with_overridden_local_address.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_publishing_with_overridden_local_address.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_publishing_with_overridden_local_address.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_registering_publishers_unobtrusive_messages.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_registering_publishers_unobtrusive_messages_code.cs similarity index 56% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_registering_publishers_unobtrusive_messages.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_registering_publishers_unobtrusive_messages_code.cs index 59afc0523..d40272565 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_registering_publishers_unobtrusive_messages.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_registering_publishers_unobtrusive_messages_code.cs @@ -7,32 +7,15 @@ using AcceptanceTesting.Customization; using ScenarioDescriptors; - public class When_registering_publishers_unobtrusive_messages : NServiceBusAcceptanceTest + public class When_registering_publishers_unobtrusive_messages_code : NServiceBusAcceptanceTest { [Test] - public Task Should_use_routes_from_routing_api() + public Task Should_deliver_event() { return Scenario.Define() .WithEndpoint(e => e .When(c => c.Subscribed, s => s.Publish(new SomeEvent()))) - .WithEndpoint() - .Done(c => c.ReceivedMessage) - .Repeat(r => r.For()) - .Should(context => - { - Assert.That(context.Subscribed, Is.True); - Assert.That(context.ReceivedMessage, Is.True); - }) - .Run(); - } - - [Test] - public Task Should_use_routes_from_endpoint_mapping() - { - return Scenario.Define() - .WithEndpoint(e => e - .When(c => c.Subscribed, s => s.Publish(new SomeEvent()))) - .WithEndpoint() + .WithEndpoint() .Done(c => c.ReceivedMessage) .Repeat(r => r.For()) .Should(context => @@ -61,9 +44,9 @@ public Publisher() } } - public class SubscriberUsingRoutingApi : EndpointConfigurationBuilder + public class Subscriber : EndpointConfigurationBuilder { - public SubscriberUsingRoutingApi() + public Subscriber() { EndpointSetup(c => { @@ -90,32 +73,6 @@ public Task Handle(SomeEvent message, IMessageHandlerContext context) } } - public class SubscriberUsingEndpointMappings : EndpointConfigurationBuilder - { - public SubscriberUsingEndpointMappings() - { - EndpointSetup(c => c - .Conventions().DefiningEventsAs(t => t == typeof(SomeEvent))) - .AddMapping(typeof(Publisher)); - } - - public class EventHandler : IHandleMessages - { - Context testContext; - - public EventHandler(Context testContext) - { - this.testContext = testContext; - } - - public Task Handle(SomeEvent message, IMessageHandlerContext context) - { - testContext.ReceivedMessage = true; - return Task.FromResult(0); - } - } - } - public class SomeEvent { } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_registering_publishers_unobtrusive_messages_config.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_registering_publishers_unobtrusive_messages_config.cs new file mode 100644 index 000000000..0ef0e1077 --- /dev/null +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_registering_publishers_unobtrusive_messages_config.cs @@ -0,0 +1,76 @@ +namespace NServiceBus.AcceptanceTests.Routing +{ + using System.Threading.Tasks; + using AcceptanceTesting; + using EndpointTemplates; + using NUnit.Framework; + using ScenarioDescriptors; + + public class When_registering_publishers_unobtrusive_messages_config : NServiceBusAcceptanceTest + { + [Test] + public Task Should_deliver_event() + { + return Scenario.Define() + .WithEndpoint(e => e + .When(c => c.Subscribed, s => s.Publish(new SomeEvent()))) + .WithEndpoint() + .Done(c => c.ReceivedMessage) + .Repeat(r => r.For()) + .Should(context => + { + Assert.That(context.Subscribed, Is.True); + Assert.That(context.ReceivedMessage, Is.True); + }) + .Run(); + } + + public class Context : ScenarioContext + { + public bool Subscribed { get; set; } + public bool ReceivedMessage { get; set; } + } + + public class Publisher : EndpointConfigurationBuilder + { + public Publisher() + { + EndpointSetup(c => + { + c.OnEndpointSubscribed((e, ctx) => ctx.Subscribed = true); + c.Conventions().DefiningEventsAs(t => t == typeof(SomeEvent)); + }).ExcludeType(); + } + } + + public class Subscriber : EndpointConfigurationBuilder + { + public Subscriber() + { + EndpointSetup(c => c + .Conventions().DefiningEventsAs(t => t == typeof(SomeEvent))) + .AddMapping(typeof(Publisher)); + } + + public class EventHandler : IHandleMessages + { + Context testContext; + + public EventHandler(Context testContext) + { + this.testContext = testContext; + } + + public Task Handle(SomeEvent message, IMessageHandlerContext context) + { + testContext.ReceivedMessage = true; + return Task.FromResult(0); + } + } + } + + public class SomeEvent + { + } + } +} \ No newline at end of file diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_replying_to_message.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_replying_to_message.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_replying_to_message.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_replying_to_message.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_replying_to_message_with_interface_and_unobtrusive.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_replying_to_message_with_interface_and_unobtrusive.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_replying_to_message_with_interface_and_unobtrusive.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_replying_to_message_with_interface_and_unobtrusive.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_sending_a_base_command.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_sending_a_base_command.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_sending_a_base_command.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_sending_a_base_command.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_sending_non_message_with_routing_configured_by_assembly.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_sending_non_message_with_routing_configured_by_assembly.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_sending_non_message_with_routing_configured_by_assembly.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_sending_non_message_with_routing_configured_by_assembly.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_sending_non_message_with_routing_configured_by_type.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_sending_non_message_with_routing_configured_by_type.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_sending_non_message_with_routing_configured_by_type.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_sending_non_message_with_routing_configured_by_type.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_sending_non_message_with_routing_configured_via_mappings.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_sending_non_message_with_routing_configured_via_mappings.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_sending_non_message_with_routing_configured_via_mappings.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_sending_non_message_with_routing_configured_via_mappings.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_using_instance_ids.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_using_instance_ids.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/When_using_instance_ids.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/When_using_instance_ids.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/when_replying_to_a_message_sent_to_specific_instance.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/when_replying_to_a_message_sent_to_specific_instance.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Routing/when_replying_to_a_message_sent_to_specific_instance.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Routing/when_replying_to_a_message_sent_to_specific_instance.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/RunDescriptorExtensions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/RunDescriptorExtensions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/RunDescriptorExtensions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/RunDescriptorExtensions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_base_class_mapped_is_handled_by_a_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_base_class_mapped_is_handled_by_a_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_base_class_mapped_is_handled_by_a_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_base_class_mapped_is_handled_by_a_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_base_class_message_starts_a_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_base_class_message_starts_a_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_base_class_message_starts_a_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_base_class_message_starts_a_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_existing_saga_instance_exists.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_existing_saga_instance_exists.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_existing_saga_instance_exists.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_existing_saga_instance_exists.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_finder_exists.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_finder_exists.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_finder_exists.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_finder_exists.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_finder_exists_and_context_information_added.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_finder_exists_and_context_information_added.cs similarity index 89% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_finder_exists_and_context_information_added.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_finder_exists_and_context_information_added.cs index 1806de8a7..6a3039ebc 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_finder_exists_and_context_information_added.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_finder_exists_and_context_information_added.cs @@ -27,13 +27,13 @@ public async Task Should_make_context_information_available() Assert.AreEqual("SomeData", context.ContextBag.Get().SomeData); } - public class Context : ScenarioContext + class Context : ScenarioContext { public bool FinderUsed { get; set; } public ReadOnlyContextBag ContextBag { get; set; } } - public class SagaEndpoint : EndpointConfigurationBuilder + class SagaEndpoint : EndpointConfigurationBuilder { public SagaEndpoint() { @@ -74,16 +74,16 @@ public class SagaData07 : ContainSagaData } } - public class BehaviorWhichAddsThingsToTheContext : Behavior + public class BehaviorWhichAddsThingsToTheContext : IBehavior { - public override Task Invoke(IIncomingPhysicalMessageContext context, Func next) + public Task Invoke(IIncomingPhysicalMessageContext context, Func next) { context.Extensions.Set(new State { SomeData = "SomeData" }); - return next(); + return next(context); } public class State diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_finder_exists_and_found_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_finder_exists_and_found_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_a_finder_exists_and_found_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_a_finder_exists_and_found_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_an_endpoint_replies_to_a_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_an_endpoint_replies_to_a_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_an_endpoint_replies_to_a_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_an_endpoint_replies_to_a_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_auto_correlated_property_is_changed.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_auto_correlated_property_is_changed.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_auto_correlated_property_is_changed.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_auto_correlated_property_is_changed.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_doing_request_response_between_sagas.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_doing_request_response_between_sagas.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_doing_request_response_between_sagas.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_doing_request_response_between_sagas.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_doing_request_response_between_sagas_first_handler_responding.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_doing_request_response_between_sagas_first_handler_responding.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_doing_request_response_between_sagas_first_handler_responding.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_doing_request_response_between_sagas_first_handler_responding.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_doing_request_response_between_sagas_response_from_noninitiating.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_doing_request_response_between_sagas_response_from_noninitiating.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_doing_request_response_between_sagas_response_from_noninitiating.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_doing_request_response_between_sagas_response_from_noninitiating.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_doing_request_response_between_sagas_with_timeout.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_doing_request_response_between_sagas_with_timeout.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_doing_request_response_between_sagas_with_timeout.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_doing_request_response_between_sagas_with_timeout.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_forgetting_to_set_a_corr_property.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_forgetting_to_set_a_corr_property.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_forgetting_to_set_a_corr_property.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_forgetting_to_set_a_corr_property.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_message_has_a_saga_id.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_message_has_a_saga_id.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_message_has_a_saga_id.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_message_has_a_saga_id.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_receiving_that_completes_the_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_receiving_that_completes_the_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_receiving_that_completes_the_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_receiving_that_completes_the_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_receiving_that_should_start_a_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_receiving_that_should_start_a_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_receiving_that_should_start_a_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_receiving_that_should_start_a_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_receiving_that_should_start_a_saga_with_interception.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_receiving_that_should_start_a_saga_with_interception.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_receiving_that_should_start_a_saga_with_interception.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_receiving_that_should_start_a_saga_with_interception.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_receiving_that_should_start_a_saga_without_interception.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_receiving_that_should_start_a_saga_without_interception.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_receiving_that_should_start_a_saga_without_interception.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_receiving_that_should_start_a_saga_without_interception.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_replies_to_message_published_by_a_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_replies_to_message_published_by_a_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_replies_to_message_published_by_a_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_replies_to_message_published_by_a_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_handles_unmapped_message.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_handles_unmapped_message.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_handles_unmapped_message.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_handles_unmapped_message.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_has_a_non_empty_constructor.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_has_a_non_empty_constructor.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_has_a_non_empty_constructor.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_has_a_non_empty_constructor.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_id_changed.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_id_changed.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_id_changed.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_id_changed.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_is_mapped_to_complex_expression.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_is_mapped_to_complex_expression.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_is_mapped_to_complex_expression.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_is_mapped_to_complex_expression.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_message_goes_through_delayed_retries.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_message_goes_through_delayed_retries.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_saga_message_goes_through_delayed_retries.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_message_goes_through_delayed_retries.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_started_concurrently.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_started_concurrently.cs new file mode 100644 index 000000000..06e41f873 --- /dev/null +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_saga_started_concurrently.cs @@ -0,0 +1,150 @@ +namespace NServiceBus.AcceptanceTests.Sagas +{ + using System; + using System.Threading.Tasks; + using AcceptanceTesting; + using EndpointTemplates; + using NUnit.Framework; + + public class When_saga_started_concurrently : NServiceBusAcceptanceTest + { + [Test] + public async Task Should_start_single_saga() + { + var context = await Scenario.Define(c => { c.SomeId = Guid.NewGuid().ToString(); }) + .WithEndpoint(b => + { + b.When((session, ctx) => + { + var t1 = session.SendLocal(new StartMessageOne + { + SomeId = ctx.SomeId + }); + var t2 = session.SendLocal(new StartMessageTwo + { + SomeId = ctx.SomeId + }); + return Task.WhenAll(t1, t2); + }); + }) + .Done(c => c.PlacedSagaId != Guid.Empty && c.BilledSagaId != Guid.Empty) + .Run(); + + Assert.AreNotEqual(Guid.Empty, context.PlacedSagaId); + Assert.AreNotEqual(Guid.Empty, context.BilledSagaId); + Assert.AreEqual(context.PlacedSagaId, context.BilledSagaId, "Both messages should have been handled by the same saga, but SagaIds don't match."); + } + + class Context : ScenarioContext + { + public string SomeId { get; set; } + public Guid PlacedSagaId { get; set; } + public Guid BilledSagaId { get; set; } + public bool SagaCompleted { get; set; } + } + + class ConcurrentHandlerEndpoint : EndpointConfigurationBuilder + { + public ConcurrentHandlerEndpoint() + { + EndpointSetup(b => + { + b.LimitMessageProcessingConcurrencyTo(2); + b.Recoverability().Immediate(immediate => immediate.NumberOfRetries(3)); + }); + } + + class ConcurrentlyStartedSaga : Saga, + IAmStartedByMessages, + IAmStartedByMessages + { + public Context Context { get; set; } + + public async Task Handle(StartMessageOne message, IMessageHandlerContext context) + { + Data.Placed = true; + await context.SendLocal(new SuccessfulProcessing + { + SagaId = Data.Id, + Type = nameof(StartMessageOne) + }); + CheckForCompletion(context); + } + + public async Task Handle(StartMessageTwo message, IMessageHandlerContext context) + { + Data.Billed = true; + await context.SendLocal(new SuccessfulProcessing + { + SagaId = Data.Id, + Type = nameof(StartMessageTwo) + }); + CheckForCompletion(context); + } + + protected override void ConfigureHowToFindSaga(SagaPropertyMapper mapper) + { + mapper.ConfigureMapping(msg => msg.SomeId).ToSaga(saga => saga.OrderId); + mapper.ConfigureMapping(msg => msg.SomeId).ToSaga(saga => saga.OrderId); + } + + void CheckForCompletion(IMessageHandlerContext context) + { + if (!Data.Billed || !Data.Placed) + { + return; + } + MarkAsComplete(); + Context.SagaCompleted = true; + } + } + + class ConcurrentlyStartedSagaData : ContainSagaData + { + public virtual string OrderId { get; set; } + public virtual bool Placed { get; set; } + public virtual bool Billed { get; set; } + } + + // Intercepts the messages sent out by the saga + class LogSuccessfulHandler : IHandleMessages + { + public Context Context { get; set; } + + public Task Handle(SuccessfulProcessing message, IMessageHandlerContext context) + { + if (message.Type == nameof(StartMessageOne)) + { + Context.PlacedSagaId = message.SagaId; + } + else if (message.Type == nameof(StartMessageTwo)) + { + Context.BilledSagaId = message.SagaId; + } + else + { + throw new Exception("Unknown type"); + } + + return Task.FromResult(0); + } + } + } + + class StartMessageOne : ICommand + { + public string SomeId { get; set; } + } + + class StartMessageTwo : ICommand + { + public string SomeId { get; set; } + } + + class SuccessfulProcessing : ICommand + { + public string Type { get; set; } + public Guid SagaId { get; set; } + } + } +} \ No newline at end of file diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_sagas_cant_be_found.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_sagas_cant_be_found.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_sagas_cant_be_found.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_sagas_cant_be_found.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_sending_from_a_saga_handle.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_sending_from_a_saga_handle.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_sending_from_a_saga_handle.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_sending_from_a_saga_handle.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_sending_from_a_saga_timeout.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_sending_from_a_saga_timeout.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_sending_from_a_saga_timeout.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_sending_from_a_saga_timeout.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_started_by_base_event_from_other_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_started_by_base_event_from_other_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_started_by_base_event_from_other_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_started_by_base_event_from_other_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_started_by_event_from_another_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_started_by_event_from_another_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_started_by_event_from_another_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_started_by_event_from_another_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_timeout_hit_not_found_saga.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_timeout_hit_not_found_saga.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_timeout_hit_not_found_saga.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_timeout_hit_not_found_saga.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_two_sagas_subscribe_to_the_same_event.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_two_sagas_subscribe_to_the_same_event.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_two_sagas_subscribe_to_the_same_event.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_two_sagas_subscribe_to_the_same_event.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_updating_existing_correlation_property.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_updating_existing_correlation_property.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_updating_existing_correlation_property.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_updating_existing_correlation_property.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_using_ReplyToOriginator.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_using_ReplyToOriginator.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_using_ReplyToOriginator.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_using_ReplyToOriginator.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_using_a_received_message_for_timeout.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_using_a_received_message_for_timeout.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_using_a_received_message_for_timeout.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_using_a_received_message_for_timeout.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_using_contain_saga_data.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_using_contain_saga_data.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/When_using_contain_saga_data.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/When_using_contain_saga_data.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/when_receiving_multiple_timeouts.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/when_receiving_multiple_timeouts.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/when_receiving_multiple_timeouts.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/when_receiving_multiple_timeouts.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/when_reply_from_saga_not_found_handler.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/when_reply_from_saga_not_found_handler.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Sagas/when_reply_from_saga_not_found_handler.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Sagas/when_reply_from_saga_not_found_handler.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Satellites/When_a_message_is_available.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Satellites/When_a_message_is_available.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Satellites/When_a_message_is_available.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Satellites/When_a_message_is_available.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/AllOutboxCapableStorages.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/AllOutboxCapableStorages.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/AllOutboxCapableStorages.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/AllOutboxCapableStorages.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/AllTransports.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/AllTransports.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/AllTransports.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/AllTransports.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/Builders.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/Builders.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/Builders.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/Builders.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/EnvironmentHelper.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/EnvironmentHelper.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/EnvironmentHelper.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/EnvironmentHelper.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/Persistence.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/Persistence.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/Persistence.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/Persistence.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/Serializers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/Serializers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/Serializers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/Serializers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/Transports.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/Transports.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/ScenarioDescriptors/Transports.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/ScenarioDescriptors/Transports.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Scheduling/When_scheduling_a_recurring_task.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Scheduling/When_scheduling_a_recurring_task.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Scheduling/When_scheduling_a_recurring_task.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Scheduling/When_scheduling_a_recurring_task.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/SelfVerification/When_running_saga_tests.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/SelfVerification/When_running_saga_tests.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/SelfVerification/When_running_saga_tests.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/SelfVerification/When_running_saga_tests.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_configuring_custom_xml_namespace.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_configuring_custom_xml_namespace.cs similarity index 97% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_configuring_custom_xml_namespace.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_configuring_custom_xml_namespace.cs index 38069ce4e..459314f74 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_configuring_custom_xml_namespace.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_configuring_custom_xml_namespace.cs @@ -10,7 +10,7 @@ public class When_configuring_custom_xml_namespace : NServiceBusAcceptanceTest { - const string CustomXmlNamespace = "http://particular.net"; + const string CustomXmlNamespace = "https://particular.net"; [Test] public async Task Should_use_as_root_namespace_in_messages() diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_registering_additional_deserializers.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_registering_additional_deserializers.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_registering_additional_deserializers.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_registering_additional_deserializers.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_registering_custom_serializer.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_registering_custom_serializer.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_registering_custom_serializer.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_registering_custom_serializer.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_registering_deserializers_with_settings.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_registering_deserializers_with_settings.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_registering_deserializers_with_settings.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_registering_deserializers_with_settings.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_sanitizing_xml_messages.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_sanitizing_xml_messages.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_sanitizing_xml_messages.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_sanitizing_xml_messages.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_skip_wrapping_xml.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_skip_wrapping_xml.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_skip_wrapping_xml.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_skip_wrapping_xml.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_wrapping_is_not_skipped.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_wrapping_is_not_skipped.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_wrapping_is_not_skipped.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_wrapping_is_not_skipped.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_xml_serializer_used_with_unobtrusive_mode.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_xml_serializer_used_with_unobtrusive_mode.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Serialization/When_xml_serializer_used_with_unobtrusive_mode.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Serialization/When_xml_serializer_used_with_unobtrusive_mode.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Timeout/CyclingOutageTimeoutPersister.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Timeout/CyclingOutageTimeoutPersister.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Timeout/CyclingOutageTimeoutPersister.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Timeout/CyclingOutageTimeoutPersister.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Timeout/When_timeout_storage_is_unavailable_temporarily.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Timeout/When_timeout_storage_is_unavailable_temporarily.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Timeout/When_timeout_storage_is_unavailable_temporarily.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Timeout/When_timeout_storage_is_unavailable_temporarily.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/FakePromotableResourceManager.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/FakePromotableResourceManager.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/FakePromotableResourceManager.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/FakePromotableResourceManager.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_using_scope_suppress.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_using_scope_suppress.cs similarity index 95% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_using_scope_suppress.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_using_scope_suppress.cs index f7beccbc5..ebcb8435b 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_using_scope_suppress.cs +++ b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_using_scope_suppress.cs @@ -24,7 +24,7 @@ public Task Should_dispatch_immediately() .Should(c => { Assert.True(c.MessageDispatched, "Should dispatch the message immediately"); - Assert.True(c.Logs.Any(l => l.Level == LogLevel.Warn && l.Message.Contains("We detected that you suppressed the ambient transaction"))); + Assert.True(c.Logs.Any(l => l.Level == LogLevel.Warn && l.Message.Contains("Suppressed ambient transaction detected when requesting the outgoing operation"))); }) .Run(); } diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_least_once.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_least_once.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_least_once.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_least_once.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_most_once.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_most_once.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_most_once.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_at_most_once.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_exactly_once.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_exactly_once.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_exactly_once.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/ImmediateDispatch/When_requesting_immediate_dispatch_with_exactly_once.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/Issue_2481.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/Issue_2481.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/Issue_2481.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/Issue_2481.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/When_receiving_with_dtc_enabled.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/When_receiving_with_dtc_enabled.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/When_receiving_with_dtc_enabled.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/When_receiving_with_dtc_enabled.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/When_receiving_with_native_multi_queue_transaction.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/When_receiving_with_native_multi_queue_transaction.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/When_receiving_with_native_multi_queue_transaction.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/When_receiving_with_native_multi_queue_transaction.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/When_receiving_with_the_default_settings.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/When_receiving_with_the_default_settings.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/When_receiving_with_the_default_settings.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/When_receiving_with_the_default_settings.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/When_sending_within_an_ambient_transaction.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/When_sending_within_an_ambient_transaction.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Tx/When_sending_within_an_ambient_transaction.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Tx/When_sending_within_an_ambient_transaction.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/UnicastRoutingExtensions.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/UnicastRoutingExtensions.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/UnicastRoutingExtensions.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/UnicastRoutingExtensions.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Versioning/When_multiple_versions_of_a_message_is_published.cs b/src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Versioning/When_multiple_versions_of_a_message_is_published.cs similarity index 100% rename from src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0-rc0001/Versioning/When_multiple_versions_of_a_message_is_published.cs rename to src/NServiceBus.SqlServer.AcceptanceTests/App_Packages/NSB.AcceptanceTests.6.0.0/Versioning/When_multiple_versions_of_a_message_is_published.cs diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj b/src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj index 3b6cc20f4..9638a8279 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj +++ b/src/NServiceBus.SqlServer.AcceptanceTests/NServiceBus.SqlServer.AcceptanceTests.csproj @@ -44,11 +44,11 @@ - ..\packages\NServiceBus.AcceptanceTesting.6.0.0-rc0001\lib\net452\NServiceBus.AcceptanceTesting.dll + ..\packages\NServiceBus.AcceptanceTesting.6.0.0\lib\net452\NServiceBus.AcceptanceTesting.dll True - ..\packages\NServiceBus.6.0.0-rc0001\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.6.0.0\lib\net452\NServiceBus.Core.dll True @@ -72,247 +72,251 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/packages.config b/src/NServiceBus.SqlServer.AcceptanceTests/packages.config index ed363303d..b2aa8d60a 100644 --- a/src/NServiceBus.SqlServer.AcceptanceTests/packages.config +++ b/src/NServiceBus.SqlServer.AcceptanceTests/packages.config @@ -1,8 +1,8 @@  - - - + + + \ No newline at end of file diff --git a/src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj b/src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj index cf1ac4ec8..4c84e8015 100644 --- a/src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj +++ b/src/NServiceBus.SqlServer.IntegrationTests/NServiceBus.SqlServer.IntegrationTests.csproj @@ -49,11 +49,11 @@ True - ..\packages\NServiceBus.6.0.0-rc0001\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.6.0.0\lib\net452\NServiceBus.Core.dll True - ..\packages\NServiceBus.NHibernate.7.0.0-rc0001\lib\net452\NServiceBus.NHibernate.dll + ..\packages\NServiceBus.NHibernate.7.0.0\lib\net452\NServiceBus.NHibernate.dll True diff --git a/src/NServiceBus.SqlServer.IntegrationTests/packages.config b/src/NServiceBus.SqlServer.IntegrationTests/packages.config index db446906a..a70dadaba 100644 --- a/src/NServiceBus.SqlServer.IntegrationTests/packages.config +++ b/src/NServiceBus.SqlServer.IntegrationTests/packages.config @@ -2,7 +2,7 @@ - - + + \ No newline at end of file diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/IConfigureTransportInfrastructure.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/IConfigureTransportInfrastructure.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/IConfigureTransportInfrastructure.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/IConfigureTransportInfrastructure.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/NServiceBusTransportTest.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/NServiceBusTransportTest.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/NServiceBusTransportTest.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/NServiceBusTransportTest.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/TransportConfigurationResult.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/TransportConfigurationResult.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/TransportConfigurationResult.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/TransportConfigurationResult.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/TypeScanner.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/TypeScanner.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/TypeScanner.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/TypeScanner.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_failure_happens_after_send.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_failure_happens_after_send.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_failure_happens_after_send.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_failure_happens_after_send.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_message_is_available.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_message_is_available.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_message_is_available.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_message_is_available.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_on_error_throws.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_on_error_throws.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_on_error_throws.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_on_error_throws.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_on_message_throws.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_on_message_throws.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_on_message_throws.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_on_message_throws.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_on_message_throws_after_delayed_retry.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_on_message_throws_after_delayed_retry.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_on_message_throws_after_delayed_retry.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_on_message_throws_after_delayed_retry.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_on_message_throws_after_immediate_retry.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_on_message_throws_after_immediate_retry.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_on_message_throws_after_immediate_retry.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_on_message_throws_after_immediate_retry.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_requesting_immediate_retry.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_requesting_immediate_retry.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_requesting_immediate_retry.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_requesting_immediate_retry.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_scope_dispose_throws.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_scope_dispose_throws.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_scope_dispose_throws.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_scope_dispose_throws.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_sending_from_on_error.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_sending_from_on_error.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_sending_from_on_error.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_sending_from_on_error.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_user_aborts_processing.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_user_aborts_processing.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_user_aborts_processing.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_user_aborts_processing.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_using_non_durable_delivery.cs b/src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_using_non_durable_delivery.cs similarity index 100% rename from src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0-rc0001/When_using_non_durable_delivery.cs rename to src/NServiceBus.SqlServer.TransportTests/App_Packages/NSB.TransportTests.6.0.0/When_using_non_durable_delivery.cs diff --git a/src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj b/src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj index d555089f9..5c1ccfa54 100644 --- a/src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj +++ b/src/NServiceBus.SqlServer.TransportTests/NServiceBus.SqlServer.TransportTests.csproj @@ -32,7 +32,7 @@ - ..\packages\NServiceBus.6.0.0-rc0001\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.6.0.0\lib\net452\NServiceBus.Core.dll True @@ -60,21 +60,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/NServiceBus.SqlServer.TransportTests/packages.config b/src/NServiceBus.SqlServer.TransportTests/packages.config index f59dc6656..751e72efe 100644 --- a/src/NServiceBus.SqlServer.TransportTests/packages.config +++ b/src/NServiceBus.SqlServer.TransportTests/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj b/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj index 9a4e66ed0..9c3ea133a 100644 --- a/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj +++ b/src/NServiceBus.SqlServer.UnitTests/NServiceBus.SqlServer.UnitTests.csproj @@ -69,7 +69,7 @@ True - ..\packages\NServiceBus.6.0.0-rc0001\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.6.0.0\lib\net452\NServiceBus.Core.dll True diff --git a/src/NServiceBus.SqlServer.UnitTests/packages.config b/src/NServiceBus.SqlServer.UnitTests/packages.config index bdd39238d..8d759ac59 100644 --- a/src/NServiceBus.SqlServer.UnitTests/packages.config +++ b/src/NServiceBus.SqlServer.UnitTests/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj b/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj index 97f7e46d4..4684d9870 100644 --- a/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj +++ b/src/NServiceBus.SqlServer/NServiceBus.SqlServer.csproj @@ -56,7 +56,7 @@ - ..\packages\NServiceBus.6.0.0-rc0001\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.6.0.0\lib\net452\NServiceBus.Core.dll True diff --git a/src/NServiceBus.SqlServer/packages.config b/src/NServiceBus.SqlServer/packages.config index a795f7e44..971b4b56f 100644 --- a/src/NServiceBus.SqlServer/packages.config +++ b/src/NServiceBus.SqlServer/packages.config @@ -3,7 +3,7 @@ - +