diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 610bf59c1..d3bc20d3a 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -10,7 +10,7 @@ on:
- cron: "0 0 * * *"
env:
- DOTNET_VERSION: '8.0'
+ DOTNET_VERSION: '6.0.113'
# FIXME: figure out why we need to clean after make if we
# want 'make strict' target to really happen without
@@ -18,14 +18,14 @@ env:
# (msbuild bug?)
jobs:
- macOS--dotnet-and-mono:
+ macOS--dotnet6-and-mono:
runs-on: macOS-13
steps:
- uses: actions/checkout@v1
with:
submodules: false
- - name: Setup .NET SDK
- uses: actions/setup-dotnet@v5
+ - name: Setup .NET SDK 6.0.x
+ uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: Install specific Xamarin.iOS and Xamarin.Android versions
@@ -60,9 +60,6 @@ jobs:
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
dotnet tool install fsxc --version 0.5.9.1
- # fsxc was built with .NET6.x
- export DOTNET_ROLL_FORWARD=major
-
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
macOS--mono-only:
@@ -99,16 +96,16 @@ jobs:
- name: integration tests
run: make update-servers
- macOS--dotnet-only:
+ macOS--dotnet6-only:
runs-on: macOS-13
steps:
- uses: actions/checkout@v1
with:
submodules: false
- - name: Setup .NET SDK
- uses: actions/setup-dotnet@v5
+ - name: Setup .NET SDK 6.0.x
+ uses: actions/setup-dotnet@v1.7.2
with:
- dotnet-version: ${{ env.DOTNET_VERSION }}
+ dotnet-version: ${{ env.DOTNET_VERSION }}
- name: HACK to emulate mono uninstall
run: sudo rm -f `which mono` && sudo rm -f `which msbuild`
- name: configure
@@ -126,14 +123,14 @@ jobs:
- name: integration tests
run: make update-servers
- windows--dotnet-and-legacyFramework:
+ windows--dotnet6-and-legacyFramework:
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
with:
submodules: false
- - name: Setup .NET SDK
- uses: actions/setup-dotnet@v5
+ - name: Setup .NET SDK 6.0.x
+ uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: configure
@@ -158,9 +155,6 @@ jobs:
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
dotnet tool install fsxc --version 0.5.9.1
- # fsxc was built with .NET6.x
- export DOTNET_ROLL_FORWARD=major
-
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
windows--legacyFramework-only:
@@ -186,14 +180,14 @@ jobs:
- name: integration tests
run: .\make update-servers
- windows--dotnet-only:
+ windows--dotnet6-only:
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
with:
submodules: false
- - name: Setup .NET SDK
- uses: actions/setup-dotnet@v5
+ - name: Setup .NET SDK 6.0.x
+ uses: actions/setup-dotnet@v1.7.2
with:
dotnet-version: ${{ env.DOTNET_VERSION }}
- name: HACK to emulate legacy .NETFramework uninstall
@@ -220,9 +214,6 @@ jobs:
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
dotnet tool install fsxc --version 0.5.9.1
- # fsxc was built with .NET6.x
- export DOTNET_ROLL_FORWARD=major
-
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
linux24-github--dotnet-and-mono:
@@ -231,6 +222,10 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: false
+ - name: Setup .NET SDK 6.0.x
+ uses: actions/setup-dotnet@v1.7.2
+ with:
+ dotnet-version: ${{ env.DOTNET_VERSION }}
- name: install missing dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
- name: check runtime version(s)
@@ -256,6 +251,10 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: false
+ - name: Setup .NET SDK 6.0.x
+ uses: actions/setup-dotnet@v1.7.2
+ with:
+ dotnet-version: ${{ env.DOTNET_VERSION }}
- name: install missing dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
- name: install last version of mono (Microsoft APT repositories)
@@ -313,10 +312,10 @@ jobs:
- name: integration tests
run: make update-servers
- linux24-vanilla--stockdotnet-only:
- runs-on: ubuntu-24.04
+ linux22-vanilla--stockdotnet6-only:
+ runs-on: ubuntu-22.04
container:
- image: "ubuntu:24.04"
+ image: "ubuntu:22.04"
steps:
- uses: actions/checkout@v1
# can't use the option below because of error "Input 'submodules' not supported when falling back to download using the GitHub REST API. To create a local Git repository instead, add Git 2.18 or higher to the PATH."
@@ -326,7 +325,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
- run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8
+ run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
@@ -353,15 +352,12 @@ jobs:
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
dotnet tool install fsxc --version 0.5.9.1
- # fsxc was built with .NET6.x
- export DOTNET_ROLL_FORWARD=major
-
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
- linux24-vanilla--stockdotnet-and-newmono:
- runs-on: ubuntu-24.04
+ linux22-vanilla--stockdotnet6-and-newmono:
+ runs-on: ubuntu-22.04
container:
- image: "ubuntu:24.04"
+ image: "ubuntu:22.04"
steps:
- uses: actions/checkout@v1
# can't use the option below because of error "Input 'submodules' not supported when falling back to download using the GitHub REST API. To create a local Git repository instead, add Git 2.18 or higher to the PATH."
@@ -371,7 +367,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
- run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8
+ run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6
- name: install last version of mono (Microsoft APT repositories)
run: sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
@@ -400,15 +396,12 @@ jobs:
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
dotnet tool install fsxc --version 0.5.9.1
- # fsxc was built with .NET6.x
- export DOTNET_ROLL_FORWARD=major
-
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
- linux24-vanilla--stockdotnet-and-stockmono:
- runs-on: ubuntu-24.04
+ linux22-vanilla--stockdotnet6-and-stockmono:
+ runs-on: ubuntu-22.04
container:
- image: "ubuntu:24.04"
+ image: "ubuntu:22.04"
steps:
- uses: actions/checkout@v1
# can't use the option below because of error "Input 'submodules' not supported when falling back to download using the GitHub REST API. To create a local Git repository instead, add Git 2.18 or higher to the PATH."
@@ -418,7 +411,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install all dependencies
- run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet8 mono-xbuild
+ run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make curl dotnet6 mono-xbuild
# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
@@ -445,9 +438,6 @@ jobs:
# we need to install specific version because of this bug: https://github.com/dotnet/sdk/issues/24037
dotnet tool install fsxc --version 0.5.9.1
- # fsxc was built with .NET6.x
- export DOTNET_ROLL_FORWARD=major
-
find . -type f -name "*.fsx" | xargs -t -I {} dotnet fsxc {}
linux24-vanilla--newmono-only:
@@ -495,6 +485,10 @@ jobs:
- uses: actions/checkout@v1
with:
submodules: false
+ - name: Setup .NET SDK 6.0.x
+ uses: actions/setup-dotnet@v1.7.2
+ with:
+ dotnet-version: ${{ env.DOTNET_VERSION }}
- name: install missing dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
- name: check runtime version(s)
@@ -518,6 +512,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
+ - name: Setup .NET SDK 6.0.x
+ uses: actions/setup-dotnet@v1.7.2
+ with:
+ dotnet-version: ${{ env.DOTNET_VERSION }}
- name: install missing dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes fsharp nunit-console
- name: install last version of mono (Microsoft APT repositories)
@@ -622,19 +620,19 @@ jobs:
- linux24-github--dotnet-and-newmono
- linux24-vanilla--stockmono-only
- linux24-vanilla--newmono-only
- - linux24-vanilla--stockdotnet-only
- - linux24-vanilla--stockdotnet-and-stockmono
- - linux24-vanilla--stockdotnet-and-newmono
+ - linux22-vanilla--stockdotnet6-only
+ - linux22-vanilla--stockdotnet6-and-stockmono
+ - linux22-vanilla--stockdotnet6-and-newmono
- linux22-github--dotnet-and-mono
- linux22-github--dotnet-and-newmono
- linux22-vanilla--stockmono-only
- linux22-vanilla--newmono-only
- - windows--dotnet-and-legacyFramework
+ - windows--dotnet6-and-legacyFramework
- windows--legacyFramework-only
- - windows--dotnet-only
- - macOS--dotnet-and-mono
+ - windows--dotnet6-only
+ - macOS--dotnet6-and-mono
- macOS--mono-only
- - macOS--dotnet-only
+ - macOS--dotnet6-only
steps:
- uses: actions/checkout@v1
diff --git a/Directory.Build.props b/Directory.Build.props
index ccd7c51ef..ba5122e77 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,4 +8,7 @@
true
true
+
+ NETSDK1138
+
diff --git a/scripts/make.fsx b/scripts/make.fsx
index 97c7264f2..2c5a866f8 100755
--- a/scripts/make.fsx
+++ b/scripts/make.fsx
@@ -34,9 +34,6 @@ let UNIX_NAME = "gwallet"
let DEFAULT_FRONTEND = "GWallet.Frontend.Console"
let BACKEND = "GWallet.Backend"
-// format: X.Y (can't be X.Y.Z here
-let DOTNET_VERSION = "8.0"
-
type BinaryConfig =
| Debug
| Release
@@ -273,8 +270,7 @@ let GetPathToFrontendBinariesDir (binaryConfig: BinaryConfig) =
#if LEGACY_FRAMEWORK
Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString())
#else
- Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString(),
- sprintf "net%s" DOTNET_VERSION)
+ Path.Combine (FsxHelper.RootDir.FullName, "src", DEFAULT_FRONTEND, "bin", binaryConfig.ToString(), "net6.0")
#endif
let GetPathToBackend () =
diff --git a/src/GWallet.Frontend.Console/GWallet.Frontend.Console.fsproj b/src/GWallet.Frontend.Console/GWallet.Frontend.Console.fsproj
index bc2a4f134..85569c9e0 100644
--- a/src/GWallet.Frontend.Console/GWallet.Frontend.Console.fsproj
+++ b/src/GWallet.Frontend.Console/GWallet.Frontend.Console.fsproj
@@ -1,7 +1,7 @@
Exe
- net8.0
+ net6.0