Skip to content

Commit 1b71e8f

Browse files
mus65Rob-Hague
mus65
and
Rob-Hague
authored
fix build with .NET 9.0 SDK (sshnet#1427)
* .NET 9: fix CA1872 see https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1872 * .NET 9: fix CA2022 see dotnet/roslyn-analyzers#7208 Most of these could be safely ignored because of the following assert. As far as I can see, The SftpFileStream.Read() implementation guarentees that the specified number of bytes is read anyway. --------- Co-authored-by: Rob Hague <rob.hague00@gmail.com>
1 parent 9dc7db9 commit 1b71e8f

46 files changed

Lines changed: 107 additions & 95 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.

‎test/Renci.SshNet.IntegrationTests/SftpTests.cs‎

Lines changed: 36 additions & 35 deletions
Large diffs are not rendered by default.

‎test/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelDataMessageTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void GetBytes()
123123
Assert.AreEqual((uint)size, sshDataStream.ReadUInt32());
124124

125125
var actualData = new byte[size];
126-
sshDataStream.Read(actualData, 0, size);
126+
_ = sshDataStream.Read(actualData, 0, size);
127127
Assert.IsTrue(actualData.SequenceEqual(data.Take(offset, size)));
128128

129129
Assert.IsTrue(sshDataStream.IsEndOfData);

‎test/Renci.SshNet.Tests/Classes/Messages/Connection/ChannelOpen/ChannelOpenMessageTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ public void GetBytes()
102102
Assert.AreEqual((uint)target.ChannelType.Length, actualChannelTypeLength);
103103

104104
var actualChannelType = new byte[actualChannelTypeLength];
105-
sshDataStream.Read(actualChannelType, 0, (int)actualChannelTypeLength);
105+
_ = sshDataStream.Read(actualChannelType, 0, (int)actualChannelTypeLength);
106106
Assert.IsTrue(target.ChannelType.SequenceEqual(actualChannelType));
107107

108108
Assert.AreEqual(localChannelNumber, sshDataStream.ReadUInt32());
109109
Assert.AreEqual(initialWindowSize, sshDataStream.ReadUInt32());
110110
Assert.AreEqual(maximumPacketSize, sshDataStream.ReadUInt32());
111111

112112
var actualInfo = new byte[infoBytes.Length];
113-
sshDataStream.Read(actualInfo, 0, actualInfo.Length);
113+
_ = sshDataStream.Read(actualInfo, 0, actualInfo.Length);
114114
Assert.IsTrue(infoBytes.SequenceEqual(actualInfo));
115115

116116
Assert.IsTrue(sshDataStream.IsEndOfData);

‎test/Renci.SshNet.Tests/Classes/Messages/Transport/IgnoreMessageTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void GetBytes()
7474
Assert.AreEqual((uint)_data.Length, sshDataStream.ReadUInt32());
7575

7676
var actualData = new byte[_data.Length];
77-
sshDataStream.Read(actualData, 0, actualData.Length);
77+
_ = sshDataStream.Read(actualData, 0, actualData.Length);
7878
Assert.IsTrue(_data.SequenceEqual(actualData));
7979

8080
Assert.IsTrue(sshDataStream.IsEndOfData);

‎test/Renci.SshNet.Tests/Classes/Security/Cryptography/RsaKeyTest.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ private static RsaKey GetRsaKey(string fileName, string passPhrase = null)
2424
// This is just to line up any differences in the assertion message.
2525
private static void AssertEqual(byte[] actualBytes, string expectedHex)
2626
{
27+
#if NET
28+
string actualHex = Convert.ToHexString(actualBytes);
29+
#else
2730
string actualHex = BitConverter.ToString(actualBytes).Replace("-", "");
31+
#endif
2832

2933
Assert.AreEqual(expectedHex, actualHex,
3034
$"{Environment.NewLine}Expected: {expectedHex}{Environment.NewLine} Actual: {actualHex}");

‎test/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/FStatVfsRequestTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ public void GetBytes()
110110
Assert.AreEqual((uint)_nameBytes.Length, sshDataStream.ReadUInt32());
111111

112112
var actualNameBytes = new byte[_nameBytes.Length];
113-
sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
113+
_ = sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
114114
Assert.IsTrue(_nameBytes.SequenceEqual(actualNameBytes));
115115

116116
Assert.AreEqual((uint)_handle.Length, sshDataStream.ReadUInt32());
117117

118118
var actualHandle = new byte[_handle.Length];
119-
sshDataStream.Read(actualHandle, 0, actualHandle.Length);
119+
_ = sshDataStream.Read(actualHandle, 0, actualHandle.Length);
120120
Assert.IsTrue(_handle.SequenceEqual(actualHandle));
121121

122122
Assert.IsTrue(sshDataStream.IsEndOfData);

‎test/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/HardLinkRequestTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,19 @@ public void GetBytes()
9797
Assert.AreEqual((uint)_nameBytes.Length, sshDataStream.ReadUInt32());
9898

9999
var actualNameBytes = new byte[_nameBytes.Length];
100-
sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
100+
_ = sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
101101
Assert.IsTrue(_nameBytes.SequenceEqual(actualNameBytes));
102102

103103
Assert.AreEqual((uint)_oldPathBytes.Length, sshDataStream.ReadUInt32());
104104

105105
var actualOldPath = new byte[_oldPathBytes.Length];
106-
sshDataStream.Read(actualOldPath, 0, actualOldPath.Length);
106+
_ = sshDataStream.Read(actualOldPath, 0, actualOldPath.Length);
107107
Assert.IsTrue(_oldPathBytes.SequenceEqual(actualOldPath));
108108

109109
Assert.AreEqual((uint)_newPathBytes.Length, sshDataStream.ReadUInt32());
110110

111111
var actualNewPath = new byte[_newPathBytes.Length];
112-
sshDataStream.Read(actualNewPath, 0, actualNewPath.Length);
112+
_ = sshDataStream.Read(actualNewPath, 0, actualNewPath.Length);
113113
Assert.IsTrue(_newPathBytes.SequenceEqual(actualNewPath));
114114

115115
Assert.IsTrue(sshDataStream.IsEndOfData);

‎test/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/PosixRenameRequestTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,19 @@ public void GetBytes()
101101
Assert.AreEqual((uint)_nameBytes.Length, sshDataStream.ReadUInt32());
102102

103103
var actualNameBytes = new byte[_nameBytes.Length];
104-
sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
104+
_ = sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
105105
Assert.IsTrue(_nameBytes.SequenceEqual(actualNameBytes));
106106

107107
Assert.AreEqual((uint)_oldPathBytes.Length, sshDataStream.ReadUInt32());
108108

109109
var actualOldPath = new byte[_oldPathBytes.Length];
110-
sshDataStream.Read(actualOldPath, 0, actualOldPath.Length);
110+
_ = sshDataStream.Read(actualOldPath, 0, actualOldPath.Length);
111111
Assert.IsTrue(_oldPathBytes.SequenceEqual(actualOldPath));
112112

113113
Assert.AreEqual((uint)_newPathBytes.Length, sshDataStream.ReadUInt32());
114114

115115
var actualNewPath = new byte[_newPathBytes.Length];
116-
sshDataStream.Read(actualNewPath, 0, actualNewPath.Length);
116+
_ = sshDataStream.Read(actualNewPath, 0, actualNewPath.Length);
117117
Assert.IsTrue(_newPathBytes.SequenceEqual(actualNewPath));
118118

119119
Assert.IsTrue(sshDataStream.IsEndOfData);

‎test/Renci.SshNet.Tests/Classes/Sftp/Requests/ExtendedRequests/StatVfsRequestTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,13 @@ public void GetBytes()
116116
Assert.AreEqual((uint)_nameBytes.Length, sshDataStream.ReadUInt32());
117117

118118
var actualNameBytes = new byte[_nameBytes.Length];
119-
sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
119+
_ = sshDataStream.Read(actualNameBytes, 0, actualNameBytes.Length);
120120
Assert.IsTrue(_nameBytes.SequenceEqual(actualNameBytes));
121121

122122
Assert.AreEqual((uint)_pathBytes.Length, sshDataStream.ReadUInt32());
123123

124124
var actualPath = new byte[_pathBytes.Length];
125-
sshDataStream.Read(actualPath, 0, actualPath.Length);
125+
_ = sshDataStream.Read(actualPath, 0, actualPath.Length);
126126
Assert.IsTrue(_pathBytes.SequenceEqual(actualPath));
127127

128128
Assert.IsTrue(sshDataStream.IsEndOfData);

‎test/Renci.SshNet.Tests/Classes/Sftp/Requests/SftpBlockRequestTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void GetBytes()
9292

9393
Assert.AreEqual((uint)_handle.Length, sshDataStream.ReadUInt32());
9494
var actualHandle = new byte[_handle.Length];
95-
sshDataStream.Read(actualHandle, 0, actualHandle.Length);
95+
_ = sshDataStream.Read(actualHandle, 0, actualHandle.Length);
9696
Assert.IsTrue(_handle.SequenceEqual(actualHandle));
9797

9898
Assert.AreEqual(_offset, sshDataStream.ReadUInt64());

0 commit comments

Comments
 (0)