Skip to content

Commit aad5a69

Browse files
alexeyzimarevalexeyzimarev
authored
Merge branch 'dev' into dependabot/github_actions/dawidd6/action-download-artifact-11
2 parents 155cb99 + 9acc7b1 commit aad5a69

File tree

94 files changed

+3307
-2327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+3307
-2327
lines changed

‎.github/workflows/build-dev.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,21 @@ jobs:
2626
steps:
2727
-
2828
name: Checkout
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030
-
3131
name: Setup .NET
32-
uses: actions/setup-dotnet@v4
32+
uses: actions/setup-dotnet@v5
3333
with:
34-
dotnet-version: '9.0.x'
34+
dotnet-version: '10.0.x'
3535
-
3636
name: Unshallow
3737
run: git fetch --prune --unshallow
38-
3938
-
4039
name: NuGet login
4140
uses: NuGet/login@v1
4241
id: nuget-login
4342
with:
4443
user: ${{ secrets.NUGET_USER }}
45-
4644
-
4745
name: Create and push NuGet package
4846
run: |

‎.github/workflows/pull-request-docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
-
1313
name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
-
1616
name: Build docs
1717
run: |

‎.github/workflows/pull-request.yml‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,32 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Upload
18-
uses: actions/upload-artifact@v4
18+
uses: actions/upload-artifact@v5
1919
with:
2020
name: Event File
2121
path: ${{ github.event_path }}
22+
2223
test-windows:
2324
runs-on: windows-latest
2425
strategy:
2526
matrix:
26-
dotnet: ['net48', 'net8.0', 'net9.0']
27+
dotnet: ['net48', 'net8.0', 'net9.0', 'net10.0']
2728

2829
steps:
29-
-
30-
name: Checkout
31-
uses: actions/checkout@v4
32-
-
33-
name: Setup .NET
34-
uses: actions/setup-dotnet@v4
30+
- name: Checkout
31+
uses: actions/checkout@v5
32+
- name: Setup .NET
33+
uses: actions/setup-dotnet@v5
3534
with:
3635
dotnet-version: |
3736
8.0.x
3837
9.0.x
39-
-
40-
name: Run tests
38+
10.0.x
39+
- name: Run tests
4140
run: dotnet test -c Debug -f ${{ matrix.dotnet }}
42-
-
43-
name: Upload Test Results
41+
- name: Upload Test Results
4442
if: always()
45-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v5
4644
with:
4745
name: Test Results Windows ${{ matrix.dotnet }}
4846
path: |
@@ -54,26 +52,23 @@ jobs:
5452
runs-on: ubuntu-latest
5553
strategy:
5654
matrix:
57-
dotnet: ['net8.0', 'net9.0']
55+
dotnet: [ 'net8.0', 'net9.0', 'net10.0' ]
5856

5957
steps:
60-
-
61-
name: Checkout
62-
uses: actions/checkout@v4
63-
-
64-
name: Setup .NET
65-
uses: actions/setup-dotnet@v4
58+
- name: Checkout
59+
uses: actions/checkout@v5
60+
- name: Setup .NET
61+
uses: actions/setup-dotnet@v5
6662
with:
6763
dotnet-version: |
6864
8.0.x
6965
9.0.x
70-
-
71-
name: Run tests
66+
10.0.x
67+
- name: Run tests
7268
run: dotnet test -f ${{ matrix.dotnet }}
73-
-
74-
name: Upload Test Results
69+
- name: Upload Test Results
7570
if: always()
76-
uses: actions/upload-artifact@v4
71+
uses: actions/upload-artifact@v5
7772
with:
7873
name: Test Results Ubuntu ${{ matrix.dotnet }}
7974
path: |

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,5 @@ RestSharp.IntegrationTests/config.json
5555
/out/
5656
/docs/.vuepress/dist/
5757
.vscode/
58-
.temp/
58+
.temp/
59+
*.trx

