diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd748944..0e30cc5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: - master jobs: - linux: + build: runs-on: ubuntu-latest env: ARTEMIS_USERNAME: "artemis" @@ -22,7 +22,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: "8.0.x" + dotnet-version: 10.0.x - name: Run ActiveMQ Artemis run: docker compose up -V -d working-directory: ./test/artemis @@ -30,15 +30,3 @@ jobs: run: dotnet build --configuration Release - name: Test with dotnet run: dotnet test --configuration Release - windows: - runs-on: windows-latest - steps: - - uses: actions/checkout@v1 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: "8.0.x" - - name: Build with dotnet - run: dotnet build --configuration Release - - name: Test with dotnet - run: dotnet test --filter "FullyQualifiedName!~IntegrationTests" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aad4a856..b711deea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: "8.x" + dotnet-version: 10.0.x - name: Create NuGet Package run: dotnet pack -c Release /p:Version=${{ github.event.release.name }} /p:PackageReleaseNotes="See https://github.com/Havret/dotnet-activemq-artemis-client/releases/tag/${{ github.event.release.tag_name }}" diff --git a/benchmark/PingPong/PingPong.csproj b/benchmark/PingPong/PingPong.csproj index bd0f2ce3..bdc6e44d 100644 --- a/benchmark/PingPong/PingPong.csproj +++ b/benchmark/PingPong/PingPong.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 diff --git a/samples/ArtemisNetClient.Examples.AspNetCore/ArtemisNetClient.Examples.AspNetCore.csproj b/samples/ArtemisNetClient.Examples.AspNetCore/ArtemisNetClient.Examples.AspNetCore.csproj index ebf4cea4..b4eff1ce 100644 --- a/samples/ArtemisNetClient.Examples.AspNetCore/ArtemisNetClient.Examples.AspNetCore.csproj +++ b/samples/ArtemisNetClient.Examples.AspNetCore/ArtemisNetClient.Examples.AspNetCore.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 ActiveMQ.Artemis.Client.Examples.AspNetCore diff --git a/samples/ArtemisNetClient.Examples.LeaderElection/ArtemisNetClient.Examples.LeaderElection.csproj b/samples/ArtemisNetClient.Examples.LeaderElection/ArtemisNetClient.Examples.LeaderElection.csproj index e6dabe85..86ffec35 100644 --- a/samples/ArtemisNetClient.Examples.LeaderElection/ArtemisNetClient.Examples.LeaderElection.csproj +++ b/samples/ArtemisNetClient.Examples.LeaderElection/ArtemisNetClient.Examples.LeaderElection.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 ActiveMQ.Artemis.Client.Examples.LeaderElection diff --git a/samples/Testing/Application.Tests/Application.Tests.csproj b/samples/Testing/Application.Tests/Application.Tests.csproj index c29c92d5..2d0f4e97 100644 --- a/samples/Testing/Application.Tests/Application.Tests.csproj +++ b/samples/Testing/Application.Tests/Application.Tests.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable false diff --git a/samples/Testing/Application/Application.csproj b/samples/Testing/Application/Application.csproj index fc91e345..b7f36ef0 100644 --- a/samples/Testing/Application/Application.csproj +++ b/samples/Testing/Application/Application.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable false WebApplication1 diff --git a/src/ArtemisNetClient.Extensions.App.Metrics/ArtemisNetClient.Extensions.App.Metrics.csproj b/src/ArtemisNetClient.Extensions.App.Metrics/ArtemisNetClient.Extensions.App.Metrics.csproj index 683fdeda..3a3ef58e 100644 --- a/src/ArtemisNetClient.Extensions.App.Metrics/ArtemisNetClient.Extensions.App.Metrics.csproj +++ b/src/ArtemisNetClient.Extensions.App.Metrics/ArtemisNetClient.Extensions.App.Metrics.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/ArtemisNetClient.Extensions.CloudEvents/ArtemisNetClient.Extensions.CloudEvents.csproj b/src/ArtemisNetClient.Extensions.CloudEvents/ArtemisNetClient.Extensions.CloudEvents.csproj index f2658ac1..103bedb9 100644 --- a/src/ArtemisNetClient.Extensions.CloudEvents/ArtemisNetClient.Extensions.CloudEvents.csproj +++ b/src/ArtemisNetClient.Extensions.CloudEvents/ArtemisNetClient.Extensions.CloudEvents.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/ArtemisNetClient.Extensions.DependencyInjection/ArtemisNetClient.Extensions.DependencyInjection.csproj b/src/ArtemisNetClient.Extensions.DependencyInjection/ArtemisNetClient.Extensions.DependencyInjection.csproj index 23d38216..ea89e889 100644 --- a/src/ArtemisNetClient.Extensions.DependencyInjection/ArtemisNetClient.Extensions.DependencyInjection.csproj +++ b/src/ArtemisNetClient.Extensions.DependencyInjection/ArtemisNetClient.Extensions.DependencyInjection.csproj @@ -5,7 +5,7 @@ Microsoft.Extensions.DependencyInjection support for ActiveMQ Artemis .NET Client. https://havret.github.io/dotnet-activemq-artemis-client/ ArtemisNetClient.Extensions.DependencyInjection - https://github.com/Havret/activemq-artemis-extensions/blob/master/LICENSE + https://github.com/Havret/activemq-artemis-extensions/blob/master/LICENSE git https://github.com/Havret/activemq-artemis-extensions true @@ -17,16 +17,16 @@ - - + + - + - + diff --git a/src/ArtemisNetClient.Extensions.HealthChecks/ArtemisNetClient.Extensions.HealthChecks.csproj b/src/ArtemisNetClient.Extensions.HealthChecks/ArtemisNetClient.Extensions.HealthChecks.csproj index 50099c2b..f7b2a1b3 100644 --- a/src/ArtemisNetClient.Extensions.HealthChecks/ArtemisNetClient.Extensions.HealthChecks.csproj +++ b/src/ArtemisNetClient.Extensions.HealthChecks/ArtemisNetClient.Extensions.HealthChecks.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/ArtemisNetClient/ArtemisNetClient.csproj b/src/ArtemisNetClient/ArtemisNetClient.csproj index 28c5c8ef..6a2bc51c 100644 --- a/src/ArtemisNetClient/ArtemisNetClient.csproj +++ b/src/ArtemisNetClient/ArtemisNetClient.csproj @@ -16,27 +16,19 @@ true ActiveMQ.Artemis.Client - - - - - - - - - - - - - - + + + + + + - - - - + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 48e1ef62..0bf80d4a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,10 @@ - net8.0;net6.0;netstandard2.0;netstandard2.1 + net8.0;net10.0;netstandard2.0;netstandard2.1 12 + + + + \ No newline at end of file diff --git a/test/ArtemisNetClient.Extensions.App.Metrics.IntegrationTests/ArtemisNetClient.Extensions.App.Metrics.IntegrationTests.csproj b/test/ArtemisNetClient.Extensions.App.Metrics.IntegrationTests/ArtemisNetClient.Extensions.App.Metrics.IntegrationTests.csproj index 73f08a5b..5a5714e5 100644 --- a/test/ArtemisNetClient.Extensions.App.Metrics.IntegrationTests/ArtemisNetClient.Extensions.App.Metrics.IntegrationTests.csproj +++ b/test/ArtemisNetClient.Extensions.App.Metrics.IntegrationTests/ArtemisNetClient.Extensions.App.Metrics.IntegrationTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/ArtemisNetClient.Extensions.CloudEvents.UnitTests/ArtemisNetClient.Extensions.CloudEvents.UnitTests.csproj b/test/ArtemisNetClient.Extensions.CloudEvents.UnitTests/ArtemisNetClient.Extensions.CloudEvents.UnitTests.csproj index f3d46595..35d096f2 100644 --- a/test/ArtemisNetClient.Extensions.CloudEvents.UnitTests/ArtemisNetClient.Extensions.CloudEvents.UnitTests.csproj +++ b/test/ArtemisNetClient.Extensions.CloudEvents.UnitTests/ArtemisNetClient.Extensions.CloudEvents.UnitTests.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index ea961e15..536e3fa5 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,6 +1,6 @@ - net8.0 + net10.0 12 false