Merge pull request #273 from andy840119/upgrade-csharp-language-version

Upgrade csharp language version
karaoke-dev · Dec 20, 2022 · ba6d35a · ba6d35a
2 parents 3ae2396 + 28196b2
commit ba6d35a
Show file tree

Hide file tree

Showing 31 changed files with 516 additions and 537 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -191,6 +191,9 @@ csharp_style_prefer_index_operator = true:warning
 csharp_style_prefer_range_operator = true:warning
 csharp_style_prefer_switch_expression = false:none
 
+#Style - C# 10 features
+csharp_style_namespace_declarations = file_scoped:warning
+
 [*.{yaml,yml}]
 insert_final_newline = true
 indent_style = space

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,4 @@
 # Make everything partial
-35abcde7a4eeb823067b9cd0ef4b84c81e4e35cd
+35abcde7a4eeb823067b9cd0ef4b84c81e4e35cd
+# Apply the file-scope namespace
+4f9de16847716c1d51ba84ef4a5ceba373908842
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <!-- Contains required properties for osu!framework projects. -->
 <Project>
   <PropertyGroup Label="C#">
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/osu.Framework.Microphone.Android.props b/osu.Framework.Microphone.Android.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>android-x86;android-arm;android-arm64</RuntimeIdentifiers>
     <AndroidPackageFormat>apk</AndroidPackageFormat>

diff --git a/osu.Framework.Microphone.Tests.Android/TestGameActivity.cs b/osu.Framework.Microphone.Tests.Android/TestGameActivity.cs
@@ -5,12 +5,11 @@
 using Android.Content.PM;
 using osu.Framework.Android;
 
-namespace osu.Framework.Tests.Android
+namespace osu.Framework.Tests.Android;
+
+[Activity(MainLauncher = true, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, Theme = "@android:style/Theme.NoTitleBar")]
+public class TestGameActivity : AndroidGameActivity
 {
-    [Activity(MainLauncher = true, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize, Theme = "@android:style/Theme.NoTitleBar")]
-    public class TestGameActivity : AndroidGameActivity
-    {
-        protected override Game CreateGame()
-            => new VisualTestGame();
-    }
+    protected override Game CreateGame()
+        => new VisualTestGame();
 }
diff --git a/osu.Framework.Microphone.Tests.iOS/AppDelegate.cs b/osu.Framework.Microphone.Tests.iOS/AppDelegate.cs
@@ -4,11 +4,10 @@
 using Foundation;
 using osu.Framework.iOS;
 
-namespace osu.Framework.Tests
+namespace osu.Framework.Tests;
+
+[Register("AppDelegate")]
+public class AppDelegate : GameAppDelegate
 {
-    [Register("AppDelegate")]
-    public class AppDelegate : GameAppDelegate
-    {
-        protected override Game CreateGame() => new VisualTestGame();
-    }
+    protected override Game CreateGame() => new VisualTestGame();
 }
diff --git a/osu.Framework.Microphone.Tests.iOS/Application.cs b/osu.Framework.Microphone.Tests.iOS/Application.cs
@@ -3,13 +3,12 @@
 
 using UIKit;
 
-namespace osu.Framework.Tests
+namespace osu.Framework.Tests;
+
+public static class Application
 {
-    public static class Application
+    public static void Main(string[] args)
     {
-        public static void Main(string[] args)
-        {
-            UIApplication.Main(args, null, typeof(AppDelegate));
-        }
+        UIApplication.Main(args, null, typeof(AppDelegate));
     }
 }
diff --git a/osu.Framework.Microphone.Tests/AutomatedVisualTestGame.cs b/osu.Framework.Microphone.Tests/AutomatedVisualTestGame.cs
@@ -3,13 +3,12 @@
 
 using osu.Framework.Testing;
 
-namespace osu.Framework.Tests
+namespace osu.Framework.Tests;
+
+internal partial class AutomatedVisualTestGame : TestGame
 {
-    internal partial class AutomatedVisualTestGame : TestGame
+    public AutomatedVisualTestGame()
     {
-        public AutomatedVisualTestGame()
-        {
-            Add(new TestBrowserTestRunner(new TestBrowser()));
-        }
+        Add(new TestBrowserTestRunner(new TestBrowser()));
     }
 }
