Skip to content

Commit 8bb34a6

Browse files
authored
Merge pull request #26 from marcominerva/develop
Update packages, configs, and add TinyHelpers
2 parents c60bd68 + 3041466 commit 8bb34a6

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ csharp_style_pattern_local_over_anonymous_function = true:suggestion
140140
csharp_style_prefer_index_operator = true:suggestion
141141
csharp_style_prefer_range_operator = true:suggestion
142142
csharp_style_throw_expression = true:suggestion
143-
csharp_style_unused_value_assignment_preference = discard_variable:suggestion
144-
csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion
143+
csharp_style_unused_value_assignment_preference = discard_variable:none
144+
csharp_style_unused_value_expression_statement_preference = discard_variable:none
145145

146146
# 'using' directive preferences
147147
csharp_using_directive_placement = outside_namespace:suggestion

samples/DallEApi/DallEApi.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
11-
<PackageReference Include="MinimalHelpers.OpenApi" Version="2.0.3" />
12-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
11+
<PackageReference Include="MinimalHelpers.OpenApi" Version="2.0.17" />
12+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
13+
<PackageReference Include="TinyHelpers.AspNetCore" Version="3.1.19" />
1314
</ItemGroup>
1415

1516
<ItemGroup>

samples/DallEApi/Program.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
using System.Diagnostics;
21
using System.Text.Json.Serialization;
32
using DallENet;
43
using DallENet.Models;
4+
using TinyHelpers.AspNetCore.Extensions;
5+
using TinyHelpers.AspNetCore.Swagger;
56

67
var builder = WebApplication.CreateBuilder(args);
78

@@ -35,16 +36,14 @@
3536
//});
3637

3738
builder.Services.AddEndpointsApiExplorer();
38-
builder.Services.AddSwaggerGen();
39-
40-
builder.Services.AddProblemDetails(options =>
39+
builder.Services.AddSwaggerGen(options =>
4140
{
42-
options.CustomizeProblemDetails = context =>
43-
{
44-
context.ProblemDetails.Extensions["traceId"] = Activity.Current?.Id ?? context.HttpContext.TraceIdentifier;
45-
};
41+
options.AddDefaultResponse();
4642
});
4743

44+
builder.Services.AddDefaultProblemDetails();
45+
builder.Services.AddDefaultExceptionHandler();
46+
4847
var app = builder.Build();
4948

5049
// Configures the HTTP request pipeline.

samples/DallEApi/appsettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"Provider": "Azure", // Optional. Currently only Azure is supported
44
"ApiKey": "", // Required
55
"ResourceName": "", // Required
6-
"ApiVersion": "2023-12-01-preview", // Optional, used only by Azure OpenAI Service. Allowed values: 2023-12-01-preview (default)
6+
"ApiVersion": "2024-10-21", // Optional, used only by Azure OpenAI Service (default: 2024-10-21)
77
"AuthenticationType": "ApiKey", // Optional, used only by Azure OpenAI Service. Allowed values: ApiKey (default) or ActiveDirectory
88

99
"DefaultModel": "dall-e-3", // Required"

samples/DallEConsole/DallEConsole.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

src/DallENet/DallENet.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
</ItemGroup>
3838

3939
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
40-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
41+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
42+
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="All" />
12+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" PrivateAssets="All" />
1313
</ItemGroup>
1414

1515
</Project>

0 commit comments

Comments
 (0)