diff --git a/Directory.Packages.props b/Directory.Packages.props index d455a8a3b..0ffc049d3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,23 +5,23 @@ - + - - + + - + - - + + - + - + - + \ No newline at end of file diff --git a/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Concat.cs b/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Concat.cs index 2581826bb..483914841 100644 --- a/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Concat.cs +++ b/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Concat.cs @@ -26,7 +26,9 @@ public void ShouldReturnSecondWhenFirstIsEmpty() var actual = Extensions.Concat(first, second); Assert.IsNotNull(actual); +#pragma warning disable MSTEST0065 // Avoid Assert.AreEqual on collection types Assert.AreEqual(second, actual); +#pragma warning restore MSTEST0065 // Avoid Assert.AreEqual on collection types } [TestMethod] @@ -38,7 +40,9 @@ public void ShouldReturnSecondWhenFirstIsNull() var actual = Extensions.Concat(first, second); Assert.IsNotNull(actual); +#pragma warning disable MSTEST0065 // Avoid Assert.AreEqual on collection types Assert.AreEqual(second, actual); +#pragma warning restore MSTEST0065 // Avoid Assert.AreEqual on collection types } [TestMethod] @@ -50,7 +54,9 @@ public void ShouldReturnFirstWhenSecondIsEmpty() var actual = Extensions.Concat(first, second); Assert.IsNotNull(actual); +#pragma warning disable MSTEST0065 // Avoid Assert.AreEqual on collection types Assert.AreEqual(first, actual); +#pragma warning restore MSTEST0065 // Avoid Assert.AreEqual on collection types } [TestMethod] @@ -62,7 +68,9 @@ public void ShouldReturnFirstWhenSecondIsNull() var actual = Extensions.Concat(first, second); Assert.IsNotNull(actual); +#pragma warning disable MSTEST0065 // Avoid Assert.AreEqual on collection types Assert.AreEqual(first, actual); +#pragma warning restore MSTEST0065 // Avoid Assert.AreEqual on collection types } [TestMethod] diff --git a/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Pad.cs b/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Pad.cs index d14a4e172..c750f8e62 100644 --- a/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Pad.cs +++ b/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Pad.cs @@ -12,7 +12,9 @@ public void ShouldReturnNotPadded() { byte[] value = { 0x0a, 0x0d }; var padded = value.Pad(2); +#pragma warning disable MSTEST0065 // Avoid Assert.AreEqual on collection types Assert.AreEqual(value, padded); +#pragma warning restore MSTEST0065 // Avoid Assert.AreEqual on collection types Assert.HasCount(value.Length, padded); } diff --git a/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Take_OffsetAndCount.cs b/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Take_OffsetAndCount.cs index 85978bd2d..cd511ed7d 100644 --- a/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Take_OffsetAndCount.cs +++ b/test/Renci.SshNet.Tests/Classes/Common/ExtensionsTest_Take_OffsetAndCount.cs @@ -61,7 +61,9 @@ public void ShouldReturnValueWhenCountIsEqualToLengthOfValueAndOffsetIsZero() Assert.IsNotNull(actual); Assert.HasCount(value.Length, actual); +#pragma warning disable MSTEST0065 // Avoid Assert.AreEqual on collection types Assert.AreEqual(value, actual); +#pragma warning restore MSTEST0065 // Avoid Assert.AreEqual on collection types } [TestMethod] diff --git a/test/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_ServerSendsUnsafeName.cs b/test/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_ServerSendsUnsafeName.cs index 98b63d7f1..a53e39a84 100644 --- a/test/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_ServerSendsUnsafeName.cs +++ b/test/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_ServerSendsUnsafeName.cs @@ -49,8 +49,6 @@ protected override void SetupData() protected override void SetupMocks() { - _ = ServiceFactoryMock.Setup(p => p.CreateRemotePathDoubleQuoteTransformation()) - .Returns(_remotePathTransformationMock.Object); _ = ServiceFactoryMock.Setup(p => p.CreateSocketFactory()) .Returns(SocketFactoryMock.Object); _ = ServiceFactoryMock.Setup(p => p.CreateSession(_connectionInfo, SocketFactoryMock.Object)) @@ -73,7 +71,7 @@ protected override void Arrange() { base.Arrange(); - _scpClient = new ScpClient(_connectionInfo, false, ServiceFactoryMock.Object); + _scpClient = new ScpClient(_connectionInfo, false, ServiceFactoryMock.Object, _remotePathTransformationMock.Object); _scpClient.Connect(); } diff --git a/version.json b/version.json index 1945ff7bb..6a43a40d0 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "2025.1.1-prerelease.{height}", + "version": "2026.0.0", "assemblyVersion": { "precision": "revision" }, @@ -15,4 +15,4 @@ "versionIncrement": "build", "firstUnstableTag": "prerelease" } -} \ No newline at end of file +}