Skip to content

Commit 1351991

Browse files
Merge pull request #424 from nclient/main
[Release] 0.12.2
2 parents 9352d4e + d0b0acf commit 1351991

File tree

330 files changed

+2203
-1696
lines changed

Some content is hidden

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

330 files changed

+2203
-1696
lines changed

.github/actions/release-info/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runs:
2424
steps:
2525
- id: version-prefix-generator
2626
env:
27-
default-version-prefix: 0.12.1
27+
default-version-prefix: 0.12.2
2828
run: |
2929
if [[ "${{ inputs.version-prefix || '' }}" != "" ]]; then
3030
echo "::set-output name=version-prefix::${{ inputs.version-prefix }}"

.github/workflows/sonarcloud-analysis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ jobs:
5757
/d:sonar.host.url="https://sonarcloud.io" `
5858
/d:sonar.cs.nunit.reportsPaths="**/TestResults/TestResult-*.xml" `
5959
/d:sonar.cs.opencover.reportsPaths="**/TestResults/coverage.*.opencover.xml" `
60-
/d:sonar.coverage.exclusions=benchmark/**,sandbox/**,tests/**
60+
/d:sonar.coverage.exclusions=benchmark/**,sandbox/**,tests/**,**/AspNetRouting/**,**/Castle/**,**/AspNetBinding/**,**/AspNetCore/** `
61+
/d:sonar.cpd.exclusions=**/AspNetRouting/**,**/Castle/**,**/AspNetBinding/**,**/AspNetCore/**
6162
- name: Build solution
6263
shell: powershell
6364
run: dotnet build ${{ env.solution }} --configuration Release

NClient.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=92345632_002D556A_002D4D8D_002DBE26_002D1D6102310FCD_002Fd_003AAspNetRouting/@EntryIndexedValue">ExplicitlyExcluded</s:String>
33
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=92345632_002D556A_002D4D8D_002DBE26_002D1D6102310FCD_002Fd_003ACastle/@EntryIndexedValue">ExplicitlyExcluded</s:String>
44
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=93B399D9_002D3842_002D4B85_002DA06B_002D95E2F62B6F13_002Fd_003AAspNetBinding/@EntryIndexedValue">ExplicitlyExcluded</s:String>
5+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=47A43396_002D24E7_002D41E3_002DBA94_002D041EC1F82494_002Fd_003AAspNetCore/@EntryIndexedValue">ExplicitlyExcluded</s:String>
56

67

78
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArgumentsStyleAnonymousFunction/@EntryIndexedValue">DO_NOT_SHOW</s:String>

src/NClient.Extensions/NClient.Extensions.DependencyInjection/NClientFactoryInjectedBuilder.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Net.Http;
33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Logging;
5-
using NClient.Providers.Api.Rest.Extensions;
65

76
namespace NClient.Extensions.DependencyInjection
87
{

src/NClient.Extensions/NClient.Extensions.DependencyInjection/NClientInjectedBuilder.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Net.Http;
33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Logging;
5-
using NClient.Providers.Api.Rest.Extensions;
65

76
namespace NClient.Extensions.DependencyInjection
87
{

src/NClient.Providers/NClient.Providers.Api.Rest/Exceptions/Factories/ClientArgumentExceptionFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
namespace NClient.Providers.Api.Rest.Exceptions.Factories
44
{
5-
public interface IClientArgumentExceptionFactory
5+
internal interface IClientArgumentExceptionFactory
66
{
77
ClientArgumentException ParameterInRouteTemplateIsNull(string parameterName);
88
}
99

10-
public class ClientArgumentExceptionFactory : IClientArgumentExceptionFactory
10+
internal class ClientArgumentExceptionFactory : IClientArgumentExceptionFactory
1111
{
1212
public ClientArgumentException ParameterInRouteTemplateIsNull(string parameterName) =>
1313
new($"The parameter '{parameterName}' used in the path cannot be null.");

src/NClient.Providers/NClient.Providers.Api.Rest/Exceptions/Factories/ObjectMemberManagerExceptionFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace NClient.Providers.Api.Rest.Exceptions.Factories
55
{
6-
public class ObjectMemberManagerExceptionFactory : IObjectMemberManagerExceptionFactory
6+
internal class ObjectMemberManagerExceptionFactory : IObjectMemberManagerExceptionFactory
77
{
88
public NClientException MemberNameConflict(string memberName, string objectName) =>
99
new ClientValidationException($"Multiple '{memberName}' members were found in the '{objectName}' object type.");

src/NClient.Providers/NClient.Providers.Api.Rest/Extensions/RestApiExtensions.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
using NClient.Common.Helpers;
2+
using NClient.Providers.Api.Rest;
23

3-
namespace NClient.Providers.Api.Rest.Extensions
4+
// ReSharper disable once CheckNamespace
5+
namespace NClient
46
{
5-
// TODO: doc
67
public static class RestApiExtensions
78
{
9+
/// <summary>The client should be used for a REST-like API.</summary>
10+
/// <typeparam name="TClient">The type of client interface.</typeparam>
811
public static INClientTransportBuilder<TClient> UsingRestApi<TClient>(
912
this INClientApiBuilder<TClient> apiBuilder)
1013
where TClient : class
@@ -14,6 +17,7 @@ public static INClientTransportBuilder<TClient> UsingRestApi<TClient>(
1417
return apiBuilder.UsingCustomApi(new RestRequestBuilderProvider());
1518
}
1619

20+
/// <summary>The client factory should be used for a REST-like API.</summary>
1721
public static INClientFactoryTransportBuilder UsingRestApi(
1822
this INClientFactoryApiBuilder apiBuilder)
1923
{

src/NClient.Providers/NClient.Providers.Api.Rest/NClient.Providers.Api.Rest.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
5555
<_Parameter1>NClient.Standalone.Tests</_Parameter1>
5656
</AssemblyAttribute>
57+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
58+
<_Parameter1>NClient.Core.Tests</_Parameter1>
59+
</AssemblyAttribute>
5760
</ItemGroup>
5861

5962
</Project>

src/NClient.Providers/NClient.Providers.Api.Rest/RestRequestBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public RestRequestBuilder(
4646
_toolset = toolset;
4747
}
4848

49-
public Task<IRequest> BuildAsync(Guid requestId, string resource,
49+
public Task<IRequest> BuildAsync(Guid requestId, string host,
5050
IMethodInvocation methodInvocation, CancellationToken cancellationToken)
5151
{
5252
cancellationToken.ThrowIfCancellationRequested();
@@ -67,7 +67,7 @@ public Task<IRequest> BuildAsync(Guid requestId, string resource,
6767
var route = _routeProvider
6868
.Build(routeTemplate, methodInvocation.Method.ClientName, methodInvocation.Method.Name, methodParameters, methodInvocation.Method.UseVersionAttribute);
6969

70-
var endpoint = PathHelper.Combine(resource, route);
70+
var endpoint = PathHelper.Combine(host, route);
7171
var request = new Request(requestId, endpoint, requestType);
7272

7373
var headerAttributes = methodInvocation.Method.MetadataAttributes;

0 commit comments

Comments
 (0)