Merge pull request #2593 from planetarium/release/200

Backmerge 200
planetarium · Oct 2, 2024 · 8c54741 · 8c54741
2 parents 2b3dfb4 + e30eb17
commit 8c54741
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 29 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
 WORKDIR /app
 ARG COMMIT
 
@@ -24,7 +24,7 @@ RUN dotnet publish NineChronicles.Headless.Executable/NineChronicles.Headless.Ex
     --version-suffix $COMMIT
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 RUN apt-get update && apt-get install -y libc6-dev
 COPY --from=build-env /app/out .

diff --git a/Dockerfile.ACC b/Dockerfile.ACC
@@ -1,5 +1,5 @@
 # Use the SDK image to build the app
-FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
 WORKDIR /app
 ARG COMMIT
 
@@ -21,7 +21,7 @@ RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.He
     --version-suffix $COMMIT
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0
 WORKDIR /app
 RUN apt-get update && apt-get install -y libc6-dev
 COPY --from=build-env /app/out .

diff --git a/Dockerfile.ACC.amd64 b/Dockerfile.ACC.amd64
@@ -1,5 +1,5 @@
 # Use the SDK image to build the app
-FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
 WORKDIR /app
 ARG COMMIT
 
@@ -21,7 +21,7 @@ RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.He
     --version-suffix $COMMIT
 
 # Build runtime image
-FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim
+FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim
 WORKDIR /app
 RUN apt-get update && apt-get install -y libc6-dev
 COPY --from=build-env /app/out .

diff --git a/Dockerfile.ACC.arm64v8 b/Dockerfile.ACC.arm64v8
@@ -1,5 +1,5 @@
 # Use the SDK image to build the app
-FROM mcr.microsoft.com/dotnet/sdk:6.0-jammy AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build-env
 WORKDIR /app
 ARG COMMIT
 
@@ -21,7 +21,7 @@ RUN dotnet publish NineChronicles.Headless.AccessControlCenter/NineChronicles.He
     --version-suffix $COMMIT
 
 # Build runtime image
-FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim-arm64v8
+FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim-arm64v8
 WORKDIR /app
 RUN apt-get update && apt-get install -y libc6-dev
 COPY --from=build-env /app/out .

diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 ARG COMMIT
 
@@ -24,7 +24,7 @@ RUN dotnet publish NineChronicles.Headless.Executable/NineChronicles.Headless.Ex
     --version-suffix $COMMIT
 
 # Build runtime image
-FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim
+FROM --platform=linux/amd64 mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim
 WORKDIR /app
 RUN apt-get update && apt-get install -y libc6-dev liblz4-dev zlib1g-dev libsnappy-dev libzstd-dev
 COPY --from=build-env /app/out .

diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 WORKDIR /app
 ARG COMMIT
 
@@ -24,7 +24,7 @@ RUN dotnet publish NineChronicles.Headless.Executable/NineChronicles.Headless.Ex
     --version-suffix $COMMIT
 
 # Build runtime image
-FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim-arm64v8
+FROM --platform=linux/arm64 mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim-arm64v8
 WORKDIR /app
 RUN apt-get update && apt-get install -y libc6-dev
 COPY --from=build-env /app/out .

diff --git a/Lib9c b/Lib9c
diff --git a/...hronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj b/...hronicles.Headless.AccessControlCenter/NineChronicles.Headless.AccessControlCenter.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>..\NineChronicles.Headless.Common.ruleset</CodeAnalysisRuleSet>
     <Nullable>enable</Nullable>

diff --git a/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs
@@ -62,7 +62,7 @@ public void TransferAsset(
             }
             else
             {
-                Assert.Contains("System.FormatException: Input string was not in a correct format.", _console.Error.ToString());
+                Assert.Contains("System.FormatException", _console.Error.ToString());
             }
         }
 
@@ -104,7 +104,7 @@ public void ClaimStakeReward(string addressString, int expectedCode)
             }
             else
             {
-                Assert.Contains("System.FormatException: Input string was not in a correct format.", _console.Error.ToString());
+                Assert.Contains("System.FormatException", _console.Error.ToString());
             }
         }
 
@@ -131,7 +131,7 @@ public void MigrateMonsterCollection(string addressString, int expectedCode)
             }
             else
             {
-                Assert.Contains("System.FormatException: Input string was not in a correct format.", _console.Error.ToString());
+                Assert.Contains("System.FormatException", _console.Error.ToString());
             }
         }
     }

diff --git a/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj b/NineChronicles.Headless.Executable.Tests/NineChronicles.Headless.Executable.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <LangVersion>8</LangVersion>
 
         <IsPackable>false</IsPackable>

diff --git a/NineChronicles.Headless.Executable/NineChronicles.Headless.Executable.csproj b/NineChronicles.Headless.Executable/NineChronicles.Headless.Executable.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <VersionPrefix>1.0.0</VersionPrefix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>..\NineChronicles.Headless.Common.ruleset</CodeAnalysisRuleSet>

diff --git a/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs b/NineChronicles.Headless.Tests/ArenaParticipantsWorkerTest.cs
@@ -92,7 +92,8 @@ public void AvatarAddrAndScoresWithRank()
             .SetLegacyState(sheetAddress, csv.Serialize())
             .SetLegacyState(participantsAddr, participants.Serialize())
             .SetLegacyState(arenaScore.Address, arenaScore.Serialize());