diff --git a/osu.Framework.Microphone.Tests/Program.cs b/osu.Framework.Microphone.Tests/Program.cs
@@ -4,22 +4,21 @@
 using System;
 using osu.Framework.Platform;
 
-namespace osu.Framework.Tests
+namespace osu.Framework.Tests;
+
+public static class Program
 {
-    public static class Program
+    [STAThread]
+    public static void Main(string[] args)
     {
-        [STAThread]
-        public static void Main(string[] args)
-        {
-            bool benchmark = args.Length > 0 && args[0] == @"-benchmark";
+        bool benchmark = args.Length > 0 && args[0] == @"-benchmark";
 
-            using (GameHost host = Host.GetSuitableDesktopHost(@"microphone-tests"))
-            {
-                if (benchmark)
-                    host.Run(new AutomatedVisualTestGame());
-                else
-                    host.Run(new VisualTestGame());
-            }
+        using (GameHost host = Host.GetSuitableDesktopHost(@"microphone-tests"))
+        {
+            if (benchmark)
+                host.Run(new AutomatedVisualTestGame());
+            else
+                host.Run(new VisualTestGame());
         }
     }
 }
diff --git a/osu.Framework.Microphone.Tests/TestGame.cs b/osu.Framework.Microphone.Tests/TestGame.cs
@@ -4,14 +4,13 @@
 using osu.Framework.Allocation;
 using osu.Framework.IO.Stores;
 
-namespace osu.Framework.Tests
+namespace osu.Framework.Tests;
+
+internal partial class TestGame : Game
 {
-    internal partial class TestGame : Game
+    [BackgroundDependencyLoader]
+    private void load()
     {
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Resources.AddStore(new NamespacedResourceStore<byte[]>(new DllResourceStore(typeof(TestGame).Assembly), "Resources"));
-        }
+        Resources.AddStore(new NamespacedResourceStore<byte[]>(new DllResourceStore(typeof(TestGame).Assembly), "Resources"));
     }
 }
diff --git a/osu.Framework.Microphone.Tests/Visual/FrameworkTestScene.cs b/osu.Framework.Microphone.Tests/Visual/FrameworkTestScene.cs
@@ -5,19 +5,18 @@
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 
-namespace osu.Framework.Tests.Visual
+namespace osu.Framework.Tests.Visual;
+
+public abstract partial class FrameworkTestScene : TestScene
 {
-    public abstract partial class FrameworkTestScene : TestScene
-    {
-        protected override ITestSceneTestRunner CreateRunner() => new FrameworkTestSceneTestRunner();
+    protected override ITestSceneTestRunner CreateRunner() => new FrameworkTestSceneTestRunner();
 
-        private partial class FrameworkTestSceneTestRunner : TestSceneTestRunner
+    private partial class FrameworkTestSceneTestRunner : TestSceneTestRunner
+    {
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Resources.AddStore(new NamespacedResourceStore<byte[]>(new DllResourceStore(typeof(FrameworkTestScene).Assembly), "Resources"));
-            }
+            Resources.AddStore(new NamespacedResourceStore<byte[]>(new DllResourceStore(typeof(FrameworkTestScene).Assembly), "Resources"));
         }
     }
 }
diff --git a/osu.Framework.Microphone.Tests/Visual/Input/TestSceneGetMicrophoneList.cs b/osu.Framework.Microphone.Tests/Visual/Input/TestSceneGetMicrophoneList.cs
@@ -5,21 +5,20 @@
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 
-namespace osu.Framework.Tests.Visual.Input
+namespace osu.Framework.Tests.Visual.Input;
+
+[TestFixture]
+public partial class TestSceneGetMicrophoneList : FrameworkTestScene
 {
-    [TestFixture]
-    public partial class TestSceneGetMicrophoneList : FrameworkTestScene
+    public TestSceneGetMicrophoneList()
     {
-        public TestSceneGetMicrophoneList()
+        var manager = new MicrophoneManager();
+        Child = new BasicDropdown<string>
         {
-            var manager = new MicrophoneManager();
-            Child = new BasicDropdown<string>
-            {
-                X = 100,
-                Y = 100,
-                Width = 300,
-                Items = manager.MicrophoneDeviceNames
-            };
-        }
+            X = 100,
+            Y = 100,
+            Width = 300,
+            Items = manager.MicrophoneDeviceNames
+        };
     }
 }