Skip to content
This repository was archived by the owner on Mar 14, 2023. It is now read-only.

Commit 549b144

Browse files
SimonCroppSimonCropp
committed
.
1 parent c3f3325 commit 549b144

204 files changed

Lines changed: 80 additions & 17059 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Directory.Build.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
<PackageProjectUrl>https://docs.particular.net/nuget/$(PackageId)</PackageProjectUrl>
1515
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludePDBsInPackage</TargetsForTfmSpecificContentInPackage>
1616
<PackageOutputPath>..\nugets</PackageOutputPath>
17-
<SignAssembly>true</SignAssembly>
18-
<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
1917
</PropertyGroup>
2018
<Target Name="IncludePDBsInPackage">
2119
<ItemGroup>

‎NServiceBus.Hyperion/AssemblyInfo.cs‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎NServiceBus.Hyperion/Guard.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
static class Guard
44
{
5-
65
// ReSharper disable UnusedParameter.Global
76
public static void AgainstNull(object value, string argumentName)
87
{

‎NServiceBus.Hyperion/HyperionConfigurationExtensions.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
using Hyperion;
2-
using NServiceBus.Configuration.AdvanceExtensibility;
2+
using NServiceBus.Configuration.AdvancedExtensibility;
33
using NServiceBus.Serialization;
44
using NServiceBus.Settings;
55
using NServiceBus.Hyperion;
66

77
namespace NServiceBus
88
{
9-
109
/// <summary>
1110
/// Extensions for <see cref="SerializationExtensions{T}"/> to manipulate how messages are serialized via Hyperion.
1211
/// </summary>
1312
public static class HyperionConfigurationExtensions
1413
{
15-
1614
/// <summary>
1715
/// Configures the <see cref="SerializerOptions"/> to use.
1816
/// </summary>
@@ -21,6 +19,7 @@ public static class HyperionConfigurationExtensions
2119
public static void Options(this SerializationExtensions<HyperionSerializer> config, SerializerOptions options)
2220
{
2321
Guard.AgainstNull(config, nameof(config));
22+
Guard.AgainstNull(options, nameof(options));
2423
var settings = config.GetSettings();
2524
settings.Set<SerializerOptions>(options);
2625
}

‎NServiceBus.Hyperion/HyperionMessageSerializer.cs‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,46 @@
44
using NServiceBus.Serialization;
55
using Hyperion;
66

7-
class HyperionMessageSerializer : IMessageSerializer
8-
{
9-
Serializer serializer;
7+
class HyperionMessageSerializer : IMessageSerializer
8+
{
9+
Serializer serializer;
1010

11-
public HyperionMessageSerializer(string contentType, SerializerOptions options)
11+
public HyperionMessageSerializer(string contentType, SerializerOptions options)
12+
{
13+
if (options == null)
1214
{
13-
if (options == null)
14-
{
15-
serializer = new Serializer();
16-
}
17-
else
18-
{
19-
serializer = new Serializer(options);
20-
}
21-
22-
if (contentType == null)
23-
{
24-
ContentType = "hyperion";
25-
}
26-
else
27-
{
28-
ContentType = contentType;
29-
}
15+
serializer = new Serializer();
16+
}
17+
else
18+
{
19+
serializer = new Serializer(options);
3020
}
3121

32-
public void Serialize(object message, Stream stream)
22+
if (contentType == null)
3323
{
34-
var messageType = message.GetType();
35-
if (messageType.Name.EndsWith("__impl"))
36-
{
37-
throw new Exception("Interface based message are not currently supported. Create a class that implements the desired interface.");
38-
}
39-
serializer.Serialize(message, stream);
24+
ContentType = "hyperion";
4025
}
26+
else
27+
{
28+
ContentType = contentType;
29+
}
30+
}
4131

42-
public object[] Deserialize(Stream stream, IList<Type> messageTypes = null)
32+
public void Serialize(object message, Stream stream)
33+
{
34+
var messageType = message.GetType();
35+
if (messageType.Name.EndsWith("__impl"))
4336
{
44-
return new [] { serializer.Deserialize(stream) };
37+
throw new Exception("Interface based message are not currently supported. Create a class that implements the desired interface.");
4538
}
4639

47-
public string ContentType { get; }
48-
}
40+
serializer.Serialize(message, stream);
41+
}
42+
43+
public object[] Deserialize(Stream stream, IList<Type> messageTypes = null)
44+
{
45+
return new[] {serializer.Deserialize(stream)};
46+
}
47+
48+
public string ContentType { get; }
49+
}

‎NServiceBus.Hyperion/HyperionSerializer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class HyperionSerializer : SerializationDefinition
1515
/// </summary>
1616
public override Func<IMessageMapper, IMessageSerializer> Configure(ReadOnlySettings settings)
1717
{
18+
Guard.AgainstNull(settings, nameof(settings));
1819
return mapper =>
1920
{
2021
var options = settings.GetOptions();

‎NServiceBus.Hyperion/NServiceBus.Hyperion.csproj‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net452</TargetFramework>
5-
<WarningLevel>4</WarningLevel>
6-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8-
<DocumentationFile>$(ProjectDir)bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile>
4+
<TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
97
</PropertyGroup>
108
<ItemGroup>
11-
<PackageReference Include="Hyperion" Version="0.9.2" />
12-
<PackageReference Include="NServiceBus" Version="6.3.4" />
13-
<PackageReference Include="PepitaPackage" Version="1.21.4" />
9+
<PackageReference Include="Hyperion" Version="0.9.8" />
10+
<PackageReference Include="NServiceBus" Version="7.0.1" />
1411
</ItemGroup>
15-
<Target Name="NuGetBuild" AfterTargets="AfterBuild">
16-
<ItemGroup>
17-
<FilesToDelete Include="$(SolutionDir)NuGetBuild\**\*.*" />
18-
</ItemGroup>
19-
<Delete Files="@(FilesToDelete)" />
20-
<Copy SourceFiles="$(OutputPath)NServiceBus.Hyperion.dll" DestinationFolder="$(SolutionDir)NuGetBuild\lib\net452" />
21-
<Copy SourceFiles="$(OutputPath)NServiceBus.Hyperion.pdb" DestinationFolder="$(SolutionDir)NuGetBuild\lib\net452" />
22-
<Copy SourceFiles="$(OutputPath)NServiceBus.Hyperion.xml" DestinationFolder="$(SolutionDir)NuGetBuild\lib\net452" />
23-
<Copy SourceFiles="$(ProjectDir)NServiceBus.Hyperion.nuspec" DestinationFolder="$(SolutionDir)NuGetBuild" />
24-
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetBuild" MetadataAssembly="$(OutputPath)\NServiceBus.Hyperion.dll" />
25-
</Target>
2612
</Project>

‎NServiceBus.Hyperion/NServiceBus.Hyperion.nuspec‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎NsbHyperion.sln‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio 15
34
VisualStudioVersion = 15.0.26403.7
45
MinimumVisualStudioVersion = 15.0.26403.0
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.Hyperion", "NServiceBus.Hyperion\NServiceBus.Hyperion.csproj", "{29ED7A0C-9A61-4416-A020-AAB1E1C5C743}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Hyperion", "NServiceBus.Hyperion\NServiceBus.Hyperion.csproj", "{29ED7A0C-9A61-4416-A020-AAB1E1C5C743}"
67
EndProject
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "Sample\Sample.csproj", "{D1C231FA-FFF6-4B8A-AFEE-DABD7F8324E3}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "Sample\Sample.csproj", "{D1C231FA-FFF6-4B8A-AFEE-DABD7F8324E3}"
89
EndProject
9-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{B4AD5761-3E58-42EE-AD76-AE13E6E2213B}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{B4AD5761-3E58-42EE-AD76-AE13E6E2213B}"
11+
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6D8F49E3-6EF5-4764-B383-2CD748A6FBA5}"
13+
ProjectSection(SolutionItems) = preProject
14+
.editorconfig = .editorconfig
15+
appveyor.yml = appveyor.yml
16+
Directory.Build.props = Directory.Build.props
17+
EndProjectSection
1018
EndProject
1119
Global
1220
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,4 +38,7 @@ Global
3038
GlobalSection(SolutionProperties) = preSolution
3139
HideSolutionNode = FALSE
3240
EndGlobalSection
41+
GlobalSection(ExtensibilityGlobals) = postSolution
42+
SolutionGuid = {53DB8AA8-0FCD-4BE3-A21C-99B54E441930}
43+
EndGlobalSection
3344
EndGlobal

‎Sample/MyMessage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
public class MyMessage : IMessage
55
{
66
public DateTime DateSend { get; set; }
7-
}
7+
}

0 commit comments

Comments
 (0)