-        var actual = ArenaParticipantsWorker.AvatarAddrAndScoresWithRank(participants.AvatarAddresses, currentRoundData, state);
+        var actual =
+            ArenaParticipantsWorker.AvatarAddrAndScoresWithRank(participants.AvatarAddresses, currentRoundData, state);
         Assert.Equal(2, actual.Count);
         var first = actual.First();
         Assert.Equal(avatarAddress, first.avatarAddr);
@@ -131,7 +132,9 @@ public void GetArenaParticipants()
         // equipment
         var equipmentSheet = tableSheets.EquipmentItemSheet;
         var random = new Random(0);
-        var equipment = (Equipment)ItemFactory.CreateItem(equipmentSheet.Values.First(r => r.ItemSubType == ItemSubType.Armor), random);
+        var equipment =
+            (Equipment)ItemFactory.CreateItem(equipmentSheet.Values.First(r => r.ItemSubType == ItemSubType.Armor),
+                random);
         equipment.equipped = true;
         avatarState.inventory.AddItem(equipment);
         avatarState2.inventory.AddItem(equipment);
@@ -182,8 +185,12 @@ public void GetArenaParticipants()
         {
             state = state.SetLegacyState(Addresses.GetSheetAddress(key), s.Serialize());
         }
-        var avatarAddrAndScoresWithRank = ArenaParticipantsWorker.AvatarAddrAndScoresWithRank(participants.AvatarAddresses, currentRoundData, state);
-        var actual = ArenaParticipantsWorker.GetArenaParticipants(state, participants.AvatarAddresses, avatarAddrAndScoresWithRank);
+
+        var avatarAddrAndScoresWithRank =
+            ArenaParticipantsWorker.AvatarAddrAndScoresWithRank(participants.AvatarAddresses, currentRoundData, state);
+        var actual =
+            ArenaParticipantsWorker.GetArenaParticipants(state, participants.AvatarAddresses,
+                avatarAddrAndScoresWithRank);
         Assert.Equal(2, actual.Count);
         var first = actual.First();
         Assert.Equal(avatarAddress, first.AvatarAddr);

diff --git a/NineChronicles.Headless.Tests/Common/Fixtures.cs b/NineChronicles.Headless.Tests/Common/Fixtures.cs
@@ -6,8 +6,12 @@
 using Libplanet.Common;
 using Libplanet.Crypto;
 using Libplanet.Types.Assets;
+using Nekoyume;
+using Nekoyume.Model;
 using Nekoyume.Model.Item;
+using Nekoyume.Model.Quest;
 using Nekoyume.Model.State;
+using Nekoyume.TableData;
 
 namespace NineChronicles.Headless.Tests
 {
@@ -54,7 +58,8 @@ public static ShopState ShopStateFX()
                 var equipment = ItemFactory.CreateItemUsable(row, Guid.Empty, 0);
                 if (equipment is ITradableItem tradableItem)
                 {
-                    var shopItem = new ShopItem(UserAddress, AvatarAddress, Guid.NewGuid(), index * CurrencyFX, tradableItem);
+                    var shopItem = new ShopItem(UserAddress, AvatarAddress, Guid.NewGuid(), index * CurrencyFX,
+                        tradableItem);
                     shopState.Register(shopItem);
                 }
             }

diff --git a/NineChronicles.Headless.Tests/NineChronicles.Headless.Tests.csproj b/NineChronicles.Headless.Tests/NineChronicles.Headless.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>

diff --git a/NineChronicles.Headless/ActionEvaluationPublisher.cs b/NineChronicles.Headless/ActionEvaluationPublisher.cs
@@ -303,7 +303,8 @@ public IdGroupFinder(IMemoryCache memoryCache)
                 var serializedInput = "key";
 
                 // Check cache
-                if (_memoryCache.TryGetValue(serializedInput, out List<(HashSet<string> IPs, HashSet<string> IDs)> cachedResult))
+                List<(HashSet<string> IPs, HashSet<string> IDs)> cachedResult = new();
+                if (_memoryCache.TryGetValue(serializedInput, out cachedResult!))
                 {
                     return cachedResult;
                 }

diff --git a/NineChronicles.Headless/MemoryCacheExtensions.cs b/NineChronicles.Headless/MemoryCacheExtensions.cs
@@ -20,7 +20,7 @@ public static byte[] SetSheet(this MemoryCache cache, string cacheKey, IValue va
 
     public static bool TryGetSheet<T>(this MemoryCache cache, string cacheKey, out T cached)
     {
-        return cache.TryGetValue(cacheKey, out cached);
+        return cache.TryGetValue(cacheKey, out cached!);
     }
 
     public static string? GetSheet(this MemoryCache cache, string cacheKey)

diff --git a/NineChronicles.Headless/NineChronicles.Headless.csproj b/NineChronicles.Headless/NineChronicles.Headless.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <CodeAnalysisRuleSet>..\NineChronicles.Headless.Common.ruleset</CodeAnalysisRuleSet>
     <Nullable>enable</Nullable>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.0",
+        "version": "8.0.0",
         "rollForward": "minor"
     }
 }