‎Directory.Packages.props‎

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,52 @@
11
<Project>
2-
<PropertyGroup>
3-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4-
</PropertyGroup>
5-
<PropertyGroup Label="Package versions for .NET 8" Condition="$(TargetFramework) == 'net8.0'">
6-
<MicrosoftTestHostVer>8.0.3</MicrosoftTestHostVer>
7-
</PropertyGroup>
8-
<PropertyGroup Label="Package versions for .NET 9" Condition="$(TargetFramework) == 'net9.0'">
9-
<MicrosoftTestHostVer>9.0.0</MicrosoftTestHostVer>
10-
</PropertyGroup>
11-
<ItemGroup Label="Runtime dependencies">
12-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
13-
<PackageVersion Include="CsvHelper" Version="33.0.1"/>
14-
<PackageVersion Include="System.Text.Json" Version="9.0.0"/>
15-
</ItemGroup>
16-
<ItemGroup Label="Compile dependencies">
17-
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0"/>
18-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0"/>
19-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0"/>
20-
<PackageVersion Include="MinVer" Version="6.0.0"/>
21-
<PackageVersion Include="Nullable" Version="1.3.1"/>
22-
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3"/>
23-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0"/>
24-
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0"/>
25-
</ItemGroup>
26-
<ItemGroup Label="Testing dependencies">
27-
<PackageVersion Include="HttpMultipartParser" Version="8.4.0"/>
28-
<PackageVersion Include="PolySharp" Version="1.15.0"/>
29-
<PackageVersion Include="AutoFixture" Version="4.18.1"/>
30-
<PackageVersion Include="coverlet.collector" Version="6.0.2"/>
31-
<PackageVersion Include="FluentAssertions" Version="7.0.0"/>
32-
<PackageVersion Include="HttpTracer" Version="2.1.1"/>
33-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftTestHostVer)"/>
34-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
35-
<PackageVersion Include="Moq" Version="4.20.72"/>
36-
<PackageVersion Include="Polly" Version="8.5.0"/>
37-
<PackageVersion Include="rest-mock-core" Version="0.7.12"/>
38-
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0"/>
39-
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0"/>
40-
<PackageVersion Include="Xunit.Extensions.Logging" Version="1.1.0"/>
41-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All"/>
42-
<PackageVersion Include="xunit" Version="2.9.2"/>
43-
<PackageVersion Include="WireMock.Net" Version="1.6.10"/>
44-
<PackageVersion Include="WireMock.Net.FluentAssertions" Version="1.5.51"/>
45-
</ItemGroup>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<PropertyGroup Label="Package versions for .NET 10" Condition="'$(TargetFramework)' == 'net10.0'">
6+
<MicrosoftTestHostVer>10.0.0</MicrosoftTestHostVer>
7+
<SystemTextJsonVer>10.0.0</SystemTextJsonVer>
8+
</PropertyGroup>
9+
<PropertyGroup Label="Package versions for .NET 9" Condition="'$(TargetFramework)' == 'net9.0'">
10+
<MicrosoftTestHostVer>9.0.10</MicrosoftTestHostVer>
11+
</PropertyGroup>
12+
<PropertyGroup Label="Package versions for .NET 8" Condition="'$(TargetFramework)' == 'net8.0'">
13+
<MicrosoftTestHostVer>8.0.21</MicrosoftTestHostVer>
14+
</PropertyGroup>
15+
<PropertyGroup Label="Package versions for pre-.NET 10" Condition="'$(TargetFramework)' != 'net10.0'">
16+
<SystemTextJsonVer>9.0.10</SystemTextJsonVer>
17+
</PropertyGroup>
18+
<ItemGroup Label="Runtime dependencies">
19+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
20+
<PackageVersion Include="CsvHelper" Version="33.0.1" />
21+
<PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVer)" />
22+
</ItemGroup>
23+
<ItemGroup Label="Compile dependencies">
24+
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
25+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
26+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
27+
<PackageVersion Include="MinVer" Version="6.0.0" />
28+
<PackageVersion Include="Nullable" Version="1.3.1" />
29+
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3" />
30+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
31+
<PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
32+
</ItemGroup>
33+
<ItemGroup Label="Testing dependencies">
34+
<PackageVersion Include="HttpMultipartParser" Version="8.4.0" />
35+
<PackageVersion Include="PolySharp" Version="1.15.0" />
36+
<PackageVersion Include="AutoFixture" Version="4.18.1" />
37+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
38+
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
39+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftTestHostVer)" />
40+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
41+
<PackageVersion Include="Moq" Version="4.20.72" />
42+
<PackageVersion Include="Polly" Version="8.5.0" />
43+
<PackageVersion Include="rest-mock-core" Version="0.7.12" />
44+
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
45+
<PackageVersion Include="System.Net.Http.Json" Version="9.0.0" />
46+
<PackageVersion Include="Xunit.Extensions.Logging" Version="1.1.0" />
47+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="All" />
48+
<PackageVersion Include="xunit" Version="2.9.2" />
49+
<PackageVersion Include="WireMock.Net" Version="1.16.0" />
50+
<PackageVersion Include="WireMock.Net.FluentAssertions" Version="1.5.51" />
51+
</ItemGroup>
4652
</Project>

0 commit comments

Comments
 (0)