Skip to content

Commit 532d310

Browse files
kMutagenekMutagene
committed
Update to .NET 8, requested PR changes
1 parent c5a9e7c commit 532d310

24 files changed

Lines changed: 69 additions & 93 deletions

‎.editorconfig‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 4
6+
charset = utf-8
7+
trim_trailing_whitespace = true
8+
insert_final_newline = false
9+
10+
[*.fs]
11+
fsharp_multiline_bracket_style = stroustrup
12+
fsharp_newline_before_multiline_computation_expression = false
13+
14+
[*.fsproj]
15+
indent_style = space
16+
indent_size = 2

‎ARCtrl.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{326188FB-2CC0-4610-A082-708885BF47AA}"
77
ProjectSection(SolutionItems) = preProject
8+
.editorconfig = .editorconfig
89
.gitignore = .gitignore
910
.github\workflows\build-test.yml = .github\workflows\build-test.yml
1011
build.cmd = build.cmd

‎build/BasicTasks.fs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module BasicTasks
1+
module BasicTasks
22

33
open BlackFox.Fake
44
open Fake.IO
@@ -159,5 +159,15 @@ let clean = BuildTask.create "Clean" [] {
159159

160160
let build = BuildTask.create "Build" [clean] {
161161
solutionFile
162-
|> DotNet.build id
162+
|> DotNet.build (fun p ->
163+
let msBuildParams =
164+
{p.MSBuildParams with
165+
DisableInternalBinLog = true
166+
}
167+
{
168+
p with
169+
MSBuildParams = msBuildParams
170+
}
171+
|> DotNet.Options.withCustomParams (Some "-tl")
172+
)
163173
}

‎build/Build.fsproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?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
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77
<ItemGroup>
@@ -21,15 +21,15 @@
2121
</ItemGroup>
2222
<ItemGroup>
2323
<PackageReference Include="BlackFox.Fake.BuildTask" Version="0.1.3" />
24-
<PackageReference Include="Fake.Api.Github" Version="5.23.0-alpha002" />
25-
<PackageReference Include="Fake.Core.Process" Version="5.23.0-alpha002" />
26-
<PackageReference Include="Fake.Core.ReleaseNotes" Version="5.23.0-alpha002" />
27-
<PackageReference Include="Fake.Core.Target" Version="5.23.0-alpha002" />
28-
<PackageReference Include="Fake.DotNet.Cli" Version="5.23.0-alpha002" />
29-
<PackageReference Include="Fake.DotNet.MSBuild" Version="5.23.0-alpha002" />
30-
<PackageReference Include="Fake.IO.FileSystem" Version="5.23.0-alpha002" />
31-
<PackageReference Include="Fake.JavaScript.Npm" Version="5.23.0-alpha002" />
32-
<PackageReference Include="Fake.Tools.Git" Version="5.23.0-alpha002" />
24+
<PackageReference Include="Fake.Api.Github" Version="6.0.0" />
25+
<PackageReference Include="Fake.Core.Process" Version="6.0.0" />
26+
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
27+
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
28+
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
29+
<PackageReference Include="Fake.DotNet.MSBuild" Version="6.0.0" />
30+
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
31+
<PackageReference Include="Fake.JavaScript.Npm" Version="6.0.0" />
32+
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
3333
<PackageReference Include="Fake.Extensions.Release" Version="0.3.0" />
3434
</ItemGroup>
3535
</Project>

‎build/PackageTasks.fs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module PackageTasks
1+
module PackageTasks
22

33
open MessagePrompts
44
open BasicTasks
@@ -29,6 +29,7 @@ module BundleDotNet =
2929
"Version",versionTag
3030
"PackageReleaseNotes", (ProjectInfo.release.Notes |> List.map replaceCommitLink |> String.toLines )
3131
] @ p.MSBuildParams.Properties)
32+
DisableInternalBinLog = true
3233
}
3334
{
3435
p with

‎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": "latestMinor"
55
}
66
}

‎src/ARCtrl/ARCtrl.fsproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,4 @@
4747
<Package Name="requests" Version="&gt;= 2.28.1 &lt; 3.0.0" ResolutionStrategy="Max" />
4848
</PythonDependencies>
4949
</PropertyGroup>
50-
<ItemGroup>
51-
<PackageReference Update="FSharp.Core" Version="7.0.401" />
52-
</ItemGroup>
5350
</Project>

‎src/CWL/ARCtrl.CWL.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
@@ -21,4 +21,4 @@
2121
<RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
2222
<RepositoryType>git</RepositoryType>
2323
</PropertyGroup>
24-
</Project>
24+
</Project>

‎src/Contract/ARCtrl.Contract.fsproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
2626
<None Include="../../build/logo.png" Pack="true" PackagePath="\" />
2727
</ItemGroup>
28-
<ItemGroup>
29-
<PackageReference Update="FSharp.Core" Version="7.0.401" />
30-
</ItemGroup>
3128
<PropertyGroup>
3229
<Authors>nfdi4plants, Kevin Frey, Lukas Weil, Kevin Schneider, Oliver Maus</Authors>
3330
<Description>ARC helper functions for contracts management.</Description>

‎src/Core/ARCtrl.Core.fsproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@
6262
<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
6363
<None Include="../../build/logo.png" Pack="true" PackagePath="\" />
6464
</ItemGroup>
65-
<ItemGroup>
66-
<PackageReference Update="FSharp.Core" Version="7.0.401" />
67-
</ItemGroup>
6865
<PropertyGroup>
6966
<Authors>nfdi4plants, Lukas Weil, Kevin Frey, Kevin Schneider, Oliver Maus</Authors>
7067
<Description>ARC and ISA compliant experimental metadata toolkit in F#. This project is meant as an easy means to open, manipulate and save ISA (Investigation,Study,Assay) metadata files in the dotnet environment.</Description>

0 commit comments

Comments
 (0)