Skip to content

Commit b1a7408

Browse files
Move to .net 8.0 (#288)
* Move to .net 8.0 * Update call to tests * sequence tests * update build.yml --------- Co-authored-by: Jimmy Byrd <jimmy.byrd@motivity.net>
1 parent e55be40 commit b1a7408

File tree

41 files changed

+2223
-3221
lines changed

Some content is hidden

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

41 files changed

+2223
-3221
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "7.2.0",
6+
"version": "8.0.3",
77
"commands": [
88
"paket"
99
]
@@ -21,4 +21,4 @@
2121
]
2222
}
2323
}
24-
}
24+
}

.devcontainer/devcontainer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"ghcr.io/devcontainers-contrib/features/starship:1": {},
2424
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
2525
"ghcr.io/devcontainers/features/dotnet:2": {
26-
"version": "7.0",
27-
"additionalVersions": "6.0"
26+
"version": "8.0"
2827
}
2928
},
3029
"overrideFeatureInstallOrder": [
@@ -70,4 +69,4 @@
7069
"restore": "dotnet tool restore && dotnet restore"
7170
},
7271
"waitFor": "updateContentCommand"
73-
}
72+
}

.github/workflows/build.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ jobs:
1818
runs-on: ${{ matrix.os }}
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: Setup necessary dotnet SDKs
23-
uses: actions/setup-dotnet@v3
23+
uses: actions/setup-dotnet@v4
2424
with:
25-
global-json-file: global.json
2625
dotnet-version: |
27-
6.x
28-
7.x
26+
8.x
2927
3028
- name: Build via Bash
3129
if: runner.os != 'Windows'
@@ -47,7 +45,7 @@ jobs:
4745
runs-on: ubuntu-latest
4846
steps:
4947

50-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
5149

5250
- name: Build and run dev container task
5351
uses: devcontainers/ci@v0.3

.paket/Paket.Restore.targets

Lines changed: 500 additions & 497 deletions
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [Unreleased]
9+
10+
### Changed
11+
- [Adds support for .NET 8.0](https://github.com/TheAngryByrd/MiniScaffold/pull/288) from @simon-reynolds
12+
813
## [0.37.1] - 2023-11-19
914

1015
### Fixed

Content/Console/.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"paket": {
12-
"version": "7.2.0",
12+
"version": "8.0.3",
1313
"commands": [
1414
"paket"
1515
]

Content/Console/.devcontainer/devcontainer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"ghcr.io/devcontainers-contrib/features/starship:1": {},
2424
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
2525
"ghcr.io/devcontainers/features/dotnet:2": {
26-
"version": "7.0",
27-
"additionalVersions": "6.0"
26+
"version": "8.0"
2827
}
2928
},
3029
"overrideFeatureInstallOrder": [
@@ -70,4 +69,4 @@
7069
"restore": "dotnet tool restore && dotnet restore"
7170
},
7271
"waitFor": "updateContentCommand"
73-
}
72+
}

Content/Console/.github/workflows/build.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ jobs:
2323

2424
steps:
2525
- name: checkout code
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Setup dotnet
29-
uses: actions/setup-dotnet@v3
29+
uses: actions/setup-dotnet@v4
3030
with:
3131
dotnet-version: |
32-
6.x
33-
7.x
34-
global-json-file: global.json
32+
8.x
3533
3634
- name: Build
3735
if: runner.os != 'Windows'
@@ -56,7 +54,7 @@ jobs:
5654
runs-on: ubuntu-latest
5755
steps:
5856

59-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
6058

6159
- name: Build and run dev container task
6260
uses: devcontainers/ci@v0.3

Content/Console/.paket/Paket.Restore.targets

Lines changed: 500 additions & 497 deletions
Large diffs are not rendered by default.

Content/Console/build/build.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ let mutable latestEntry =
132132
else
133133
changelog.LatestEntry
134134

135-
let targetFramework = "net6.0"
135+
let targetFramework = "net8.0"
136136

137137
// RuntimeIdentifiers: https://docs.microsoft.com/en-us/dotnet/core/rid-catalog
138138
// dotnet-packaging Tasks: https://github.com/qmfrederik/dotnet-packaging/blob/0c8e063ada5ba0de2b194cd3fad8308671b48092/Packaging.Targets/build/Packaging.Targets.targets

Content/Console/build/build.fsproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<WarnOn>3390;$(WarnOn)</WarnOn>
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<Compile Include="Changelog.fs" />
11-
<Compile Include="build.fs" />
12-
</ItemGroup>
13-
<Import Project="..\.paket\Paket.Restore.targets" />
14-
</Project>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8.0</TargetFramework>
6+
<WarnOn>3390;$(WarnOn)</WarnOn>
7+
<IsPackable>false</IsPackable>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<Compile Include="Changelog.fs" />
11+
<Compile Include="build.fs" />
12+
</ItemGroup>
13+
<Import Project="..\.paket\Paket.Restore.targets" />
14+
</Project>

Content/Console/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
3+
"version": "8.0.100",
44
"rollForward": "feature"
55
}
66
}

Content/Console/paket.dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source https://www.nuget.org/api/v2
22
source https://api.nuget.org/v3/index.json
33
storage: none
44
nuget Argu
5-
nuget FSharp.Core 6.0
5+
nuget FSharp.Core 8.0.400
66
nuget Expecto
77
nuget YoloDev.Expecto.TestSdk
88
nuget Microsoft.NET.Test.Sdk

0 commit comments

Comments
 (0)