From ba8e14debdce54789a49da3d952e5cc2057a6cf9 Mon Sep 17 00:00:00 2001 From: Laszlo Paillat Date: Tue, 9 Nov 2021 23:14:19 +0100 Subject: [PATCH] updated dependencies updated to net6.0 --- .github/workflows/CodeCoverage.yml | 8 ++++---- .github/workflows/ContinuousIntegration.yml | 6 +++--- .github/workflows/PullRequest.yml | 6 +++--- .github/workflows/Release.yml | 2 +- README.md | 2 +- source/DefaultEcs.Benchmark/DefaultEcs.Benchmark.csproj | 7 +++---- source/DefaultEcs.Test/DefaultEcs.Test.csproj | 8 ++++---- source/DefaultEcs/DefaultEcs.csproj | 2 +- source/Directory.Build.props | 2 +- source/Sample/DefaultBoids/DefaultBoids.csproj | 2 +- source/Sample/DefaultBrick/DefaultBrick.csproj | 2 +- source/Sample/DefaultSlap/DefaultSlap.csproj | 2 +- 12 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.github/workflows/CodeCoverage.yml b/.github/workflows/CodeCoverage.yml index 2b923d22..a968ee07 100644 --- a/.github/workflows/CodeCoverage.yml +++ b/.github/workflows/CodeCoverage.yml @@ -19,13 +19,13 @@ jobs: - name: Set up dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.100' + dotnet-version: '6.0.x' - - name: Collect coverage for net5.0 - run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net5.0 -p:CollectCoverage=true -p:CoverletOutputFormat=lcov -p:CoverletOutput=..\..\build\lcov.info -p:Exclude="[*]DefaultEcs.Internal.Debug*" /p:TEST=true + - name: Collect coverage for net6.0 + run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net6.0 -p:CollectCoverage=true -p:CoverletOutputFormat=lcov -p:CoverletOutput=..\..\build\lcov.info -p:Exclude="[*]DefaultEcs.Internal.Debug*" /p:TEST=true - name: Upload to coverall uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: 'build\lcov.net5.0.info' + path-to-lcov: 'build\lcov.net6.0.info' diff --git a/.github/workflows/ContinuousIntegration.yml b/.github/workflows/ContinuousIntegration.yml index ccda6c84..6aeaa89b 100644 --- a/.github/workflows/ContinuousIntegration.yml +++ b/.github/workflows/ContinuousIntegration.yml @@ -18,7 +18,7 @@ jobs: - name: Set up dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.100' + dotnet-version: '6.0.x' source-url: https://nuget.pkg.github.com/Doraku/index.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} @@ -29,8 +29,8 @@ jobs: - name: Run tests net48 run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net48 /p:TEST=true - - name: Run tests net5.0 - run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net5.0 /p:TEST=true + - name: Run tests net6.0 + run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net6.0 /p:TEST=true - name: Decrypte snk file env: diff --git a/.github/workflows/PullRequest.yml b/.github/workflows/PullRequest.yml index 45714b5d..e97a71b4 100644 --- a/.github/workflows/PullRequest.yml +++ b/.github/workflows/PullRequest.yml @@ -16,7 +16,7 @@ jobs: - name: Set up dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.100' + dotnet-version: '6.0.x' - name: Run tests net452 run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net452 /p:TEST=true @@ -24,5 +24,5 @@ jobs: - name: Run tests net48 run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net48 /p:TEST=true - - name: Run tests net5.0 - run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net5.0 /p:TEST=true \ No newline at end of file + - name: Run tests net6.0 + run: dotnet test source\DefaultEcs.Test\DefaultEcs.Test.csproj -c Release -f net6.0 /p:TEST=true \ No newline at end of file diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 646603fa..ff958950 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -16,7 +16,7 @@ jobs: - name: Set up dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '5.0.100' + dotnet-version: '6.0.x' source-url: https://api.nuget.org/v3/index.json env: NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }} diff --git a/README.md b/README.md index 91754fd5..d935d82b 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ DefaultEcs is an [Entity Component System](https://en.wikipedia.org/wiki/Entity_ # Requirement DefaultEcs heavily uses features from C#7.0 and Span from the System.Memory package, compatible from .NETStandard 1.1. -For development, a C#9.0 compatible environment, net framework 4.8, netcore 3.1 and net5 are required to build and run all tests (it is possible to disable some target in the test project if needed). +For development, a C#9.0 compatible environment, net framework 4.8, net6.0 are required to build and run all tests (it is possible to disable some target in the test project if needed). It is possible to use DefaultEcs in Unity (check [FAQ](./documentation/FAQ.md#unity)). diff --git a/source/DefaultEcs.Benchmark/DefaultEcs.Benchmark.csproj b/source/DefaultEcs.Benchmark/DefaultEcs.Benchmark.csproj index 0915a73c..483694c1 100644 --- a/source/DefaultEcs.Benchmark/DefaultEcs.Benchmark.csproj +++ b/source/DefaultEcs.Benchmark/DefaultEcs.Benchmark.csproj @@ -1,14 +1,13 @@  - net48 - + net6.0 Exe true - - + + diff --git a/source/DefaultEcs.Test/DefaultEcs.Test.csproj b/source/DefaultEcs.Test/DefaultEcs.Test.csproj index 8a2693a3..2267d8b4 100644 --- a/source/DefaultEcs.Test/DefaultEcs.Test.csproj +++ b/source/DefaultEcs.Test/DefaultEcs.Test.csproj @@ -3,18 +3,18 @@ net452; net48; - netcoreapp3.1; - net5.0; + net6.0; true - + + - + diff --git a/source/DefaultEcs/DefaultEcs.csproj b/source/DefaultEcs/DefaultEcs.csproj index 1ec0a0e8..9a51a740 100644 --- a/source/DefaultEcs/DefaultEcs.csproj +++ b/source/DefaultEcs/DefaultEcs.csproj @@ -26,7 +26,7 @@ - + diff --git a/source/Directory.Build.props b/source/Directory.Build.props index 055b5daf..340ec4c2 100644 --- a/source/Directory.Build.props +++ b/source/Directory.Build.props @@ -5,7 +5,7 @@ - + diff --git a/source/Sample/DefaultBoids/DefaultBoids.csproj b/source/Sample/DefaultBoids/DefaultBoids.csproj index c1781cd5..7903f8ee 100644 --- a/source/Sample/DefaultBoids/DefaultBoids.csproj +++ b/source/Sample/DefaultBoids/DefaultBoids.csproj @@ -1,6 +1,6 @@  - net5.0-windows + net6.0-windows WinExe diff --git a/source/Sample/DefaultBrick/DefaultBrick.csproj b/source/Sample/DefaultBrick/DefaultBrick.csproj index 4785a4ff..186aeaa4 100644 --- a/source/Sample/DefaultBrick/DefaultBrick.csproj +++ b/source/Sample/DefaultBrick/DefaultBrick.csproj @@ -1,6 +1,6 @@  - net5.0-windows + net6.0-windows WinExe diff --git a/source/Sample/DefaultSlap/DefaultSlap.csproj b/source/Sample/DefaultSlap/DefaultSlap.csproj index 47ceda03..6c08b8b4 100644 --- a/source/Sample/DefaultSlap/DefaultSlap.csproj +++ b/source/Sample/DefaultSlap/DefaultSlap.csproj @@ -1,6 +1,6 @@  - net5.0-windows + net6.0-windows WinExe