diff --git a/.editorconfig b/.editorconfig index c341ed3647..70183245c8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -93,7 +93,7 @@ dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper #Formatting - indentation options csharp_indent_case_contents = true csharp_indent_case_contents_when_block = false -csharp_indent_labels = one_less_than_current +csharp_indent_labels = no_change csharp_indent_switch_labels = true #Formatting - new line options @@ -155,19 +155,19 @@ csharp_style_expression_bodied_properties = true:warning csharp_style_expression_bodied_local_functions = true:silent #Style - expression preferences -dotnet_style_object_initializer = true:warning +dotnet_style_object_initializer = true:silent dotnet_style_collection_initializer = true:warning dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning dotnet_style_prefer_auto_properties = true:warning dotnet_style_prefer_conditional_expression_over_assignment = true:silent dotnet_style_prefer_conditional_expression_over_return = true:silent -dotnet_style_prefer_compound_assignment = true:warning +dotnet_style_prefer_compound_assignment = true:silent #Style - null/type checks -dotnet_style_coalesce_expression = true:warning -dotnet_style_null_propagation = true:warning +dotnet_style_coalesce_expression = true:silent +dotnet_style_null_propagation = true:silent csharp_style_pattern_matching_over_is_with_cast_check = true:warning -csharp_style_pattern_matching_over_as_with_null_check = true:warning +csharp_style_pattern_matching_over_as_with_null_check = true:silent csharp_style_throw_expression = true:silent csharp_style_conditional_delegate_call = true:warning @@ -178,8 +178,8 @@ csharp_style_unused_value_expression_statement_preference = discard_variable:sil csharp_style_unused_value_assignment_preference = discard_variable:warning #Style - variable declaration -csharp_style_inlined_variable_declaration = true:warning -csharp_style_deconstructed_variable_declaration = true:warning +csharp_style_inlined_variable_declaration = true:silent +csharp_style_deconstructed_variable_declaration = true:silent #Style - other C# 7.x features dotnet_style_prefer_inferred_tuple_names = true:warning @@ -188,12 +188,18 @@ csharp_style_pattern_local_over_anonymous_function = true:warning dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent #Style - C# 8 features -csharp_prefer_static_local_function = true:warning +csharp_prefer_static_local_function = true:silent csharp_prefer_simple_using_statement = true:silent -csharp_style_prefer_index_operator = true:warning -csharp_style_prefer_range_operator = true:warning +csharp_style_prefer_index_operator = true:silent +csharp_style_prefer_range_operator = true:silent csharp_style_prefer_switch_expression = false:none +#Style - C# 9 features +csharp_style_prefer_pattern_matching = false:none + +#Style - C# 12 features +csharp_style_prefer_primary_constructors = false + csharp_style_namespace_declarations = block_scoped:warning [*.{yaml,yml}] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08660f8cde..729f12520e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,10 +14,10 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Restore Tools run: dotnet tool restore @@ -78,10 +78,10 @@ jobs: - name: Checkout uses: actions/checkout@v6 - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Setup Go uses: actions/setup-go@v6 @@ -125,10 +125,10 @@ jobs: distribution: microsoft java-version: 11 - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Restore .NET workloads run: dotnet workload install android @@ -138,24 +138,22 @@ jobs: build-only-ios: name: Build only (iOS) - runs-on: macos-15 + runs-on: macos-26 timeout-minutes: 60 steps: - name: Checkout uses: actions/checkout@v6 - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Restore .NET workloads run: dotnet workload install ios - # https://github.com/dotnet/macios/issues/19157 - # https://github.com/actions/runner-images/issues/12758 - - name: Use Xcode 16.4 - run: sudo xcode-select -switch /Applications/Xcode_16.4.app + - name: Use Xcode 26.5 + run: sudo xcode-select -switch /Applications/Xcode_26.5.app - name: Compile run: dotnet build -c Debug osu-framework.iOS.slnf diff --git a/.github/workflows/deploy-nativelibs.yml b/.github/workflows/deploy-nativelibs.yml index 7666bc1f1c..90edca2dee 100644 --- a/.github/workflows/deploy-nativelibs.yml +++ b/.github/workflows/deploy-nativelibs.yml @@ -46,10 +46,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts" - - name: Setup .NET 8.0.x + - name: Setup .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Build NativeLibs run: dotnet pack -c Release osu.Framework.NativeLibs /p:Configuration=Release /p:Version=${{needs.check-if-tag.outputs.version}} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}} diff --git a/.github/workflows/deploy-pack.yml b/.github/workflows/deploy-pack.yml index e18aaf1959..7336cdc73e 100644 --- a/.github/workflows/deploy-pack.yml +++ b/.github/workflows/deploy-pack.yml @@ -53,10 +53,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}\artifacts" - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Pack (Framework) run: dotnet pack -c Release osu.Framework /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg -o ${{steps.artifactsPath.outputs.nuget_artifacts}} @@ -84,10 +84,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts" - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Replace project references run: osu.Framework.Templates/replace-references.sh ${{ github.ref_name }} @@ -119,10 +119,10 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}\artifacts" - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Setup JDK 11 uses: actions/setup-java@v5 @@ -147,7 +147,7 @@ jobs: pack-ios: name: Pack (iOS) - runs-on: macos-15 + runs-on: macos-26 environment: production defaults: run: @@ -160,18 +160,16 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts" - - name: Install .NET 8.0.x + - name: Install .NET 10.0.x uses: actions/setup-dotnet@v5 with: - dotnet-version: "8.0.x" + dotnet-version: "10.0.x" - name: Restore .NET Workloads run: dotnet workload install ios - # https://github.com/dotnet/macios/issues/19157 - # https://github.com/actions/runner-images/issues/12758 - - name: Use Xcode 16.4 - run: sudo xcode-select -switch /Applications/Xcode_16.4.app + - name: Use Xcode 26.5 + run: sudo xcode-select -switch /Applications/Xcode_26.5.app - name: Pack (iOS Framework) run: dotnet pack -c Release osu.Framework.iOS /p:Version=${{ github.ref_name }} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}} diff --git a/.idea/.idea.osu-framework.Desktop/.idea/runConfigurations/Benchmarks.xml b/.idea/.idea.osu-framework.Desktop/.idea/runConfigurations/Benchmarks.xml index 11482fa08b..3bebf90f1f 100644 --- a/.idea/.idea.osu-framework.Desktop/.idea/runConfigurations/Benchmarks.xml +++ b/.idea/.idea.osu-framework.Desktop/.idea/runConfigurations/Benchmarks.xml @@ -1,8 +1,8 @@ -