Skip to content

Commit

Permalink
Merge pull request #34 from pfpack/release/v2.0.3-rc.1
Browse files Browse the repository at this point in the history
release/v2.0.3-rc.1
  • Loading branch information
andreise authored Nov 29, 2023
2 parents e17286d + d4aa1f4 commit 22fd1cc
Show file tree
Hide file tree
Showing 58 changed files with 150 additions and 143 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x
# Create Local NuGet Source

Expand Down Expand Up @@ -116,4 +117,8 @@ jobs:

- name: Push Packages
if: ${{ github.event_name == 'release' }}
run: dotnet nuget push "../../../nuget/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NuGetSourcePassword }} --skip-duplicate
run: >
dotnet nuget push "../../../nuget/*.nupkg"
-s https://api.nuget.org/v3/index.json
-k ${{ secrets.NuGetSourcePassword }}
--skip-duplicate
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
Expand All @@ -14,9 +14,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit" Version="4.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public void YieldSingle_ExpectCollectionLengthEqualsOne(
var actual = sourceValue.YieldSingle();

var actualLength = actual.Count();
Assert.AreEqual(1, actualLength);
Assert.That(actualLength, Is.EqualTo(1));
}

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

var actualFirst = actual.FirstOrDefault();
Assert.AreSame(sourceValue, actualFirst);
Assert.That(actualFirst, Is.SameAs(sourceValue));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ partial class YielderTest
public void YieldEmpty_ExpectEmptyCollection()
{
var actual = Yielder.YieldEmpty<StructType?>();
Assert.IsEmpty(actual);
Assert.That(actual, Is.Empty);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public void YieldSingle_ExpectCollectionLengthEqualsOne(
var actual = Yielder.YieldSingle(sourceValue);

var actualLength = actual.Count();
Assert.AreEqual(1, actualLength);
Assert.That(actualLength, Is.EqualTo(1));
}

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

var actualFirst = actual.FirstOrDefault();
Assert.AreSame(sourceValue, actualFirst);
Assert.That(actualFirst, Is.SameAs(sourceValue));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ partial class YielderTypedTest
public void YieldEmpty_ExpectEmptyCollection()
{
var actual = Yielder<StructType?>.YieldEmpty();
Assert.IsEmpty(actual);
Assert.That(actual, Is.Empty);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public void YieldSingle_ExpectCollectionLengthEqualsOne(
var actual = Yielder<object?>.YieldSingle(sourceValue);

var actualLength = actual.Count();
Assert.AreEqual(1, actualLength);
Assert.That(actualLength, Is.EqualTo(1));
}

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

var actualFirst = actual.FirstOrDefault();
Assert.AreSame(sourceValue, actualFirst);
Assert.That(actualFirst, Is.SameAs(sourceValue));
}
}
4 changes: 2 additions & 2 deletions src/primitives-linq/Primitives.Linq/Primitives.Linq.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
Expand All @@ -17,7 +17,7 @@
<Description>PrimeFuncPack Primitives.Linq is a core library for .NET consisting of very basic extensions to work with Linq.</Description>
<RootNamespace>System</RootNamespace>
<AssemblyName>PrimeFuncPack.Primitives.Linq</AssemblyName>
<Version>2.0.2</Version>
<Version>2.0.3-rc.1</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ public void Pipe_ExpectSourceValue(
object? sourceValue)
{
var actual = Pipeline.Pipe(sourceValue);
Assert.AreSame(sourceValue, actual);
Assert.That(actual, Is.SameAs(sourceValue));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public void Pipe_ExpectMappedSourceValue(
{
var actual = sourceValue.Pipe(value => (value, PlusFifteen));
var expected = (sourceValue, PlusFifteen);
Assert.AreSame(expected.sourceValue, sourceValue);
Assert.AreEqual(expected, actual);
Assert.That(sourceValue, Is.SameAs(expected.sourceValue));
Assert.That(actual, Is.EqualTo(expected));
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
Expand All @@ -14,9 +14,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="NUnit" Version="4.0.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="PrimeFuncPack.UnitTest.Data" Version="3.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
Expand All @@ -17,7 +17,7 @@
<Description>PrimeFuncPack Primitives.Pipeline is a core library for .NET consisting of very basic extensions to work with functional pipelines.</Description>
<RootNamespace>System</RootNamespace>
<AssemblyName>PrimeFuncPack.Primitives.Pipeline</AssemblyName>
<Version>2.0.2</Version>
<Version>2.0.3-rc.1</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public void IsNotNullOrEmpty_SourceIsNull_ExpectFalse()
string? source = null;

var actual = source.IsNotNullOrEmpty();
Assert.False(actual);
Assert.That(actual, Is.False);
}

[Test]
Expand All @@ -21,7 +21,7 @@ public void IsNotNullOrEmpty_SourceIsEmpty_ExpectFalse()
string source = string.Empty;

var actual = source.IsNotNullOrEmpty();
Assert.False(actual);
Assert.That(actual, Is.False);
}

[Test]
Expand All @@ -32,6 +32,6 @@ public void IsNotNullOrEmpty_SourceIsNotEmpty_ExpectTrue(
string source)
{
var actual = source.IsNotNullOrEmpty();
Assert.True(actual);
Assert.That(actual, Is.True);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public void IsNotNullOrWhiteSpace_SourceIsNull_ExpectFalse()
string? source = null;

var actual = source.IsNotNullOrWhiteSpace();
Assert.False(actual);
Assert.That(actual, Is.False);
}

[Test]
Expand All @@ -21,7 +21,7 @@ public void IsNotNullOrWhiteSpace_SourceIsEmpty_ExpectFalse()
string source = string.Empty;

var actual = source.IsNotNullOrWhiteSpace();
Assert.False(actual);
Assert.That(actual, Is.False);
}

