Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add net 8 #12

Merged
merged 3 commits into from
Dec 4, 2023
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
15 changes: 10 additions & 5 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup .NET
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
include-prerelease: false
dotnet-version: |
6.0.x
8.0.x

# Create Local NuGet Source

Expand Down Expand Up @@ -53,4 +54,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
23 changes: 11 additions & 12 deletions src/unit-test-data/UnitTest.Data.Tests/UnitTest.Data.Tests.fsproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<GenerateProgramFile>true</GenerateProgramFile>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IsPackable>false</IsPackable>
<Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
<Copyright>Copyright © 2020-2022 Andrei Sergeev, Pavel Moskovoy</Copyright>
<Copyright>Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy</Copyright>
<RootNamespace>PrimeFuncPack.UnitTest.Data.Tests</RootNamespace>
<AssemblyName>PrimeFuncPack.UnitTest.Data.Tests</AssemblyName>
</PropertyGroup>
Expand All @@ -25,22 +25,21 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<ProjectReference Include="..\UnitTest.Data\UnitTest.Data.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="DeepEqual" Version="4.2.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="DeepEqual" Version="2.0.0" />
<PackageReference Include="FSharp.Core" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\UnitTest.Data\UnitTest.Data.csproj" />
</ItemGroup>

</Project>
24 changes: 24 additions & 0 deletions src/unit-test-data/UnitTest.Data/TestEntities/EnumType.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
namespace PrimeFuncPack.UnitTest;

public enum EnumType
{
Zero,

One,

Two,

Three,

Four,

Five,

Six,

Seven,

Eight,

Nine
}
6 changes: 3 additions & 3 deletions src/unit-test-data/UnitTest.Data/UnitTest.Data.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
Expand All @@ -13,11 +13,11 @@
<RepositoryUrl>https://github.com/pfpack/pfpack-unit-test</RepositoryUrl>
<Company>pfpack</Company>
<Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
<Copyright>Copyright © 2020-2022 Andrei Sergeev, Pavel Moskovoy</Copyright>
<Copyright>Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy</Copyright>
<Description>PrimeFuncPack UnitTest.Data is a library for .NET consisting of data types and predefined values to support unit testing.</Description>
<RootNamespace>PrimeFuncPack.UnitTest</RootNamespace>
<AssemblyName>PrimeFuncPack.UnitTest.Data</AssemblyName>
<Version>3.0.0</Version>
<Version>3.1.0-preview.1</Version>
</PropertyGroup>

<ItemGroup>
Expand Down