Skip to content

Commit 03595ce

Browse files
committed
Retarget dotnet 9.0
1 parent a48b416 commit 03595ce

File tree

7 files changed

+21
-81
lines changed

7 files changed

+21
-81
lines changed

Cli/Cli.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55

66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<AssemblyName>bgg-dungeon</AssemblyName>

Cli/Dockerfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM mcr.microsoft.com/dotnet/runtime:8.0.12-jammy
2+
FROM mcr.microsoft.com/dotnet/runtime:9.0.1-noble
33

44
LABEL org.opencontainers.image.source=https://github.com/gitfool/BoardGameGeek.Dungeon
55

@@ -11,16 +11,14 @@ RUN <<EOF
1111
rm -rf /var/lib/apt/lists/*
1212
EOF
1313

14-
# Add non-root user
14+
# Modify non-root user
1515
RUN <<EOF
1616
set -ex
17-
groupadd --gid 1000 user
18-
useradd --uid 1000 --gid 1000 --shell /bin/bash -m user
19-
echo "user ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/user
20-
chmod 0440 /etc/sudoers.d/user
17+
echo "ubuntu ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/ubuntu
18+
chmod 0440 /etc/sudoers.d/ubuntu
2119
EOF
2220

23-
USER user
21+
USER ubuntu
2422

2523
RUN <<EOF
2624
set -ex

Cli/packages.lock.json

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net8.0": {
4+
"net9.0": {
55
"Flurl": {
66
"type": "Direct",
77
"requested": "[4.0.0, )",
@@ -234,8 +234,7 @@
234234
"Microsoft.Extensions.Configuration": "9.0.1",
235235
"Microsoft.Extensions.Configuration.Abstractions": "9.0.1",
236236
"Microsoft.Extensions.Configuration.FileExtensions": "9.0.1",
237-
"Microsoft.Extensions.FileProviders.Abstractions": "9.0.1",
238-
"System.Text.Json": "9.0.1"
237+
"Microsoft.Extensions.FileProviders.Abstractions": "9.0.1"
239238
}
240239
},
241240
"Microsoft.Extensions.Configuration.UserSecrets": {
@@ -283,8 +282,7 @@
283282
"contentHash": "pfAPuVtHvG6dvZtAa0OQbXdDqq6epnr8z0/IIUjdmV0tMeI8Aj9KxDXvdDvqr+qNHTkmA7pZpChNxwNZt4GXVg==",
284283
"dependencies": {
285284
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1",
286-
"Microsoft.Extensions.Options": "9.0.1",
287-
"System.Diagnostics.DiagnosticSource": "9.0.1"
285+
"Microsoft.Extensions.Options": "9.0.1"
288286
}
289287
},
290288
"Microsoft.Extensions.FileProviders.Abstractions": {
@@ -337,8 +335,7 @@
337335
"resolved": "9.0.1",
338336
"contentHash": "w2gUqXN/jNIuvqYwX3lbXagsizVNXYyt6LlF57+tMve4JYCEgCMMAjRce6uKcDASJgpMbErRT1PfHy2OhbkqEA==",
339337
"dependencies": {
340-
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1",
341-
"System.Diagnostics.DiagnosticSource": "9.0.1"
338+
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1"
342339
}
343340
},
344341
"Microsoft.Extensions.Logging.Configuration": {
@@ -365,8 +362,7 @@
365362
"Microsoft.Extensions.Logging": "9.0.1",
366363
"Microsoft.Extensions.Logging.Abstractions": "9.0.1",
367364
"Microsoft.Extensions.Logging.Configuration": "9.0.1",
368-
"Microsoft.Extensions.Options": "9.0.1",
369-
"System.Text.Json": "9.0.1"
365+
"Microsoft.Extensions.Options": "9.0.1"
370366
}
371367
},
372368
"Microsoft.Extensions.Logging.Debug": {
@@ -400,8 +396,7 @@
400396
"Microsoft.Extensions.Logging": "9.0.1",
401397
"Microsoft.Extensions.Logging.Abstractions": "9.0.1",
402398
"Microsoft.Extensions.Options": "9.0.1",
403-
"Microsoft.Extensions.Primitives": "9.0.1",
404-
"System.Text.Json": "9.0.1"
399+
"Microsoft.Extensions.Primitives": "9.0.1"
405400
}
406401
},
407402
"Microsoft.Extensions.Options.ConfigurationExtensions": {
@@ -453,21 +448,11 @@
453448
"resolved": "0.49.1",
454449
"contentHash": "USV+pdu49OJ3nCjxNuw1K9Zw/c1HCBbwbjXZp0EOn6wM99tFdAtN34KEBZUMyRuJuXlUMDqhd8Yq9obW2MslYA=="
455450
},
456-
"System.Diagnostics.DiagnosticSource": {
457-
"type": "Transitive",
458-
"resolved": "9.0.1",
459-
"contentHash": "yOcDWx4P/s1I83+7gQlgQLmhny2eNcU0cfo1NBWi+en4EAI38Jau+/neT85gUW6w1s7+FUJc2qNOmmwGLIREqA=="
460-
},
461451
"System.Diagnostics.EventLog": {
462452
"type": "Transitive",
463453
"resolved": "9.0.1",
464454
"contentHash": "iVnDpgYJsRaRFnk77kcLA3+913WfWDtnAKrQl9tQ5ahqKANTaJKmQdsuPWWiAPWE9pk1Kj4Pg9JGXWfFYYyakQ=="
465455
},
466-
"System.IO.Pipelines": {
467-
"type": "Transitive",
468-
"resolved": "9.0.1",
469-
"contentHash": "uXf5o8eV/gtzDQY4lGROLFMWQvcViKcF8o4Q6KpIOjloAQXrnscQSu6gTxYJMHuNJnh7szIF9AzkaEq+zDLoEg=="
470-
},
471456
"System.Linq.Async": {
472457
"type": "Transitive",
473458
"resolved": "6.0.1",
@@ -481,20 +466,6 @@
481466
"resolved": "4.5.5",
482467
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
483468
},
484-
"System.Text.Encodings.Web": {
485-
"type": "Transitive",
486-
"resolved": "9.0.1",
487-
"contentHash": "XkspqduP2t1e1x2vBUAD/xZ5ZDvmywuUwsmB93MvyQLospJfqtX0GsR/kU0vUL2h4kmvf777z3txV2W4NrQ9Qg=="
488-
},
489-
"System.Text.Json": {
490-
"type": "Transitive",
491-
"resolved": "9.0.1",
492-
"contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==",
493-
"dependencies": {
494-
"System.IO.Pipelines": "9.0.1",
495-
"System.Text.Encodings.Web": "9.0.1"
496-
}
497-
},
498469
"System.Threading.Tasks.Extensions": {
499470
"type": "Transitive",
500471
"resolved": "4.5.4",

Library/Library.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>

Library/packages.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net8.0": {
4+
"net9.0": {
55
"FluentValidation": {
66
"type": "Direct",
77
"requested": "[11.11.0, )",

Tests/Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44

55
<IsPackable>false</IsPackable>
66
<IsTestProject>true</IsTestProject>

Tests/packages.lock.json

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
"net8.0": {
4+
"net9.0": {
55
"coverlet.collector": {
66
"type": "Direct",
77
"requested": "[6.0.4, )",
@@ -181,8 +181,7 @@
181181
"Microsoft.Extensions.Configuration": "9.0.1",
182182
"Microsoft.Extensions.Configuration.Abstractions": "9.0.1",
183183
"Microsoft.Extensions.Configuration.FileExtensions": "9.0.1",
184-
"Microsoft.Extensions.FileProviders.Abstractions": "9.0.1",
185-
"System.Text.Json": "9.0.1"
184+
"Microsoft.Extensions.FileProviders.Abstractions": "9.0.1"
186185
}
187186
},
188187
"Microsoft.Extensions.Configuration.UserSecrets": {
@@ -230,8 +229,7 @@
230229
"contentHash": "pfAPuVtHvG6dvZtAa0OQbXdDqq6epnr8z0/IIUjdmV0tMeI8Aj9KxDXvdDvqr+qNHTkmA7pZpChNxwNZt4GXVg==",
231230
"dependencies": {
232231
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1",
233-
"Microsoft.Extensions.Options": "9.0.1",
234-
"System.Diagnostics.DiagnosticSource": "9.0.1"
232+
"Microsoft.Extensions.Options": "9.0.1"
235233
}
236234
},
237235
"Microsoft.Extensions.FileProviders.Abstractions": {
@@ -313,8 +311,7 @@
313311
"resolved": "9.0.1",
314312
"contentHash": "w2gUqXN/jNIuvqYwX3lbXagsizVNXYyt6LlF57+tMve4JYCEgCMMAjRce6uKcDASJgpMbErRT1PfHy2OhbkqEA==",
315313
"dependencies": {
316-
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1",
317-
"System.Diagnostics.DiagnosticSource": "9.0.1"
314+
"Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.1"
318315
}
319316
},
320317
"Microsoft.Extensions.Logging.Configuration": {
@@ -341,8 +338,7 @@
341338
"Microsoft.Extensions.Logging": "9.0.1",
342339
"Microsoft.Extensions.Logging.Abstractions": "9.0.1",
343340
"Microsoft.Extensions.Logging.Configuration": "9.0.1",
344-
"Microsoft.Extensions.Options": "9.0.1",
345-
"System.Text.Json": "9.0.1"
341+
"Microsoft.Extensions.Options": "9.0.1"
346342
}
347343
},
348344
"Microsoft.Extensions.Logging.Debug": {
@@ -376,8 +372,7 @@
376372
"Microsoft.Extensions.Logging": "9.0.1",
377373
"Microsoft.Extensions.Logging.Abstractions": "9.0.1",
378374
"Microsoft.Extensions.Options": "9.0.1",
379-
"Microsoft.Extensions.Primitives": "9.0.1",
380-
"System.Text.Json": "9.0.1"
375+
"Microsoft.Extensions.Primitives": "9.0.1"
381376
}
382377
},
383378
"Microsoft.Extensions.Options": {
@@ -532,11 +527,6 @@
532527
"System.Security.Cryptography.ProtectedData": "4.4.0"
533528
}
534529
},
535-
"System.Diagnostics.DiagnosticSource": {
536-
"type": "Transitive",
537-
"resolved": "9.0.1",
538-
"contentHash": "yOcDWx4P/s1I83+7gQlgQLmhny2eNcU0cfo1NBWi+en4EAI38Jau+/neT85gUW6w1s7+FUJc2qNOmmwGLIREqA=="
539-
},
540530
"System.Diagnostics.EventLog": {
541531
"type": "Transitive",
542532
"resolved": "9.0.1",
@@ -555,11 +545,6 @@
555545
"System.Linq.Async": "6.0.1"
556546
}
557547
},
558-
"System.IO.Pipelines": {
559-
"type": "Transitive",
560-
"resolved": "9.0.1",
561-
"contentHash": "uXf5o8eV/gtzDQY4lGROLFMWQvcViKcF8o4Q6KpIOjloAQXrnscQSu6gTxYJMHuNJnh7szIF9AzkaEq+zDLoEg=="
562-
},
563548
"System.Linq.Async": {
564549
"type": "Transitive",
565550
"resolved": "6.0.1",
@@ -583,20 +568,6 @@
583568
"resolved": "4.4.0",
584569
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
585570
},
586-
"System.Text.Encodings.Web": {
587-
"type": "Transitive",
588-
"resolved": "9.0.1",
589-
"contentHash": "XkspqduP2t1e1x2vBUAD/xZ5ZDvmywuUwsmB93MvyQLospJfqtX0GsR/kU0vUL2h4kmvf777z3txV2W4NrQ9Qg=="
590-
},
591-
"System.Text.Json": {
592-
"type": "Transitive",
593-
"resolved": "9.0.1",
594-
"contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==",
595-
"dependencies": {
596-
"System.IO.Pipelines": "9.0.1",
597-
"System.Text.Encodings.Web": "9.0.1"
598-
}
599-
},
600571
"System.Threading.Tasks.Extensions": {
601572
"type": "Transitive",
602573
"resolved": "4.5.4",

0 commit comments

Comments
 (0)