Skip to content

Commit 48832b9

Browse files
ThoriumThorium
committed
Update FAKE and Paket to latest versions and tests to .NET 8
1 parent 3b9a09b commit 48832b9

File tree

13 files changed

+820
-831
lines changed

13 files changed

+820
-831
lines changed

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
]
1010
},
1111
"fake-cli": {
12-
"version": "5.22.0",
12+
"version": "6.1.3",
1313
"commands": [
1414
"fake"
1515
]
1616
},
1717
"paket": {
18-
"version": "7.1.5",
18+
"version": "8.0.3",
1919
"commands": [
2020
"paket"
2121
]

‎.paket/Paket.Restore.targets

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

‎build.fsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,16 @@ Target.create "CleanInternetCaches" (fun _ ->
111111

112112
Target.create "Build" (fun _ ->
113113
"FSharp.Data.sln"
114-
|> DotNet.build (fun o -> { o with Configuration = DotNet.BuildConfiguration.Release }))
114+
|> DotNet.build (fun o ->
115+
{ o with
116+
Configuration = DotNet.BuildConfiguration.Release
117+
MSBuildParams = { o.MSBuildParams with DisableInternalBinLog = true } }))
115118

116119
Target.create "RunTests" (fun _ ->
117120
let setParams (o: DotNet.TestOptions) =
118121
{ o with
119122
Configuration = DotNet.BuildConfiguration.Release
123+
MSBuildParams = { o.MSBuildParams with DisableInternalBinLog = true }
120124
Logger =
121125
if isCI then
122126
Some "GitHubActions"
@@ -149,7 +153,10 @@ Target.create "Pack" (fun _ ->
149153
{ p with
150154
Configuration = DotNet.BuildConfiguration.Release
151155
OutputPath = Some "bin"
152-
MSBuildParams = { p.MSBuildParams with Properties = properties } })
156+
MSBuildParams =
157+
{ p.MSBuildParams with
158+
Properties = properties
159+
DisableInternalBinLog = true } })
153160
"FSharp.Data.sln")
154161

155162
// --------------------------------------------------------------------------------------

‎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.203",
3+
"version": "8.0.400",
44
"rollForward": "major"
55
}
66
}

‎paket.dependencies

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
frameworks: net6.0, netstandard2.0
1+
frameworks: net8.0, netstandard2.0
22
source https://api.nuget.org/v3/index.json
33

44
# These are for TPSDK testing of TPDTCs against .NET Core App 2.0, to make sure references can be found in a known packages/... location.
@@ -20,33 +20,33 @@ group Fake
2020
source https://api.nuget.org/v3/index.json
2121
storage: none
2222

