.

Author: SimonCropp

Directory.Build.props

@@ -14,8 +14,6 @@
     <PackageProjectUrl>https://docs.particular.net/nuget/$(PackageId)</PackageProjectUrl>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludePDBsInPackage</TargetsForTfmSpecificContentInPackage>
     <PackageOutputPath>..\nugets</PackageOutputPath>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Target Name="IncludePDBsInPackage">
     <ItemGroup>

NServiceBus.Hyperion/AssemblyInfo.cs

@@ -2,7 +2,6 @@
 
 static class Guard
 {
-
     // ReSharper disable UnusedParameter.Global
     public static void AgainstNull(object value, string argumentName)
     {

NServiceBus.Hyperion/Guard.cs

@@ -1,18 +1,16 @@
 using Hyperion;
-using NServiceBus.Configuration.AdvanceExtensibility;
+using NServiceBus.Configuration.AdvancedExtensibility;
 using NServiceBus.Serialization;
 using NServiceBus.Settings;
 using NServiceBus.Hyperion;
 
 namespace NServiceBus
 {
-
     /// <summary>
     /// Extensions for <see cref="SerializationExtensions{T}"/> to manipulate how messages are serialized via Hyperion.
     /// </summary>
     public static class HyperionConfigurationExtensions
     {
-
         /// <summary>
         /// Configures the <see cref="SerializerOptions"/> to use.
         /// </summary>
@@ -21,6 +19,7 @@ public static class HyperionConfigurationExtensions
         public static void Options(this SerializationExtensions<HyperionSerializer> config, SerializerOptions options)
         {
             Guard.AgainstNull(config, nameof(config));
+            Guard.AgainstNull(options, nameof(options));
             var settings = config.GetSettings();
             settings.Set<SerializerOptions>(options);
         }

NServiceBus.Hyperion/HyperionConfigurationExtensions.cs

@@ -4,45 +4,46 @@
 using NServiceBus.Serialization;
 using Hyperion;
 
-    class HyperionMessageSerializer : IMessageSerializer
-    {
-        Serializer serializer;
+class HyperionMessageSerializer : IMessageSerializer
+{
+    Serializer serializer;
 
-        public HyperionMessageSerializer(string contentType, SerializerOptions options)
+    public HyperionMessageSerializer(string contentType, SerializerOptions options)
+    {
+        if (options == null)
         {
-            if (options == null)
-            {
-                serializer = new Serializer();
-            }
-            else
-            {
-                serializer = new Serializer(options);
-            }
-
-            if (contentType == null)
-            {
-                ContentType = "hyperion";
-            }
-            else
-            {
-                ContentType = contentType;
-            }
+            serializer = new Serializer();
+        }
+        else
+        {
+            serializer = new Serializer(options);
         }
 
-        public void Serialize(object message, Stream stream)
+        if (contentType == null)
         {
-            var messageType = message.GetType();
-            if (messageType.Name.EndsWith("__impl"))
-            {
-                throw new Exception("Interface based message are not currently supported. Create a class that implements the desired interface.");
-            }
-            serializer.Serialize(message, stream);
+            ContentType = "hyperion";
         }
+        else
+        {
+            ContentType = contentType;
+        }
+    }
 
-        public object[] Deserialize(Stream stream, IList<Type> messageTypes = null)
+    public void Serialize(object message, Stream stream)
+    {
+        var messageType = message.GetType();
+        if (messageType.Name.EndsWith("__impl"))
         {
-            return new [] { serializer.Deserialize(stream) };
+            throw new Exception("Interface based message are not currently supported. Create a class that implements the desired interface.");
         }
 
-        public string ContentType { get; }
-    }
+        serializer.Serialize(message, stream);
+    }
+
+    public object[] Deserialize(Stream stream, IList<Type> messageTypes = null)
+    {
+        return new[] {serializer.Deserialize(stream)};
+    }
+
+    public string ContentType { get; }
+}

NServiceBus.Hyperion/HyperionMessageSerializer.cs

@@ -15,6 +15,7 @@ public class HyperionSerializer : SerializationDefinition
         /// </summary>
         public override Func<IMessageMapper, IMessageSerializer> Configure(ReadOnlySettings settings)
         {
+            Guard.AgainstNull(settings, nameof(settings));
             return mapper =>
             {
                 var options = settings.GetOptions();

NServiceBus.Hyperion/HyperionSerializer.cs

@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <DocumentationFile>$(ProjectDir)bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile>
+    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Hyperion" Version="0.9.2" />
-    <PackageReference Include="NServiceBus" Version="6.3.4" />
-    <PackageReference Include="PepitaPackage" Version="1.21.4" />
+    <PackageReference Include="Hyperion" Version="0.9.8" />
+    <PackageReference Include="NServiceBus" Version="7.0.1" />
   </ItemGroup>
-  <Target Name="NuGetBuild" AfterTargets="AfterBuild">
-    <ItemGroup>
-      <FilesToDelete Include="$(SolutionDir)NuGetBuild\**\*.*" />
-    </ItemGroup>
-    <Delete Files="@(FilesToDelete)" />
-    <Copy SourceFiles="$(OutputPath)NServiceBus.Hyperion.dll" DestinationFolder="$(SolutionDir)NuGetBuild\lib\net452" />
-    <Copy SourceFiles="$(OutputPath)NServiceBus.Hyperion.pdb" DestinationFolder="$(SolutionDir)NuGetBuild\lib\net452" />
-    <Copy SourceFiles="$(OutputPath)NServiceBus.Hyperion.xml" DestinationFolder="$(SolutionDir)NuGetBuild\lib\net452" />
-    <Copy SourceFiles="$(ProjectDir)NServiceBus.Hyperion.nuspec" DestinationFolder="$(SolutionDir)NuGetBuild" />
-    <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetBuild" MetadataAssembly="$(OutputPath)\NServiceBus.Hyperion.dll" />
-  </Target>
 </Project>

NServiceBus.Hyperion/NServiceBus.Hyperion.csproj

@@ -1,12 +1,20 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 15.0.26403.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.Hyperion", "NServiceBus.Hyperion\NServiceBus.Hyperion.csproj", "{29ED7A0C-9A61-4416-A020-AAB1E1C5C743}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Hyperion", "NServiceBus.Hyperion\NServiceBus.Hyperion.csproj", "{29ED7A0C-9A61-4416-A020-AAB1E1C5C743}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{D1C231FA-FFF6-4B8A-AFEE-DABD7F8324E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "Sample\Sample.csproj", "{D1C231FA-FFF6-4B8A-AFEE-DABD7F8324E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{B4AD5761-3E58-42EE-AD76-AE13E6E2213B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{B4AD5761-3E58-42EE-AD76-AE13E6E2213B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6D8F49E3-6EF5-4764-B383-2CD748A6FBA5}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		appveyor.yml = appveyor.yml
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,4 +38,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {53DB8AA8-0FCD-4BE3-A21C-99B54E441930}
+	EndGlobalSection
 EndGlobal

NServiceBus.Hyperion/NServiceBus.Hyperion.nuspec

@@ -4,4 +4,4 @@
 public class MyMessage : IMessage
 {
     public DateTime DateSend { get; set; }
-}
+}