Skip to content

WIP: Upgrade from .NET v6.x to v7.x #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
knocte wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Upgrade from .NET v6.x to v7.x #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8610fa3
Upgrade from .NET v6.x to v7.x
knocte Sep 2, 2024
414f51b
Revert
knocte Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: |
sudo apt install --yes git

sudo DEBIAN_FRONTEND=noninteractive apt install --yes dotnet6
sudo DEBIAN_FRONTEND=noninteractive apt install --yes dotnet7

# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand All @@ -41,7 +41,7 @@ jobs:

sanity-check:
needs:
- macOS--dotnet6-and-mono
- macOS--dotnet7-and-mono
- macOS--mono
- linux-oldLTS-github--dotnet-and-xbuild
- linux-oldLTS-github--dotnet-and-msbuild
Expand All @@ -51,9 +51,9 @@ jobs:
- linux-newLTS-github--dotnet-and-msbuild
- linux-newLTS-vanilla--stockmono
- linux-newLTS-vanilla--newmono
- linux-newLTS-vanilla--dotnet6
- linux-newLTS-vanilla--dotnet7
- windows--legacyFramework
- windows--dotnet6
- windows--dotnet7

runs-on: ubuntu-22.04
steps:
Expand All @@ -79,25 +79,25 @@ jobs:
if: github.event_name == 'pull_request'
run: ./conventions/commitlint.sh --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose

- name: Setup .NET SDK 6.0.x
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: '6.0.x'
dotnet-version: '7.0.x'
- name: fantomless
run: |
dotnet new tool-manifest
dotnet tool install fantomless-tool --version 4.7.996
dotnet fantomless --recurse .
git diff --exit-code

macOS--dotnet6-and-mono:
macOS--dotnet7-and-mono:
runs-on: macOS-12
steps:
- uses: actions/checkout@v1
- name: Setup .NET SDK 6.0.x
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: '6.0.x'
dotnet-version: '7.0.x'
- name: configure
run: ./configure.sh
- name: build in DEBUG mode
Expand Down Expand Up @@ -442,7 +442,7 @@ jobs:
- name: compile this repo's .fsx scripts with fsx
run: ./compileFSharpScripts.fsx

linux-newLTS-vanilla--dotnet6:
linux-newLTS-vanilla--dotnet7:
runs-on: ubuntu-22.04
container:
image: "ubuntu:22.04"
Expand All @@ -451,7 +451,7 @@ jobs:
- name: install sudo
run: apt update && apt install --yes sudo
- name: install dependencies
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet6
run: sudo DEBIAN_FRONTEND=noninteractive apt install --yes git make dotnet7

# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
Expand Down Expand Up @@ -504,14 +504,14 @@ jobs:
- name: compile this repo's .fsx scripts with fsx
run: .\Tools\fsi.bat compileFSharpScripts.fsx

windows--dotnet6:
windows--dotnet7:
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Setup .NET SDK 6.0.x
- name: Setup .NET SDK
uses: actions/[email protected]
with:
dotnet-version: '6.0.x'
dotnet-version: '7.0.x'
- name: build in DEBUG mode
run: .\make.bat
- name: run unit tests
Expand Down
2 changes: 1 addition & 1 deletion version.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
BaseVersion=0.6.0
BaseVersion=0.7.0