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.

Sign up for GitHub

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

Jump to bottom

Build with .NET 8.0 #2818

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Build with .NET 8.0 #2818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0f25b05
Build with .NET 8.0:
Thorium Sep 23, 2024
23550b4
try to run integration-tests with net6.0
Thorium Sep 24, 2024
0fa3e8a
build path fix
Thorium Sep 24, 2024
759cae3
Merge branch 'master' into net8-build
Thorium Sep 24, 2024
eec08ad
uninstall didn't seem to work well anyway
Thorium Sep 24, 2024
3a16f01
publish both test-artifacts, ensure test DirectorySeparatorChar
Thorium Sep 24, 2024
3e80b63
If no product release found (like Dotnet 9.0.0-rc) then just return a…
Thorium Sep 26, 2024
1cfeff3
If no product release found (like Dotnet 9.0.0-rc) then just return a…
Thorium Sep 26, 2024
d8ba770
Merge branch 'master' into net8-build
Thorium Sep 27, 2024
ecc3f37
Merge branch 'master' of https://github.com/fsprojects/FAKE
Thorium Sep 27, 2024
b91d794
Merge branch 'master' into net8-build
Thorium Sep 27, 2024
8bffe4d
parentheses added
Thorium Sep 27, 2024
c7fb3c1
integration tests back to 8
Thorium Sep 27, 2024
03c5f13
typo fix
Thorium Sep 27, 2024
6b18ea8
Merge branch 'master' into net8-build
Thorium Sep 30, 2024
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
6 changes: 5 additions & 1 deletion .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,18 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.301'
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.304'
- name: Restore dotnet tools
run: dotnet tool restore
- name: remove current fake runner tool
run: dotnet tool uninstall fake-cli
- name: Build fake runner
run: dotnet pack --version-suffix 1 src/app/fake-cli/fake-cli.fsproj
- name: add fake runner as a tool
run: dotnet tool install fake-cli --add-source "./src/app/fake-cli/bin/Debug" --version 1.0.0-1
run: dotnet tool install fake-cli --add-source "./src/app/fake-cli/bin/Debug" --add-source "./src/app/fake-cli/bin/Release" --version 1.0.0-1
- name: Build
run: dotnet fake -v build --parallel 3 -e FAKE_DETAILED_ERRORS=true
- name: publish build artifacts
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,18 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.301'
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.304'
- name: Restore dotnet tools
run: dotnet tool restore
- name: remove current fake runner tool
run: dotnet tool uninstall fake-cli
- name: Build fake runner
run: dotnet pack -p:PackageVersion=${{ github.event.inputs.releaseVersion }} src/app/fake-cli/fake-cli.fsproj
- name: add fake runner as a tool
run: dotnet tool install fake-cli --add-source "./src/app/fake-cli/bin/Debug" --version ${{ github.event.inputs.releaseVersion }}
run: dotnet tool install fake-cli --add-source "./src/app/fake-cli/bin/Debug" --add-source "./src/app/fake-cli/bin/Release" --version ${{ github.event.inputs.releaseVersion }}
- name: Build
run: dotnet fake build -t Release_BuildAndTest --parallel 3
- name: publish build artifacts
Expand Down
997 changes: 500 additions & 497 deletions .paket/Paket.Restore.targets
View file
Open in desktop

Large diffs are not rendered by default.

