Skip to content

Commit e29b8ab

Browse files
mnadareskimnadareski
committed
Add support for .NET 10
1 parent 6075aa2 commit e29b8ab

File tree

100 files changed

+865
-948
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+865
-948
lines changed

‎.github/workflows/build_and_test.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313
with:
1414
fetch-depth: 0
1515

1616
- name: Setup .NET
17-
uses: actions/setup-dotnet@v4
17+
uses: actions/setup-dotnet@v5
1818
with:
1919
dotnet-version: |
20-
6.0.x
2120
8.0.x
2221
9.0.x
22+
10.0.x
2323
2424
- name: Run tests
2525
run: dotnet test
@@ -36,7 +36,7 @@ jobs:
3636
git push origin rolling --force
3737
3838
- name: Upload to rolling
39-
uses: ncipollo/release-action@v1.14.0
39+
uses: ncipollo/release-action@v1.20.0
4040
with:
4141
allowUpdates: True
4242
artifacts: "*.nupkg,*.snupkg"

‎.github/workflows/check_pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v5
1010

1111
- name: Setup .NET
12-
uses: actions/setup-dotnet@v4
12+
uses: actions/setup-dotnet@v5
1313
with:
1414
dotnet-version: |
15-
6.0.x
1615
8.0.x
1716
9.0.x
17+
10.0.x
1818
1919
- name: Build
2020
run: dotnet build

‎SabreTools.IO.Test/Compression/BZip2Tests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void BZip2OutputStreamTest()
2929
{
3030
string path = Path.Combine(Environment.CurrentDirectory, "TestData", "file-to-compress.bin");
3131
byte[] input = File.ReadAllBytes(path);
32-
MemoryStream output = new MemoryStream();
32+
var output = new MemoryStream();
3333

3434
var bzip = new BZip2OutputStream(output, leaveOpen: true);
3535
bzip.Write(input, 0, input.Length);
@@ -38,4 +38,4 @@ public void BZip2OutputStreamTest()
3838
Assert.Equal(122, output.Length);
3939
}
4040
}
41-
}
41+
}

‎SabreTools.IO.Test/Compression/BlastTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ public void DecompressorTest()
2424
Assert.Equal("AIAIAIAIAIAIA", str);
2525
}
2626
}
27-
}
27+
}

‎SabreTools.IO.Test/Compression/MSZIPTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public void DecompressorTest()
1616
// CFDATA blocks.
1717
string path = Path.Combine(Environment.CurrentDirectory, "TestData", "test-archive.msz");
1818
byte[] inputBytes = File.ReadAllBytes(path);
19-
MemoryStream input = new MemoryStream(inputBytes);
20-
MemoryStream output = new MemoryStream();
19+
var input = new MemoryStream(inputBytes);
20+
var output = new MemoryStream();
2121

2222
var decompressor = Decompressor.Create();
2323
input.SeekIfPossible(0x0000);
@@ -28,4 +28,4 @@ public void DecompressorTest()
2828
Assert.Equal(38470, output.Length);
2929
}
3030
}
31-
}
31+
}

‎SabreTools.IO.Test/Compression/QuantumTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ public void DecompressorTest()
2626
Assert.Equal(38470, output.Length);
2727
}
2828
}
29-
}
29+
}

