diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index d8ceb6305d..2bc76c292d 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -36,7 +36,6 @@
-
@@ -58,6 +57,7 @@
+
@@ -69,7 +69,7 @@
-
+
diff --git a/src/ProjectReferences.Transports.props b/src/ProjectReferences.Transports.props
index ecabdb9a97..71ce167f9d 100644
--- a/src/ProjectReferences.Transports.props
+++ b/src/ProjectReferences.Transports.props
@@ -4,7 +4,7 @@
-
+
diff --git a/src/ServiceControl.Config.Tests/AddInstance/AddMonitoringInstance/ConnectionString.cs b/src/ServiceControl.Config.Tests/AddInstance/AddMonitoringInstance/ConnectionString.cs
index e01a5c5168..44d1256337 100644
--- a/src/ServiceControl.Config.Tests/AddInstance/AddMonitoringInstance/ConnectionString.cs
+++ b/src/ServiceControl.Config.Tests/AddInstance/AddMonitoringInstance/ConnectionString.cs
@@ -41,39 +41,38 @@ public static MonitoringAddViewModel When_no_transport_is_selected(this Monitori
class AddMonitoringConnectionStringsTests
{
- // TODO uncomment tests when MSMQ is added back
- //[Test]
- //public void MSMQ_transport_is_selected()
- //{
- // var viewModel = Given_a_monitoring_instance()
- // .When_MSQMQ_transport_is_selected();
-
- // Assert.IsFalse(viewModel.ShowConnectionString);
- // Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
- // Assert.IsEmpty(viewModel.SampleConnectionString);
- // Assert.IsNull(viewModel.TransportWarning);
- //}
-
- //[TestAllTransportsExcept("MSMQ")]
- //public void Non_MSMQ_transport_is_selected(string transportInfoName)
- //{
- // var viewModel = Given_a_monitoring_instance()
- // .When_a_transport_is_selected(transportInfoName);
-
- // Assert.IsTrue(viewModel.ShowConnectionString);
- // StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
- // Assert.IsNotEmpty(viewModel.SampleConnectionString);
-
- // if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
- // {
- // Assert.IsNotNull(viewModel.TransportWarning);
- // Assert.IsNotEmpty(viewModel.TransportWarning);
- // }
- // else
- // {
- // Assert.IsNull(viewModel.TransportWarning);
- // }
- //}
+ [Test]
+ public void MSMQ_transport_is_selected()
+ {
+ var viewModel = Given_a_monitoring_instance()
+ .When_MSQMQ_transport_is_selected();
+
+ Assert.IsFalse(viewModel.ShowConnectionString);
+ Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
+ Assert.IsEmpty(viewModel.SampleConnectionString);
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+
+ [TestAllTransportsExcept("MSMQ")]
+ public void Non_MSMQ_transport_is_selected(string transportInfoName)
+ {
+ var viewModel = Given_a_monitoring_instance()
+ .When_a_transport_is_selected(transportInfoName);
+
+ Assert.IsTrue(viewModel.ShowConnectionString);
+ StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
+ Assert.IsNotEmpty(viewModel.SampleConnectionString);
+
+ if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
+ {
+ Assert.IsNotNull(viewModel.TransportWarning);
+ Assert.IsNotEmpty(viewModel.TransportWarning);
+ }
+ else
+ {
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+ }
[Test]
public void Screen_Loaded()
diff --git a/src/ServiceControl.Config.Tests/AddInstance/ConnectionString.cs b/src/ServiceControl.Config.Tests/AddInstance/ConnectionString.cs
index 62b1064b1c..1930e3e80b 100644
--- a/src/ServiceControl.Config.Tests/AddInstance/ConnectionString.cs
+++ b/src/ServiceControl.Config.Tests/AddInstance/ConnectionString.cs
@@ -41,39 +41,38 @@ public static ServiceControlAddViewModel When_no_transport_is_selected(this Serv
class AddConnectionStringsTests
{
- // TODO uncomment tests when MSMQ is added back
- //[Test]
- //public void MSMQ_transport_is_selected()
- //{
- // var viewModel = Given_a_service_control_instance()
- // .When_MSQMQ_transport_is_selected();
-
- // Assert.IsFalse(viewModel.ShowConnectionString);
- // Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
- // Assert.IsEmpty(viewModel.SampleConnectionString);
- // Assert.IsNull(viewModel.TransportWarning);
- //}
-
- //[TestAllTransportsExcept("MSMQ")]
- //public void Non_MSMQ_transport_is_selected(string transportInfoName)
- //{
- // var viewModel = Given_a_service_control_instance()
- // .When_a_transport_is_selected(transportInfoName);
-
- // Assert.IsTrue(viewModel.ShowConnectionString);
- // StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
- // Assert.IsNotEmpty(viewModel.SampleConnectionString);
-
- // if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
- // {
- // Assert.IsNotNull(viewModel.TransportWarning);
- // Assert.IsNotEmpty(viewModel.TransportWarning);
- // }
- // else
- // {
- // Assert.IsNull(viewModel.TransportWarning);
- // }
- //}
+ [Test]
+ public void MSMQ_transport_is_selected()
+ {
+ var viewModel = Given_a_service_control_instance()
+ .When_MSQMQ_transport_is_selected();
+
+ Assert.IsFalse(viewModel.ShowConnectionString);
+ Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
+ Assert.IsEmpty(viewModel.SampleConnectionString);
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+
+ [TestAllTransportsExcept("MSMQ")]
+ public void Non_MSMQ_transport_is_selected(string transportInfoName)
+ {
+ var viewModel = Given_a_service_control_instance()
+ .When_a_transport_is_selected(transportInfoName);
+
+ Assert.IsTrue(viewModel.ShowConnectionString);
+ StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
+ Assert.IsNotEmpty(viewModel.SampleConnectionString);
+
+ if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
+ {
+ Assert.IsNotNull(viewModel.TransportWarning);
+ Assert.IsNotEmpty(viewModel.TransportWarning);
+ }
+ else
+ {
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+ }
[Test]
public void Screen_Loaded()
diff --git a/src/ServiceControl.Config.Tests/EditInstance/EditAuditInstance/ConnectionString.cs b/src/ServiceControl.Config.Tests/EditInstance/EditAuditInstance/ConnectionString.cs
index ef13fa5c34..5ef5ea0af3 100644
--- a/src/ServiceControl.Config.Tests/EditInstance/EditAuditInstance/ConnectionString.cs
+++ b/src/ServiceControl.Config.Tests/EditInstance/EditAuditInstance/ConnectionString.cs
@@ -40,38 +40,37 @@ public static ServiceControlAuditEditViewModel When_no_transport_is_selected(thi
class EditAuditConnectionStringsTests
{
- // TODO uncomment tests when MSMQ is added back
- //[Test]
- //public void MSMQ_transport_is_selected()
- //{
- // var viewModel = Given_an_audit_instance()
- // .When_MSQMQ_transport_is_selected();
+ [Test]
+ public void MSMQ_transport_is_selected()
+ {
+ var viewModel = Given_an_audit_instance()
+ .When_MSQMQ_transport_is_selected();
- // Assert.IsFalse(viewModel.ShowConnectionString);
- // Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
- // Assert.IsEmpty(viewModel.SampleConnectionString);
- // Assert.IsNull(viewModel.TransportWarning);
- //}
+ Assert.IsFalse(viewModel.ShowConnectionString);
+ Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
+ Assert.IsEmpty(viewModel.SampleConnectionString);
+ Assert.IsNull(viewModel.TransportWarning);
+ }
- //[TestAllTransportsExcept("MSMQ")]
- //public void Non_MSMQ_transport_is_selected(string transportInfoName)
- //{
- // var viewModel = Given_an_audit_instance()
- // .When_a_transport_is_selected(transportInfoName);
+ [TestAllTransportsExcept("MSMQ")]
+ public void Non_MSMQ_transport_is_selected(string transportInfoName)
+ {
+ var viewModel = Given_an_audit_instance()
+ .When_a_transport_is_selected(transportInfoName);
- // Assert.IsTrue(viewModel.ShowConnectionString);
- // StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
- // Assert.IsNotEmpty(viewModel.SampleConnectionString);
- // if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
- // {
- // Assert.IsNotNull(viewModel.TransportWarning);
- // Assert.IsNotEmpty(viewModel.TransportWarning);
- // }
- // else
- // {
- // Assert.IsNull(viewModel.TransportWarning);
- // }
- //}
+ Assert.IsTrue(viewModel.ShowConnectionString);
+ StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
+ Assert.IsNotEmpty(viewModel.SampleConnectionString);
+ if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
+ {
+ Assert.IsNotNull(viewModel.TransportWarning);
+ Assert.IsNotEmpty(viewModel.TransportWarning);
+ }
+ else
+ {
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+ }
[Test]
public void Screen_Loaded()
diff --git a/src/ServiceControl.Config.Tests/EditInstance/EditErrorInstance/ConnectionString.cs b/src/ServiceControl.Config.Tests/EditInstance/EditErrorInstance/ConnectionString.cs
index c2bb531628..418487d9a2 100644
--- a/src/ServiceControl.Config.Tests/EditInstance/EditErrorInstance/ConnectionString.cs
+++ b/src/ServiceControl.Config.Tests/EditInstance/EditErrorInstance/ConnectionString.cs
@@ -41,38 +41,37 @@ public static ServiceControlEditViewModel When_no_transport_is_selected(this Ser
class EditErrorConnectionStringsTests
{
- // TODO uncomment tests when MSMQ is added back
- //[Test]
- //public void MSMQ_transport_is_selected()
- //{
- // var viewModel = Given_a_service_control_instance()
- // .When_MSQMQ_transport_is_selected();
-
- // Assert.IsFalse(viewModel.ShowConnectionString);
- // Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
- // Assert.IsEmpty(viewModel.SampleConnectionString);
- // Assert.IsNull(viewModel.TransportWarning);
- //}
-
- //[TestAllTransportsExcept("MSMQ")]
- //public void Non_MSMQ_transport_is_selected(string transportInfoName)
- //{
- // var viewModel = Given_a_service_control_instance()
- // .When_a_transport_is_selected(transportInfoName);
-
- // Assert.IsTrue(viewModel.ShowConnectionString);
- // StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
- // Assert.IsNotEmpty(viewModel.SampleConnectionString);
- // if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
- // {
- // Assert.IsNotNull(viewModel.TransportWarning);
- // Assert.IsNotEmpty(viewModel.TransportWarning);
- // }
- // else
- // {
- // Assert.IsNull(viewModel.TransportWarning);
- // }
- //}
+ [Test]
+ public void MSMQ_transport_is_selected()
+ {
+ var viewModel = Given_a_service_control_instance()
+ .When_MSQMQ_transport_is_selected();
+
+ Assert.IsFalse(viewModel.ShowConnectionString);
+ Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
+ Assert.IsEmpty(viewModel.SampleConnectionString);
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+
+ [TestAllTransportsExcept("MSMQ")]
+ public void Non_MSMQ_transport_is_selected(string transportInfoName)
+ {
+ var viewModel = Given_a_service_control_instance()
+ .When_a_transport_is_selected(transportInfoName);
+
+ Assert.IsTrue(viewModel.ShowConnectionString);
+ StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
+ Assert.IsNotEmpty(viewModel.SampleConnectionString);
+ if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
+ {
+ Assert.IsNotNull(viewModel.TransportWarning);
+ Assert.IsNotEmpty(viewModel.TransportWarning);
+ }
+ else
+ {
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+ }
[Test]
public void Screen_Loaded()
diff --git a/src/ServiceControl.Config.Tests/EditInstance/EditMonitoringInstance/ConnectionString.cs b/src/ServiceControl.Config.Tests/EditInstance/EditMonitoringInstance/ConnectionString.cs
index 18a25f37aa..ddfb5883fe 100644
--- a/src/ServiceControl.Config.Tests/EditInstance/EditMonitoringInstance/ConnectionString.cs
+++ b/src/ServiceControl.Config.Tests/EditInstance/EditMonitoringInstance/ConnectionString.cs
@@ -41,38 +41,37 @@ public static MonitoringEditViewModel When_no_transport_is_selected(this Monitor
class EditMonitoringConnectionStringsTests
{
- // TODO uncomment tests when MSMQ is added back
- //[Test]
- //public void MSMQ_transport_is_selected()
- //{
- // var viewModel = Given_a_monitoring_instance()
- // .When_MSQMQ_transport_is_selected();
-
- // Assert.IsFalse(viewModel.ShowConnectionString);
- // Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
- // Assert.IsEmpty(viewModel.SampleConnectionString);
- // Assert.IsNull(viewModel.TransportWarning);
- //}
-
- //[TestAllTransportsExcept("MSMQ")]
- //public void Non_MSMQ_transport_is_selected(string transportInfoName)
- //{
- // var viewModel = Given_a_monitoring_instance()
- // .When_a_transport_is_selected(transportInfoName);
-
- // Assert.IsTrue(viewModel.ShowConnectionString);
- // StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
- // Assert.IsNotEmpty(viewModel.SampleConnectionString);
- // if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
- // {
- // Assert.IsNotNull(viewModel.TransportWarning);
- // Assert.IsNotEmpty(viewModel.TransportWarning);
- // }
- // else
- // {
- // Assert.IsNull(viewModel.TransportWarning);
- // }
- //}
+ [Test]
+ public void MSMQ_transport_is_selected()
+ {
+ var viewModel = Given_a_monitoring_instance()
+ .When_MSQMQ_transport_is_selected();
+
+ Assert.IsFalse(viewModel.ShowConnectionString);
+ Assert.AreEqual("MSMQ", viewModel.SelectedTransport.Name);
+ Assert.IsEmpty(viewModel.SampleConnectionString);
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+
+ [TestAllTransportsExcept("MSMQ")]
+ public void Non_MSMQ_transport_is_selected(string transportInfoName)
+ {
+ var viewModel = Given_a_monitoring_instance()
+ .When_a_transport_is_selected(transportInfoName);
+
+ Assert.IsTrue(viewModel.ShowConnectionString);
+ StringAssert.StartsWith(transportInfoName, viewModel.SelectedTransport.Name);
+ Assert.IsNotEmpty(viewModel.SampleConnectionString);
+ if (transportInfoName is "SQLServer" or "AmazonSQS" or "AzureStorageQueue")
+ {
+ Assert.IsNotNull(viewModel.TransportWarning);
+ Assert.IsNotEmpty(viewModel.TransportWarning);
+ }
+ else
+ {
+ Assert.IsNull(viewModel.TransportWarning);
+ }
+ }
[Test]
public void Screen_Loaded()
diff --git a/src/ServiceControl.Config.Tests/Validation/EditAuditInstanceValidationTests.cs b/src/ServiceControl.Config.Tests/Validation/EditAuditInstanceValidationTests.cs
index 814146f545..b6ec0c1517 100644
--- a/src/ServiceControl.Config.Tests/Validation/EditAuditInstanceValidationTests.cs
+++ b/src/ServiceControl.Config.Tests/Validation/EditAuditInstanceValidationTests.cs
@@ -48,45 +48,44 @@ public class EditAuditInstanceValidationTests
Assert.IsNotEmpty(errors);
}
- // TODO uncomment tests when MSMQ is added back
- //[TestTheseTransports("MSMQ")]
- //public void Transport_connection_string_can_be_empty_if_sample_connection_string_is_not_present_when_editing_audit_instance(
- // string transportInfoName)
- //{
- // var viewModel = new ServiceControlAuditEditViewModel
- // {
- // SelectedTransport = ServiceControlCoreTransports.Find(transportInfoName),
- // SubmitAttempted = true,
- // ConnectionString = string.Empty
- // };
+ [TestTheseTransports("MSMQ")]
+ public void Transport_connection_string_can_be_empty_if_sample_connection_string_is_not_present_when_editing_audit_instance(
+ string transportInfoName)
+ {
+ var viewModel = new ServiceControlAuditEditViewModel
+ {
+ SelectedTransport = ServiceControlCoreTransports.Find(transportInfoName),
+ SubmitAttempted = true,
+ ConnectionString = string.Empty
+ };
- // var notifyErrorInfo = GetNotifyErrorInfo(viewModel);
+ var notifyErrorInfo = GetNotifyErrorInfo(viewModel);
- // var errors = notifyErrorInfo.GetErrors(nameof(viewModel.ConnectionString));
+ var errors = notifyErrorInfo.GetErrors(nameof(viewModel.ConnectionString));
- // Assert.IsEmpty(errors);
- //}
+ Assert.IsEmpty(errors);
+ }
- //[TestTheseTransports("MSMQ")]
- //public void Transport_connection_string_can_be_null_if_sample_connection_string_is_not_present_when_editing_audit_instance(
- // string transportInfoName)
- //{
- // var viewModel = new ServiceControlAuditEditViewModel
- // {
- // SelectedTransport = ServiceControlCoreTransports.Find(transportInfoName),
- // SubmitAttempted = true,
- // ConnectionString = null
- // };
+ [TestTheseTransports("MSMQ")]
+ public void Transport_connection_string_can_be_null_if_sample_connection_string_is_not_present_when_editing_audit_instance(
+ string transportInfoName)
+ {
+ var viewModel = new ServiceControlAuditEditViewModel
+ {
+ SelectedTransport = ServiceControlCoreTransports.Find(transportInfoName),
+ SubmitAttempted = true,
+ ConnectionString = null
+ };
- // viewModel.NotifyOfPropertyChange(nameof(viewModel.ConnectionString));
+ viewModel.NotifyOfPropertyChange(nameof(viewModel.ConnectionString));
- // var notifyErrorInfo = GetNotifyErrorInfo(viewModel);
+ var notifyErrorInfo = GetNotifyErrorInfo(viewModel);
- // var errors = notifyErrorInfo.GetErrors(nameof(viewModel.ConnectionString));
+ var errors = notifyErrorInfo.GetErrors(nameof(viewModel.ConnectionString));
- // Assert.IsEmpty(errors);
+ Assert.IsEmpty(errors);
- //}
+ }
#endregion
diff --git a/src/ServiceControl.Config.Tests/Validation/EditErrorInstanceValidationTests.cs b/src/ServiceControl.Config.Tests/Validation/EditErrorInstanceValidationTests.cs
index 3ecc508672..d3ef90dec8 100644
--- a/src/ServiceControl.Config.Tests/Validation/EditErrorInstanceValidationTests.cs
+++ b/src/ServiceControl.Config.Tests/Validation/EditErrorInstanceValidationTests.cs
@@ -48,44 +48,43 @@ public class EditErrorInstanceValidationTests
Assert.IsNotEmpty(errors);
}
- // TODO uncomment tests when MSMQ is added back
- //[TestTheseTransports("MSMQ")]
- //public void Transport_connection_string_can_be_empty_if_sample_connection_string_is_not_present_when_editing_error_instance(
- // string transportInfoName)
- //{
- // var viewModel = new ServiceControlEditViewModel
- // {
- // SelectedTransport = ServiceControlCoreTransports.Find(transportInfoName),
- // SubmitAttempted = true,
- // ConnectionString = string.Empty
- // };
-
- // var notifyErrorInfo = GetNotifyErrorInfo(viewModel);
-
- // var errors = notifyErrorInfo.GetErrors(nameof(viewModel.ConnectionString));
-
- // Assert.IsEmpty(errors);
- //}
-
- //[TestTheseTransports("MSMQ")]
- //public void Transport_connection_string_can_be_null_if_sample_connection_string_is_not_present_when_editing_error_instance(
- // string transportInfoName)
- //{
- // var viewModel = new ServiceControlEditViewModel
- // {
- // SelectedTransport = ServiceControlCoreTransports.Find(transportInfoName),
- // SubmitAttempted = true,
- // ConnectionString = null
- // };
-
- // viewModel.NotifyOfPropertyChange(nameof(viewModel.ConnectionString));
-
- // var notifyErrorInfo = GetNotifyErrorInfo(viewModel);
-
- // var errors = notifyErrorInfo.GetErrors(nameof(viewModel.ConnectionString));
-
- // Assert.IsEmpty(errors);
- //}
+ [TestTheseTransports("MSMQ")]
+ public void Transport_connection_string_can_be_empty_if_sample_connection_string_is_not_present_when_editing_error_instance(
+ string transportInfoName)
+ {
+ var viewModel = new ServiceControlEditViewModel
+ {
+ SelectedTransport = ServiceControlCoreTransports.Find(transportInfoName),
+ SubmitAttempted = true,
+ ConnectionString = string.Empty
+ };
+
+ var notifyErrorInfo = GetNotifyErrorInfo(viewModel);
+
+ var errors = notifyErrorInfo.GetErrors(nameof(viewModel.ConnectionString));
+
+ Assert.IsEmpty(errors);
+ }
+
+ [TestTheseTransports("MSMQ")]
+ public void Transport_connection_string_can_be_null_if_sample_connection_string_is_not_present_when_editing_error_instance(
+ string transportInfoName)
+ {
+ var viewModel = new ServiceControlEditViewModel
+ {
+ SelectedTransport = ServiceControlCoreTransports.Find(transportInfoName),
+ SubmitAttempted = true,
+ ConnectionString = null
+ };
+
+ viewModel.NotifyOfPropertyChange(nameof(viewModel.ConnectionString));
+
+ var notifyErrorInfo = GetNotifyErrorInfo(viewModel);
+
+ var errors = notifyErrorInfo.GetErrors(nameof(viewModel.ConnectionString));
+
+ Assert.IsEmpty(errors);
+ }
#endregion
diff --git a/src/ServiceControl.Transports.Msmq.Tests/ServiceControl.Transports.Msmq.Tests.csproj b/src/ServiceControl.Transports.Msmq.Tests/ServiceControl.Transports.Msmq.Tests.csproj
index aa6f0c65b4..3d15a7b18a 100644
--- a/src/ServiceControl.Transports.Msmq.Tests/ServiceControl.Transports.Msmq.Tests.csproj
+++ b/src/ServiceControl.Transports.Msmq.Tests/ServiceControl.Transports.Msmq.Tests.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net8.0-windows
@@ -23,13 +23,13 @@
+
+
-
-
\ No newline at end of file
diff --git a/src/ServiceControl.Transports.Msmq/ServiceControl.Transports.Msmq.csproj b/src/ServiceControl.Transports.Msmq/ServiceControl.Transports.Msmq.csproj
index 140ee47bfe..a94fdaaa1c 100644
--- a/src/ServiceControl.Transports.Msmq/ServiceControl.Transports.Msmq.csproj
+++ b/src/ServiceControl.Transports.Msmq/ServiceControl.Transports.Msmq.csproj
@@ -1,7 +1,7 @@
- net8.0
+ net8.0-windows
@@ -10,8 +10,10 @@
-
+
+
+
diff --git a/src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/ServiceControl.Transports.RabbitMQClassicConventionalRoutingTests.csproj b/src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/ServiceControl.Transports.RabbitMQClassicConventionalRoutingTests.csproj
index a5d75ecda1..4c93060f75 100644
--- a/src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/ServiceControl.Transports.RabbitMQClassicConventionalRoutingTests.csproj
+++ b/src/ServiceControl.Transports.RabbitMQClassicConventionalRouting.Tests/ServiceControl.Transports.RabbitMQClassicConventionalRoutingTests.csproj
@@ -15,8 +15,8 @@
-
-
+
+
diff --git a/src/ServiceControl.Transports/DevelopmentTransportLocations.cs b/src/ServiceControl.Transports/DevelopmentTransportLocations.cs
index 5998b29ef1..050be32d03 100644
--- a/src/ServiceControl.Transports/DevelopmentTransportLocations.cs
+++ b/src/ServiceControl.Transports/DevelopmentTransportLocations.cs
@@ -20,7 +20,7 @@ static DevelopmentTransportLocations()
ManifestFiles.Add(BuildManifestPath(srcFolder, "ServiceControl.Transports.ASBS"));
ManifestFiles.Add(BuildManifestPath(srcFolder, "ServiceControl.Transports.ASQ"));
ManifestFiles.Add(BuildManifestPath(srcFolder, "ServiceControl.Transports.Learning"));
- //ManifestFiles.Add(BuildManifestPath(srcFolder, "ServiceControl.Transports.Msmq")); TODO Uncomment when we add MSMQ back in
+ ManifestFiles.Add(BuildManifestPath(srcFolder, "ServiceControl.Transports.Msmq"));
ManifestFiles.Add(BuildManifestPath(srcFolder, "ServiceControl.Transports.RabbitMQ"));
ManifestFiles.Add(BuildManifestPath(srcFolder, "ServiceControl.Transports.SqlServer"));
ManifestFiles.Add(BuildManifestPath(srcFolder, "ServiceControl.Transports.SQS"));
diff --git a/src/ServiceControl.sln b/src/ServiceControl.sln
index 59c50ff5b8..c9e917651b 100644
--- a/src/ServiceControl.sln
+++ b/src/ServiceControl.sln
@@ -153,6 +153,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LegacyArtifacts", "LegacyAr
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{E067C14F-867B-4479-BC85-39F2AFAF25D0}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Transports.Msmq", "ServiceControl.Transports.Msmq\ServiceControl.Transports.Msmq.csproj", "{F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Transports.Msmq.Tests", "ServiceControl.Transports.Msmq.Tests\ServiceControl.Transports.Msmq.Tests.csproj", "{5F8E6C64-B505-4FF7-81CC-9161FBC198A8}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -821,6 +825,30 @@ Global
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x64.Build.0 = Release|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x86.ActiveCfg = Release|Any CPU
{38147B68-13EE-48DC-BB38-4217889978AE}.Release|x86.Build.0 = Release|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Debug|x64.Build.0 = Debug|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Debug|x86.Build.0 = Debug|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Release|x64.ActiveCfg = Release|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Release|x64.Build.0 = Release|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Release|x86.ActiveCfg = Release|Any CPU
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE}.Release|x86.Build.0 = Release|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Debug|x64.Build.0 = Debug|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Debug|x86.Build.0 = Debug|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Release|x64.ActiveCfg = Release|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Release|x64.Build.0 = Release|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Release|x86.ActiveCfg = Release|Any CPU
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -890,6 +918,8 @@ Global
{4F2CAFC7-113A-4D31-A365-6669AB4C7787} = {350F72AB-142D-4AAD-9EF1-1A83DC991D87}
{38147B68-13EE-48DC-BB38-4217889978AE} = {55C388DD-2B39-4C2F-AEBD-AFD3444815F1}
{E067C14F-867B-4479-BC85-39F2AFAF25D0} = {E2249BAA-D9E9-4369-9C70-0E21C69A3E56}
+ {F04B9D2C-7E31-4697-BAE3-D3FFC5FBBDFE} = {A21A1A89-0B07-4E87-8E3C-41D9C280DCB8}
+ {5F8E6C64-B505-4FF7-81CC-9161FBC198A8} = {E0E45F22-35E3-4AD8-B09E-EFEA5A2F18EE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3B9E5B72-F580-465A-A22C-2D2148AF4EB4}
diff --git a/src/ServiceControlInstaller.Engine.UnitTests/RunEngineTasksExplicitly.cs b/src/ServiceControlInstaller.Engine.UnitTests/RunEngineTasksExplicitly.cs
index d54631a6f7..2c11c578e9 100644
--- a/src/ServiceControlInstaller.Engine.UnitTests/RunEngineTasksExplicitly.cs
+++ b/src/ServiceControlInstaller.Engine.UnitTests/RunEngineTasksExplicitly.cs
@@ -41,6 +41,7 @@ public void UpgradeInstance()
}
}
+ //TODO Update these to not use MSMQ
[Test]
[Explicit]
public async Task CreateInstanceMSMQ()
diff --git a/src/ServiceControlInstaller.Packaging.UnitTests/DeploymentPackageTests.cs b/src/ServiceControlInstaller.Packaging.UnitTests/DeploymentPackageTests.cs
index 82f39827b1..6922d2298a 100644
--- a/src/ServiceControlInstaller.Packaging.UnitTests/DeploymentPackageTests.cs
+++ b/src/ServiceControlInstaller.Packaging.UnitTests/DeploymentPackageTests.cs
@@ -95,7 +95,7 @@ public void Should_package_transports_individually()
"AzureServiceBus",
"NetStandardAzureServiceBus",
"RabbitMQ",
- //"MSMQ", TODO Uncomment when we add MSMQ back in
+ "MSMQ",
"AmazonSQS",
"LearningTransport"};