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

Bump SDK and stop testing below net8 #16

Merged
merged 3 commits into from
Aug 20, 2024
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
13 changes: 6 additions & 7 deletions .github/workflows/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- macOS-latest
- windows-latest
dotnet:
- { sdk: 6.0.x, framework: net6.0 }
- { sdk: 8.0.x, framework: net8.0 }

runs-on: ${{matrix.os}}
Expand All @@ -45,10 +44,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup .NET SDK v6.0.x
- name: Setup .NET SDK v8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Prepare .NET tools
run: dotnet tool restore
- name: Run Fantomas
Expand All @@ -61,10 +60,10 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET SDK v6.0.x
- name: Setup .NET SDK v8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Prepare .NET tools
run: dotnet tool restore
- name: Prepare analyzers
Expand All @@ -85,10 +84,10 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0 # so that NerdBank.GitVersioning has access to history
- name: Setup .NET SDK v6.0.x
- name: Setup .NET SDK v8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x
- name: Build
run: dotnet build ShapeSifter/ShapeSifter.fsproj --configuration Release
- name: Pack
Expand Down
6 changes: 5 additions & 1 deletion ShapeSifter.Test/ShapeSifter.Test.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<WarningLevel>5</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
Expand All @@ -21,7 +21,11 @@
<PackageReference Include="ApiSurface" Version="4.0.40" />
<PackageReference Include="FsUnit" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageReference Include="NUnit" Version="4.1.0" />
<!-- stop NuGet from yapping: -->
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion ShapeSifter/SurfaceBaseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ ShapeSifter.Patterns inherit obj
ShapeSifter.Patterns+TType`1 inherit obj, implements 'a ShapeSifter.Patterns+TType System.IEquatable, System.Collections.IStructuralEquatable, 'a ShapeSifter.Patterns+TType System.IComparable, System.IComparable, System.Collections.IStructuralComparable - union type with 1 cases
ShapeSifter.Patterns+TType`1.get_Item [method]: unit -> unit
ShapeSifter.Patterns+TType`1.get_Tag [method]: unit -> int
ShapeSifter.Patterns+TType`1.Equals [method]: ('a ShapeSifter.Patterns+TType, System.Collections.IEqualityComparer) -> bool
ShapeSifter.Patterns+TType`1.Item [property]: [read-only] unit
ShapeSifter.Patterns+TType`1.NewTType [static method]: unit -> 'a ShapeSifter.Patterns+TType
ShapeSifter.Patterns+TType`1.Tag [property]: [read-only] int
Expand Down Expand Up @@ -186,4 +187,4 @@ ShapeSifter.UnionConvCrate.tryMake [static method]: unit -> 'union ShapeSifter.U
ShapeSifter.UnionConvCrate`1 - interface with 1 member(s)
ShapeSifter.UnionConvCrate`1.Apply [method]: ShapeSifter.UnionConvEvaluator<'union, 'ret> -> 'ret
ShapeSifter.UnionConvEvaluator`2 - interface with 1 member(s)
ShapeSifter.UnionConvEvaluator`2.Eval [method]: Microsoft.FSharp.Reflection.UnionCaseInfo ShapeSifter.TypeField list -> 'ts HCollections.TypeList -> ShapeSifter.Conv<'union, 'ts HCollections.HUnion> -> 'ret
ShapeSifter.UnionConvEvaluator`2.Eval [method]: Microsoft.FSharp.Reflection.UnionCaseInfo ShapeSifter.TypeField list -> 'ts HCollections.TypeList -> ShapeSifter.Conv<'union, 'ts HCollections.HUnion> -> 'ret
2 changes: 1 addition & 1 deletion ShapeSifter/version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0",
"version": "1.1",
"publicReleaseRefSpec": [
"^refs/heads/main$"
],
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "8.0.400",
"rollForward": "latestMajor"
}
}