From a8ffe0298ccbf5c26f7c8522a4a86e467e06573f Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 15 Apr 2024 11:24:46 +0800 Subject: [PATCH 1/3] Bump to net8 --- .../osu.Server.DifficultyCalculator.csproj | 2 +- .../osu.Server.Queues.BeatmapProcessor.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj index 133d2fe..6957111 100644 --- a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj +++ b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + net8.0 osu.Server.DifficultyCalculator osu.Server.DifficultyCalculator latest diff --git a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj index 32482c9..c320941 100644 --- a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj +++ b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable latest true From ca018033ee159849c6ec7ccd0a9877519b7c7daa Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 15 Apr 2024 11:24:55 +0800 Subject: [PATCH 2/3] Add new dotsettings entries --- osu.Server.DifficultyCalculator.sln.DotSettings | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/osu.Server.DifficultyCalculator.sln.DotSettings b/osu.Server.DifficultyCalculator.sln.DotSettings index dfbda44..ad0cc9d 100644 --- a/osu.Server.DifficultyCalculator.sln.DotSettings +++ b/osu.Server.DifficultyCalculator.sln.DotSettings @@ -730,9 +730,19 @@ See the LICENCE file in the repository root for full licence text. <Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Type parameters"><ElementKinds><Kind Name="TYPE_PARAMETER" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb"><ExtraRule Prefix="_" Suffix="" Style="aaBb" /></Policy></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Constant fields (not private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Local functions"><ElementKinds><Kind Name="LOCAL_FUNCTION" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Enum members"><ElementKinds><Kind Name="ENUM_MEMBER" /></ElementKinds></Descriptor><Policy Inspect="False" Prefix="" Suffix="" Style="AaBb" /></Policy> <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private methods"><ElementKinds><Kind Name="ASYNC_METHOD" /><Kind Name="METHOD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public methods"><ElementKinds><Kind Name="ASYNC_METHOD" /><Kind Name="METHOD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private" Description="private properties"><ElementKinds><Kind Name="PROPERTY" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + <Policy><Descriptor Staticness="Any" AccessRightKinds="Any" Description="Local constants"><ElementKinds><Kind Name="LOCAL_CONSTANT" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /></Policy> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Protected, ProtectedInternal, Internal, Public, PrivateProtected" Description="Static readonly fields (not private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AA_BB" /></Policy> + <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, ProtectedInternal, Internal, Public" Description="internal/protected/public properties"><ElementKinds><Kind Name="PROPERTY" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> @@ -788,6 +798,7 @@ See the LICENCE file in the repository root for full licence text. True True True + True TestFolder True True From 15a19b207a7e8fee79b84e8b773ca2aebffa9bf6 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 15 Apr 2024 11:25:46 +0800 Subject: [PATCH 3/3] Upgrade packages --- .../osu.Server.DifficultyCalculator.csproj | 22 +++++++++---------- .../osu.Server.Queues.BeatmapProcessor.csproj | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj index 6957111..bae9ab9 100644 --- a/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj +++ b/osu.Server.DifficultyCalculator/osu.Server.DifficultyCalculator.csproj @@ -10,18 +10,18 @@ true - + - - - - - - - - - - + + + + + + + + + + diff --git a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj index c320941..b3c7c13 100644 --- a/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj +++ b/osu.Server.Queues.BeatmapProcessor/osu.Server.Queues.BeatmapProcessor.csproj @@ -10,7 +10,7 @@ - +