88 changes: 44 additions & 44 deletions Fake.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29009.5
# Visual Studio Version 17
VisualStudioVersion = 17.10.35122.118
MinimumVisualStudioVersion = 15.0.26124.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{7BFFAE76-DEE9-417A-A79B-6A6644C4553A}"
EndProject
Expand Down Expand Up @@ -185,15 +185,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestTools", "TestTools", "{
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Core.DependencyManager.Paket", "src\app\Fake.Core.DependencyManager.Paket\Fake.Core.DependencyManager.Paket.fsproj", "{F4D3249D-F4EC-4B86-BEA8-3F2314ED9B65}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.BuildServer.GitHubActions", "src\app\Fake.BuildServer.GitHubActions\Fake.BuildServer.GitHubActions.fsproj", "{AB09E8EB-A66E-4D60-B47C-4F35F439D020}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.GitHubActions", "src\app\Fake.BuildServer.GitHubActions\Fake.BuildServer.GitHubActions.fsproj", "{AB09E8EB-A66E-4D60-B47C-4F35F439D020}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.Testing.Fixie", "src\app\Fake.Testing.Fixie\Fake.Testing.Fixie.fsproj", "{5FEC4AB5-D5EE-43B5-B176-0A91D951817A}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.Testing.Fixie", "src\app\Fake.Testing.Fixie\Fake.Testing.Fixie.fsproj", "{5FEC4AB5-D5EE-43B5-B176-0A91D951817A}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.BuildServer.Bitbucket", "src\app\Fake.BuildServer.Bitbucket\Fake.BuildServer.Bitbucket.fsproj", "{5472237F-020B-4F9A-8E06-01D553576387}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.BuildServer.Bitbucket", "src\app\Fake.BuildServer.Bitbucket\Fake.BuildServer.Bitbucket.fsproj", "{5472237F-020B-4F9A-8E06-01D553576387}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.JavaScript.TypeScript", "src\app\Fake.JavaScript.TypeScript\Fake.JavaScript.TypeScript.fsproj", "{1C476373-FF62-4EA7-8CCC-6A0D0DB96B6D}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.JavaScript.TypeScript", "src\app\Fake.JavaScript.TypeScript\Fake.JavaScript.TypeScript.fsproj", "{1C476373-FF62-4EA7-8CCC-6A0D0DB96B6D}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fake.DotNet.Fsdocs", "src\app\Fake.DotNet.Fsdocs\Fake.DotNet.Fsdocs.fsproj", "{6918A236-3F2A-47EA-9651-020522C48E24}"
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Fake.DotNet.Fsdocs", "src\app\Fake.DotNet.Fsdocs\Fake.DotNet.Fsdocs.fsproj", "{6918A236-3F2A-47EA-9651-020522C48E24}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -637,42 +637,30 @@ Global
{D24CEE35-B6C0-4C92-AE18-E80F90B69974}.Release|x64.Build.0 = Release|Any CPU
{D24CEE35-B6C0-4C92-AE18-E80F90B69974}.Release|x86.ActiveCfg = Release|Any CPU
{D24CEE35-B6C0-4C92-AE18-E80F90B69974}.Release|x86.Build.0 = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|x64.ActiveCfg = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|x64.Build.0 = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|x86.ActiveCfg = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|x86.Build.0 = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|Any CPU.Build.0 = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|x64.ActiveCfg = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|x64.Build.0 = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|x86.ActiveCfg = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|x86.Build.0 = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|x64.ActiveCfg = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|x64.Build.0 = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|x86.ActiveCfg = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|x86.Build.0 = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|Any CPU.Build.0 = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|x64.ActiveCfg = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|x64.Build.0 = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|x86.ActiveCfg = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|x86.Build.0 = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|x64.ActiveCfg = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|x64.Build.0 = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|x86.ActiveCfg = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|x86.Build.0 = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|Any CPU.Build.0 = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|x64.ActiveCfg = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|x64.Build.0 = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|x86.ActiveCfg = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|x86.Build.0 = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|x64.ActiveCfg = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|x64.Build.0 = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|x86.ActiveCfg = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Debug|x86.Build.0 = Debug|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|Any CPU.Build.0 = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|x64.ActiveCfg = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|x64.Build.0 = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|x86.ActiveCfg = Release|Any CPU
{5B2A7546-A441-45C9-8176-2872E2A30477}.Release|x86.Build.0 = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|Any CPU.Build.0 = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|x64.ActiveCfg = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|x64.Build.0 = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|x86.ActiveCfg = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Debug|x86.Build.0 = Debug|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|Any CPU.ActiveCfg = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|Any CPU.Build.0 = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|x64.ActiveCfg = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|x64.Build.0 = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|x86.ActiveCfg = Release|Any CPU
{18C490E3-EA3F-4DC5-87A0-1A02309F8664}.Release|x86.Build.0 = Release|Any CPU
{31A5759B-B562-43C0-A845-14EFA4091543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{31A5759B-B562-43C0-A845-14EFA4091543}.Debug|Any CPU.Build.0 = Debug|Any CPU
{31A5759B-B562-43C0-A845-14EFA4091543}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -733,6 +721,18 @@ Global
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|x64.Build.0 = Release|Any CPU
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|x86.ActiveCfg = Release|Any CPU
{F15967FF-E905-4CAD-9545-E59E0F47AD8E}.Release|x86.Build.0 = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|x64.ActiveCfg = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|x64.Build.0 = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|x86.ActiveCfg = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Debug|x86.Build.0 = Debug|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|Any CPU.Build.0 = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|x64.ActiveCfg = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|x64.Build.0 = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|x86.ActiveCfg = Release|Any CPU
{E02F39E8-24E1-4210-A096-C4D7BDD22534}.Release|x86.Build.0 = Release|Any CPU
{9EA0CFE4-ED50-4CB9-BE93-1AFB9D90C878}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9EA0CFE4-ED50-4CB9-BE93-1AFB9D90C878}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9EA0CFE4-ED50-4CB9-BE93-1AFB9D90C878}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1290,13 +1290,13 @@ Global
{13C1F95D-2FAD-4890-BF94-0AE7CF9AB2FC} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{D24CEE35-B6C0-4C92-AE18-E80F90B69974} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{5B2A7546-A441-45C9-8176-2872E2A30477} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{E02F39E8-24E1-4210-A096-C4D7BDD22534} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{18C490E3-EA3F-4DC5-87A0-1A02309F8664} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{31A5759B-B562-43C0-A845-14EFA4091543} = {CCAC5CAB-03C8-4C11-ADBE-A0D05F6A4F18}
{D8850C67-0542-427A-ABCB-92174EA42C95} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{8D72BED1-BC02-4B23-A631-4849BD0FD3E1} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{A1CAA84D-3C99-4218-AFB6-55EE2288800E} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{F15967FF-E905-4CAD-9545-E59E0F47AD8E} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{E02F39E8-24E1-4210-A096-C4D7BDD22534} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{9EA0CFE4-ED50-4CB9-BE93-1AFB9D90C878} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{486FA49B-D395-42C5-AFB0-FA85B6D9FDBC} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
{31F61589-E899-4C58-AF91-371AC6149032} = {7BFFAE76-DEE9-417A-A79B-6A6644C4553A}
Expand Down
5 changes: 5 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Release Notes
## 8.0.0-alpha - 2024-09-03
* Added .NET8.0 to package target libraries
* Some dependency updates

