Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.6.2" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.7.0" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" />
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.114" />
<PackageVersion Include="GitHubActionsTestLogger" Version="3.0.5" />
<PackageVersion Include="Meziantou.Analyzer" Version="3.0.125" />
<!-- Should stay on LTS .NET releases. -->
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="10.0.9" />
<PackageVersion Include="Microsoft.Bcl.Cryptography" Version="10.0.10" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.9" />
<PackageVersion Include="MSTest" Version="4.2.3" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.10" />
<PackageVersion Include="MSTest" Version="4.3.3" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.10.85" />
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.10.91" />
<PackageVersion Include="PolySharp" Version="1.16.0" />
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.27.0.140913" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
<!-- Should stay on LTS .NET releases. -->
<PackageVersion Include="System.Formats.Asn1" Version="10.0.9" />
<PackageVersion Include="System.Formats.Asn1" Version="10.0.10" />
<PackageVersion Include="Testcontainers" Version="4.13.0" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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();
}

Expand Down
4 changes: 2 additions & 2 deletions version.json
Original file line number Diff line number Diff line change
@@ -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"
},
Expand All @@ -15,4 +15,4 @@
"versionIncrement": "build",
"firstUnstableTag": "prerelease"
}
}
}