Move to latest ServerCommon for new Service Bus SDK (#1152)

joelverhagen · web-flow · commit 872034f85f24 · 2023-09-22T09:58:03.000-07:00
* Move to new Service Bus library * Resolve some restore warnings Progress on NuGet/Engineering#5011
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,12 +1,4 @@
 <Project>
-
-  <!-- NuGet dependencies shared across projects -->
-  <PropertyGroup>
-    <ServerCommonPackageVersion>2.111.0</ServerCommonPackageVersion>
-    <NuGetClientPackageVersion>6.4.2</NuGetClientPackageVersion>
-    <NuGetGalleryPackageVersion>4.4.5-dev-8381969</NuGetGalleryPackageVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,6 +2,9 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <EnablePackageVersionOverride>false</EnablePackageVersionOverride>
+    <ServerCommonPackageVersion>2.112.0</ServerCommonPackageVersion>
+    <NuGetClientPackageVersion>6.6.1</NuGetClientPackageVersion>
+    <NuGetGalleryPackageVersion>4.4.5-dev-8435783</NuGetGalleryPackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Autofac" Version="4.9.1" />
@@ -34,7 +37,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
     <PackageVersion Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
-    <PackageVersion Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.1.0" />
+    <PackageVersion Include="Microsoft.WindowsAzure.ConfigurationManager" Version="3.2.3" />
     <PackageVersion Include="Moq" Version="4.13.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="NuGet.Build.Tasks.Pack" Version="4.8.0" />
@@ -54,6 +57,7 @@
     <PackageVersion Include="NuGet.Services.Status.Table" Version="$(ServerCommonPackageVersion)" />
     <PackageVersion Include="NuGet.Services.Storage" Version="$(ServerCommonPackageVersion)" />
     <PackageVersion Include="NuGet.Services.Testing.Entities" Version="$(ServerCommonPackageVersion)" />
+    <PackageVersion Include="NuGet.Services.Validation" Version="$(ServerCommonPackageVersion)" />
     <PackageVersion Include="NuGet.StrongName.Octokit" Version="0.32.0" />
     <PackageVersion Include="NuGet.StrongName.json-ld.net" Version="1.0.6" />
     <PackageVersion Include="NuGet.Versioning" Version="$(NuGetClientPackageVersion)" />
diff --git a/NuGet.Jobs.sln b/NuGet.Jobs.sln
@@ -185,6 +185,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		build.ps1 = build.ps1
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
+		global.json = global.json
+		.nuget\NuGet.config = .nuget\NuGet.config
 		SdkProjects.props = SdkProjects.props
 		sign.thirdparty.props = sign.thirdparty.props
 		test.ps1 = test.ps1
diff --git a/build.ps1 b/build.ps1
@@ -9,7 +9,7 @@ param (
     [string]$SemanticVersion = '1.0.0-zlocal',
     [string]$Branch = 'zlocal',
     [string]$CommitSHA,
-    [string]$BuildBranchCommit = '900bef1848c739abb49805f2706014d0be4dccbe'
+    [string]$BuildBranchCommit = '900bef1848c739abb49805f2706014d0be4dccbe' #DevSkim: ignore DS173237. Not a secret/token. It is a commit hash.
 )
 
 # For TeamCity - If any issue occurs, this script fails the build. - By default, TeamCity returns an exit code of 0 for all powershell scripts, even if they fail
@@ -25,10 +25,7 @@ if (-not (Test-Path "$PSScriptRoot/build")) {
     New-Item -Path "$PSScriptRoot/build" -ItemType "directory"
 }
 
-# Enable TLS 1.2 since GitHub requires it.
-[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12
-
-wget -UseBasicParsing -Uri "https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranchCommit/build/init.ps1" -OutFile "$PSScriptRoot/build/init.ps1"
+Invoke-WebRequest -UseBasicParsing -Uri "https://raw.githubusercontent.com/NuGet/ServerCommon/$BuildBranchCommit/build/init.ps1" -OutFile "$PSScriptRoot/build/init.ps1"
 . "$PSScriptRoot/build/init.ps1" -BuildBranchCommit "$BuildBranchCommit"
 
 Function Clean-Tests {
diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.300",
+    "rollForward": "latestFeature"
+  }
+}
diff --git a/src/NuGet.Services.Validation.Orchestrator/OrchestrationRunner.cs b/src/NuGet.Services.Validation.Orchestrator/OrchestrationRunner.cs
@@ -38,7 +38,7 @@ public async Task RunOrchestrationAsync()
         {
             _logger.LogInformation("Starting up the orchestration");
 
-            _subscriptionProcessor.Start(_configuration.MaxConcurrentCalls);
+            await _subscriptionProcessor.StartAsync(_configuration.MaxConcurrentCalls);
             await Task.Delay(_configuration.ProcessRecycleInterval);
 
             _logger.LogInformation("Recycling the process...");
diff --git a/src/NuGet.Services.Validation.Orchestrator/PackageValidationMessageDataSerializer.cs b/src/NuGet.Services.Validation.Orchestrator/PackageValidationMessageDataSerializer.cs
@@ -14,7 +14,7 @@ public PackageValidationMessageDataSerializationAdapter(IServiceBusMessageSerial
             _serializer = serializer;
         }
 
-        public PackageValidationMessageData Deserialize(IBrokeredMessage message)
+        public PackageValidationMessageData Deserialize(IReceivedBrokeredMessage message)
             => _serializer.DeserializePackageValidationMessageData(message);
 
         public IBrokeredMessage Serialize(PackageValidationMessageData message)
diff --git a/src/Validation.Common.Job/SubscriptionProcessorJob.cs b/src/Validation.Common.Job/SubscriptionProcessorJob.cs
@@ -45,7 +45,7 @@ public override async Task Run()
                         $"SubcriptionProcessorJob<T>.{nameof(SetupDefaultSubscriptionProcessorConfiguration)}() or set it up your way.");
                 }
 
