From a1d267e7794bdeead1db6b1f3f7e12def16bb50b Mon Sep 17 00:00:00 2001 From: Daniel Kuschny Date: Fri, 10 May 2024 11:50:55 +0200 Subject: [PATCH] chore: Target net8.0 (#1465) --- .github/dependabot.yml | 8 ++++++++ .github/workflows/build.yml | 18 ++++++++--------- .github/workflows/dependabot.yml | 5 ----- .github/workflows/publish.yml | 20 +++++++++---------- .github/workflows/release.yml | 12 +++++------ README.md | 4 ++-- src.csharp/AlphaTab.Test/AlphaTab.Test.csproj | 2 +- .../AlphaTab.Windows/AlphaTab.Windows.csproj | 2 +- 8 files changed, 37 insertions(+), 34 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index aca3c61e9..6616b0981 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,3 +23,11 @@ updates: - platform-java schedule: interval: "weekly" + + - package-ecosystem: "github-actions" + directory: "/" + labels: + - area-dependencies + - platform-all + schedule: + interval: "weekly" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 815486651..b3287debd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,8 +12,8 @@ jobs: name: Build and Test Web runs-on: windows-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' - run: npm install @@ -24,13 +24,13 @@ jobs: name: Build and Test C# runs-on: windows-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: - dotnet-version: '6' + dotnet-version: '8' - run: npm install - run: npm run build-csharp - run: npm run test-csharp @@ -39,15 +39,15 @@ jobs: name: Build and Test Kotlin runs-on: windows-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' - uses: actions/setup-java@v3 with: java-version: '19' distribution: 'temurin' - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml index 927de5a46..e7a91908d 100644 --- a/.github/workflows/dependabot.yml +++ b/.github/workflows/dependabot.yml @@ -10,11 +10,6 @@ jobs: runs-on: ubuntu-latest if: ${{ github.actor == 'dependabot[bot]' }} steps: - - name: Dependabot metadata - id: metadata - uses: dependabot/fetch-metadata@v1.1.1 - with: - github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs run: gh pr merge --auto --squash "$PR_URL" env: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4386b599a..d784a259e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ jobs: steps: - run: touch dummy.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cache with: path: dummy.txt @@ -26,9 +26,9 @@ jobs: if: needs.check_sha.outputs.hit == 'false' runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' cache: 'npm' @@ -38,7 +38,7 @@ jobs: - run: npm run build - run: npm pack - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' registry-url: https://registry.npmjs.org/ @@ -53,16 +53,16 @@ jobs: if: needs.check_sha.outputs.hit == 'false' runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' cache: 'npm' - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: - dotnet-version: "6" + dotnet-version: "8" - run: npm install - run: node ./scripts/update-csharp-version.js alpha ${{github.run_number}} @@ -84,9 +84,9 @@ jobs: SONATYPE_SIGNING_PASSWORD: ${{secrets.SONATYPE_SIGNING_PASSWORD}} SONATYPE_SIGNING_KEY: ${{secrets.SONATYPE_SIGNING_KEY}} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' cache: 'npm' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82b194db7..41dc6fdac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,15 +9,15 @@ jobs: name: Web runs-on: windows-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' - run: npm install - run: node ./scripts/update-version.js ${{github.run_number}} - run: npm run build - run: npm pack - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 'lts/*' registry-url: https://registry.npmjs.org/ @@ -30,13 +30,13 @@ jobs: name: C# runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-node@v1 with: node-version: 'lts/*' - - uses: actions/setup-dotnet@v3 + - uses: actions/setup-dotnet@v4 with: - dotnet-version: '6' + dotnet-version: '8' env: NUGET_AUTH_TOKEN: ${{secrets.NUGET_API_KEY}} - run: npm install diff --git a/README.md b/README.md index d8cca929f..cf63d1de4 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Node.js using `require` (UMD) | Access to all low level APIs and SVG rendering | .netcoreapp3.1 (WinForms) | Full experience including low level APIs, Background Workers, Audio Playback (through NAudio), SVG and HTML5 rendering. UI level integration for user interaction and automatic resizing. Reduced UI level integration related to transparency and animations. | 1.0-1.2.2 Browsers using ES6 Modules (ESM) | Full experience including low level APIs, Background Workers, Audio Playback, SVG and HTML5 rendering. UI level integration for user interaction and automatic resizing. | 1.3 (pre-release :warning:) Node.js using `import` (ESM) | Access to all low level APIs and SVG rendering | 1.3 (pre-release :warning:) -.net6.0-windows (WPF) | Full experience including low level APIs, Background Workers, Audio Playback (through NAudio), SVG and HTML5 rendering. UI level integration for user interaction and automatic resizing. | 1.3 (pre-release :warning:) -.net6.0-windows (WinForms) | Full experience including low level APIs, Background Workers, Audio Playback (through NAudio), SVG and HTML5 rendering. UI level integration for user interaction and automatic resizing. Reduced UI level integration related to transparency and animations. | 1.3 (pre-release :warning:) +.net8.0-windows (WPF) | Full experience including low level APIs, Background Workers, Audio Playback (through NAudio), SVG and HTML5 rendering. UI level integration for user interaction and automatic resizing. | 1.3 (pre-release :warning:) +.net8.0-windows (WinForms) | Full experience including low level APIs, Background Workers, Audio Playback (through NAudio), SVG and HTML5 rendering. UI level integration for user interaction and automatic resizing. Reduced UI level integration related to transparency and animations. | 1.3 (pre-release :warning:) Android (Kotlin) | Full experience including low level APIs, Background Workers, Audio Playback, Android Canvas and SVG rendering. UI level integration for user interaction and automatic resizing. Reduced UI level integration related to transparency and animations. | 1.3 (pre-release :warning:) ## Thanks to... diff --git a/src.csharp/AlphaTab.Test/AlphaTab.Test.csproj b/src.csharp/AlphaTab.Test/AlphaTab.Test.csproj index 84749a816..7ea4c0dc6 100644 --- a/src.csharp/AlphaTab.Test/AlphaTab.Test.csproj +++ b/src.csharp/AlphaTab.Test/AlphaTab.Test.csproj @@ -2,7 +2,7 @@ AlphaTab - net6.0 + net8.0 false enable 10 diff --git a/src.csharp/AlphaTab.Windows/AlphaTab.Windows.csproj b/src.csharp/AlphaTab.Windows/AlphaTab.Windows.csproj index bb08ea895..715925af1 100644 --- a/src.csharp/AlphaTab.Windows/AlphaTab.Windows.csproj +++ b/src.csharp/AlphaTab.Windows/AlphaTab.Windows.csproj @@ -7,7 +7,7 @@ README.md true true - net6.0-windows + net8.0-windows true true $(NoWarn);NU5105