From 0b0ff361542521ea066c06d2bad6955c2905873a Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Tue, 7 Dec 2021 20:06:22 +0100
Subject: [PATCH 1/4] Allow only number characters parseable by `int.TryParse`

char.IsNumber() is too broad, allowing full width and other numbers.
---
 osu.Game/Overlays/Settings/SettingsNumberBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/SettingsNumberBox.cs b/osu.Game/Overlays/Settings/SettingsNumberBox.cs
index cbe9f7fc64..0a4949f8b6 100644
--- a/osu.Game/Overlays/Settings/SettingsNumberBox.cs
+++ b/osu.Game/Overlays/Settings/SettingsNumberBox.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Settings
 
         private class OutlinedNumberBox : OutlinedTextBox
         {
-            protected override bool CanAddCharacter(char character) => char.IsNumber(character);
+            protected override bool CanAddCharacter(char character) => character >= '0' && character <= '9';
 
             public new void NotifyInputError() => base.NotifyInputError();
         }

From b326ccc1968f5ff757ece4dd2806c878a2724a38 Mon Sep 17 00:00:00 2001
From: Susko3 <16479013+Susko3@users.noreply.github.com>
Date: Wed, 15 Dec 2021 07:13:24 +0100
Subject: [PATCH 2/4] Move logic to framework and update all usages

---
 osu.Game/Graphics/UserInterface/OsuNumberBox.cs | 4 +++-
 osu.Game/Overlays/Settings/SettingsNumberBox.cs | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuNumberBox.cs b/osu.Game/Graphics/UserInterface/OsuNumberBox.cs
index 36288c745a..3d565a4464 100644
--- a/osu.Game/Graphics/UserInterface/OsuNumberBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuNumberBox.cs
@@ -1,10 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Extensions;
+
 namespace osu.Game.Graphics.UserInterface
 {
     public class OsuNumberBox : OsuTextBox
     {
-        protected override bool CanAddCharacter(char character) => char.IsNumber(character);
+        protected override bool CanAddCharacter(char character) => character.IsAsciiDigit();
     }
 }
diff --git a/osu.Game/Overlays/Settings/SettingsNumberBox.cs b/osu.Game/Overlays/Settings/SettingsNumberBox.cs
index 0a4949f8b6..cc4446033a 100644
--- a/osu.Game/Overlays/Settings/SettingsNumberBox.cs
+++ b/osu.Game/Overlays/Settings/SettingsNumberBox.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -67,7 +68,7 @@ namespace osu.Game.Overlays.Settings
 
         private class OutlinedNumberBox : OutlinedTextBox
         {
-            protected override bool CanAddCharacter(char character) => character >= '0' && character <= '9';
+            protected override bool CanAddCharacter(char character) => character.IsAsciiDigit();
 
             public new void NotifyInputError() => base.NotifyInputError();
         }

From 42f14667a360a16e95197cd2d2635bb9e4026479 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Dec 2021 16:50:55 +0900
Subject: [PATCH 3/4] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 0c922c09ac..5e5e110dfb 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,7 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1203.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.1207.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2021.1215.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index adb25f46fe..bc429f9af1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,7 +36,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Realm" Version="10.7.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.1207.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.1215.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1203.0" />
     <PackageReference Include="Sentry" Version="3.11.1" />
     <PackageReference Include="SharpCompress" Version="0.30.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index db5d9af865..1ae9aa3dc5 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -60,7 +60,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.1207.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.1215.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1203.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@@ -83,7 +83,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="ppy.osu.Framework" Version="2021.1207.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2021.1215.0" />
     <PackageReference Include="SharpCompress" Version="0.30.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 694ee687250b3c910154ab2d83a927d6c061bdf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 15 Dec 2021 16:59:33 +0900
Subject: [PATCH 4/4] Update resources

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 5e5e110dfb..1131203a95 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1203.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1215.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.1215.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bc429f9af1..5a0c999fb0 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.7.1" />
     <PackageReference Include="ppy.osu.Framework" Version="2021.1215.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1203.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1215.0" />
     <PackageReference Include="Sentry" Version="3.11.1" />
     <PackageReference Include="SharpCompress" Version="0.30.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 1ae9aa3dc5..27ac1bf647 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,7 +61,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.1215.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1203.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.1215.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>