Skip to content

Commit d404bdb

Browse files
vbilopavvbilopav
committed
merge master
1 parent e938911 commit d404bdb

5 files changed

Lines changed: 30 additions & 26 deletions

File tree

‎NpgsqlRest/NpgsqlRest.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
<GenerateDocumentationFile>true</GenerateDocumentationFile>
3030
<PackageReadmeFile>README.MD</PackageReadmeFile>
3131
<DocumentationFile>bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile>
32-
<Version>2.36.0</Version>
33-
<AssemblyVersion>2.36.0</AssemblyVersion>
34-
<FileVersion>2.36.0</FileVersion>
35-
<PackageVersion>2.36.0</PackageVersion>
32+
<Version>2.37.0</Version>
33+
<AssemblyVersion>2.37.0</AssemblyVersion>
34+
<FileVersion>2.37.0</FileVersion>
35+
<PackageVersion>2.37.0</PackageVersion>
3636
</PropertyGroup>
3737

3838
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

‎NpgsqlRestClient/NpgsqlRestClient.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<InvariantGlobalization>true</InvariantGlobalization>
99
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
1010
<PublishAot>true</PublishAot>
11-
<Version>2.36.1</Version>
11+
<Version>2.37.0</Version>
1212
</PropertyGroup>
1313

1414
<ItemGroup>

‎NpgsqlRestClient/appsettings.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
2.36.1
2+
2.37.0
33
*/
44
{
55
//
@@ -62,6 +62,9 @@
6262
"Default": "Host={PGHOST};Port=5432;Database={PGDATABASE};Username={PGUSER};Password={PGPASSWORD}"
6363
},
6464

65+
//
66+
// Additional connection settings and options.
67+
//
6568
"ConnectionSettings": {
6669
//
6770
// Sets the ApplicationName connection property in the connection string to the value of the ApplicationName configuration.

‎NpgsqlRestTests/NpgsqlRestTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="FluentAssertions" Version="8.7.0" />
17+
<PackageReference Include="FluentAssertions" Version="8.7.1" />
1818
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
2020
<PackageReference Include="xunit" Version="2.9.3" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎NpgsqlRestTests/Setup/Program.cs‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,24 @@ public static void Main()
8181

8282
var builder = WebApplication.CreateBuilder([]);
8383

84-
builder.Services.AddRateLimiter(options =>
85-
{
86-
options.AddFixedWindowLimiter("max 2 per second", config =>
87-
{
88-
config.PermitLimit = 2;
89-
config.Window = TimeSpan.FromSeconds(1);
90-
config.AutoReplenishment = true;
91-
});
92-
93-
//var fixedWindowRateLimiterOptions = new FixedWindowRateLimiterOptions();
94-
//var policyName = "max 2 per second (from AddPolicy)";
95-
// options.AddPolicy(policyName, context =>
96-
// {
97-
// return fixedWindowRateLimiterOptions;
98-
// });
99-
});
84+
// builder.Services.AddRateLimiter(options =>
85+
// {
86+
// options.AddFixedWindowLimiter("max 2 per second", config =>
87+
// {
88+
// config.PermitLimit = 2;
89+
// config.Window = TimeSpan.FromSeconds(1);
90+
// config.AutoReplenishment = true;
91+
// });
92+
//
93+
// //var fixedWindowRateLimiterOptions = new FixedWindowRateLimiterOptions();
94+
// //var policyName = "max 2 per second (from AddPolicy)";
95+
// // options.AddPolicy(policyName, context =>
96+
// // {
97+
// // return fixedWindowRateLimiterOptions;
98+
// // });
99+
// });
100100

101-
var fixedWindowRateLimiterOptions = new FixedWindowRateLimiterOptions();
101+
//var fixedWindowRateLimiterOptions = new FixedWindowRateLimiterOptions();
102102

103103
builder
104104
.Services
@@ -210,7 +210,8 @@ public static void Main()
210210
UseDefaultUploadMetadataContextKey = true,
211211
//DefaultUploadMetadataContextKey = "request.upload_metadata",
212212
},
213-
RateLimiterOptions = new RateLimiterOptions { Enabled = true }
213+
214+
//RateLimiterOptions = new RateLimiterOptions { Enabled = true }
214215
});
215216
app.Run();
216217
}

0 commit comments

Comments
 (0)