Skip to content

Commit 68662c6

Browse files
committed
GitHubCI,Frontend.Console: swap .net6 with .net8
This is to fix this compiler error when building in Release mode: ``` Determining projects to restore... /usr/share/dotnet/sdk/10.0.100/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.EolTargetFrameworks.targets(32,5): error NETSDK1138: The target framework 'net6.0' is out of support and will not receive security updates in the future. Please refer to https://aka.ms/dotnet-core-support for more information about the support policy. [/home/runner/work/geewallet/geewallet/src/GWallet.Frontend.Console/GWallet.Frontend.Console.fsproj] ```
1 parent ab4d306 commit 68662c6

File tree

3 files changed

+37
-31
lines changed

3 files changed

+37
-31
lines changed

.github/workflows/CI.yml

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,25 @@ on:
99
schedule:
1010
- cron: "0 0 * * *"
1111

12+
env:
13+
DOTNET_VERSION: '8.0'
1214

1315
# FIXME: figure out why we need to clean after make if we
1416
# want 'make strict' target to really happen without
1517
# assuming the binaries from previous build are good
1618
# (msbuild bug?)
1719

1820
jobs:
19-
macOS--dotnet6-and-mono:
21+
macOS--dotnet-and-mono:
2022
runs-on: macOS-13
2123
steps:
2224
- uses: actions/checkout@v1
2325
with:
2426
submodules: false
25-
- name: Setup .NET SDK 6.0.x
26-
uses: actions/setup-dotnet@v1.7.2
27+
- name: Setup .NET SDK
28+
uses: actions/setup-dotnet@v5
2729
with:
28-
dotnet-version: '6.0.113'
30+
dotnet-version: ${{ env.DOTNET_VERSION }}
2931
- name: Install specific Xamarin.iOS and Xamarin.Android versions
3032
run: |
3133
wget https://download.visualstudio.microsoft.com/download/pr/81c41aaa-a3d7-4875-8416-d04b472379b7/21d9f6c5ad3a6bc2479b2ec4b0685b6c/xamarin.ios-16.0.0.72.pkg
@@ -94,16 +96,16 @@ jobs:
9496
- name: integration tests
9597
run: make update-servers
9698

97-
macOS--dotnet6-only:
99+
macOS--dotnet-only:
98100
runs-on: macOS-13
99101
steps:
100102
- uses: actions/checkout@v1
101103
with:
102104
submodules: false
103-
- name: Setup .NET SDK 6.0.x
104-
uses: actions/setup-dotnet@v1.7.2
105+
- name: Setup .NET SDK
106+
uses: actions/setup-dotnet@v5
105107
with:
106-
dotnet-version: '6.0.113'
108+
dotnet-version: ${{ env.DOTNET_VERSION }}
107109
- name: HACK to emulate mono uninstall
108110
run: sudo rm -f `which mono` && sudo rm -f `which msbuild`
109111
- name: configure
@@ -121,16 +123,16 @@ jobs:
121123
- name: integration tests
122124
run: make update-servers
123125

124-
windows--dotnet6-and-legacyFramework:
126+
windows--dotnet-and-legacyFramework:
125127
runs-on: windows-latest
126128
steps:
127129
- uses: actions/checkout@v1
128130
with:
129131
submodules: false
130-
- name: Setup .NET SDK 6.0.x
131-
uses: actions/setup-dotnet@v1.7.2
132+
- name: Setup .NET SDK
133+
uses: actions/setup-dotnet@v5
132134
with:
133-
dotnet-version: '6.0.113'
135+
dotnet-version: ${{ env.DOTNET_VERSION }}
134136
- name: configure
135137
run: .\configure.bat
136138
- name: build in DEBUG mode
@@ -178,16 +180,16 @@ jobs:
178180
- name: integration tests
179181
run: .\make update-servers
180182

