Skip to content

Commit ca0557e

Browse files
authored
Merge pull request #7340 from microting/copilot/fix-startup-cs-for-dotnet-10
Update Startup.cs for .NET 10 with hybrid package approach
2 parents fa3c29f + 38fa455 commit ca0557e

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

eFormAPI/eFormAPI.Web/Startup.cs

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ namespace eFormAPI.Web;
6666
using Services.Mailing.EmailService;
6767
using Services.Mailing.EmailTags;
6868
using Microsoft.Extensions.Hosting;
69-
using Microsoft.OpenApi.Models;
69+
using Microsoft.OpenApi;
7070
using System.IO;
7171
using Microsoft.Extensions.PlatformAbstractions;
7272
using Microting.EformAngularFrontendBase.Infrastructure.Data;
@@ -294,23 +294,9 @@ public void ConfigureServices(IServiceCollection services)
294294
Scheme = "Bearer"
295295
});
296296

297-
c.AddSecurityRequirement(new OpenApiSecurityRequirement()
297+
c.AddSecurityRequirement(document => new OpenApiSecurityRequirement()
298298
{
299-
{
300-
new OpenApiSecurityScheme
301-
{
302-
Reference = new OpenApiReference
303-
{
304-
Type = ReferenceType.SecurityScheme,
305-
Id = "Bearer"
306-
},
307-
Scheme = "oauth2",
308-
Name = "Bearer",
309-
In = ParameterLocation.Header
310-
311-
},
312-
new List<string>()
313-
}
299+
[new OpenApiSecuritySchemeReference("Bearer", document)] = new List<string>()
314300
});
315301
});
316302
try

eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<PackageReference Include="HtmlToOpenXml.dll" Version="3.2.8" />
5353
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.0" />
5454
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.0" />
55-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0" />
56-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
55+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.11" />
56+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.11" />
5757
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
5858
<PackageReference Include="Microting.eForm" Version="9.0.72" />
5959
<PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.59" />

0 commit comments

Comments
 (0)