## 6.1.3 - 2024-09-26
* ENHANCEMENT: SdkAssemblyResolver. Support using the latest installed SDK.


## 6.1.2 - 2024-09-24
* ENHANCEMENT: Updated runtime-identifier to more recent runtimes.
* LEGACY: Removed .NETFrameworkAssembly attribute fix on detecting .NET assemblies.
Expand Down
31 changes: 14 additions & 17 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@
source release/dotnetcore
source https://api.nuget.org/v3/index.json
nuget FSharp.Core
nuget Microsoft.Build 17.3.2
nuget Microsoft.Build.Framework 17.3.2
nuget Microsoft.Build.Tasks.Core 17.3.2
nuget Microsoft.Build.Utilities.Core 17.3.2
nuget Microsoft.Build 17.11.4
Thorium marked this conversation as resolved.
Show resolved Hide resolved
nuget System.AppContext prerelease
nuget Paket.Core prerelease
nuget Fake.Api.GitHub prerelease
Expand Down Expand Up @@ -41,7 +38,7 @@ nuget System.Reactive
nuget Suave
nuget Newtonsoft.Json
nuget System.Net.Http
nuget Octokit 6.0.0
nuget Octokit 13.0.1
nuget Microsoft.Deployment.DotNet.Releases //"

open System.Reflection
Expand Down Expand Up @@ -660,15 +657,15 @@ Target.create "DotNetCoreIntegrationTests" (fun _ ->

runExpecto
root
"src/test/Fake.Core.IntegrationTests/bin/Release/net6.0/Fake.Core.IntegrationTests.dll"
("src" </> "test" </> "Fake.Core.IntegrationTests" </> "bin" </> "Release" </> "net8.0" </> "Fake.Core.IntegrationTests.dll")
"Fake_Core_IntegrationTests.TestResults.xml")

