Skip to content

Commit f84bd32

Browse files
alexeyzimarevalexeyzimarev
authored
Merge branch 'dev' into copilot/add-documentation-for-timeouts
2 parents 23739fe + eb9e3d1 commit f84bd32

26 files changed

Lines changed: 702 additions & 73 deletions

File tree

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Upload
18-
uses: actions/upload-artifact@v5
18+
uses: actions/upload-artifact@v6
1919
with:
2020
name: Event File
2121
path: ${{ github.event_path }}
@@ -37,10 +37,16 @@ jobs:
3737
9.0.x
3838
10.0.x
3939
- name: Run tests
40-
run: dotnet test -c Debug -f ${{ matrix.dotnet }}
40+
run: |
41+
dotnet test test/RestSharp.Tests -c Debug -f ${{ matrix.dotnet }}
42+
dotnet test test/RestSharp.Tests.Integrated -c Debug -f ${{ matrix.dotnet }}
43+
dotnet test test/RestSharp.Tests.Serializers.Json -c Debug -f ${{ matrix.dotnet }}
44+
dotnet test test/RestSharp.Tests.Serializers.Xml -c Debug -f ${{ matrix.dotnet }}
45+
dotnet test test/RestSharp.Tests.Serializers.Csv -c Debug -f ${{ matrix.dotnet }}
46+
dotnet test test/RestSharp.Tests.DependencyInjection -c Debug -f ${{ matrix.dotnet }}
4147
- name: Upload Test Results
4248
if: always()
43-
uses: actions/upload-artifact@v5
49+
uses: actions/upload-artifact@v6
4450
with:
4551
name: Test Results Windows ${{ matrix.dotnet }}
4652
path: |
@@ -65,10 +71,16 @@ jobs:
6571
9.0.x
6672
10.0.x
6773
- name: Run tests
68-
run: dotnet test -f ${{ matrix.dotnet }}
74+
run: |
75+
dotnet test test/RestSharp.Tests -f ${{ matrix.dotnet }}
76+
dotnet test test/RestSharp.Tests.Integrated -f ${{ matrix.dotnet }}
77+
dotnet test test/RestSharp.Tests.Serializers.Json -f ${{ matrix.dotnet }}
78+
dotnet test test/RestSharp.Tests.Serializers.Xml -f ${{ matrix.dotnet }}
79+
dotnet test test/RestSharp.Tests.Serializers.Csv -f ${{ matrix.dotnet }}
80+
dotnet test test/RestSharp.Tests.DependencyInjection -f ${{ matrix.dotnet }}
6981
- name: Upload Test Results
7082
if: always()
71-
uses: actions/upload-artifact@v5
83+
uses: actions/upload-artifact@v6
7284
with:
7385
name: Test Results Ubuntu ${{ matrix.dotnet }}
7486
path: |

‎.github/workflows/test-results.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222
-
2323
name: Download and Extract Artifacts
24-
uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5
24+
uses: dawidd6/action-download-artifact@fe9d59ce33ce92db8a6ac90b2c8be6b6d90417c8
2525
with:
2626
run_id: ${{ github.event.workflow_run.id }}
2727
path: artifacts

‎BEST_PRACTICES.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,18 @@ Use this quick checklist before requesting review:
197197
- RestSharp.Serializers.CsvHelper
198198
- License: Apache-2.0
199199

200+
## 17) Working with Issues
201+
202+
- Use issues for bugs and feature requests only. For questions and support, use:
203+
- StackOverflow with tag `restsharp`
204+
- When creating an issue:
205+
- Provide clear, concise description and reproduction steps.
206+
- Include relevant code snippets or links to repro projects.
207+
- Use appropriate labels and templates.
208+
- When addressing an issue:
209+
- Avoid changing the default behavior unless absolutely necessary.
210+
- Avoid breaking the existing API.
211+
- Leave the existing tests to catch possible regressions.
212+
- Add new tests for the fixed cases.
213+
200214
Keep this document up-to-date when build properties, TFMs, CI workflows, or repository conventions change.

‎CLAUDE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## MCP Servers Available
2+
- mem0: Use this AI memory for storing and retrieving long-term context as well as short-term context

