Skip to content

Commit 476cf26

Browse files
zidadzidad
authored
Merge branch 'master' into fix/use-awesomeassertions
2 parents eab0823 + 4879475 commit 476cf26

9 files changed

Lines changed: 56 additions & 146 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ jobs:
1919
timeout-minutes: 15
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
25-
- name: Setup .NET Core 8.x
26-
uses: actions/setup-dotnet@v4
25+
- name: Setup .NET SDK
26+
uses: actions/setup-dotnet@v5
2727
with:
28-
dotnet-version: 8.x
28+
dotnet-version: 10.x
2929
- name: Install dependencies
30-
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln
30+
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx
3131
- name: Check formatting
32-
run: dotnet format --no-restore --verify-no-changes --severity warn ./Source/EasyNetQ.Management.Client.sln || (echo "Run 'dotnet format' to fix issues" && exit 1)
32+
run: dotnet format --no-restore --verify-no-changes --severity warn ./Source/EasyNetQ.Management.Client.slnx || (echo "Run 'dotnet format' to fix issues" && exit 1)
3333
- name: Build
34-
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release
34+
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release
3535
- name: Approval Tests
3636
run: |
3737
cd ${{ github.workspace }}/Source/EasyNetQ.Management.Client.ApprovalTests
@@ -53,17 +53,17 @@ jobs:
5353
fail-fast: true
5454
steps:
5555
- name: Checkout
56-
uses: actions/checkout@v5
56+
uses: actions/checkout@v6
5757
with:
5858
fetch-depth: 0
59-
- name: Setup .NET Core 8.x
60-
uses: actions/setup-dotnet@v4
59+
- name: Setup .NET SDK
60+
uses: actions/setup-dotnet@v5
6161
with:
62-
dotnet-version: 8.x
62+
dotnet-version: 10.x
6363
- name: Install dependencies
64-
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln
64+
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx
6565
- name: Build
66-
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release
66+
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release
6767
- name: Tests
6868
run: |
6969
cd ${{ github.workspace }}/Source/EasyNetQ.Management.Client.Tests
@@ -82,23 +82,23 @@ jobs:
8282
os: [ubuntu-latest]
8383
include:
8484
- os: ubuntu-latest
85-
framework: net8.0
85+
framework: net10.0
8686
# - os: windows-latest
8787
# framework: net48
8888
fail-fast: true
8989
steps:
9090
- name: Checkout
91-
uses: actions/checkout@v5
91+
uses: actions/checkout@v6
9292
with:
9393
fetch-depth: 0
94-
- name: Setup .NET Core 8.x
95-
uses: actions/setup-dotnet@v4
94+
- name: Setup .NET SDK
95+
uses: actions/setup-dotnet@v5
9696
with:
97-
dotnet-version: 8.x
97+
dotnet-version: 10.x
9898
- name: Install dependencies
99-
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln
99+
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx
100100
- name: Build
101-
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release
101+
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release
102102
- name: Integration Tests
103103
env:
104104
RABBITMQ_VERSION: ${{ matrix.rabbitmq }}
@@ -113,18 +113,18 @@ jobs:
113113
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
114114
steps:
115115
- name: Checkout
116-
uses: actions/checkout@v5
116+
uses: actions/checkout@v6
117117
with:
118118
fetch-depth: 0
119-
- name: Setup .NET Core 8.x
120-
uses: actions/setup-dotnet@v4
119+
- name: Setup .NET SDK
120+
uses: actions/setup-dotnet@v5
121121
with:
122-
dotnet-version: 8.x
122+
dotnet-version: 10.x
123123
- name: Install dependencies
124-
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln
124+
run: dotnet restore ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx
125125
- name: Build
126-
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release
126+
run: dotnet build ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release
127127
- name: Pack
128-
run: dotnet pack ${{ github.workspace }}/Source/EasyNetQ.Management.Client.sln --configuration Release --no-build --include-symbols -p:PackageOutputPath="${{ github.workspace }}/Packages"
128+
run: dotnet pack ${{ github.workspace }}/Source/EasyNetQ.Management.Client.slnx --configuration Release --no-build --include-symbols -p:PackageOutputPath="${{ github.workspace }}/Packages"
129129
- name: Publish
130130
run: dotnet nuget push '${{ github.workspace }}/Packages/*.*' --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_TOKEN }}

‎.github/workflows/depsreview.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: 'Checkout Repository'
12-
uses: actions/checkout@v5
12+
uses: actions/checkout@v6
1313
- name: 'Dependency Review'
14-
uses: actions/dependency-review-action@v4
14+
uses: actions/dependency-review-action@v5

‎Source/EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.ApprovalTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<LangVersion>latest</LangVersion>
55
<ImplicitUsings>enable</ImplicitUsings>
66

‎Source/EasyNetQ.Management.Client.IntegrationTests/EasyNetQ.Management.Client.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net10.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>

‎Source/EasyNetQ.Management.Client.Tests/EasyNetQ.Management.Client.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net48;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net10.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>enable</ImplicitUsings>
77

@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="AwesomeAssertions" Version="9.2.1" />
21-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
21+
<PackageReference Condition="'$(TargetFramework)'=='net48'" Include="System.Text.Json" Version="8.0.5" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
2323
<PackageReference Include="xunit" Version="2.8.1" />
2424
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">

‎Source/EasyNetQ.Management.Client.sln‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎Source/EasyNetQ.Management.Client.slnx‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Solution>
2+
<Folder Name="/Solution items/">
3+
<File Path="../.editorconfig" />
4+
<File Path="../.gitignore" />
5+
<File Path="../license.txt" />
6+
<File Path="../README.md" />
7+
</Folder>
8+
<Folder Name="/Solution items/.github/">
9+
<File Path="../.github/CODEOWNERS" />
10+
<File Path="../.github/dependabot.yml" />
11+
</Folder>
12+
<Folder Name="/Solution items/.github/workflows/">
13+
<File Path="../.github/workflows/ci.yml" />
14+
<File Path="../.github/workflows/depsreview.yaml" />
15+
</Folder>
16+
<Project Path="EasyNetQ.Management.Client.ApprovalTests/EasyNetQ.Management.Client.ApprovalTests.csproj" />
17+
<Project Path="EasyNetQ.Management.Client.ExtensionsGenerator/EasyNetQ.Management.Client.ExtensionsGenerator.csproj" />
18+
<Project Path="EasyNetQ.Management.Client.IntegrationTests/EasyNetQ.Management.Client.IntegrationTests.csproj" />
19+
<Project Path="EasyNetQ.Management.Client.Tests/EasyNetQ.Management.Client.Tests.csproj" />
20+
<Project Path="EasyNetQ.Management.Client/EasyNetQ.Management.Client.csproj" />
21+
</Solution>

‎Source/EasyNetQ.Management.Client/EasyNetQ.Management.Client.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
<Nullable>enable</Nullable>
77

@@ -47,7 +47,7 @@
4747
<None Include="..\..\license.txt" Pack="true" PackagePath="" />
4848
<None Include="..\..\Assets\EasyNetQ.png" Pack="true" PackagePath="" />
4949
</ItemGroup>
50-
50+
5151
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
5252
<PackageReference Include="System.Text.Json" Version="8.0.5" />
5353
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />

‎Source/EasyNetQ.Management.Client/Serialization/JsonNumberEnumConverter.cs‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)