Skip to content

Commit 22fd1cc

Browse files
authored
Merge pull request #34 from pfpack/release/v2.0.3-rc.1
release/v2.0.3-rc.1
2 parents e17286d + d4aa1f4 commit 22fd1cc

File tree

58 files changed

+150
-143
lines changed

Some content is hidden

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

58 files changed

+150
-143
lines changed

.github/workflows/dotnet.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- name: Setup .NET
2222
uses: actions/setup-dotnet@v3
2323
with:
2424
dotnet-version: |
2525
6.0.x
2626
7.0.x
27+
8.0.x
2728
2829
# Create Local NuGet Source
2930

@@ -116,4 +117,8 @@ jobs:
116117

117118
- name: Push Packages
118119
if: ${{ github.event_name == 'release' }}
119-
run: dotnet nuget push "../../../nuget/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NuGetSourcePassword }} --skip-duplicate
120+
run: >
121+
dotnet nuget push "../../../nuget/*.nupkg"
122+
-s https://api.nuget.org/v3/index.json
123+
-k ${{ secrets.NuGetSourcePassword }}
124+
--skip-duplicate

src/primitives-linq/Primitives.Linq.Tests/Primitives.Linq.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<InvariantGlobalization>true</InvariantGlobalization>
@@ -14,9 +14,9 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="NUnit" Version="3.13.3" />
18-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
17+
<PackageReference Include="NUnit" Version="4.0.0" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2020
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
2121
</ItemGroup>
2222

src/primitives-linq/Primitives.Linq.Tests/YieldExtensionsTest/YieldExtensionsTest.Single.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void YieldSingle_ExpectCollectionLengthEqualsOne(
1313
var actual = sourceValue.YieldSingle();
1414

1515
var actualLength = actual.Count();
16-
Assert.AreEqual(1, actualLength);
16+
Assert.That(actualLength, Is.EqualTo(1));
1717
}
1818

1919
[Test]
@@ -24,6 +24,6 @@ public void YieldSingle_ExpectFirstItemIsSameAsSourceValue(
2424
var actual = sourceValue.YieldSingle();
2525

2626
var actualFirst = actual.FirstOrDefault();
27-
Assert.AreSame(sourceValue, actualFirst);
27+
Assert.That(actualFirst, Is.SameAs(sourceValue));
2828
}
2929
}

src/primitives-linq/Primitives.Linq.Tests/YielderTest/YielderTest.Empty.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ partial class YielderTest
1010
public void YieldEmpty_ExpectEmptyCollection()
1111
{
1212
var actual = Yielder.YieldEmpty<StructType?>();
13-
Assert.IsEmpty(actual);
13+
Assert.That(actual, Is.Empty);
1414
}
1515
}

src/primitives-linq/Primitives.Linq.Tests/YielderTest/YielderTest.Single.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void YieldSingle_ExpectCollectionLengthEqualsOne(
1313
var actual = Yielder.YieldSingle(sourceValue);
1414

1515
var actualLength = actual.Count();
16-
Assert.AreEqual(1, actualLength);
16+
Assert.That(actualLength, Is.EqualTo(1));
1717
}
1818

1919
[Test]
@@ -24,6 +24,6 @@ public void YieldSingle_ExpectFirstItemIsSameAsSourceValue(
2424
var actual = Yielder.YieldSingle(sourceValue);
2525

2626
var actualFirst = actual.FirstOrDefault();
27-
Assert.AreSame(sourceValue, actualFirst);
27+
Assert.That(actualFirst, Is.SameAs(sourceValue));
2828
}
2929
}

src/primitives-linq/Primitives.Linq.Tests/YielderTypedTest/YielderTypedTest.Empty.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ partial class YielderTypedTest
1010
public void YieldEmpty_ExpectEmptyCollection()
1111
{
1212
var actual = Yielder<StructType?>.YieldEmpty();
13-
Assert.IsEmpty(actual);
13+
Assert.That(actual, Is.Empty);
1414
}
1515
}

src/primitives-linq/Primitives.Linq.Tests/YielderTypedTest/YielderTypedTest.Single.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void YieldSingle_ExpectCollectionLengthEqualsOne(
1313
var actual = Yielder<object?>.YieldSingle(sourceValue);
1414

1515
var actualLength = actual.Count();
16-
Assert.AreEqual(1, actualLength);
16+
Assert.That(actualLength, Is.EqualTo(1));
1717
}
1818

1919
[Test]
@@ -24,6 +24,6 @@ public void YieldSingle_ExpectFirstItemIsSameAsSourceValue(
2424
var actual = Yielder<object?>.YieldSingle(sourceValue);
2525

2626
var actualFirst = actual.FirstOrDefault();
27-
Assert.AreSame(sourceValue, actualFirst);
27+
Assert.That(actualFirst, Is.SameAs(sourceValue));
2828
}
2929
}

src/primitives-linq/Primitives.Linq/Primitives.Linq.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<InvariantGlobalization>true</InvariantGlobalization>
@@ -17,7 +17,7 @@
1717
<Description>PrimeFuncPack Primitives.Linq is a core library for .NET consisting of very basic extensions to work with Linq.</Description>
1818
<RootNamespace>System</RootNamespace>
1919
<AssemblyName>PrimeFuncPack.Primitives.Linq</AssemblyName>
20-
<Version>2.0.2</Version>
20+
<Version>2.0.3-rc.1</Version>
2121
</PropertyGroup>
2222

2323
<ItemGroup>

src/primitives-pipeline/Primitives.Pipeline.Tests/Pipeline.Tests/Pipe.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ public void Pipe_ExpectSourceValue(
1111
object? sourceValue)
1212
{
1313
var actual = Pipeline.Pipe(sourceValue);
14-
Assert.AreSame(sourceValue, actual);
14+
Assert.That(actual, Is.SameAs(sourceValue));
1515
}
1616
}

src/primitives-pipeline/Primitives.Pipeline.Tests/PipelineExtensions.Tests/Pipe.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void Pipe_ExpectMappedSourceValue(
1313
{
1414
var actual = sourceValue.Pipe(value => (value, PlusFifteen));
1515
var expected = (sourceValue, PlusFifteen);
16-
Assert.AreSame(expected.sourceValue, sourceValue);
17-
Assert.AreEqual(expected, actual);
16+
Assert.That(sourceValue, Is.SameAs(expected.sourceValue));
17+
Assert.That(actual, Is.EqualTo(expected));
1818
}
1919
}

0 commit comments

Comments
 (0)