Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 2 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- master

jobs:
linux:
build:
runs-on: ubuntu-latest
env:
ARTEMIS_USERNAME: "artemis"
Expand All @@ -22,23 +22,11 @@ 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
- name: Build with dotnet
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"
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion benchmark/PingPong/PingPong.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>ActiveMQ.Artemis.Client.Examples.AspNetCore</RootNamespace>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<RootNamespace>ActiveMQ.Artemis.Client.Examples.LeaderElection</RootNamespace>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/Testing/Application.Tests/Application.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion samples/Testing/Application/Application.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>false</ImplicitUsings>
<RootNamespace>WebApplication1</RootNamespace>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="App.Metrics.Abstractions" Version="4.1.0" />
<PackageReference Include="App.Metrics.Abstractions" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CloudNative.CloudEvents" Version="2.5.1" />
<PackageReference Include="CloudNative.CloudEvents" Version="2.8.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Description>Microsoft.Extensions.DependencyInjection support for ActiveMQ Artemis .NET Client.</Description>
<PackageProjectUrl>https://havret.github.io/dotnet-activemq-artemis-client/</PackageProjectUrl>
<PackageId>ArtemisNetClient.Extensions.DependencyInjection</PackageId>
<PackageLicenseUrl>https://github.com/Havret/activemq-artemis-extensions/blob/master/LICENSE</PackageLicenseUrl>
<PackageLicenseUrl>https://github.com/Havret/activemq-artemis-extensions/blob/master/LICENSE</PackageLicenseUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Havret/activemq-artemis-extensions</RepositoryUrl>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
Expand All @@ -17,16 +17,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0"/>
</ItemGroup>

<ItemGroup>
<None Remove="ArtemisNetClient.Extensions.DependencyInjection.csproj.DotSettings" />
<None Remove="ArtemisNetClient.Extensions.DependencyInjection.csproj.DotSettings"/>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ArtemisNetClient\ArtemisNetClient.csproj" />
<ProjectReference Include="..\ArtemisNetClient\ArtemisNetClient.csproj"/>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.18" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.19" />
</ItemGroup>

<ItemGroup>
Expand Down
28 changes: 10 additions & 18 deletions src/ArtemisNetClient/ArtemisNetClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,19 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RootNamespace>ActiveMQ.Artemis.Client</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AMQPNetLite" Version="2.5.0" />
<PackageReference Include="AMQPNetLite.WebSockets" Version="2.5.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.0" />
<PackageReference Include="Polly" Version="7.2.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
<PackageReference Include="System.Text.Json" Version="9.0.4" />
<PackageReference Include="System.Threading.Channels" Version="9.0.4" />
<ItemGroup>
<PackageReference Include="AMQPNetLite" Version="2.5.0"/>
<PackageReference Include="AMQPNetLite.WebSockets" Version="2.5.0"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0"/>
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2"/>
<PackageReference Include="Polly" Version="8.6.3"/>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.4" />
<PackageReference Include="System.Text.Json" Version="9.0.4" />
<PackageReference Include="System.Threading.Channels" Version="9.0.4" />
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' ">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8"/>
<PackageReference Include="System.Text.Json" Version="9.0.8"/>
<PackageReference Include="System.Threading.Channels" Version="9.0.8"/>
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;net10.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<LangVersion>12</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="App.Metrics.AspNetCore.All" Version="4.1.0" />
<PackageReference Include="App.Metrics.AspNetCore.All" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CloudNative.CloudEvents" Version="2.5.1"/>
<PackageReference Include="CloudNative.CloudEvents.SystemTextJson" Version="2.5.1"/>
<PackageReference Include="CloudNative.CloudEvents" Version="2.8.0"/>
<PackageReference Include="CloudNative.CloudEvents.SystemTextJson" Version="2.8.0"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>12</LangVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Loading