Skip to content

Commit cf34cf6

Browse files
knocteknocte
committed
Revert migration from .NET6 to .NET8
This commit reverts two recent commits: * "GitHubCI: set DOTNET_ROLL_FORWARD=major for fsxc" (f2f3c16). * "GitHubCI,Frontend.Console: swap .net6 with .net8" (2a55b3a). Reason is we found a breaking change in .NET8, so we have decided to maintain .NET6 in the stable branch, and only have a .NET6->.NET8 migration path in the master branch.
1 parent 23f4445 commit cf34cf6

File tree

3 files changed

+31
-55
lines changed

3 files changed

+31
-55
lines changed

‎.github/workflows/CI.yml‎

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

12-
env:
13-
DOTNET_VERSION: '8.0'
1412

1513
# FIXME: figure out why we need to clean after make if we
1614
# want 'make strict' target to really happen without
1715
# assuming the binaries from previous build are good
1816
# (msbuild bug?)
1917

2018
jobs:
21-
macOS--dotnet-and-mono:
19+
macOS--dotnet6-and-mono:
2220
runs-on: macOS-13
2321
steps:
2422
- uses: actions/checkout@v1
2523
with:
2624
submodules: false
27-
- name: Setup .NET SDK
28-
uses: actions/setup-dotnet@v5
25+
- name: Setup .NET SDK 6.0.x
26+
uses: actions/setup-dotnet@v1.7.2
2927
with:
30-
dotnet-version: ${{ env.DOTNET_VERSION }}
28+
dotnet-version: '6.0.113'
3129
- name: Install specific Xamarin.iOS and Xamarin.Android versions
3230
run: |
3331
wget https://download.visualstudio.microsoft.com/download/pr/81c41aaa-a3d7-4875-8416-d04b472379b7/21d9f6c5ad3a6bc2479b2ec4b0685b6c/xamarin.ios-16.0.0.72.pkg
@@ -60,9 +58,6 @@ jobs:
6058
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
6159
dotnet tool install fsxc --version 0.5.9.1
6260
63-
# fsxc was built with .NET6.x
64-
export DOTNET_ROLL_FORWARD=major
65-
6661
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
6762
6863
macOS--mono-only:
@@ -99,16 +94,16 @@ jobs:
9994
- name: integration tests
10095
run: make update-servers
10196

102-
macOS--dotnet-only:
97+
macOS--dotnet6-only:
10398
runs-on: macOS-13
10499
steps:
105100
- uses: actions/checkout@v1
106101
with:
107102
submodules: false
108-
- name: Setup .NET SDK
109-
uses: actions/setup-dotnet@v5
103+
- name: Setup .NET SDK 6.0.x
104+
uses: actions/setup-dotnet@v1.7.2
110105
with:
111-
dotnet-version: ${{ env.DOTNET_VERSION }}
106+
dotnet-version: '6.0.113'
112107
- name: HACK to emulate mono uninstall
113108
run: sudo rm -f `which mono` && sudo rm -f `which msbuild`
114109
- name: configure
@@ -126,16 +121,16 @@ jobs:
126121
- name: integration tests
127122
run: make update-servers
128123

129-
windows--dotnet-and-legacyFramework:
124+
windows--dotnet6-and-legacyFramework:
130125
runs-on: windows-latest
131126
steps:
132127
- uses: actions/checkout@v1
133128
with:
134129
submodules: false
135-
- name: Setup .NET SDK
136-
uses: actions/setup-dotnet@v5
130+
- name: Setup .NET SDK 6.0.x
131+
uses: actions/setup-dotnet@v1.7.2
137132
with:
138-
dotnet-version: ${{ env.DOTNET_VERSION }}
133+
dotnet-version: '6.0.113'
139134
- name: configure
140135
run: .\configure.bat
141136
- name: build in DEBUG mode
@@ -158,9 +153,6 @@ jobs:
158153
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
159154
dotnet tool install fsxc --version 0.5.9.1
160155
161-
# fsxc was built with .NET6.x
162-
export DOTNET_ROLL_FORWARD=major
163-
164156
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
165157
166158
windows--legacyFramework-only:
@@ -186,16 +178,16 @@ jobs:
186178
- name: integration tests
187179
run: .\make update-servers
188180

