Skip to content

Commit e278572

Browse files
committed
Fix more nullability warnings after updating to net6.0
1 parent 0907ab2 commit e278572

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

src/NetMQ.Tests/ExceptionTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ private static T Clone<T>(T source) where T : class
108108
return Deserialise<T>(Serialise(source));
109109
}
110110

111+
#pragma warning disable SYSLIB0011 // BinaryFormatter is obsolete
111112
private static Stream Serialise(object source)
112113
{
113114
var formatter = new BinaryFormatter();
@@ -122,6 +123,7 @@ private static T Deserialise<T>(Stream stream)
122123
stream.Position = 0;
123124
return (T)formatter.Deserialize(stream);
124125
}
126+
#pragma warning restore SYSLIB0011 // BinaryFormatter is obsolete
125127

126128
#endregion
127129
}

src/NetMQ.Tests/NetMQ.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<ItemGroup>
4343
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
4444
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
45-
<PackageReference Include="xunit" Version="2.4.1" />
46-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
45+
<PackageReference Include="xunit" Version="2.4.2-pre.13" />
46+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
4747
</ItemGroup>
4848

4949
<ItemGroup Condition=" '$(TargetFramework)' == 'net47' ">

src/NetMQ.Tests/OutgoingSocketExtensionsTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ public void SendFrameEmpty()
213213
var socket = new MockOutgoingSocket((ref Msg msg, TimeSpan timeout, bool more) =>
214214
{
215215
Assert.Equal(SendReceiveConstants.InfiniteTimeout, timeout);
216+
Assert.NotNull(msg.UnsafeData);
216217
Assert.Empty(msg.UnsafeData);
217218
Assert.False(more);
218219
return true;
@@ -227,6 +228,7 @@ public void SendMoreFrameEmpty()
227228
var socket = new MockOutgoingSocket((ref Msg msg, TimeSpan timeout, bool more) =>
228229
{
229230
Assert.Equal(SendReceiveConstants.InfiniteTimeout, timeout);
231+
Assert.NotNull(msg.UnsafeData);
230232
Assert.Empty(msg.UnsafeData);
231233
Assert.True(more);
232234
return true;
@@ -242,6 +244,7 @@ public void TrySendFrameEmpty()
242244
var socket = new MockOutgoingSocket((ref Msg msg, TimeSpan timeout, bool more) =>
243245
{
244246
Assert.Equal(TimeSpan.Zero, timeout);
247+
Assert.NotNull(msg.UnsafeData);
245248
Assert.Empty(msg.UnsafeData);
246249
Assert.False(more);
247250
return true;
@@ -257,6 +260,7 @@ public void TrySendFrameEmptyFailed()
257260
var socket = new MockOutgoingSocket((ref Msg msg, TimeSpan timeout, bool more) =>
258261
{
259262
Assert.Equal(TimeSpan.Zero, timeout);
263+
Assert.NotNull(msg.UnsafeData);
260264
Assert.Empty(msg.UnsafeData);
261265
Assert.False(more);
262266
return false;

src/NetMQ.Tests/PgmTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void UseInterface()
8282
{
8383
var hostEntry = Dns.GetHostEntry(Dns.GetHostName());
8484

85-
string ip = hostEntry.AddressList
85+
string? ip = hostEntry.AddressList
8686
.Where(addr => addr.AddressFamily == AddressFamily.InterNetwork)
8787
.Select(addr => addr.ToString())
8888
.FirstOrDefault();

src/NetMQ.Tests/ThrowingTraceListener.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ namespace NetMQ.Tests
66
{
77
public sealed class ThrowingTraceListener : TraceListener
88
{
9-
public override void Fail(string message, string detailMessage)
9+
public override void Fail(string? message, string? detailMessage)
1010
{
1111
throw new DebugAssertFailureException((message + Environment.NewLine + detailMessage).Trim());
1212
}
1313

14-
public override void Write(string message)
14+
public override void Write(string? message)
1515
{
1616
}
1717

18-
public override void WriteLine(string message)
18+
public override void WriteLine(string? message)
1919
{
2020
}
2121

0 commit comments

Comments
 (0)