Skip to content

Commit

Permalink
Update .NET SDK to 5.0.201
Browse files Browse the repository at this point in the history
This also gives us a new preprocessor symbol: `NET5_0_OR_GREATER`, which we now use to future-proof against targeting newer .NET versions.
  • Loading branch information
AArnott committed Apr 17, 2021
1 parent 27230c7 commit 827abd9
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.100",
"version": "5.0.201",
"rollForward": "patch",
"allowPrerelease": false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ public T Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions
}
}

#if NET5_0
#if NET5_0_OR_GREATER

public sealed class HalfFormatter : IMessagePackFormatter<Half>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ internal static class BuiltinResolverGetFormatterHelper
{ typeof(System.Numerics.Complex), ComplexFormatter.Instance },
{ typeof(System.Numerics.Complex?), new StaticNullableFormatter<System.Numerics.Complex>(ComplexFormatter.Instance) },

#if NET5_0
#if NET5_0_OR_GREATER
{ typeof(System.Half), HalfFormatter.Instance },
#endif
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public void UriTest_Relative()
this.Convert(relative).ToString().Is("/me/");
}

#if NET5_0
#if NET5_0_OR_GREATER

[Fact]
public void HalfTest()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using Xunit;

#if NET5_0
#if NET5_0_OR_GREATER

namespace MessagePack.Tests
{
Expand Down
2 changes: 1 addition & 1 deletion tests/MessagePack.Tests/IsExternalInit.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) All contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

#if !NET5_0
#if !NET5_0_OR_GREATER

#pragma warning disable CA1812

Expand Down

0 comments on commit 827abd9

Please sign in to comment.