-                processor.Start(configuration.Value.MaxConcurrentCalls);
+                await processor.StartAsync(configuration.Value.MaxConcurrentCalls);
 
                 // Wait a certain period of time, and then shutdown this process so that it is restarted.
                 await Task.Delay(configuration.Value.ProcessDuration);
diff --git a/src/Validation.ContentScan.Core/ContentScanMessageSerializer.cs b/src/Validation.ContentScan.Core/ContentScanMessageSerializer.cs
@@ -17,7 +17,7 @@ public class ContentScanMessageSerializer : IBrokeredMessageSerializer<ContentSc
         private IBrokeredMessageSerializer<CheckContentScanStatusData1> _checkScanStatusSerializer =
             new BrokeredMessageSerializer<CheckContentScanStatusData1>();
 
-        public ContentScanData Deserialize(IBrokeredMessage message)
+        public ContentScanData Deserialize(IReceivedBrokeredMessage message)
         {
             var schemaName = message.GetSchemaName();
             switch (schemaName)
diff --git a/src/Validation.PackageSigning.Core/Messages/CertificateValidationMessageSerializer.cs b/src/Validation.PackageSigning.Core/Messages/CertificateValidationMessageSerializer.cs
@@ -24,7 +24,7 @@ public IBrokeredMessage Serialize(CertificateValidationMessage message)
             });
         }
 
-        public CertificateValidationMessage Deserialize(IBrokeredMessage brokeredMessage)
+        public CertificateValidationMessage Deserialize(IReceivedBrokeredMessage brokeredMessage)
         {
             var message = _serializer.Deserialize(brokeredMessage);
 
diff --git a/src/Validation.PackageSigning.Core/Messages/SignatureValidationMessageSerializer.cs b/src/Validation.PackageSigning.Core/Messages/SignatureValidationMessageSerializer.cs
@@ -26,7 +26,7 @@ public IBrokeredMessage Serialize(SignatureValidationMessage message)
             });
         }
 