[Test]
Expand All @@ -32,7 +32,7 @@ public void IsNotNullOrWhiteSpace_SourceIsWhiteSpace_ExpectFalse(
string source)
{
var actual = source.IsNotNullOrWhiteSpace();
Assert.False(actual);
Assert.That(actual, Is.False);
}

[Test]
Expand All @@ -41,6 +41,6 @@ public void IsNotNullOrWhiteSpace_SourceIsNotWhiteSpace_ExpectTrue()
var source = SomeString;

var actual = source.IsNotNullOrWhiteSpace();
Assert.True(actual);
Assert.That(actual, Is.True);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ public void IsNotNull_AnonymousValueIsNotNull_ExpectTrue()
};

var actual = source.IsNotNull();
Assert.True(actual);
Assert.That(actual, Is.True);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ partial class PredicateExtensionsTests
public void IsNotNull_NonnullableStruct_ExpectTrue(int source)
{
var actual = source.IsNotNull();
Assert.True(actual);
Assert.That(actual, Is.True);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public void IsNotNull_NullableStructIsNull_CallStructOverload_ExpectFalse()
int? source = null;

var actual = source.IsNotNull();
Assert.False(actual);
Assert.That(actual, Is.False);
}

[Test]
Expand All @@ -20,7 +20,7 @@ public void IsNotNull_NullableStructIsNull_CallObjectOverload_ExpectFalse()
int? source = null;

var actual = source.IsNotNull<object>();
Assert.False(actual);
Assert.That(actual, Is.False);
}

// Test both zero and non-zero values
Expand All @@ -30,7 +30,7 @@ public void IsNotNull_NullableStructIsNull_CallObjectOverload_ExpectFalse()
public void IsNotNull_NullableStructIsNotNull_CallStructOverload_ExpectTrue(int? source)
{
var actual = source.IsNotNull();
Assert.True(actual);
Assert.That(actual, Is.True);
}

// Test both zero and non-zero values
Expand All @@ -40,6 +40,6 @@ public void IsNotNull_NullableStructIsNotNull_CallStructOverload_ExpectTrue(int?
public void IsNotNull_NullableStructIsNotNull_CallObjectOverload_ExpectTrue(int? source)
{
var actual = source.IsNotNull<object>();
Assert.True(actual);
Assert.That(actual, Is.True);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public void IsNotNull_RefValueIsNull_ExpectFalse()
RefType source = null!;

var actual = source.IsNotNull();
Assert.False(actual);
Assert.That(actual, Is.False);
}

[Test]
Expand All @@ -22,6 +22,6 @@ public void IsNotNull_RefValueIsNotNull_ExpectTrue()
var source = MinusFifteenIdRefType;

var actual = source.IsNotNull();
Assert.True(actual);
Assert.That(actual, Is.True);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public void IsNotNull_StringIsNull_ExpectFalse()
string source = null!;

var actual = source.IsNotNull();
Assert.False(actual);
Assert.That(actual, Is.False);
}

[Test]
Expand All @@ -23,6 +23,6 @@ public void IsNotNull_StringIsNull_ExpectFalse()
public void IsNotNull_StringIsNotNull_ExpectTrue(string? source)
{
var actual = source.IsNotNull();
Assert.True(actual);
Assert.That(actual, Is.True);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public void IsNullOrEmpty_SourceIsNull_ExpectTrue()
string? source = null;

var actual = source.IsNullOrEmpty();
Assert.True(actual);
Assert.That(actual, Is.True);
}

[Test]
Expand All @@ -21,7 +21,7 @@ public void IsNullOrEmpty_SourceIsEmpty_ExpectTrue()
string source = string.Empty;

var actual = source.IsNullOrEmpty();
Assert.True(actual);
Assert.That(actual, Is.True);
}

[Test]
Expand All @@ -32,6 +32,6 @@ public void IsNullOrEmpty_SourceIsNotEmpty_ExpectFalse(
string source)
{
var actual = source.IsNullOrEmpty();
Assert.False(actual);
Assert.That(actual, Is.False);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public void IsNullOrWhiteSpace_SourceIsNull_ExpectTrue()
string? source = null;

var actual = source.IsNullOrWhiteSpace();
Assert.True(actual);
Assert.That(actual, Is.True);
}

[Test]
Expand All @@ -21,7 +21,7 @@ public void IsNullOrWhiteSpace_SourceIsEmpty_ExpectTrue()
string source = string.Empty;

var actual = source.IsNullOrWhiteSpace();
Assert.True(actual);
Assert.That(actual, Is.True);
}

[Test]
Expand All @@ -32,7 +32,7 @@ public void IsNullOrWhiteSpace_SourceIsWhiteSpace_ExpectTrue(
string source)
{
var actual = source.IsNullOrWhiteSpace();
Assert.True(actual);
Assert.That(actual, Is.True);
}

[Test]
Expand All @@ -41,6 +41,6 @@ public void IsNullOrWhiteSpace_SourceIsNotWhiteSpace_ExpectFalse()
var source = SomeString;

var actual = source.IsNullOrWhiteSpace();
Assert.False(actual);
Assert.That(actual, Is.False);
}
}
Loading

0 comments on commit 22fd1cc

Please sign in to comment.