diff --git a/src/Packaging.NServiceBus.AmazonSQS/Packaging.NServiceBus.AmazonSQS.csproj b/src/Packaging.NServiceBus.AmazonSQS/Packaging.NServiceBus.AmazonSQS.csproj index 92bf33f..9eba00f 100644 --- a/src/Packaging.NServiceBus.AmazonSQS/Packaging.NServiceBus.AmazonSQS.csproj +++ b/src/Packaging.NServiceBus.AmazonSQS/Packaging.NServiceBus.AmazonSQS.csproj @@ -55,7 +55,7 @@ ..\packages\NServiceBus.AmazonSQS.4.1.2\lib\net452\NServiceBus.AmazonSQS.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll @@ -77,7 +77,7 @@ - + diff --git a/src/Packaging.NServiceBus.AmazonSQS/packages.config b/src/Packaging.NServiceBus.AmazonSQS/packages.config index 1f9d165..262a99e 100644 --- a/src/Packaging.NServiceBus.AmazonSQS/packages.config +++ b/src/Packaging.NServiceBus.AmazonSQS/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/Packaging.NServiceBus.AzureStorageQueues/Packaging.NServiceBus.AzureStorageQueues.csproj b/src/Packaging.NServiceBus.AzureStorageQueues/Packaging.NServiceBus.AzureStorageQueues.csproj index d8383f3..770d13d 100644 --- a/src/Packaging.NServiceBus.AzureStorageQueues/Packaging.NServiceBus.AzureStorageQueues.csproj +++ b/src/Packaging.NServiceBus.AzureStorageQueues/Packaging.NServiceBus.AzureStorageQueues.csproj @@ -42,7 +42,13 @@ + + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll + + + + @@ -51,7 +57,7 @@ - + diff --git a/src/Packaging.NServiceBus.AzureStorageQueues/packages.config b/src/Packaging.NServiceBus.AzureStorageQueues/packages.config index b2a3719..65912b9 100644 --- a/src/Packaging.NServiceBus.AzureStorageQueues/packages.config +++ b/src/Packaging.NServiceBus.AzureStorageQueues/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/Packaging.NServiceBus.MSMQ/Packaging.NServiceBus.MSMQ.csproj b/src/Packaging.NServiceBus.MSMQ/Packaging.NServiceBus.MSMQ.csproj index c487344..d64c496 100644 --- a/src/Packaging.NServiceBus.MSMQ/Packaging.NServiceBus.MSMQ.csproj +++ b/src/Packaging.NServiceBus.MSMQ/Packaging.NServiceBus.MSMQ.csproj @@ -43,7 +43,7 @@ - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Transport.Msmq.1.0.0\lib\net452\NServiceBus.Transport.Msmq.dll @@ -59,7 +59,7 @@ - + diff --git a/src/Packaging.NServiceBus.MSMQ/packages.config b/src/Packaging.NServiceBus.MSMQ/packages.config index fa9b84a..7f7fb74 100644 --- a/src/Packaging.NServiceBus.MSMQ/packages.config +++ b/src/Packaging.NServiceBus.MSMQ/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Packaging.NServiceBus.RabbitMQ/Packaging.NServiceBus.RabbitMQ.csproj b/src/Packaging.NServiceBus.RabbitMQ/Packaging.NServiceBus.RabbitMQ.csproj index 4abc95a..910bf77 100644 --- a/src/Packaging.NServiceBus.RabbitMQ/Packaging.NServiceBus.RabbitMQ.csproj +++ b/src/Packaging.NServiceBus.RabbitMQ/Packaging.NServiceBus.RabbitMQ.csproj @@ -46,7 +46,7 @@ ..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.RabbitMQ.5.0.1\lib\net452\NServiceBus.Transport.RabbitMQ.dll @@ -66,7 +66,7 @@ - + diff --git a/src/Packaging.NServiceBus.RabbitMQ/packages.config b/src/Packaging.NServiceBus.RabbitMQ/packages.config index 2776123..1b38bf6 100644 --- a/src/Packaging.NServiceBus.RabbitMQ/packages.config +++ b/src/Packaging.NServiceBus.RabbitMQ/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/Packaging.NServiceBus.SQLServer/Packaging.NServiceBus.SQLServer.csproj b/src/Packaging.NServiceBus.SQLServer/Packaging.NServiceBus.SQLServer.csproj index 06b2870..14b5060 100644 --- a/src/Packaging.NServiceBus.SQLServer/Packaging.NServiceBus.SQLServer.csproj +++ b/src/Packaging.NServiceBus.SQLServer/Packaging.NServiceBus.SQLServer.csproj @@ -40,7 +40,7 @@ - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.SqlServer.4.1.0\lib\net452\NServiceBus.Transport.SqlServer.dll @@ -67,7 +67,7 @@ - + diff --git a/src/Packaging.NServiceBus.SQLServer/packages.config b/src/Packaging.NServiceBus.SQLServer/packages.config index 60d0950..09affe6 100644 --- a/src/Packaging.NServiceBus.SQLServer/packages.config +++ b/src/Packaging.NServiceBus.SQLServer/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/ServiceControl.Monitoring.AcceptanceTests.csproj b/src/ServiceControl.Monitoring.AcceptanceTests/ServiceControl.Monitoring.AcceptanceTests.csproj index cf421af..fc06555 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/ServiceControl.Monitoring.AcceptanceTests.csproj +++ b/src/ServiceControl.Monitoring.AcceptanceTests/ServiceControl.Monitoring.AcceptanceTests.csproj @@ -1,4 +1,4 @@ - + @@ -43,7 +43,7 @@ ..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Metrics.3.0.0\lib\net452\NServiceBus.Metrics.dll @@ -95,7 +95,7 @@ - + diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/packages.config b/src/ServiceControl.Monitoring.AcceptanceTests/packages.config index 9374abc..110aa78 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/packages.config +++ b/src/ServiceControl.Monitoring.AcceptanceTests/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/ServiceControl.Monitoring.SmokeTests.AmazonSQS.csproj b/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/ServiceControl.Monitoring.SmokeTests.AmazonSQS.csproj index 7a5f39f..1f3198b 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/ServiceControl.Monitoring.SmokeTests.AmazonSQS.csproj +++ b/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/ServiceControl.Monitoring.SmokeTests.AmazonSQS.csproj @@ -54,7 +54,7 @@ ..\packages\NServiceBus.AmazonSQS.4.1.2\lib\net452\NServiceBus.AmazonSQS.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Metrics.3.0.0\lib\net452\NServiceBus.Metrics.dll @@ -105,7 +105,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/packages.config b/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/packages.config index 72cef67..a4f445a 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/packages.config +++ b/src/ServiceControl.Monitoring.SmokeTests.AmazonSQS/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues.csproj b/src/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues.csproj index c61ba7a..2e505db 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues.csproj +++ b/src/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues.csproj @@ -60,7 +60,7 @@ ..\packages\NServiceBus.Azure.Transports.WindowsAzureStorageQueues.8.0.1\lib\net452\NServiceBus.Azure.Transports.WindowsAzureStorageQueues.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Metrics.3.0.0\lib\net452\NServiceBus.Metrics.dll @@ -118,7 +118,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues/packages.config b/src/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues/packages.config index a2826c6..8ed8ebe 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues/packages.config +++ b/src/ServiceControl.Monitoring.SmokeTests.AzureStorageQueues/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.LearningTransport/ServiceControl.Monitoring.SmokeTests.LearningTransport.csproj b/src/ServiceControl.Monitoring.SmokeTests.LearningTransport/ServiceControl.Monitoring.SmokeTests.LearningTransport.csproj index a4f90b2..3c4e324 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.LearningTransport/ServiceControl.Monitoring.SmokeTests.LearningTransport.csproj +++ b/src/ServiceControl.Monitoring.SmokeTests.LearningTransport/ServiceControl.Monitoring.SmokeTests.LearningTransport.csproj @@ -42,7 +42,7 @@ ..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Metrics.3.0.0\lib\net452\NServiceBus.Metrics.dll @@ -96,7 +96,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.LearningTransport/packages.config b/src/ServiceControl.Monitoring.SmokeTests.LearningTransport/packages.config index 11f919f..9ba27ad 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.LearningTransport/packages.config +++ b/src/ServiceControl.Monitoring.SmokeTests.LearningTransport/packages.config @@ -1,10 +1,10 @@  - + - + \ No newline at end of file diff --git a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj index e8b6019..aeff00e 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj +++ b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus.csproj @@ -57,7 +57,7 @@ ..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.8.0.6\lib\net452\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Metrics.3.0.0\lib\net452\NServiceBus.Metrics.dll @@ -117,7 +117,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config index 338b40b..1de09c4 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config +++ b/src/ServiceControl.Monitoring.SmokeTests.LegacyAzureServiceBus/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.MSMQ/ServiceControl.Monitoring.SmokeTests.MSMQ.csproj b/src/ServiceControl.Monitoring.SmokeTests.MSMQ/ServiceControl.Monitoring.SmokeTests.MSMQ.csproj index 8263dfd..1c41d4e 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.MSMQ/ServiceControl.Monitoring.SmokeTests.MSMQ.csproj +++ b/src/ServiceControl.Monitoring.SmokeTests.MSMQ/ServiceControl.Monitoring.SmokeTests.MSMQ.csproj @@ -43,7 +43,7 @@ ..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Metrics.3.0.0\lib\net452\NServiceBus.Metrics.dll @@ -100,7 +100,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.MSMQ/packages.config b/src/ServiceControl.Monitoring.SmokeTests.MSMQ/packages.config index 3e2fe37..9e8cbe3 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.MSMQ/packages.config +++ b/src/ServiceControl.Monitoring.SmokeTests.MSMQ/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.RabbitMQ/ServiceControl.Monitoring.SmokeTests.RabbitMQ.csproj b/src/ServiceControl.Monitoring.SmokeTests.RabbitMQ/ServiceControl.Monitoring.SmokeTests.RabbitMQ.csproj index 735fb67..3379446 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.RabbitMQ/ServiceControl.Monitoring.SmokeTests.RabbitMQ.csproj +++ b/src/ServiceControl.Monitoring.SmokeTests.RabbitMQ/ServiceControl.Monitoring.SmokeTests.RabbitMQ.csproj @@ -54,7 +54,7 @@ ..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Metrics.3.0.0\lib\net452\NServiceBus.Metrics.dll @@ -122,7 +122,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.RabbitMQ/packages.config b/src/ServiceControl.Monitoring.SmokeTests.RabbitMQ/packages.config index 1f52053..8f7e55e 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.RabbitMQ/packages.config +++ b/src/ServiceControl.Monitoring.SmokeTests.RabbitMQ/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.SQLServer/ServiceControl.Monitoring.SmokeTests.SQLServer.csproj b/src/ServiceControl.Monitoring.SmokeTests.SQLServer/ServiceControl.Monitoring.SmokeTests.SQLServer.csproj index 939fc4c..ffa84ca 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.SQLServer/ServiceControl.Monitoring.SmokeTests.SQLServer.csproj +++ b/src/ServiceControl.Monitoring.SmokeTests.SQLServer/ServiceControl.Monitoring.SmokeTests.SQLServer.csproj @@ -42,7 +42,7 @@ ..\packages\NServiceBus.AcceptanceTesting.7.1.4\lib\net452\NServiceBus.AcceptanceTesting.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Metrics.3.0.0\lib\net452\NServiceBus.Metrics.dll @@ -108,7 +108,7 @@ - + diff --git a/src/ServiceControl.Monitoring.SmokeTests.SQLServer/packages.config b/src/ServiceControl.Monitoring.SmokeTests.SQLServer/packages.config index 1150e3a..5ac5449 100644 --- a/src/ServiceControl.Monitoring.SmokeTests.SQLServer/packages.config +++ b/src/ServiceControl.Monitoring.SmokeTests.SQLServer/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/ServiceControl.Monitoring.Tests/ServiceControl.Monitoring.Tests.csproj b/src/ServiceControl.Monitoring.Tests/ServiceControl.Monitoring.Tests.csproj index 098b559..1cc6e49 100644 --- a/src/ServiceControl.Monitoring.Tests/ServiceControl.Monitoring.Tests.csproj +++ b/src/ServiceControl.Monitoring.Tests/ServiceControl.Monitoring.Tests.csproj @@ -55,7 +55,7 @@ ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll @@ -104,7 +104,7 @@ - + diff --git a/src/ServiceControl.Monitoring.Tests/packages.config b/src/ServiceControl.Monitoring.Tests/packages.config index 791aae8..8173ede 100644 --- a/src/ServiceControl.Monitoring.Tests/packages.config +++ b/src/ServiceControl.Monitoring.Tests/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/ServiceControl.Monitoring/EndpointFactory.cs b/src/ServiceControl.Monitoring/EndpointFactory.cs index c2a6999..63a996a 100644 --- a/src/ServiceControl.Monitoring/EndpointFactory.cs +++ b/src/ServiceControl.Monitoring/EndpointFactory.cs @@ -51,7 +51,9 @@ public static void MakeMetricsReceiver(EndpointConfiguration config, Settings se } else { +#pragma warning disable 618 transport.ConnectionStringName("NServiceBus/Transport"); +#pragma warning restore 618 } if (settings.EnableInstallers) diff --git a/src/ServiceControl.Monitoring/ServiceControl.Monitoring.csproj b/src/ServiceControl.Monitoring/ServiceControl.Monitoring.csproj index e22b932..925d723 100644 --- a/src/ServiceControl.Monitoring/ServiceControl.Monitoring.csproj +++ b/src/ServiceControl.Monitoring/ServiceControl.Monitoring.csproj @@ -83,7 +83,7 @@ ..\packages\NLog.4.5.10\lib\net45\NLog.dll - ..\packages\NServiceBus.7.1.4\lib\net452\NServiceBus.Core.dll + ..\packages\NServiceBus.7.1.6\lib\net452\NServiceBus.Core.dll ..\packages\NServiceBus.Newtonsoft.Json.2.1.0\lib\net452\NServiceBus.Newtonsoft.Json.dll @@ -212,7 +212,7 @@ - + diff --git a/src/ServiceControl.Monitoring/packages.config b/src/ServiceControl.Monitoring/packages.config index 79922ac..25fa312 100644 --- a/src/ServiceControl.Monitoring/packages.config +++ b/src/ServiceControl.Monitoring/packages.config @@ -7,7 +7,7 @@ - + diff --git a/src/ServiceControl.Transports.LearningTransport/ServiceControl.Transports.LearningTransport.csproj b/src/ServiceControl.Transports.LearningTransport/ServiceControl.Transports.LearningTransport.csproj index 9427775..3b69045 100644 --- a/src/ServiceControl.Transports.LearningTransport/ServiceControl.Transports.LearningTransport.csproj +++ b/src/ServiceControl.Transports.LearningTransport/ServiceControl.Transports.LearningTransport.csproj @@ -5,7 +5,7 @@ - +