Skip to content

Commit

Permalink
Dotnet 8 builds
Browse files Browse the repository at this point in the history
  • Loading branch information
TheAngryByrd committed Oct 12, 2023
1 parent 2e2593a commit 9482101
Show file tree
Hide file tree
Showing 8 changed files with 206 additions and 194 deletions.
17 changes: 3 additions & 14 deletions .config/dotnet-tools.json
Expand Up @@ -2,24 +2,13 @@
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.23.0",
"commands": [
"fake"
]
},

"paket": {
"version": "7.2.1",
"version": "8.0.0-alpha002",
"commands": [
"paket"
]
},
"octonav": {
"version": "0.0.1",
"commands": [
"octonav"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "5.0.2",
"commands": [
Expand All @@ -33,4 +22,4 @@
]
}
}
}
}
26 changes: 20 additions & 6 deletions .github/workflows/build.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
dotnet-version: ["", "6.0.x", "7.0.x"]
dotnet-version: ["", "6.0.x", "7.0.x", "8.0.x"]
# these entries will mesh with the above combinations
include:
# just use what's in the repo
Expand All @@ -32,20 +32,27 @@ jobs:
label: "repo global.json"
build_net7: false
test_tfm: net6.0
# latest 6.0 stable
# latest 6.0
- global-json-file: "global.json"
dotnet-version: "6.0.x"
include-prerelease: false
label: "6.0 stable"
label: "6.0"
build_net7: false
test_tfm: net6.0
# latest 7.0 preview
# latest 7.0
- global-json-file: "global.json"
dotnet-version: "7.0.x"
include-prerelease: true
label: "7.0 preview"
label: "7.0"
build_net7: true
test_tfm: net7.0
# latest 8.0
- global-json-file: "global.json"
dotnet-version: "8.0.x"
include-prerelease: true
label: "8.0"
build_net8: true
test_tfm: net8.0
fail-fast: false # we have timing issues on some OS, so we want them all to run

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -76,18 +83,25 @@ jobs:
run: dotnet --info

- name: Restore tools
run: dotnet tool restore
run: |
dotnet tool restore \
&& dotnet paket restore
- name: Check format
run: dotnet build -t:CheckFormat
env:
DOTNET_ROLL_FORWARD: LatestMajor
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1

- name: Run Build
run: dotnet run --project build -t Build
env:
BuildNet7: ${{ matrix.build_net7 }}
BuildNet8: ${{ matrix.build_net8 }}

- name: Run and report tests
run: dotnet test -c Release -f ${{ matrix.test_tfm }} --no-restore --no-build --no-build --logger GitHubActions /p:AltCover=true /p:AltCoverAssemblyExcludeFilter="System.Reactive|FSharp.Compiler.Service|Ionide.ProjInfo|FSharp.Analyzers|Analyzer|Humanizer|FSharp.Core|FSharp.DependencyManager" -- Expecto.fail-on-focused-tests=true
working-directory: test/FsAutoComplete.Tests.Lsp
env:
BuildNet7: ${{ matrix.build_net7 }}
BuildNet8: ${{ matrix.build_net8 }}
11 changes: 9 additions & 2 deletions paket.dependencies
@@ -1,6 +1,6 @@
version 7.2.1

framework: netstandard2.0, netstandard2.1, net6.0, net7.0
framework: netstandard2.0, netstandard2.1, net6.0, net7.0, net8.0

source https://api.nuget.org/v3/index.json
# this is the FCS nightly feed, re-enable at your own risk!
Expand Down Expand Up @@ -37,7 +37,7 @@ nuget Serilog.Sinks.Async >= 1.5
nuget Destructurama.FSharp
nuget FSharp.UMX >= 1.1
nuget FSharp.Formatting >= 14.0
nuget FsToolkit.ErrorHandling.TaskResult >= 4.4 framework: netstandard2.1 ,net6.0, net7.0
nuget FsToolkit.ErrorHandling.TaskResult >= 4.4 framework: netstandard2.1 ,net6.0, net7.0, net8.0
nuget IcedTasks >= 0.5
nuget FSharpx.Async >= 1.14
nuget CliWrap >= 3.0
Expand All @@ -59,6 +59,8 @@ nuget OpenTelemetry.Api >= 1.3.2
nuget OpenTelemetry.Exporter.OpenTelemetryProtocol >= 1.3.2 # 1.4 bumps to 7.0 versions of System.Diagnostics libs, so can't use it
nuget LinkDotNet.StringBuilder 1.18.0
nuget CommunityToolkit.HighPerformance
nuget System.Security.Cryptography.Pkcs 6.0.4


group Build
source https://api.nuget.org/v3/index.json
Expand All @@ -83,3 +85,8 @@ group Build
nuget MSBuild.StructuredLogger
nuget Octokit 0.48 // there's an API break in 0.50, so we need to pin this to prevent errors
nuget Fantomas.Core 6.2.0

nuget NuGet.Versioning 6.7.0
nuget NuGet.Common 6.7.0
nuget NuGet.Protocol 6.7.0

339 changes: 168 additions & 171 deletions paket.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj
Expand Up @@ -2,11 +2,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<Compile Include="FsLibLog.fs" />
<Compile Include="FsOpenTelemetry.fs" />
</ItemGroup>
<Import Project="..\..\.paket\Paket.Restore.targets" />
</Project>
</Project>
1 change: 1 addition & 0 deletions src/FsAutoComplete/FsAutoComplete.fsproj
Expand Up @@ -4,6 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
<AssemblyName>fsautocomplete</AssemblyName>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
Expand Down
Expand Up @@ -3,6 +3,7 @@
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet7)' == 'true'">net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(BuildNet8)' == 'true'">net6.0;net7.0;net8.0</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<RollForward>LatestMajor</RollForward>
<IsTestProject>true</IsTestProject>
Expand Down

0 comments on commit 9482101

Please sign in to comment.