Skip to content

Commit da771ee

Browse files
authored
Merge pull request #14 from pfpack/feature/use-net-9
Use .NET9
2 parents b766ede + 9667b3c commit da771ee

File tree

7 files changed

+23
-20
lines changed

7 files changed

+23
-20
lines changed

.github/workflows/dotnet.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- name: Setup .NET
22-
uses: actions/setup-dotnet@v3
22+
uses: actions/setup-dotnet@v4
2323
with:
2424
dotnet-version: |
25-
6.0.x
2625
8.0.x
26+
9.0.x
2727
2828
# Create Local NuGet Source
2929

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ StyleCopReport.xml
8282
*.pgc
8383
*.pgd
8484
*.rsp
85+
# but not Directory.Build.rsp, as it configures directory-level build defaults
86+
!Directory.Build.rsp
8587
*.sbr
8688
*.tlb
8789
*.tli
@@ -301,7 +303,7 @@ node_modules/
301303
*.dsw
302304
*.dsp
303305

304-
# Visual Studio 6 technical files
306+
# Visual Studio 6 technical files
305307
*.ncb
306308
*.aps
307309

@@ -395,4 +397,4 @@ FodyWeavers.xsd
395397
*.msp
396398

397399
# JetBrains Rider
398-
*.sln.iml
400+
*.sln.iml

src/unit-test-data/UnitTest.Data.Tests/TestHelper/TestHelper.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module internal TestHelper =
1414
let internal shouldBeEqual<'t> (expected : 't) actual =
1515
Assert.Equal(expected = expected, actual = actual)
1616

17-
let internal shouldBeEqualString expected actual =
17+
let internal shouldBeEqualString (expected: string) (actual: string) =
1818
Assert.Equal(expected = expected, actual = actual, ignoreCase = false)
1919

2020
let internal shouldBeDeepEqual expected actual =

src/unit-test-data/UnitTest.Data.Tests/UnitTest.Data.Tests.fsproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<GenerateProgramFile>true</GenerateProgramFile>
66
<ImplicitUsings>disable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<InvariantGlobalization>true</InvariantGlobalization>
99
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
10+
<NoWarn>$(NoWarn);IDE0130</NoWarn>
1011
<IsPackable>false</IsPackable>
1112
<Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
12-
<Copyright>Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy</Copyright>
13+
<Copyright>Copyright © 2020-2024 Andrei Sergeev, Pavel Moskovoy</Copyright>
1314
<RootNamespace>PrimeFuncPack.UnitTest.Data.Tests</RootNamespace>
1415
<AssemblyName>PrimeFuncPack.UnitTest.Data.Tests</AssemblyName>
1516
</PropertyGroup>
@@ -29,17 +30,17 @@
2930
</ItemGroup>
3031

3132
<ItemGroup>
32-
<PackageReference Include="DeepEqual" Version="4.2.1" />
33-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
34-
<PackageReference Include="xunit" Version="2.6.2" />
35-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
33+
<PackageReference Include="DeepEqual" Version="5.1.0" />
34+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
35+
<PackageReference Include="xunit" Version="2.9.2" />
36+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
3637
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3738
<PrivateAssets>all</PrivateAssets>
3839
</PackageReference>
39-
<PackageReference Include="coverlet.collector" Version="6.0.0">
40+
<PackageReference Include="coverlet.collector" Version="6.0.2">
4041
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4142
<PrivateAssets>all</PrivateAssets>
4243
</PackageReference>
4344
</ItemGroup>
4445

45-
</Project>
46+
</Project>

src/unit-test-data/UnitTest.Data/TestData/String/Data.String.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ partial class TestData
2727
public const string LowerAnotherString = "another string";
2828

2929
public const string UpperAnotherString = "ANOTHER STRING";
30-
}
30+
}

src/unit-test-data/UnitTest.Data/TestData/TestData.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ public static partial class TestData
66
static TestData()
77
{
88
}
9-
}
10-
9+
}

src/unit-test-data/UnitTest.Data/UnitTest.Data.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<InvariantGlobalization>true</InvariantGlobalization>
88
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<NoWarn>$(NoWarn);IDE0130</NoWarn>
910
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1011
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1112
<PackageReadmeFile>README.md</PackageReadmeFile>
1213
<PackageProjectUrl>https://github.com/pfpack/pfpack-unit-test</PackageProjectUrl>
1314
<RepositoryUrl>https://github.com/pfpack/pfpack-unit-test</RepositoryUrl>
1415
<Company>pfpack</Company>
1516
<Authors>Andrei Sergeev, Pavel Moskovoy</Authors>
16-
<Copyright>Copyright © 2020-2023 Andrei Sergeev, Pavel Moskovoy</Copyright>
17+
<Copyright>Copyright © 2020-2024 Andrei Sergeev, Pavel Moskovoy</Copyright>
1718
<Description>PrimeFuncPack UnitTest.Data is a library for .NET consisting of data types and predefined values to support unit testing.</Description>
1819
<RootNamespace>PrimeFuncPack.UnitTest</RootNamespace>
1920
<AssemblyName>PrimeFuncPack.UnitTest.Data</AssemblyName>
20-
<Version>3.1.0</Version>
21+
<Version>3.1.1-preview.1</Version>
2122
</PropertyGroup>
2223

2324
<ItemGroup>
@@ -31,4 +32,4 @@
3132
</None>
3233
</ItemGroup>
3334

34-
</Project>
35+
</Project>

0 commit comments

Comments
 (0)