‎RestSharp.slnx‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<Solution>
2+
<Configurations>
3+
<BuildType Name="Debug" />
4+
<BuildType Name="Debug.Appveyor" />
5+
<BuildType Name="Release" />
6+
<Platform Name="Any CPU" />
7+
<Platform Name="ARM" />
8+
<Platform Name="Mixed Platforms" />
9+
<Platform Name="x64" />
10+
<Platform Name="x86" />
11+
</Configurations>
12+
<Folder Name="/Perf/">
13+
<Project Path="benchmarks/RestSharp.Benchmarks/RestSharp.Benchmarks.csproj">
14+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
15+
</Project>
16+
</Folder>
17+
<Folder Name="/Serializers/">
18+
<Project Path="src/RestSharp.Serializers.CsvHelper/RestSharp.Serializers.CsvHelper.csproj">
19+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
20+
</Project>
21+
<Project Path="src/RestSharp.Serializers.NewtonsoftJson/RestSharp.Serializers.NewtonsoftJson.csproj">
22+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
23+
</Project>
24+
<Project Path="src/RestSharp.Serializers.Xml/RestSharp.Serializers.Xml.csproj">
25+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
26+
</Project>
27+
</Folder>
28+
<Folder Name="/SourceGen/">
29+
<Project Path="gen/SourceGenerator/SourceGenerator.csproj">
30+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
31+
</Project>
32+
</Folder>
33+
<Folder Name="/Tests/">
34+
<Project Path="test/RestSharp.InteractiveTests/RestSharp.InteractiveTests.csproj">
35+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
36+
</Project>
37+
<Project Path="test/RestSharp.Tests.DependencyInjection/RestSharp.Tests.DependencyInjection.csproj">
38+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
39+
</Project>
40+
<Project Path="test/RestSharp.Tests.Integrated/RestSharp.Tests.Integrated.csproj">
41+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
42+
</Project>
43+
<Project Path="test/RestSharp.Tests.Serializers.Csv/RestSharp.Tests.Serializers.Csv.csproj">
44+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
45+
</Project>
46+
<Project Path="test/RestSharp.Tests.Serializers.Json/RestSharp.Tests.Serializers.Json.csproj">
47+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
48+
</Project>
49+
<Project Path="test/RestSharp.Tests.Serializers.Xml/RestSharp.Tests.Serializers.Xml.csproj">
50+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
51+
</Project>
52+
<Project Path="test/RestSharp.Tests.Shared/RestSharp.Tests.Shared.csproj">
53+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
54+
</Project>
55+
<Project Path="test/RestSharp.Tests/RestSharp.Tests.csproj">
56+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
57+
</Project>
58+
</Folder>
59+
<Project Path="src/RestSharp.Extensions.DependencyInjection/RestSharp.Extensions.DependencyInjection.csproj">
60+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
61+
</Project>
62+
<Project Path="src/RestSharp/RestSharp.csproj">
63+
<BuildType Solution="Debug.Appveyor|*" Project="Debug" />
64+
</Project>
65+
</Solution>

‎docs/docs/usage/response.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,19 @@ Response object contains the following properties:
2828
| `ErrorException` | `Exception?` | Exception thrown when executing the request, if any. |
2929
| `Version` | `Version?` | HTTP protocol version of the request. |
3030
| `RootElement` | `string?` | Root element of the serialized response content, only works if deserializer supports it. |
31+
| `MergedParameters` | `ParametersCollection` | Combined view of request parameters and client default parameters at execution time. |
32+
33+
### Merged parameters
34+
35+
The `MergedParameters` property provides a combined view of the request's own parameters and the client's [default parameters](request.md#request-headers) as they were at execution time. This is useful for logging or debugging the full set of parameters that were applied to a request, since `Request.Parameters` only contains the parameters added directly to the request.
36+
37+
```csharp
38+
var response = await client.ExecuteAsync(request);
39+
40+
foreach (var param in response.MergedParameters) {
41+
Console.WriteLine($"{param.Name} = {param.Value} ({param.Type})");
42+
}
43+
```
3144

3245
In addition, `RestResponse<T>` has one additional property:
3346

0 commit comments

Comments
 (0)