Skip to content

Commit ac38e90

Browse files
buehlerbuehler
committed
fix: upgrade dependencies
1 parent 132f16f commit ac38e90

File tree

8 files changed

+59
-59
lines changed

8 files changed

+59
-59
lines changed

‎.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "8.0.0",
6+
"version": "8.0.1",
77
"commands": [
88
"dotnet-ef"
99
]
@@ -15,4 +15,4 @@
1515
]
1616
}
1717
}
18-
}
18+
}

‎.editorconfig

Lines changed: 41 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ root = true
33
# All files
44
[*]
55
indent_style = space
6+
max_line_length = 120
67

78
# Xml files
89
[*.xml]
@@ -21,56 +22,46 @@ tab_width = 4
2122
end_of_line = crlf
2223
insert_final_newline = true
2324

24-
#### Custom StyleCop Rules ####
25-
# https://rules.sonarsource.com/csharp/RSPEC-6608/
26-
dotnet_diagnostic.S6608.severity = None
27-
28-
# https://rules.sonarsource.com/csharp/RSPEC-112/
29-
dotnet_diagnostic.S112.severity = None
30-
31-
# https://rules.sonarsource.com/csharp/RSPEC-3925/
32-
dotnet_diagnostic.S3925.severity = None
33-
34-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA0001.md
35-
dotnet_diagnostic.SA0001.severity = None
36-
37-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1101.md
38-
dotnet_diagnostic.SA1101.severity = None
39-
40-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1200.md
41-
dotnet_diagnostic.SA1200.severity = None
42-
43-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1309.md
44-
dotnet_diagnostic.SA1309.severity = None
45-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SX1309.md
46-
dotnet_diagnostic.SX1309.severity = Warning
47-
48-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1600.md
49-
dotnet_diagnostic.SA1600.severity = None
50-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1601.md
51-
dotnet_diagnostic.SA1601.severity = None
52-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1623.md
53-
dotnet_diagnostic.SA1623.severity = None
54-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1633.md
55-
dotnet_diagnostic.SA1633.severity = None
56-
57-
#### Controller Specific Rules ####
58-
[MumbleApi/Controller/**.cs]
59-
60-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1611.md
61-
dotnet_diagnostic.SA1611.severity = None
62-
63-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1615.md
64-
dotnet_diagnostic.SA1615.severity = None
65-
66-
#### Model Specific Rules ####
67-
[MumbleApi/Models/**.cs]
68-
69-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1629.md
70-
dotnet_diagnostic.SA1629.severity = None
25+
#### Custom Analyzer Rules ####
26+
dotnet_diagnostic.SA0001.severity = none
27+
dotnet_diagnostic.SA1010.severity = none
28+
dotnet_diagnostic.SA1600.severity = none
29+
dotnet_diagnostic.CS1591.severity = none
30+
dotnet_diagnostic.SA1008.severity = suggestion
31+
dotnet_diagnostic.SA1009.severity = suggestion
32+
dotnet_diagnostic.SA1101.severity = none
33+
dotnet_diagnostic.SA1106.severity = suggestion
34+
dotnet_diagnostic.SA1118.severity = none
35+
dotnet_diagnostic.SX1101.severity = suggestion
36+
dotnet_diagnostic.SA1309.severity = none
37+
dotnet_diagnostic.SX1309.severity = warning
38+
dotnet_diagnostic.SA1313.severity = suggestion
39+
dotnet_diagnostic.SA1501.severity = suggestion
40+
dotnet_diagnostic.SA1503.severity = suggestion
41+
dotnet_diagnostic.SA1611.severity = none
42+
dotnet_diagnostic.SA1615.severity = none
43+
dotnet_diagnostic.SA1623.severity = none
44+
dotnet_diagnostic.SA1629.severity = none
45+
dotnet_diagnostic.SA1633.severity = none
46+
dotnet_diagnostic.SA1642.severity = none
47+
dotnet_diagnostic.SA1643.severity = none
48+
dotnet_diagnostic.SA1649.severity = none
49+
dotnet_diagnostic.SA1651.severity = none
50+
dotnet_diagnostic.RCS1029.severity = none
51+
dotnet_diagnostic.RCS1090.severity = none
52+
53+
#### Custom Coding Conventions ####
54+
resharper_csharp_space_in_singleline_accessorholder = true
55+
resharper_csharp_space_between_accessors_in_singleline_property = true
56+
resharper_csharp_space_in_singleline_method = true
57+
resharper_csharp_space_in_singleline_anonymous_method = true
58+
resharper_csharp_space_within_single_line_array_initializer_braces = true
59+
resharper_csharp_trailing_comma_in_multiline_lists = true
60+
resharper_csharp_place_type_attribute_on_same_line = false
61+
resharper_csharp_place_attribute_on_same_line = false
7162

7263
#### .NET Coding Conventions ####
73-
[*.cs]
64+
[*.{cs,vb}]
7465

7566
# Organize usings
7667
dotnet_separate_import_directive_groups = true
@@ -123,6 +114,7 @@ dotnet_code_quality_unused_parameters = all:suggestion
123114
dotnet_remove_unnecessary_suppression_exclusions = none
124115

125116
#### C# Coding Conventions ####
117+
[*.cs]
126118

127119
# var preferences
128120
csharp_style_var_elsewhere = false:silent
@@ -219,6 +211,7 @@ csharp_preserve_single_line_blocks = true
219211
csharp_preserve_single_line_statements = true
220212

221213
#### Naming styles ####
214+
[*.{cs,vb}]
222215

223216
# Naming rules
224217

‎MumbleApi.Test/MumbleApi.Test.csproj

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

1212
<ItemGroup>
1313
<PackageReference Include="FluentAssertions" Version="6.12.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1616
<PackageReference Include="xunit" Version="2.6.6" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">

‎MumbleApi.Test/WebAppFactory.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class WebAppFactory : WebApplicationFactory<Program>
1919
{
2020
public async Task PrepareTestData(Func<DataContext, Task> action)
2121
{
22-
await using var scope = this.Services.CreateAsyncScope();
22+
await using var scope = Services.CreateAsyncScope();
2323
var factory = scope.ServiceProvider.GetRequiredService<IDbContextFactory<DataContext>>();
2424
await using var context = await factory.CreateDbContextAsync();
2525
await context.Database.EnsureDeletedAsync();
@@ -30,14 +30,14 @@ public async Task PrepareTestData(Func<DataContext, Task> action)
3030

3131
public HttpClient CreateUnauthorizedClient()
3232
{
33-
var client = this.CreateClient();
33+
var client = CreateClient();
3434
client.DefaultRequestHeaders.Add("x-zitadel-fake-auth", "false");
3535
return client;
3636
}
3737

3838
public HttpClient CreateUserClient(string userId)
3939
{
40-
var client = this.CreateClient();
40+
var client = CreateClient();
4141
client.DefaultRequestHeaders.Add("x-zitadel-fake-user-id", userId);
4242
return client;
4343
}

‎MumbleApi/Entities/Post.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class Post
1616

1717
public string? MediaUrl { get; set; }
1818

19-
public string? MediaId => MediaUrl?.Split('/').Last();
19+
public string? MediaId => MediaUrl?.Split('/')[^1];
2020

2121
public string? MediaType { get; set; }
2222

‎MumbleApi/Entities/User.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class User
1818

1919
public string? AvatarUrl { get; set; }
2020

21-
public string? AvatarId => AvatarUrl?.Split('/').Last();
21+
public string? AvatarId => AvatarUrl?.Split('/')[^1];
2222

2323
public string? AvatarMediaType { get; set; }
2424

‎MumbleApi/MumbleApi.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
<PackageReference Include="Google.Cloud.Storage.V1" Version="4.7.0" />
1616
<PackageReference Include="Lib.AspNetCore.ServerSentEvents" Version="9.0.0" />
1717
<PackageReference Include="LinqKit" Version="1.2.5" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" PrivateAssets="All" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.1" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1" PrivateAssets="All" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.1" />
1922
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
2023
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
2124
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
2225
<PackageReference Include="Ulid" Version="1.3.3" />
23-
<PackageReference Include="Zitadel" Version="5.3.3" />
26+
<PackageReference Include="Zitadel" Version="6.0.0" />
2427
</ItemGroup>
2528

2629
<ItemGroup>

‎MumbleApi/Program.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Configuration;
12
using System.Net;
23
using System.Reflection;
34
using System.Security.Claims;
@@ -30,7 +31,7 @@
3031
.AddJsonFile("appsettings.Secrets.json", true)
3132
.Build()
3233
#endif
33-
.Get<AppConfig>() ?? throw new("App Config Not Loaded.");
34+
.Get<AppConfig>() ?? throw new ConfigurationErrorsException("App Config Not Loaded.");
3435
builder.Services.AddSingleton(config);
3536

3637
builder.Services.AddLogging(
@@ -207,6 +208,9 @@ await db.Database.ExecuteSqlInterpolatedAsync(
207208

208209
await app.RunAsync();
209210

211+
/// <summary>
212+
/// Main entrypoint (used for testing).
213+
/// </summary>
210214
public partial class Program
211215
{
212216
protected Program()

0 commit comments

Comments
 (0)