Target.create "TemplateIntegrationTests" (fun _ ->
let targetDir = srcDir </> "test" </> "Fake.DotNet.Cli.IntegrationTests"
let targetDir = (srcDir </> "test" </> "Fake.DotNet.Cli.IntegrationTests")

runExpecto
targetDir
"bin/Release/net6.0/Fake.DotNet.Cli.IntegrationTests.dll"
("bin" </> "Release" </> "net8.0" </> "Fake.DotNet.Cli.IntegrationTests.dll")
"Fake_DotNet_Cli_IntegrationTests.TestResults.xml"

Shell.rm_rf (root </> "test"))
Expand All @@ -677,13 +674,13 @@ Target.create "DotNetCoreUnitTests" (fun _ ->
// dotnet run -p src/test/Fake.Core.UnitTests/Fake.Core.UnitTests.fsproj
runExpecto
root
"src/test/Fake.Core.UnitTests/bin/Release/net6.0/Fake.Core.UnitTests.dll"
("src" </> "test" </> "Fake.Core.UnitTests" </> "bin" </> "Release" </> "net8.0" </> "Fake.Core.UnitTests.dll")
"Fake_Core_UnitTests.TestResults.xml"

// dotnet run --project src/test/Fake.Core.CommandLine.UnitTests/Fake.Core.CommandLine.UnitTests.fsproj
runExpecto
root
"src/test/Fake.Core.CommandLine.UnitTests/bin/Release/net6.0/Fake.Core.CommandLine.UnitTests.dll"
("src" </> "test" </> "Fake.Core.CommandLine.UnitTests" </> "bin" </> "Release" </> "net8.0" </> "Fake.Core.CommandLine.UnitTests.dll")
"Fake_Core_CommandLine_UnitTests.TestResults.xml")

// ----------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -728,9 +725,9 @@ Target.create "BootstrapFake" (fun _ ->

let fileName =
if Environment.isUnix then
nugetDncDir </> "Fake.netcore/current/fake"
(nugetDncDir </> "Fake.netcore" </> "current" </> "fake")
else
nugetDncDir </> "Fake.netcore/current/fake.exe"
(nugetDncDir </> "Fake.netcore" </> "current" </> "fake.exe")


let processResult =
Expand Down Expand Up @@ -777,7 +774,7 @@ Target.create "_DotNetPublish_portable" (fun _ ->
DotNet.publish
(fun c ->
{ c with
Framework = Some "net6.0"
Framework = Some "net8.0"
OutputPath = Some outDir }
|> dotnetSimple)
netcoreFsproj
Expand Down Expand Up @@ -812,7 +809,7 @@ runtimes
Runtime = Some runtime.Value
Configuration = DotNet.Release
OutputPath = Some outDir
Framework = Some "net6.0"
Framework = Some "net8.0"
// DisableInternalBinLog: https://github.com/fsprojects/FAKE/issues/2722
MSBuildParams = { MSBuild.CliArguments.Create() with DisableInternalBinLog = true }}
|> dotnetSimple)
Expand Down Expand Up @@ -900,8 +897,8 @@ Target.create "DotNetCreateNuGetPackage" (fun _ ->
Directory.ensure "temp"
let testZip = "temp/tests.zip"

!! "src/test/*/bin/Release/net6.0/**" |> Zip.zip "src/test" testZip

!! "src/test/*/bin/Release/net8.0/**" |> Zip.zip "src/test" testZip
publish testZip)

Target.create "DotNetCreateChocolateyPackage" (fun _ ->
Expand Down Expand Up @@ -938,7 +935,7 @@ Target.create "DotNetCreateChocolateyPackage" (fun _ ->

Target.create "DotNetCreateDebianPackage" (fun _ ->
let runtime = "linux-x64"
let targetFramework = "net6.0"
let targetFramework = "net8.0"

let args =
[ sprintf "--runtime %s" runtime
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk" : {
"version": "6.0.301",
"version": "8.0.304",
"rollForward": "latestMinor"
}
}
4 changes: 2 additions & 2 deletions paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ group Build

group fakerunner
source https://api.nuget.org/v3/index.json
framework: net472, netstandard2.0, netcoreapp2.1, net6.0
framework: net472, netstandard2.0, netstandard2.1, netcoreapp2.1, net6.0, net8.0
storage: none

nuget FSharp.Core
Expand All @@ -44,7 +44,7 @@ group fakerunner

group fakemodule
source https://api.nuget.org/v3/index.json
framework: net472, netstandard2.0, netcoreapp2.1, net6.0
framework: net472, netstandard2.0, netstandard2.1, netcoreapp2.1, net6.0, net8.0
storage: none

nuget DotNet.Xdt
Expand Down
Loading
Loading