‎SabreTools.IO.Test/Extensions/BinaryReaderExtensionsTests.cs‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ public void ReadDecimalTest()
636636
[Fact]
637637
public void ReadDecimalBigEndianTest()
638638
{
639-
var stream = new MemoryStream(_decimalBytes.Reverse().ToArray());
639+
var stream = new MemoryStream([.. Enumerable.Reverse(_decimalBytes)]);
640640
var br = new BinaryReader(stream);
641641
decimal expected = 0.0123456789M;
642642
decimal read = br.ReadDecimalBigEndian();
@@ -658,7 +658,7 @@ public void ReadGuidBigEndianTest()
658658
{
659659
var stream = new MemoryStream(_bytes);
660660
var br = new BinaryReader(stream);
661-
var expected = new Guid(_bytes.Reverse().ToArray());
661+
var expected = new Guid([.. Enumerable.Reverse(_bytes)]);
662662
Guid read = br.ReadGuidBigEndian();
663663
Assert.Equal(expected, read);
664664
}
@@ -678,7 +678,7 @@ public void ReadInt128BigEndianTest()
678678
{
679679
var stream = new MemoryStream(_bytes);
680680
var br = new BinaryReader(stream);
681-
var reversed = _bytes.Reverse().ToArray();
681+
var reversed = Enumerable.Reverse(_bytes).ToArray();
682682
var expected = (Int128)new BigInteger(reversed);
683683
Int128 read = br.ReadInt128BigEndian();
684684
Assert.Equal(expected, read);
@@ -699,7 +699,7 @@ public void ReadUInt128BigEndianTest()
699699
{
700700
var stream = new MemoryStream(_bytes);
701701
var br = new BinaryReader(stream);
702-
var reversed = _bytes.Reverse().ToArray();
702+
var reversed = Enumerable.Reverse(_bytes).ToArray();
703703
var expected = (UInt128)new BigInteger(reversed);
704704
UInt128 read = br.ReadUInt128BigEndian();
705705
Assert.Equal(expected, read);
@@ -780,14 +780,14 @@ public void ReadTypeTest()
780780
br = new BinaryReader(stream);
781781
Int128 expectedInt128 = (Int128)new BigInteger(_bytes);
782782
Int128 actualInt128 = br.ReadType<Int128>();
783-
Assert.Equal(expectedHalf, actualHalf);
783+
Assert.Equal(expectedInt128, actualInt128);
784784

785785
// UInt128
786786
stream = new MemoryStream(_bytes);
787787
br = new BinaryReader(stream);
788788
UInt128 expectedUInt128 = (UInt128)new BigInteger(_bytes);
789789
UInt128 actualUInt128 = br.ReadType<UInt128>();
790-
Assert.Equal(expectedHalf, actualHalf);
790+
Assert.Equal(expectedUInt128, actualUInt128);
791791

792792
// Enum
793793
stream = new MemoryStream(_bytes);
@@ -1627,7 +1627,7 @@ public void PeekDecimalTest()
16271627
[Fact]
16281628
public void PeekDecimalBigEndianTest()
16291629
{
1630-
var stream = new MemoryStream(_decimalBytes.Reverse().ToArray());
1630+
var stream = new MemoryStream([.. Enumerable.Reverse(_decimalBytes)]);
16311631
var br = new BinaryReader(stream);
16321632
decimal expected = 0.0123456789M;
16331633
decimal read = br.PeekDecimalBigEndian();
@@ -1651,7 +1651,7 @@ public void PeekGuidBigEndianTest()
16511651
{
16521652
var stream = new MemoryStream(_bytes);
16531653
var br = new BinaryReader(stream);
1654-
var expected = new Guid(_bytes.Reverse().ToArray());
1654+
var expected = new Guid([.. Enumerable.Reverse(_bytes)]);
16551655
Guid read = br.PeekGuidBigEndian();
16561656
Assert.Equal(expected, read);
16571657
Assert.Equal(0, br.BaseStream.Position);
@@ -1673,7 +1673,7 @@ public void PeekInt128BigEndianTest()
16731673
{
16741674
var stream = new MemoryStream(_bytes);
16751675
var br = new BinaryReader(stream);
1676-
var reversed = _bytes.Reverse().ToArray();
1676+
var reversed = Enumerable.Reverse(_bytes).ToArray();
16771677
var expected = (Int128)new BigInteger(reversed);
16781678
Int128 read = br.PeekInt128BigEndian();
16791679
Assert.Equal(expected, read);
@@ -1696,7 +1696,7 @@ public void PeekUInt128BigEndianTest()
16961696
{
16971697
var stream = new MemoryStream(_bytes);
16981698
var br = new BinaryReader(stream);
1699-
var reversed = _bytes.Reverse().ToArray();
1699+
var reversed = Enumerable.Reverse(_bytes).ToArray();
17001700
var expected = (UInt128)new BigInteger(reversed);
17011701
UInt128 read = br.PeekUInt128BigEndian();
17021702
Assert.Equal(expected, read);
@@ -1908,7 +1908,6 @@ public void TryReadHalfTest()
19081908
{
19091909
var stream = new MemoryStream([]);
19101910
var br = new BinaryReader(stream);
1911-
Half expected = BitConverter.Int16BitsToHalf(0x0100);
19121911
bool actual = br.TryReadHalf(out Half read);
19131912
Assert.False(actual);
19141913
Assert.Equal(default, read);
@@ -1919,7 +1918,6 @@ public void TryReadHalfBigEndianTest()
19191918
{
19201919
var stream = new MemoryStream([]);
19211920
var br = new BinaryReader(stream);
1922-
Half expected = BitConverter.Int16BitsToHalf(0x0001);
19231921
bool actual = br.TryReadHalfBigEndian(out Half read);
19241922
Assert.False(actual);
19251923
Assert.Equal(default, read);
@@ -2113,7 +2111,6 @@ public void TryReadSingleTest()
21132111
{
21142112
var stream = new MemoryStream([]);
21152113
var br = new BinaryReader(stream);
2116-
float expected = BitConverter.Int32BitsToSingle(0x03020100);
21172114
bool actual = br.TryReadSingle(out float read);
21182115
Assert.False(actual);
21192116
Assert.Equal(default, read);
@@ -2124,7 +2121,6 @@ public void TryReadSingleBigEndianTest()
21242121
{
21252122
var stream = new MemoryStream([]);
21262123
var br = new BinaryReader(stream);
2127-
float expected = BitConverter.Int32BitsToSingle(0x00010203);
21282124
bool actual = br.TryReadSingleBigEndian(out float read);
21292125
Assert.False(actual);
21302126
Assert.Equal(default, read);
@@ -2318,7 +2314,6 @@ public void TryReadDoubleTest()
23182314
{
23192315
var stream = new MemoryStream([]);
23202316
var br = new BinaryReader(stream);
2321-
double expected = BitConverter.Int64BitsToDouble(0x0706050403020100);
23222317
bool actual = br.TryReadDouble(out double read);
23232318
Assert.False(actual);
23242319
Assert.Equal(default, read);
@@ -2329,7 +2324,6 @@ public void TryReadDoubleBigEndianTest()
23292324
{
23302325
var stream = new MemoryStream([]);
23312326
var br = new BinaryReader(stream);
2332-
double expected = BitConverter.Int64BitsToDouble(0x0001020304050607);
23332327
bool actual = br.TryReadDoubleBigEndian(out double read);
23342328
Assert.False(actual);
23352329
Assert.Equal(default, read);
@@ -2360,7 +2354,6 @@ public void TryReadGuidTest()
23602354
{
23612355
var stream = new MemoryStream([]);
23622356
var br = new BinaryReader(stream);
2363-
var expected = new Guid(_bytes);
23642357
bool actual = br.TryReadGuid(out Guid read);
23652358
Assert.False(actual);
23662359
Assert.Equal(default, read);
@@ -2371,7 +2364,6 @@ public void TryReadGuidBigEndianTest()
23712364
{
23722365
var stream = new MemoryStream([]);
23732366
var br = new BinaryReader(stream);
2374-
var expected = new Guid(_bytes.Reverse().ToArray());
23752367
bool actual = br.TryReadGuidBigEndian(out Guid read);
23762368
Assert.False(actual);
23772369
Assert.Equal(default, read);
@@ -2382,7 +2374,6 @@ public void TryReadInt128Test()
23822374
{
23832375
var stream = new MemoryStream([]);
23842376
var br = new BinaryReader(stream);
2385-
var expected = (Int128)new BigInteger(_bytes);
23862377
bool actual = br.TryReadInt128(out Int128 read);
23872378
Assert.False(actual);
23882379
Assert.Equal(default, read);
@@ -2393,8 +2384,6 @@ public void TryReadInt128BigEndianTest()
23932384
{
23942385
var stream = new MemoryStream([]);
23952386
var br = new BinaryReader(stream);
2396-
var reversed = _bytes.Reverse().ToArray();
2397-
var expected = (Int128)new BigInteger(reversed);
23982387
bool actual = br.TryReadInt128BigEndian(out Int128 read);
23992388
Assert.False(actual);
24002389
Assert.Equal(default, read);
@@ -2405,7 +2394,6 @@ public void TryReadUInt128Test()
24052394
{
24062395
var stream = new MemoryStream([]);
24072396
var br = new BinaryReader(stream);
2408-
var expected = (UInt128)new BigInteger(_bytes);
24092397
bool actual = br.TryReadUInt128(out UInt128 read);
24102398
Assert.False(actual);
24112399
Assert.Equal(default, read);
@@ -2416,8 +2404,6 @@ public void TryReadUInt128BigEndianTest()
24162404
{
24172405
var stream = new MemoryStream([]);
24182406
var br = new BinaryReader(stream);
2419-
var reversed = _bytes.Reverse().ToArray();
2420-
var expected = (UInt128)new BigInteger(reversed);
24212407
bool actual = br.TryReadUInt128BigEndian(out UInt128 read);
24222408
Assert.False(actual);
24232409
Assert.Equal(default, read);

0 commit comments

Comments
 (0)