Skip to content

remove net6.0 and update tests to net10.0 #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WeihanLi wants to merge 5 commits into
base: master
Choose a base branch
from
+46 −136
Open

remove net6.0 and update tests to net10.0 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69a37d4
remove net6.0 and add net10.0
WeihanLi Dec 9, 2025
0fb673e
remove net10.0 target
WeihanLi Dec 26, 2025
e8c808d
use slnx solution file
WeihanLi Dec 26, 2025
9031933
update ci sln path
WeihanLi Dec 26, 2025
78c3de4
Update Source/EasyNetQ.Management.Client.slnx
WeihanLi Dec 26, 2025
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
38 changes: 19 additions & 19 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup .NET Core 8.x
- name: Setup .NET SDK
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.x
dotnet-version: 10.x
- name: Install dependencies
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx
- name: Check formatting
run: dotnet format --no-restore --verify-no-changes --severity warn ./Source/EasyNetQ.Management.Client.sln || (echo "Run 'dotnet format' to fix issues" && exit 1)
run: dotnet format --no-restore --verify-no-changes --severity warn ./Source/EasyNetQ.Management.Client.slnx || (echo "Run 'dotnet format' to fix issues" && exit 1)
- name: Build
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release
- name: Approval Tests
run: |
cd ${{ github.workspace }}/Source/EasyNetQ.Management.Client.ApprovalTests
Expand All @@ -56,14 +56,14 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup .NET Core 8.x
- name: Setup .NET SDK
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.x
dotnet-version: 10.x
- name: Install dependencies
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx
- name: Build
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release
- name: Tests
run: |
cd ${{ github.workspace }}/Source/EasyNetQ.Management.Client.Tests
Expand All @@ -82,7 +82,7 @@ jobs:
os: [ubuntu-latest]
include:
- os: ubuntu-latest
framework: net8.0
framework: net10.0
# - os: windows-latest
# framework: net48
fail-fast: true
Expand All @@ -91,14 +91,14 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup .NET Core 8.x
- name: Setup .NET SDK
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.x
dotnet-version: 10.x
- name: Install dependencies
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx
- name: Build
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release
- name: Integration Tests
env:
RABBITMQ_VERSION: ${{ matrix.rabbitmq }}
Expand All @@ -116,15 +116,15 @@ jobs:
uses: actions/checkout@v6
with:
fetch-depth: 0
- name: Setup .NET Core 8.x
- name: Setup .NET SDK
uses: actions/setup-dotnet@v5
with:
dotnet-version: 8.x
dotnet-version: 10.x
- name: Install dependencies
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx
- name: Build
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release
- name: Pack
run: dotnet pack ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release --no-build --include-symbols -p:PackageOutputPath="${{ github.workspace }}/Packages"
run: dotnet pack ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release --no-build --include-symbols -p:PackageOutputPath="${{ github.workspace }}/Packages"
- name: Publish
run: dotnet nuget push '${{ github.workspace }}/Packages/*.*' --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_TOKEN }}
2 changes: 1 addition & 1 deletion .../EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.ApprovalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>

Expand Down
2 changes: 1 addition & 1 deletion ...etQ.Management.Client.IntegrationTests/EasyNetQ.Management.Client.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<TargetFrameworks>net48;net10.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
4 changes: 2 additions & 2 deletions Source/EasyNetQ.Management.Client.Tests/EasyNetQ.Management.Client.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<TargetFrameworks>net48;net10.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>

Expand All @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Condition="'$(TargetFramework)'=='net48'" Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="FluentAssertions" Version="8.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="xunit" Version="2.8.1" />
Expand Down
73 changes: 0 additions & 73 deletions Source/EasyNetQ.Management.Client.sln
View file
Open in desktop

This file was deleted.

21 changes: 21 additions & 0 deletions Source/EasyNetQ.Management.Client.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Solution>
<Folder Name="/Solution items/">
<File Path="../.editorconfig" />
<File Path="../.gitignore" />
<File Path="../license.txt" />
<File Path="../README.md" />
</Folder>
<Folder Name="/Solution items/.github/">
<File Path="../.github/CODEOWNERS" />
<File Path="../.github/dependabot.yml" />
</Folder>
<Folder Name="/Solution items/.github/workflows/">
<File Path="../.github/workflows/ci.yml" />
<File Path="../.github/workflows/depsreview.yaml" />
</Folder>
<Project Path="EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.ApprovalTests.csproj" />
<Project Path="EasyNetQ.Management.Client.ExtensionsGenerator/EasyNetQ.Management.Client.ExtensionsGenerator.csproj" />
<Project Path="EasyNetQ.Management.Client.IntegrationTests/EasyNetQ.Management.Client.IntegrationTests.csproj" />
<Project Path="EasyNetQ.Management.Client.Tests/EasyNetQ.Management.Client.Tests.csproj" />
<Project Path="EasyNetQ.Management.Client/EasyNetQ.Management.Client.csproj" />
</Solution>
4 changes: 2 additions & 2 deletions Source/EasyNetQ.Management.Client/EasyNetQ.Management.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>

Expand Down Expand Up @@ -47,7 +47,7 @@
<None Include="..\..\license.txt" Pack="true" PackagePath="" />
<None Include="..\..\Assets\EasyNetQ.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
Expand Down
38 changes: 0 additions & 38 deletions Source/EasyNetQ.Management.Client/Serialization/JsonNumberEnumConverter.cs
View file
Open in desktop

This file was deleted.