181-
windows--dotnet6-only:
183+
windows--dotnet-only:
182184
runs-on: windows-latest
183185
steps:
184186
- uses: actions/checkout@v1
185187
with:
186188
submodules: false
187-
- name: Setup .NET SDK 6.0.x
188-
uses: actions/setup-dotnet@v1.7.2
189+
- name: Setup .NET SDK
190+
uses: actions/setup-dotnet@v5
189191
with:
190-
dotnet-version: '6.0.113'
192+
dotnet-version: ${{ env.DOTNET_VERSION }}
191193
- name: HACK to emulate legacy .NETFramework uninstall
192194
run: del $(& "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -find MSBuild\\**\\Bin\\MSBuild.exe)
193195
- name: configure
@@ -302,7 +304,7 @@ jobs:
302304
- name: integration tests
303305
run: make update-servers
304306

305-
linux24-vanilla--stockdotnet6-only:
307+
linux24-vanilla--stockdotnet-only:
306308
runs-on: ubuntu-24.04
307309
container:
308310
image: "ubuntu:24.04"
@@ -315,7 +317,7 @@ jobs:
315317
- name: install sudo
316318
run: apt update && apt install --yes sudo
317319
- name: install all dependencies
318-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
320+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8
319321

320322
# workaround for https://github.com/actions/runner/issues/2033
321323
- name: ownership workaround
@@ -344,7 +346,7 @@ jobs:
344346
345347
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
346348
347-
linux24-vanilla--stockdotnet6-and-newmono:
349+
linux24-vanilla--stockdotnet-and-newmono:
348350
runs-on: ubuntu-24.04
349351
container:
350352
image: "ubuntu:24.04"
@@ -357,7 +359,7 @@ jobs:
357359
- name: install sudo
358360
run: apt update && apt install --yes sudo
359361
- name: install all dependencies
360-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
362+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8
361363
- name: install last version of mono (Microsoft APT repositories)
362364
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
363365

@@ -388,7 +390,7 @@ jobs:
388390
389391
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
390392
391-
linux24-vanilla--stockdotnet6-and-stockmono:
393+
linux24-vanilla--stockdotnet-and-stockmono:
392394
runs-on: ubuntu-24.04
393395
container:
394396
image: "ubuntu:24.04"
@@ -401,7 +403,7 @@ jobs:
401403
- name: install sudo
402404
run: apt update && apt install --yes sudo
403405
- name: install all dependencies
404-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6 mono-xbuild
406+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8 mono-xbuild
405407

406408
# workaround for https://github.com/actions/runner/issues/2033
407409
- name: ownership workaround
@@ -602,19 +604,19 @@ jobs:
602604
- linux24-github--dotnet-and-newmono
603605
- linux24-vanilla--stockmono-only
604606
- linux24-vanilla--newmono-only
605-
- linux24-vanilla--stockdotnet6-only
606-
- linux24-vanilla--stockdotnet6-and-stockmono
607-
- linux24-vanilla--stockdotnet6-and-newmono
607+
- linux24-vanilla--stockdotnet-only
608+
- linux24-vanilla--stockdotnet-and-stockmono
609+
- linux24-vanilla--stockdotnet-and-newmono
608610
- linux22-github--dotnet-and-mono
609611
- linux22-github--dotnet-and-newmono
610612
- linux22-vanilla--stockmono-only
611613
- linux22-vanilla--newmono-only
612-
- windows--dotnet6-and-legacyFramework
614+
- windows--dotnet-and-legacyFramework
613615
- windows--legacyFramework-only
614-
- windows--dotnet6-only
615-
- macOS--dotnet6-and-mono
616+
- windows--dotnet-only
617+
- macOS--dotnet-and-mono
616618
- macOS--mono-only
617-
- macOS--dotnet6-only
619+
- macOS--dotnet-only
618620

619621
steps:
620622
- uses: actions/checkout@v1

scripts/make.fsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ let UNIX_NAME = "gwallet"
3434
let DEFAULT_FRONTEND = "GWallet.Frontend.Console"
3535
let BACKEND = "GWallet.Backend"
3636

37+
// format: X.Y (can't be X.Y.Z here
38+
let DOTNET_VERSION = "8.0"
39+
3740
type BinaryConfig =
3841
| Debug
3942
| Release
@@ -270,7 +273,8 @@ let GetPathToFrontendBinariesDir (binaryConfig: BinaryConfig) =
270273
#if LEGACY_FRAMEWORK
271274
Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString())
272275
#else
273-
Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString(), "net6.0")
276+
Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString(),
277+
sprintf "net%s" DOTNET_VERSION)
274278
#endif
275279

276280
let GetPathToBackend () =

src/GWallet.Frontend.Console/GWallet.Frontend.Console.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
77
<Compile Include="..\GWallet.Backend\Properties\CommonAssemblyInfo.fs">

0 commit comments

Comments
 (0)