23-
nuget Fake.Testing.Common 5.20.3
24-
nuget Fake.Net.Http 5.20.3
25-
nuget Fake.IO.FileSystem 5.20.3
26-
nuget Fake.Core.CommandLineParsing 5.20.3
27-
nuget Fake.Core.Environment 5.20.3
28-
nuget Fake.Core.FakeVar 5.20.3
29-
nuget Fake.Core.SemVer 5.20.3
30-
nuget Fake.Core.String 5.20.3
31-
nuget Fake.Core.Context 5.20.3
32-
nuget Fake.Core.Trace 5.20.3
33-
nuget Fake.Core.Tasks 5.20.3
34-
nuget Fake.Core.Target 5.20.3
35-
nuget Fake.Core.ReleaseNotes 5.20.3
36-
nuget Fake.DotNet.AssemblyInfoFile 5.20.3
37-
nuget Fake.DotNet.Cli 5.20.3
38-
nuget Fake.DotNet.Testing.NUnit 5.20.3
39-
nuget Fake.DotNet.NuGet 5.20.3
40-
nuget Fake.DotNet.MsBuild 5.20.3
41-
nuget Fake.Tools.Git 5.20.3
42-
nuget Fake.DotNet.Paket 5.20.3
43-
nuget Microsoft.Build 16.9
44-
nuget Microsoft.Build.Framework 16.9
45-
nuget Microsoft.Build.Tasks.Core 16.9
46-
nuget Microsoft.Build.Utilities.Core 16.9
23+
nuget Fake.Testing.Common 6.1.3
24+
nuget Fake.Net.Http 6.1.3
25+
nuget Fake.IO.FileSystem 6.1.3
26+
nuget Fake.Core.CommandLineParsing 6.1.3
27+
nuget Fake.Core.Environment 6.1.3
28+
nuget Fake.Core.FakeVar 6.1.3
29+
nuget Fake.Core.SemVer 6.1.3
30+
nuget Fake.Core.String 6.1.3
31+
nuget Fake.Core.Context 6.1.3
32+
nuget Fake.Core.Trace 6.1.3
33+
nuget Fake.Core.Tasks 6.1.3
34+
nuget Fake.Core.Target 6.1.3
35+
nuget Fake.Core.ReleaseNotes 6.1.3
36+
nuget Fake.DotNet.AssemblyInfoFile 6.1.3
37+
nuget Fake.DotNet.Cli 6.1.3
38+
nuget Fake.DotNet.Testing.NUnit 6.1.3
39+
nuget Fake.DotNet.NuGet 6.1.3
40+
nuget Fake.DotNet.MsBuild 6.1.3
41+
nuget Fake.Tools.Git 6.1.3
42+
nuget Fake.DotNet.Paket 6.1.3
43+
nuget Microsoft.Build 17.11.4
44+
nuget Microsoft.Build.Framework 17.11.4
45+
nuget Microsoft.Build.Tasks.Core 17.11.4
46+
nuget Microsoft.Build.Utilities.Core 17.11.4
4747

4848
group Test
49-
frameworks: net6.0
49+
frameworks: net8.0
5050
source https://api.nuget.org/v3/index.json
5151

5252
nuget FSharp.Core 6.0.1

‎paket.lock

Lines changed: 275 additions & 298 deletions
Large diffs are not rendered by default.

‎src/FSharp.Data.DesignTime/FSharp.Data.DesignTime.fsproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1010
<!-- always have tailcalls on for design time compiler add-in to allow repo to compile in DEBUG, see https://github.com/fsprojects/FSharp.Data/issues/1410 -->
1111
<Tailcalls>true</Tailcalls>
12+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1213
</PropertyGroup>
1314
<ItemGroup>
1415
<Compile Include="..\..\paket-files\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fsi">

‎src/FSharp.Data/FSharp.Data.fsproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<PackagePath>typeproviders</PackagePath>
1212
<!-- always have tailcalls on for design time compiler add-in to allow repo to compile in DEBUG, see https://github.com/fsprojects/FSharp.Data/issues/1410 -->
1313
<Tailcalls>true</Tailcalls>
14+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
1415
</PropertyGroup>
1516
<ItemGroup>
1617
<Compile Include="..\AssemblyInfo.fs" />

‎tests/FSharp.Data.Core.Tests.CSharp/FSharp.Data.Core.Tests.CSharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<!-- Tests won't run without this, at least on OSX, see https://github.com/NuGet/Home/issues/4837#issuecomment-354536302 -->
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

‎tests/FSharp.Data.Core.Tests/FSharp.Data.Core.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<!-- Tests won't run without this, at least on OSX, see https://github.com/NuGet/Home/issues/4837#issuecomment-354536302 -->
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

‎tests/FSharp.Data.DesignTime.Tests/FSharp.Data.DesignTime.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
<!-- Tests won't run without this, at least on OSX, see https://github.com/NuGet/Home/issues/4837#issuecomment-354536302 -->

‎tests/FSharp.Data.Reference.Tests/FSharp.Data.Reference.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
77
<!-- Tests won't run without this, at least on OSX, see https://github.com/NuGet/Home/issues/4837#issuecomment-354536302 -->

‎tests/FSharp.Data.Tests/FSharp.Data.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<!-- Tests won't run without this, at least on OSX, see https://github.com/NuGet/Home/issues/4837#issuecomment-354536302 -->
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

0 commit comments

Comments
 (0)