From 264a62e01e3ead23a06e20209c58206c4059a52d Mon Sep 17 00:00:00 2001 From: notgiven688 <37874600+notgiven688@users.noreply.github.com> Date: Sun, 17 Nov 2024 22:46:23 +0100 Subject: [PATCH] Switch to .Net9 --- .github/workflows/deploy-docs.yml | 6 ++--- .github/workflows/jitter-tests.yml | 8 +++--- .github/workflows/publish.yml | 27 ++++++++++++++------- .github/workflows/test-deploy-docs.yml | 4 +-- README.md | 2 +- docs/docs/01_quickstart/00-project-setup.md | 2 +- src/Jitter2.slnx | 6 +++++ src/Jitter2/Jitter2.csproj | 2 +- src/JitterBenchmark/JitterBenchmark.csproj | 2 +- src/JitterDemo/JitterDemo.csproj | 3 +-- src/JitterTests/JitterTests.csproj | 3 +-- 11 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 src/Jitter2.slnx diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 318f374c..75ce857f 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -12,8 +12,8 @@ jobs: name: Build and deploy documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18 cache: npm @@ -27,7 +27,7 @@ jobs: # Popular action to deploy to GitHub Pages: # Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus - name: Deploy to GitHub Pages - uses: peaceiris/actions-gh-pages@v3 + uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} # Build output to publish to the `gh-pages` branch: diff --git a/.github/workflows/jitter-tests.yml b/.github/workflows/jitter-tests.yml index e997dad2..533e91a6 100644 --- a/.github/workflows/jitter-tests.yml +++ b/.github/workflows/jitter-tests.yml @@ -22,11 +22,11 @@ jobs: working-directory: ./src/JitterTests steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Restore dependencies run: dotnet restore - name: Build @@ -36,7 +36,7 @@ jobs: #run: dotnet test -c Release --no-restore --test-adapter-path:. --logger:"junit;LogFilePath=test-result.xml;MethodFormat=Class;FailureBodyFormat=Verbose" - name: TestReport - uses: dorny/test-reporter@v1 + uses: dorny/test-reporter@v4 if: success() || failure() # run this step even if previous step failed with: name: JitterTests # Name of the check run which will be created diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 04917408..2089c377 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -33,13 +33,15 @@ jobs: working-directory: ./src/Jitter2 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Get all history to allow automatic versioning using MinVer # Install the .NET SDK indicated in the global.json file - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x - run: dotnet add package MinVer @@ -49,7 +51,7 @@ jobs: - run: dotnet pack --configuration Release --output ${{ env.NuGetDirectory }} # Publish the NuGet package as an artifact, so they can be used in the following jobs - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: nuget if-no-files-found: error @@ -63,10 +65,12 @@ jobs: steps: # Install the .NET SDK indicated in the global.json file - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x # Download the NuGet package created in the previous job - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: nuget path: ${{ env.NuGetDirectory }} @@ -89,9 +93,12 @@ jobs: working-directory: ./src/Jitter2 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x + - name: Run tests run: dotnet test --configuration Release @@ -104,14 +111,16 @@ jobs: needs: [ validate_nuget, run_test ] steps: # Download the NuGet package created in the previous job - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: nuget path: ${{ env.NuGetDirectory }} # Install the .NET SDK indicated in the global.json file - name: Setup .NET Core - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x # Publish all NuGet packages to NuGet.org # Use --skip-duplicate to prevent errors if a package with the same version already exists. diff --git a/.github/workflows/test-deploy-docs.yml b/.github/workflows/test-deploy-docs.yml index 8c31b17a..316ab289 100644 --- a/.github/workflows/test-deploy-docs.yml +++ b/.github/workflows/test-deploy-docs.yml @@ -12,8 +12,8 @@ jobs: name: Build documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 18 cache: npm diff --git a/README.md b/README.md index 3504910b..46c2bab9 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Jitter is cross-platform. The `src` directory contains four projects: To run the demo scenes: -- Install [.NET 8.0](https://dotnet.microsoft.com/download/dotnet/8.0) +- Install [.NET 9.0](https://dotnet.microsoft.com/download/dotnet/9.0) - `git clone https://github.com/notgiven688/jitterphysics2.git` - `cd ./jitterphysics2/src/JitterDemo && dotnet run -c Release` diff --git a/docs/docs/01_quickstart/00-project-setup.md b/docs/docs/01_quickstart/00-project-setup.md index 3a0ed8e9..8c644f38 100644 --- a/docs/docs/01_quickstart/00-project-setup.md +++ b/docs/docs/01_quickstart/00-project-setup.md @@ -6,7 +6,7 @@ sidebar_position: 1 ### Requirements -Install the [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0). +Install the [.NET 9.0 SDK](https://dotnet.microsoft.com/download/dotnet/9.0). Ensure that dotnet is correctly set up by executing the following command: diff --git a/src/Jitter2.slnx b/src/Jitter2.slnx new file mode 100644 index 00000000..a731c9eb --- /dev/null +++ b/src/Jitter2.slnx @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Jitter2/Jitter2.csproj b/src/Jitter2/Jitter2.csproj index 139364c4..08f826a3 100644 --- a/src/Jitter2/Jitter2.csproj +++ b/src/Jitter2/Jitter2.csproj @@ -1,7 +1,7 @@ - net7.0;net8.0 + net7.0;net8.0;net9.0 disable enable true diff --git a/src/JitterBenchmark/JitterBenchmark.csproj b/src/JitterBenchmark/JitterBenchmark.csproj index f4f6e772..303c0c34 100644 --- a/src/JitterBenchmark/JitterBenchmark.csproj +++ b/src/JitterBenchmark/JitterBenchmark.csproj @@ -2,9 +2,9 @@ Exe - net8.0 enable enable + net9.0 diff --git a/src/JitterDemo/JitterDemo.csproj b/src/JitterDemo/JitterDemo.csproj index 862e8868..5d855a45 100644 --- a/src/JitterDemo/JitterDemo.csproj +++ b/src/JitterDemo/JitterDemo.csproj @@ -18,7 +18,6 @@ Exe WinExe true - net7.0 UNSAFE @@ -65,7 +64,7 @@ Exe - net8.0 + net9.0 disable enable true diff --git a/src/JitterTests/JitterTests.csproj b/src/JitterTests/JitterTests.csproj index 053b2de0..fd4e0ba9 100644 --- a/src/JitterTests/JitterTests.csproj +++ b/src/JitterTests/JitterTests.csproj @@ -1,10 +1,9 @@ - net8.0 + net9.0 enable enable - false