Skip to content

Commit

Permalink
Move to .net 8.0 (#288)
Browse files Browse the repository at this point in the history
* Move to .net 8.0

* Update call to tests

* sequence tests

* update build.yml

---------

Co-authored-by: Jimmy Byrd <[email protected]>
  • Loading branch information
simon-reynolds and TheAngryByrd authored Dec 7, 2024
1 parent e55be40 commit b1a7408
Show file tree
Hide file tree
Showing 41 changed files with 2,223 additions and 3,221 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"paket": {
"version": "7.2.0",
"version": "8.0.3",
"commands": [
"paket"
]
Expand All @@ -21,4 +21,4 @@
]
}
}
}
}
5 changes: 2 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
"ghcr.io/devcontainers-contrib/features/starship:1": {},
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "7.0",
"additionalVersions": "6.0"
"version": "8.0"
}
},
"overrideFeatureInstallOrder": [
Expand Down Expand Up @@ -70,4 +69,4 @@
"restore": "dotnet tool restore && dotnet restore"
},
"waitFor": "updateContentCommand"
}
}
10 changes: 4 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,12 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup necessary dotnet SDKs
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
global-json-file: global.json
dotnet-version: |
6.x
7.x
8.x
- name: Build via Bash
if: runner.os != 'Windows'
Expand All @@ -47,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build and run dev container task
uses: devcontainers/[email protected]
Expand Down
997 changes: 500 additions & 497 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

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

## [Unreleased]

### Changed
- [Adds support for .NET 8.0](https://github.com/TheAngryByrd/MiniScaffold/pull/288) from @simon-reynolds

## [0.37.1] - 2023-11-19

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Content/Console/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]
},
"paket": {
"version": "7.2.0",
"version": "8.0.3",
"commands": [
"paket"
]
Expand Down
5 changes: 2 additions & 3 deletions Content/Console/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
"ghcr.io/devcontainers-contrib/features/starship:1": {},
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "7.0",
"additionalVersions": "6.0"
"version": "8.0"
}
},
"overrideFeatureInstallOrder": [
Expand Down Expand Up @@ -70,4 +69,4 @@
"restore": "dotnet tool restore && dotnet restore"
},
"waitFor": "updateContentCommand"
}
}
10 changes: 4 additions & 6 deletions Content/Console/.github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ jobs:

steps:
- name: checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.x
7.x
global-json-file: global.json
8.x
- name: Build
if: runner.os != 'Windows'
Expand All @@ -56,7 +54,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Build and run dev container task
uses: devcontainers/[email protected]
Expand Down
997 changes: 500 additions & 497 deletions Content/Console/.paket/Paket.Restore.targets

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Content/Console/build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ let mutable latestEntry =
else
changelog.LatestEntry

let targetFramework = "net6.0"
let targetFramework = "net8.0"

// RuntimeIdentifiers: https://docs.microsoft.com/en-us/dotnet/core/rid-catalog
// dotnet-packaging Tasks: https://github.com/qmfrederik/dotnet-packaging/blob/0c8e063ada5ba0de2b194cd3fad8308671b48092/Packaging.Targets/build/Packaging.Targets.targets
Expand Down
24 changes: 12 additions & 12 deletions Content/Console/build/build.fsproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Compile Include="Changelog.fs" />
<Compile Include="build.fs" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
</Project>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Compile Include="Changelog.fs" />
<Compile Include="build.fs" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
</Project>
2 changes: 1 addition & 1 deletion Content/Console/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.100",
"version": "8.0.100",
"rollForward": "feature"
}
}
2 changes: 1 addition & 1 deletion Content/Console/paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source https://www.nuget.org/api/v2
source https://api.nuget.org/v3/index.json
storage: none
nuget Argu
nuget FSharp.Core 6.0
nuget FSharp.Core 8.0.400
nuget Expecto
nuget YoloDev.Expecto.TestSdk
nuget Microsoft.NET.Test.Sdk
Expand Down
Loading

0 comments on commit b1a7408

Please sign in to comment.