-        public SignatureValidationMessage Deserialize(IBrokeredMessage message)
+        public SignatureValidationMessage Deserialize(IReceivedBrokeredMessage message)
         {
             var deserializedMessage = _serializer.Deserialize(message);
 
diff --git a/src/Validation.ScanAndSign.Core/ScanAndSignMessageSerializer.cs b/src/Validation.ScanAndSign.Core/ScanAndSignMessageSerializer.cs
@@ -16,7 +16,7 @@ public class ScanAndSignMessageSerializer : IBrokeredMessageSerializer<ScanAndSi
         private IBrokeredMessageSerializer<ScanAndSignMessageData2> _serializer2 =
             new BrokeredMessageSerializer<ScanAndSignMessageData2>();
 
-        public ScanAndSignMessage Deserialize(IBrokeredMessage message)
+        public ScanAndSignMessage Deserialize(IReceivedBrokeredMessage message)
         {
             try
             {
diff --git a/src/Validation.Symbols.Core/SymbolsIngesterMessageSerializer.cs b/src/Validation.Symbols.Core/SymbolsIngesterMessageSerializer.cs
@@ -13,7 +13,7 @@ public class SymbolsIngesterMessageSerializer : IBrokeredMessageSerializer<Symbo
         private IBrokeredMessageSerializer<SymbolsIngesterMessageDataV1> _serializer =
             new BrokeredMessageSerializer<SymbolsIngesterMessageDataV1>();
 
-        public SymbolsIngesterMessage Deserialize(IBrokeredMessage message)
+        public SymbolsIngesterMessage Deserialize(IReceivedBrokeredMessage message)
         {
             var deserializedMessage = _serializer.Deserialize(message);
 
diff --git a/src/Validation.Symbols.Core/SymbolsValidatorMessageSerializer.cs b/src/Validation.Symbols.Core/SymbolsValidatorMessageSerializer.cs
@@ -13,7 +13,7 @@ public class SymbolsValidatorMessageSerializer : IBrokeredMessageSerializer<Symb
         private IBrokeredMessageSerializer<SymbolsValidatorMessageDataV1> _serializer =
             new BrokeredMessageSerializer<SymbolsValidatorMessageDataV1>();
 
-        public SymbolsValidatorMessage Deserialize(IBrokeredMessage message)
+        public SymbolsValidatorMessage Deserialize(IReceivedBrokeredMessage message)
         {
             var deserializedMessage = _serializer.Deserialize(message);
 
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/BaseValidationMessageHandlerFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/BaseValidationMessageHandlerFacts.cs
@@ -7,7 +7,6 @@
 using Elmah.ContentSyndication;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.ServiceBus.Messaging;
 using Moq;
 using NuGet.Jobs.Validation;
 using NuGet.Jobs.Validation.Leases;
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/OrchestrationRunnerFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/OrchestrationRunnerFacts.cs
@@ -21,15 +21,16 @@ public async Task StartsMessageProcessing()
             var runner = CreateRunner();
             await runner.RunOrchestrationAsync();
 
-            SubscriptionProcessorMock.Verify(o => o.Start(DefaultMaxConcurrentCalls), Times.Once());
+            SubscriptionProcessorMock.Verify(o => o.StartAsync(DefaultMaxConcurrentCalls), Times.Once());
         }
 
         [Fact]
         public async Task ShutsDownMessageProcessing()
         {
             var startCalled = false;
             SubscriptionProcessorMock
-                .Setup(o => o.Start(DefaultMaxConcurrentCalls))
+                .Setup(o => o.StartAsync(DefaultMaxConcurrentCalls))
+                .Returns(Task.CompletedTask)
                 .Callback(() => startCalled = true);
 
             SubscriptionProcessorMock
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/SymbolValidationMessageHandlerFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/SymbolValidationMessageHandlerFacts.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -275,7 +276,7 @@ public async Task DropsMessageIfPackageIsSoftDeletedForCheckValidator()
                 Times.Once);
         }
 
-        private class MessageWithCustomDeliveryCount : IBrokeredMessage
+        private class MessageWithCustomDeliveryCount : IReceivedBrokeredMessage
         {
             private readonly IBrokeredMessage _inner;
 
@@ -285,23 +286,18 @@ public MessageWithCustomDeliveryCount(IBrokeredMessage inner, int deliveryCount)
                 DeliveryCount = deliveryCount;
             }
 
-            public int DeliveryCount { get; private set; }
-
-            public string GetBody() => _inner.GetBody();
-            public Stream GetBody<Stream>() => _inner.GetBody<Stream>();
-            public IDictionary<string, object> Properties => _inner.Properties;
-
-            public DateTimeOffset ScheduledEnqueueTimeUtc { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+            public int DeliveryCount { get; }
             public DateTimeOffset ExpiresAtUtc => throw new NotImplementedException();
+            public TimeSpan TimeToLive => throw new NotImplementedException();
+            public IReadOnlyDictionary<string, object> Properties => _inner.Properties.ToDictionary(x => x.Key, x => x.Value);
             public DateTimeOffset EnqueuedTimeUtc => throw new NotImplementedException();
-            public TimeSpan TimeToLive { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-
-            public string MessageId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+            public DateTimeOffset ScheduledEnqueueTimeUtc => throw new NotImplementedException();
+            public string MessageId => throw new NotImplementedException();
 
             public Task AbandonAsync() => throw new NotImplementedException();
-            public IBrokeredMessage Clone() => throw new NotImplementedException();
             public Task CompleteAsync() => throw new NotImplementedException();
-            public void Dispose() => throw new NotImplementedException();
+            public string GetBody() => _inner.GetBody();
+            public TStream GetBody<TStream>() => _inner.GetBody<TStream>();
         }
     }
 
diff --git a/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs b/tests/NuGet.Services.Validation.Orchestrator.Tests/ValidationMessageHandlerFacts.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -278,7 +279,7 @@ public async Task DropsMessageIfPackageIsSoftDeletedForCheckValidator()
                 Times.Once);
         }
 
-        private class MessageWithCustomDeliveryCount : IBrokeredMessage
+        private class MessageWithCustomDeliveryCount : IReceivedBrokeredMessage
         {
             private readonly IBrokeredMessage _inner;
 
@@ -288,23 +289,18 @@ public MessageWithCustomDeliveryCount(IBrokeredMessage inner, int deliveryCount)
                 DeliveryCount = deliveryCount;
             }
 
-            public int DeliveryCount { get; private set; }
-
-            public string GetBody() => _inner.GetBody();
-            public Stream GetBody<Stream>() => _inner.GetBody<Stream>();
-            public IDictionary<string, object> Properties => _inner.Properties;
-
-            public DateTimeOffset ScheduledEnqueueTimeUtc { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+            public int DeliveryCount { get; }
             public DateTimeOffset ExpiresAtUtc => throw new NotImplementedException();
+            public TimeSpan TimeToLive => throw new NotImplementedException();
+            public IReadOnlyDictionary<string, object> Properties => _inner.Properties.ToDictionary(x => x.Key, x => x.Value);
             public DateTimeOffset EnqueuedTimeUtc => throw new NotImplementedException();
-            public TimeSpan TimeToLive { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-
-            public string MessageId { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+            public DateTimeOffset ScheduledEnqueueTimeUtc => throw new NotImplementedException();
+            public string MessageId => throw new NotImplementedException();
 
             public Task AbandonAsync() => throw new NotImplementedException();
-            public IBrokeredMessage Clone() => throw new NotImplementedException();
             public Task CompleteAsync() => throw new NotImplementedException();
-            public void Dispose() => throw new NotImplementedException();
+            public string GetBody() => _inner.GetBody();
+            public TStream GetBody<TStream>() => _inner.GetBody<TStream>();
         }
     }
 
diff --git a/tests/Validation.ContentScan.tests/ContentScanEnqueuerFacts.cs b/tests/Validation.ContentScan.tests/ContentScanEnqueuerFacts.cs
@@ -200,7 +200,7 @@ public class ContentScanEnqueuerFactsBase
 
         protected ContentScanData _capturedMessage;
         protected IBrokeredMessage _capturedBrokeredMessage;
-        protected BrokeredMessageWrapper _serializedMessage;
+        protected ServiceBusMessageWrapper _serializedMessage;
 
         protected readonly IValidationRequest _validationRequest;
         protected readonly List<string> _owners;
@@ -225,7 +225,7 @@ public ContentScanEnqueuerFactsBase()
 
             _validationRequest = new ValidationRequest(Guid.NewGuid(), new Uri("https://example.com/testpackage.nupkg"));
 
-            _serializedMessage = new BrokeredMessageWrapper("somedata");
+            _serializedMessage = new ServiceBusMessageWrapper("somedata");
 
             _serializerMock
                 .Setup(s => s.Serialize(It.IsAny<ContentScanData>()))
diff --git a/tests/Validation.PackageSigning.ScanAndSign.Tests/ScanAndSignEnqueuerFacts.cs b/tests/Validation.PackageSigning.ScanAndSign.Tests/ScanAndSignEnqueuerFacts.cs
@@ -238,7 +238,7 @@ public class ScanAndSignEnqueuerFactsBase
 
         protected ScanAndSignMessage _capturedMessage;
         protected IBrokeredMessage _capturedBrokeredMessage;
-        protected BrokeredMessageWrapper _serializedMessage;
+        protected ServiceBusMessageWrapper _serializedMessage;
 
         protected readonly INuGetValidationRequest _validationRequest;
         protected readonly List<string> _owners;
@@ -264,7 +264,7 @@ public ScanAndSignEnqueuerFactsBase()
             _validationRequest = new NuGetValidationRequest(Guid.NewGuid(), 42, "somepackage", "someversion", "https://example.com/testpackage.nupkg");
             _owners = new List<string> {"Billy", "Bob"};
 
-            _serializedMessage = new BrokeredMessageWrapper("somedata");
+            _serializedMessage = new ServiceBusMessageWrapper("somedata");
 
             _serializerMock
                 .Setup(s => s.Serialize(It.IsAny<ScanAndSignMessage>()))
diff --git a/tests/Validation.PackageSigning.ScanAndSign.Tests/ScanAndSignMessageSerializerFacts.cs b/tests/Validation.PackageSigning.ScanAndSign.Tests/ScanAndSignMessageSerializerFacts.cs
@@ -3,9 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Moq;
 using Newtonsoft.Json;
 using NuGet.Jobs.Validation.ScanAndSign;
 using NuGet.Services.ServiceBus;
@@ -71,7 +69,7 @@ public void SerializesVersion2()
 
         private ScanAndSignMessageSerializer _target = new ScanAndSignMessageSerializer();
 
-        private IBrokeredMessage CreateMessage(
+        private IReceivedBrokeredMessage CreateMessage(
             int version,
             OperationRequestType operationType,
             Guid validationId,
@@ -95,11 +93,16 @@ private IBrokeredMessage CreateMessage(
 
             var payloadStr = JsonConvert.SerializeObject(payload);
 
-            var message = new BrokeredMessageWrapper(payloadStr);
-            message.Properties["SchemaName"] = "SignatureValidationMessageData";
-            message.Properties["SchemaVersion"] = version;
+            var message = new Mock<IReceivedBrokeredMessage>();
+            message.Setup(x => x.Properties).Returns(new Dictionary<string, object>
+            {
+                { "SchemaName", "SignatureValidationMessageData" },
+                { "SchemaVersion", version },
+            });
+
+            message.Setup(x => x.GetBody()).Returns(payloadStr);
 
-            return message;
+            return message.Object;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public async Task RunOrchestrationAsync()`
`38`	`38`	`{`
`39`	`39`	`_logger.LogInformation("Starting up the orchestration");`
`40`	`40`
`41`		`- _subscriptionProcessor.Start(_configuration.MaxConcurrentCalls);`
	`41`	`+ await _subscriptionProcessor.StartAsync(_configuration.MaxConcurrentCalls);`
`42`	`42`	`await Task.Delay(_configuration.ProcessRecycleInterval);`
`43`	`43`
`44`	`44`	`_logger.LogInformation("Recycling the process...");`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public PackageValidationMessageDataSerializationAdapter(IServiceBusMessageSerial`
`14`	`14`	`_serializer = serializer;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public PackageValidationMessageData Deserialize(IBrokeredMessage message)`
	`17`	`+ public PackageValidationMessageData Deserialize(IReceivedBrokeredMessage message)`
`18`	`18`	`=> _serializer.DeserializePackageValidationMessageData(message);`
`19`	`19`
`20`	`20`	`public IBrokeredMessage Serialize(PackageValidationMessageData message)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public override async Task Run()`
`45`	`45`	`$"SubcriptionProcessorJob<T>.{nameof(SetupDefaultSubscriptionProcessorConfiguration)}() or set it up your way.");`
`46`	`46`	`}`
`47`	`47`
`48`		`- processor.Start(configuration.Value.MaxConcurrentCalls);`
	`48`	`+ await processor.StartAsync(configuration.Value.MaxConcurrentCalls);`
`49`	`49`
`50`	`50`	`// Wait a certain period of time, and then shutdown this process so that it is restarted.`
`51`	`51`	`await Task.Delay(configuration.Value.ProcessDuration);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class ContentScanMessageSerializer : IBrokeredMessageSerializer<ContentSc`
`17`	`17`	`private IBrokeredMessageSerializer<CheckContentScanStatusData1> _checkScanStatusSerializer =`
`18`	`18`	`new BrokeredMessageSerializer<CheckContentScanStatusData1>();`
`19`	`19`
`20`		`- public ContentScanData Deserialize(IBrokeredMessage message)`
	`20`	`+ public ContentScanData Deserialize(IReceivedBrokeredMessage message)`
`21`	`21`	`{`
`22`	`22`	`var schemaName = message.GetSchemaName();`
`23`	`23`	`switch (schemaName)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public IBrokeredMessage Serialize(CertificateValidationMessage message)`
`24`	`24`	`});`
`25`	`25`	`}`
`26`	`26`
`27`		`- public CertificateValidationMessage Deserialize(IBrokeredMessage brokeredMessage)`
	`27`	`+ public CertificateValidationMessage Deserialize(IReceivedBrokeredMessage brokeredMessage)`
`28`	`28`	`{`
`29`	`29`	`var message = _serializer.Deserialize(brokeredMessage);`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public IBrokeredMessage Serialize(SignatureValidationMessage message)`
`26`	`26`	`});`
`27`	`27`	`}`
`28`	`28`
`29`		`- public SignatureValidationMessage Deserialize(IBrokeredMessage message)`
	`29`	`+ public SignatureValidationMessage Deserialize(IReceivedBrokeredMessage message)`
`30`	`30`	`{`
`31`	`31`	`var deserializedMessage = _serializer.Deserialize(message);`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class ScanAndSignMessageSerializer : IBrokeredMessageSerializer<ScanAndSi`
`16`	`16`	`private IBrokeredMessageSerializer<ScanAndSignMessageData2> _serializer2 =`
`17`	`17`	`new BrokeredMessageSerializer<ScanAndSignMessageData2>();`
`18`	`18`
`19`		`- public ScanAndSignMessage Deserialize(IBrokeredMessage message)`
	`19`	`+ public ScanAndSignMessage Deserialize(IReceivedBrokeredMessage message)`
`20`	`20`	`{`
`21`	`21`	`try`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class SymbolsIngesterMessageSerializer : IBrokeredMessageSerializer<Symbo`
`13`	`13`	`private IBrokeredMessageSerializer<SymbolsIngesterMessageDataV1> _serializer =`
`14`	`14`	`new BrokeredMessageSerializer<SymbolsIngesterMessageDataV1>();`
`15`	`15`
`16`		`- public SymbolsIngesterMessage Deserialize(IBrokeredMessage message)`
	`16`	`+ public SymbolsIngesterMessage Deserialize(IReceivedBrokeredMessage message)`
`17`	`17`	`{`
`18`	`18`	`var deserializedMessage = _serializer.Deserialize(message);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class SymbolsValidatorMessageSerializer : IBrokeredMessageSerializer<Symb`
`13`	`13`	`private IBrokeredMessageSerializer<SymbolsValidatorMessageDataV1> _serializer =`
`14`	`14`	`new BrokeredMessageSerializer<SymbolsValidatorMessageDataV1>();`
`15`	`15`
`16`		`- public SymbolsValidatorMessage Deserialize(IBrokeredMessage message)`
	`16`	`+ public SymbolsValidatorMessage Deserialize(IReceivedBrokeredMessage message)`
`17`	`17`	`{`
`18`	`18`	`var deserializedMessage = _serializer.Deserialize(message);`
`19`	`19`