189-
windows--dotnet-only:
181+
windows--dotnet6-only:
190182
runs-on: windows-latest
191183
steps:
192184
- uses: actions/checkout@v1
193185
with:
194186
submodules: false
195-
- name: Setup .NET SDK
196-
uses: actions/setup-dotnet@v5
187+
- name: Setup .NET SDK 6.0.x
188+
uses: actions/setup-dotnet@v1.7.2
197189
with:
198-
dotnet-version: ${{ env.DOTNET_VERSION }}
190+
dotnet-version: '6.0.113'
199191
- name: HACK to emulate legacy .NETFramework uninstall
200192
run: del $(& "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -find MSBuild\\**\\Bin\\MSBuild.exe)
201193
- name: configure
@@ -220,9 +212,6 @@ jobs:
220212
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
221213
dotnet tool install fsxc --version 0.5.9.1
222214
223-
# fsxc was built with .NET6.x
224-
export DOTNET_ROLL_FORWARD=major
225-
226215
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
227216
228217
linux24-github--dotnet-and-mono:
@@ -313,7 +302,7 @@ jobs:
313302
- name: integration tests
314303
run: make update-servers
315304

316-
linux24-vanilla--stockdotnet-only:
305+
linux24-vanilla--stockdotnet6-only:
317306
runs-on: ubuntu-24.04
318307
container:
319308
image: "ubuntu:24.04"
@@ -326,7 +315,7 @@ jobs:
326315
- name: install sudo
327316
run: apt update && apt install --yes sudo
328317
- name: install all dependencies
329-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8
318+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
330319

331320
# workaround for https://github.com/actions/runner/issues/2033
332321
- name: ownership workaround
@@ -353,12 +342,9 @@ jobs:
353342
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
354343
dotnet tool install fsxc --version 0.5.9.1
355344
356-
# fsxc was built with .NET6.x
357-
export DOTNET_ROLL_FORWARD=major
358-
359345
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
360346
361-
linux24-vanilla--stockdotnet-and-newmono:
347+
linux24-vanilla--stockdotnet6-and-newmono:
362348
runs-on: ubuntu-24.04
363349
container:
364350
image: "ubuntu:24.04"
@@ -371,7 +357,7 @@ jobs:
371357
- name: install sudo
372358
run: apt update && apt install --yes sudo
373359
- name: install all dependencies
374-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8
360+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
375361
- name: install last version of mono (Microsoft APT repositories)
376362
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
377363

@@ -400,12 +386,9 @@ jobs:
400386
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
401387
dotnet tool install fsxc --version 0.5.9.1
402388
403-
# fsxc was built with .NET6.x
404-
export DOTNET_ROLL_FORWARD=major
405-
406389
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
407390
408-
linux24-vanilla--stockdotnet-and-stockmono:
391+
linux24-vanilla--stockdotnet6-and-stockmono:
409392
runs-on: ubuntu-24.04
410393
container:
411394
image: "ubuntu:24.04"
@@ -418,7 +401,7 @@ jobs:
418401
- name: install sudo
419402
run: apt update && apt install --yes sudo
420403
- name: install all dependencies
421-
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8 mono-xbuild
404+
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6 mono-xbuild
422405

423406
# workaround for https://github.com/actions/runner/issues/2033
424407
- name: ownership workaround
@@ -445,9 +428,6 @@ jobs:
445428
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
446429
dotnet tool install fsxc --version 0.5.9.1
447430
448-
# fsxc was built with .NET6.x
449-
export DOTNET_ROLL_FORWARD=major
450-
451431
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
452432
453433
linux24-vanilla--newmono-only:
@@ -622,19 +602,19 @@ jobs:
622602
- linux24-github--dotnet-and-newmono
623603
- linux24-vanilla--stockmono-only
624604
- linux24-vanilla--newmono-only
625-
- linux24-vanilla--stockdotnet-only
626-
- linux24-vanilla--stockdotnet-and-stockmono
627-
- linux24-vanilla--stockdotnet-and-newmono
605+
- linux24-vanilla--stockdotnet6-only
606+
- linux24-vanilla--stockdotnet6-and-stockmono
607+
- linux24-vanilla--stockdotnet6-and-newmono
628608
- linux22-github--dotnet-and-mono
629609
- linux22-github--dotnet-and-newmono
630610
- linux22-vanilla--stockmono-only
631611
- linux22-vanilla--newmono-only
632-
- windows--dotnet-and-legacyFramework
612+
- windows--dotnet6-and-legacyFramework
633613
- windows--legacyFramework-only
634-
- windows--dotnet-only
635-
- macOS--dotnet-and-mono
614+
- windows--dotnet6-only
615+
- macOS--dotnet6-and-mono
636616
- macOS--mono-only
637-
- macOS--dotnet-only
617+
- macOS--dotnet6-only
638618

639619
steps:
640620
- uses: actions/checkout@v1

‎scripts/make.fsx‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ 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-
4037
type BinaryConfig =
4138
| Debug
4239
| Release
@@ -273,8 +270,7 @@ let GetPathToFrontendBinariesDir (binaryConfig: BinaryConfig) =
273270
#if LEGACY_FRAMEWORK
274271
Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString())
275272
#else
276-
Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString(),
277-
sprintf "net%s" DOTNET_VERSION)
273+
Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString(), "net6.0")
278274
#endif
279275

280276
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>net8.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
77
<Compile Include="..\GWallet.Backend\Properties\CommonAssemblyInfo.fs">

0 commit comments

Comments
 (0)