Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.Text.Json.Serialization;
using System.Threading;
using System.Threading.Tasks;
using System.Net.Http;

using Refitter.Tests.AdditionalFiles.SingeInterface;

Expand Down Expand Up @@ -512,8 +511,9 @@ public partial interface IDeleteUserEndpoint
namespace Refitter.Tests.AdditionalFiles.ByEndpoint
{
using System;
using Microsoft.Extensions.DependencyInjection;
using Refit;
using System.Net.Http;
using Microsoft.Extensions.DependencyInjection;
using Refit;

/// <summary>
/// Extension methods for configuring Refit clients in the service collection.
Expand All @@ -536,6 +536,7 @@ public static IServiceCollection ConfigureRefitClients(
{
var clientBuilderIUpdatePetEndpoint = services
.AddRefitClient<IUpdatePetEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -544,6 +545,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIAddPetEndpoint = services
.AddRefitClient<IAddPetEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -552,6 +554,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIFindPetsByStatusEndpoint = services
.AddRefitClient<IFindPetsByStatusEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -560,6 +563,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIFindPetsByTagsEndpoint = services
.AddRefitClient<IFindPetsByTagsEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -568,6 +572,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIGetPetByIdEndpoint = services
.AddRefitClient<IGetPetByIdEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -576,6 +581,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIUpdatePetWithFormEndpoint = services
.AddRefitClient<IUpdatePetWithFormEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -584,6 +590,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIDeletePetEndpoint = services
.AddRefitClient<IDeletePetEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -592,6 +599,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIUploadFileEndpoint = services
.AddRefitClient<IUploadFileEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -600,6 +608,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIGetInventoryEndpoint = services
.AddRefitClient<IGetInventoryEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -608,6 +617,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIPlaceOrderEndpoint = services
.AddRefitClient<IPlaceOrderEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -616,6 +626,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIGetOrderByIdEndpoint = services
.AddRefitClient<IGetOrderByIdEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -624,6 +635,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIDeleteOrderEndpoint = services
.AddRefitClient<IDeleteOrderEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -632,6 +644,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderICreateUserEndpoint = services
.AddRefitClient<ICreateUserEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -640,6 +653,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderICreateUsersWithListInputEndpoint = services
.AddRefitClient<ICreateUsersWithListInputEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -648,6 +662,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderILoginUserEndpoint = services
.AddRefitClient<ILoginUserEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -656,6 +671,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderILogoutUserEndpoint = services
.AddRefitClient<ILogoutUserEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -664,6 +680,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIGetUserByNameEndpoint = services
.AddRefitClient<IGetUserByNameEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -672,6 +689,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIUpdateUserEndpoint = services
.AddRefitClient<IUpdateUserEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand All @@ -680,6 +698,7 @@ public static IServiceCollection ConfigureRefitClients(

var clientBuilderIDeleteUserEndpoint = services
.AddRefitClient<IDeleteUserEndpoint>(settings)

.ConfigureHttpClient(c => c.BaseAddress = baseUrl)
.AddHttpMessageHandler<EmptyMessageHandler>()
.AddHttpMessageHandler<AnotherEmptyMessageHandler>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using System.Net.Http;

#nullable enable annotations

Expand Down Expand Up @@ -743,6 +742,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType)
namespace Refitter.Tests.AdditionalFiles.SingeInterfaceWithHttpResilience
{
using System;
using System.Net.Http;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Http.Resilience;
using Refit;
Expand All @@ -766,6 +766,7 @@ public static IServiceCollection ConfigureRefitClients(
{
var clientBuilderISwaggerPetstoreInterfaceWithHttpResilience = services
.AddRefitClient<ISwaggerPetstoreInterfaceWithHttpResilience>(settings)

.ConfigureHttpClient(c => c.BaseAddress = new Uri("https://petstore3.swagger.io/api/v3"));

clientBuilderISwaggerPetstoreInterfaceWithHttpResilience
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using System.Net.Http;

#nullable enable annotations

Expand Down Expand Up @@ -453,6 +452,7 @@ public FileParameter(System.IO.Stream data, string fileName, string contentType)
namespace Refitter.Tests.AdditionalFiles.SingeInterface
{
using System;
using System.Net.Http;
using Microsoft.Extensions.DependencyInjection;
using Polly;
using Polly.Contrib.WaitAndRetry;
Expand Down
22 changes: 12 additions & 10 deletions src/Refitter.SourceGenerator.Tests/Build/ProjectFileContents.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@ namespace Refitter.SourceGenerators.Tests.Build;

public static class ProjectFileContents
{
public const string Net80App = @"
public const string Net80App =
@"
<Project Sdk=""Microsoft.NET.Sdk"">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>NU1510;NU1903;CS1573;CS1591;SYSLIB1034</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include=""Refit.HttpClientFactory"" Version=""11.0.1"" />
<PackageReference Include=""Refit.HttpClientFactory"" Version=""13.1.0"" />
<PackageReference Include=""System.Text.Json"" Version=""8.0.5"" />
<PackageReference Include=""System.ComponentModel.Annotations"" Version=""4.5.0"" />
<PackageReference Include=""System.Runtime.Serialization.Primitives"" Version=""4.3.0"" />
<PackageReference Include=""Microsoft.Extensions.DependencyInjection"" Version=""10.0.8"" />
<PackageReference Include=""Microsoft.Extensions.Http.Polly"" Version=""10.0.8"" />
<PackageReference Include=""Microsoft.Extensions.DependencyInjection"" Version=""10.0.9"" />
<PackageReference Include=""Microsoft.Extensions.Http.Polly"" Version=""10.0.9"" />
<PackageReference Include=""Microsoft.Extensions.Http.Resilience"" Version=""10.1.0"" />
<PackageReference Include=""Microsoft.Extensions.Options.ConfigurationExtensions"" Version=""10.0.8"" />
<PackageReference Include=""Microsoft.Extensions.Options.ConfigurationExtensions"" Version=""10.0.9"" />
<PackageReference Include=""Polly.Contrib.WaitAndRetry"" Version=""1.1.1"" />
<PackageReference Include=""System.Reactive"" Version=""6.0.1"" />
<PackageReference Include=""Apizr.Integrations.FileTransfer.MediatR"" Version=""6.4.0"" />
Expand All @@ -30,22 +31,23 @@ public static class ProjectFileContents
</ItemGroup>
</Project>";

public const string Net90App = @"
public const string Net90App =
@"
<Project Sdk=""Microsoft.NET.Sdk"">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>NU1510;NU1903;CS1573;CS1591;SYSLIB1034</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include=""Refit.HttpClientFactory"" Version=""11.0.1"" />
<PackageReference Include=""Refit.HttpClientFactory"" Version=""13.1.0"" />
<PackageReference Include=""System.Text.Json"" Version=""8.0.5"" />
<PackageReference Include=""System.ComponentModel.Annotations"" Version=""4.5.0"" />
<PackageReference Include=""System.Runtime.Serialization.Primitives"" Version=""4.3.0"" />
<PackageReference Include=""Microsoft.Extensions.DependencyInjection"" Version=""10.0.8"" />
<PackageReference Include=""Microsoft.Extensions.Http.Polly"" Version=""10.0.8"" />
<PackageReference Include=""Microsoft.Extensions.DependencyInjection"" Version=""10.0.9"" />
<PackageReference Include=""Microsoft.Extensions.Http.Polly"" Version=""10.0.9"" />
<PackageReference Include=""Microsoft.Extensions.Http.Resilience"" Version=""10.1.0"" />
<PackageReference Include=""Microsoft.Extensions.Options.ConfigurationExtensions"" Version=""10.0.8"" />
<PackageReference Include=""Microsoft.Extensions.Options.ConfigurationExtensions"" Version=""10.0.9"" />
<PackageReference Include=""Polly.Contrib.WaitAndRetry"" Version=""1.1.1"" />
<PackageReference Include=""System.Reactive"" Version=""6.0.1"" />
<PackageReference Include=""Apizr.Integrations.FileTransfer.MediatR"" Version=""6.4.0"" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Refit.HttpClientFactory" Version="11.0.1" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.8" />
<PackageReference Include="Refit.HttpClientFactory" Version="13.1.0" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="10.0.9" />
<PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
</ItemGroup>

Expand Down
Loading
Loading