From 657c7d8834fee0a809ea1357d363acd62d88b257 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Thu, 11 Nov 2021 19:41:48 +0300 Subject: [PATCH 01/15] Update iOS native references and linker flags in line with framework changes --- osu.iOS.props | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/osu.iOS.props b/osu.iOS.props index 1852957e87..6747c3aee1 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -4,12 +4,10 @@ {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Resources PackageReference - --nolinkaway - -lstdc++ -lbz2 -framework AudioToolbox -framework AVFoundation -framework CoreMedia -framework VideoToolbox -framework SystemConfiguration -framework CFNetwork -framework Accelerate bin\$(Platform)\$(Configuration) cjk,mideast,other,rare,west false - $(DefaultMtouchExtraArgs) -gcc_flags "$(DefaultMtouchGccFlags)" + --nolinkaway NSUrlSessionHandler iPhone Developer @@ -49,18 +47,6 @@ true 28126 - - - Static - False - True - - - Static - False - True - - From 8c9d39700d66af8c12ff2a82a46f39a8ea241b19 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Thu, 11 Nov 2021 20:22:32 +0300 Subject: [PATCH 02/15] Update deprecated code in iOS main entry --- osu.iOS/Application.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osu.iOS/Application.cs b/osu.iOS/Application.cs index 740937e0e1..ffabdb4698 100644 --- a/osu.iOS/Application.cs +++ b/osu.iOS/Application.cs @@ -1,6 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.iOS; using UIKit; namespace osu.iOS @@ -9,7 +10,7 @@ namespace osu.iOS { public static void Main(string[] args) { - UIApplication.Main(args, "GameUIApplication", "AppDelegate"); + UIApplication.Main(args, typeof(GameUIApplication), typeof(AppDelegate)); } } } From 4b5ff3288f43b0e3826a4052315f1b66c9e6a205 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Mon, 15 Nov 2021 07:44:42 +0300 Subject: [PATCH 03/15] Add generated mtouch symbol strip flags to osu! --- osu.iOS.props | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/osu.iOS.props b/osu.iOS.props index 6747c3aee1..f81217d6dd 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -7,12 +7,16 @@ bin\$(Platform)\$(Configuration) cjk,mideast,other,rare,west false - --nolinkaway NSUrlSessionHandler iPhone Developer true + + + --nosymbolstrip=BASS_FX_BPM_BeatCallbackReset --nosymbolstrip=BASS_FX_BPM_BeatCallbackSet --nosymbolstrip=BASS_FX_BPM_BeatDecodeGet --nosymbolstrip=BASS_FX_BPM_BeatFree --nosymbolstrip=BASS_FX_BPM_BeatGetParameters --nosymbolstrip=BASS_FX_BPM_BeatSetParameters --nosymbolstrip=BASS_FX_BPM_CallbackReset --nosymbolstrip=BASS_FX_BPM_CallbackSet --nosymbolstrip=BASS_FX_BPM_DecodeGet --nosymbolstrip=BASS_FX_BPM_Free --nosymbolstrip=BASS_FX_BPM_Translate --nosymbolstrip=BASS_FX_GetVersion --nosymbolstrip=BASS_FX_ReverseCreate --nosymbolstrip=BASS_FX_ReverseGetSource --nosymbolstrip=BASS_FX_TempoCreate --nosymbolstrip=BASS_FX_TempoGetRateRatio --nosymbolstrip=BASS_FX_TempoGetSource --nosymbolstrip=BASS_Mixer_ChannelFlags --nosymbolstrip=BASS_Mixer_ChannelGetData --nosymbolstrip=BASS_Mixer_ChannelGetEnvelopePos --nosymbolstrip=BASS_Mixer_ChannelGetLevel --nosymbolstrip=BASS_Mixer_ChannelGetLevelEx --nosymbolstrip=BASS_Mixer_ChannelGetMatrix --nosymbolstrip=BASS_Mixer_ChannelGetMixer --nosymbolstrip=BASS_Mixer_ChannelGetPosition --nosymbolstrip=BASS_Mixer_ChannelGetPositionEx --nosymbolstrip=BASS_Mixer_ChannelIsActive --nosymbolstrip=BASS_Mixer_ChannelRemove --nosymbolstrip=BASS_Mixer_ChannelRemoveSync --nosymbolstrip=BASS_Mixer_ChannelSetEnvelope --nosymbolstrip=BASS_Mixer_ChannelSetEnvelopePos --nosymbolstrip=BASS_Mixer_ChannelSetMatrix --nosymbolstrip=BASS_Mixer_ChannelSetMatrixEx --nosymbolstrip=BASS_Mixer_ChannelSetPosition --nosymbolstrip=BASS_Mixer_ChannelSetSync --nosymbolstrip=BASS_Mixer_GetVersion --nosymbolstrip=BASS_Mixer_StreamAddChannel --nosymbolstrip=BASS_Mixer_StreamAddChannelEx --nosymbolstrip=BASS_Mixer_StreamCreate --nosymbolstrip=BASS_Mixer_StreamGetChannels --nosymbolstrip=BASS_Split_StreamCreate --nosymbolstrip=BASS_Split_StreamGetAvailable --nosymbolstrip=BASS_Split_StreamGetSource --nosymbolstrip=BASS_Split_StreamGetSplits --nosymbolstrip=BASS_Split_StreamReset --nosymbolstrip=BASS_Split_StreamResetEx + --nolinkaway $(GeneratedMtouchSymbolStripFlags) + true full From 4c5599295cd9462167b402ea4f5d2742d35c9544 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Mon, 15 Nov 2021 12:20:57 +0300 Subject: [PATCH 04/15] Update more obsolete usages --- osu.Game.Rulesets.Catch.Tests.iOS/Application.cs | 3 ++- osu.Game.Rulesets.Mania.Tests.iOS/Application.cs | 3 ++- osu.Game.Rulesets.Osu.Tests.iOS/Application.cs | 3 ++- osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs | 3 ++- osu.Game.Tests.iOS/Application.cs | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs b/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs index f7f07ef938..e44868e133 100644 --- a/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs +++ b/osu.Game.Rulesets.Catch.Tests.iOS/Application.cs @@ -1,6 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.iOS; using UIKit; namespace osu.Game.Rulesets.Catch.Tests.iOS @@ -9,7 +10,7 @@ namespace osu.Game.Rulesets.Catch.Tests.iOS { public static void Main(string[] args) { - UIApplication.Main(args, "GameUIApplication", "AppDelegate"); + UIApplication.Main(args, typeof(GameUIApplication), typeof(AppDelegate)); } } } diff --git a/osu.Game.Rulesets.Mania.Tests.iOS/Application.cs b/osu.Game.Rulesets.Mania.Tests.iOS/Application.cs index c381ea585d..ec3db17e97 100644 --- a/osu.Game.Rulesets.Mania.Tests.iOS/Application.cs +++ b/osu.Game.Rulesets.Mania.Tests.iOS/Application.cs @@ -1,6 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.iOS; using UIKit; namespace osu.Game.Rulesets.Mania.Tests.iOS @@ -9,7 +10,7 @@ namespace osu.Game.Rulesets.Mania.Tests.iOS { public static void Main(string[] args) { - UIApplication.Main(args, "GameUIApplication", "AppDelegate"); + UIApplication.Main(args, typeof(GameUIApplication), typeof(AppDelegate)); } } } diff --git a/osu.Game.Rulesets.Osu.Tests.iOS/Application.cs b/osu.Game.Rulesets.Osu.Tests.iOS/Application.cs index b36d0b5728..be38a883d7 100644 --- a/osu.Game.Rulesets.Osu.Tests.iOS/Application.cs +++ b/osu.Game.Rulesets.Osu.Tests.iOS/Application.cs @@ -1,6 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.iOS; using UIKit; namespace osu.Game.Rulesets.Osu.Tests.iOS @@ -9,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Tests.iOS { public static void Main(string[] args) { - UIApplication.Main(args, "GameUIApplication", "AppDelegate"); + UIApplication.Main(args, typeof(GameUIApplication), typeof(AppDelegate)); } } } diff --git a/osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs b/osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs index 73faf16d9f..9fde65a074 100644 --- a/osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs +++ b/osu.Game.Rulesets.Taiko.Tests.iOS/Application.cs @@ -1,6 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.iOS; using UIKit; namespace osu.Game.Rulesets.Taiko.Tests.iOS @@ -9,7 +10,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.iOS { public static void Main(string[] args) { - UIApplication.Main(args, "GameUIApplication", "AppDelegate"); + UIApplication.Main(args, typeof(GameUIApplication), typeof(AppDelegate)); } } } diff --git a/osu.Game.Tests.iOS/Application.cs b/osu.Game.Tests.iOS/Application.cs index 9533b90131..585b495c96 100644 --- a/osu.Game.Tests.iOS/Application.cs +++ b/osu.Game.Tests.iOS/Application.cs @@ -1,6 +1,7 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using osu.Framework.iOS; using UIKit; namespace osu.Game.Tests.iOS @@ -9,7 +10,7 @@ namespace osu.Game.Tests.iOS { public static void Main(string[] args) { - UIApplication.Main(args, "GameUIApplication", "AppDelegate"); + UIApplication.Main(args, typeof(GameUIApplication), typeof(AppDelegate)); } } } From 77c0b8dfa937a76ed071b1c195e4e2f6939a7080 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 Nov 2021 13:27:06 +0900 Subject: [PATCH 05/15] Fix stray typo --- osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs b/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs index 026442f328..506d65f761 100644 --- a/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs +++ b/osu.Game/Migrations/20180628011956_RemoveNegativeSetIDs.cs @@ -6,7 +6,7 @@ namespace osu.Game.Migrations { protected override void Up(MigrationBuilder migrationBuilder) { - // There was a change that baetmaps were being loaded with "-1" online IDs, which is completely incorrect. + // There was a change that beatmaps were being loaded with "-1" online IDs, which is completely incorrect. // This ensures there will not be unique key conflicts as a result of these incorrectly imported beatmaps. migrationBuilder.Sql("UPDATE BeatmapSetInfo SET OnlineBeatmapSetID = null WHERE OnlineBeatmapSetID <= 0"); } From c901a4fd7e5c25b816cf4fa2280b6c1c175046a7 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 Nov 2021 13:27:28 +0900 Subject: [PATCH 06/15] Show better error message when selecting an unavailable beatmap during multiplayer room creation --- .../Match/MultiplayerMatchSettingsOverlay.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs index 5bc76a10bc..90feea4e6e 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs @@ -365,7 +365,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match { Debug.Assert(applyingSettingsOperation != null); - ErrorText.Text = text; + // see https://github.com/ppy/osu-web/blob/2c97aaeb64fb4ed97c747d8383a35b30f57428c7/app/Models/Multiplayer/PlaylistItem.php#L48. + const string not_found_prefix = "beatmaps not found:"; + + if (text.StartsWith(not_found_prefix, StringComparison.Ordinal)) + { + ErrorText.Text = "The selected beatmap is not available online."; + SelectedItem.Value.MarkInvalid(); + } + else + { + ErrorText.Text = text; + } + ErrorText.FadeIn(50); applyingSettingsOperation.Dispose(); From 284e554cbffdb25c967957a096cb8259bc364747 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 Nov 2021 13:58:03 +0900 Subject: [PATCH 07/15] Only show user displayable portion of server errors when seleting a song in multiplayer --- .../Multiplayer/MultiplayerMatchSongSelect.cs | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs index ad4bb90551..9ae352b3e7 100644 --- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs +++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs @@ -1,6 +1,9 @@ // Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence. // See the LICENCE file in the repository root for full licence text. +using System; +using System.Diagnostics; +using Microsoft.AspNetCore.SignalR; using osu.Framework.Allocation; using osu.Framework.Logging; using osu.Framework.Screens; @@ -60,13 +63,28 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer { loadingLayer.Hide(); - if (t.IsCompletedSuccessfully) - this.Exit(); - else + if (t.IsFaulted) { - Logger.Log($"Could not use current beatmap ({t.Exception?.Message})", level: LogLevel.Important); + Exception exception = t.Exception; + + if (exception is AggregateException ae) + exception = ae.InnerException; + + Debug.Assert(exception != null); + + string message = exception is HubException + // HubExceptions arrive with additional message context added, but we want to display the human readable message: + // "An unexpected error occurred invoking 'AddPlaylistItem' on the server.InvalidStateException: Can't enqueue more than 3 items at once." + // We generally use the message field for a user-parseable error (eventually to be replaced), so drop the first part for now. + ? exception.Message.Substring(exception.Message.IndexOf(':') + 1).Trim() + : exception.Message; + + Logger.Log(message, level: LogLevel.Important); Carousel.AllowSelection = true; + return; } + + this.Exit(); }); }); } From 6dc6ca1bbb67296931c47a32255aad866f22f192 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 Nov 2021 14:03:07 +0900 Subject: [PATCH 08/15] Fix potential null reference in `FadeAccessibleBackground` test class --- osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs index 69ea1dc520..194341d1ab 100644 --- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs +++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs @@ -428,7 +428,7 @@ namespace osu.Game.Tests.Visual.Background public float CurrentDim => dimmable.DimLevel; - public Vector2 CurrentBlur => Background.BlurSigma; + public Vector2 CurrentBlur => Background?.BlurSigma ?? Vector2.Zero; private TestDimmableBackground dimmable; From 215c179b929a29e0c083422f29a6031f9450ffe3 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Fri, 19 Nov 2021 16:16:20 +0900 Subject: [PATCH 09/15] Run nunit in blame mode --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68f8ef51ef..2139572601 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: run: dotnet build -c Debug -warnaserror osu.Desktop.slnf - name: Test - run: dotnet test $pwd/*.Tests/bin/Debug/*/*.Tests.dll --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx" + run: dotnet test $pwd/*.Tests/bin/Debug/*/*.Tests.dll --blame-crash --blame-hang --blame-hang-timeout 5m --logger "trx;LogFileName=TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx" shell: pwsh # Attempt to upload results even if test fails. @@ -48,7 +48,7 @@ jobs: if: ${{ always() }} with: name: osu-test-results-${{matrix.os.prettyname}}-${{matrix.threadingMode}} - path: ${{github.workspace}}/TestResults/TestResults-${{matrix.os.prettyname}}-${{matrix.threadingMode}}.trx + path: ${{github.workspace}}/TestResults/**/* build-only-android: name: Build only (Android) From 5d252f6fc09da218c857883aa0f55d6d81c1d460 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Thu, 18 Nov 2021 16:50:07 +0300 Subject: [PATCH 10/15] Add rider autogenerated .idea files for iOS solution filter --- .idea/.idea.osu.iOS/.idea/.name | 1 + .idea/.idea.osu.iOS/.idea/indexLayout.xml | 8 ++++++++ .idea/.idea.osu.iOS/.idea/misc.xml | 6 ++++++ .idea/.idea.osu.iOS/.idea/projectSettingsUpdater.xml | 6 ++++++ .idea/.idea.osu.iOS/.idea/vcs.xml | 6 ++++++ 5 files changed, 27 insertions(+) create mode 100644 .idea/.idea.osu.iOS/.idea/.name create mode 100644 .idea/.idea.osu.iOS/.idea/indexLayout.xml create mode 100644 .idea/.idea.osu.iOS/.idea/misc.xml create mode 100644 .idea/.idea.osu.iOS/.idea/projectSettingsUpdater.xml create mode 100644 .idea/.idea.osu.iOS/.idea/vcs.xml diff --git a/.idea/.idea.osu.iOS/.idea/.name b/.idea/.idea.osu.iOS/.idea/.name new file mode 100644 index 0000000000..0dba29f2dc --- /dev/null +++ b/.idea/.idea.osu.iOS/.idea/.name @@ -0,0 +1 @@ +osu.iOS \ No newline at end of file diff --git a/.idea/.idea.osu.iOS/.idea/indexLayout.xml b/.idea/.idea.osu.iOS/.idea/indexLayout.xml new file mode 100644 index 0000000000..7b08163ceb --- /dev/null +++ b/.idea/.idea.osu.iOS/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.osu.iOS/.idea/misc.xml b/.idea/.idea.osu.iOS/.idea/misc.xml new file mode 100644 index 0000000000..1d8c84d0af --- /dev/null +++ b/.idea/.idea.osu.iOS/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/.idea.osu.iOS/.idea/projectSettingsUpdater.xml b/.idea/.idea.osu.iOS/.idea/projectSettingsUpdater.xml new file mode 100644 index 0000000000..4bb9f4d2a0 --- /dev/null +++ b/.idea/.idea.osu.iOS/.idea/projectSettingsUpdater.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/.idea.osu.iOS/.idea/vcs.xml b/.idea/.idea.osu.iOS/.idea/vcs.xml new file mode 100644 index 0000000000..94a25f7f4c --- /dev/null +++ b/.idea/.idea.osu.iOS/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From eb1bcf941f06f4ffd8ee1cba6c06d7a4fb42d089 Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Fri, 19 Nov 2021 15:11:33 +0300 Subject: [PATCH 11/15] Sync `DiffPlex` dependency version with game project --- osu.iOS.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.iOS.props b/osu.iOS.props index f81217d6dd..b4306d8a0b 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -78,7 +78,7 @@ - + From 96a5136c537361b277e1f9788fc6b777dc39ef8b Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Fri, 19 Nov 2021 17:56:07 +0300 Subject: [PATCH 12/15] 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 cbd1c92fbe..25c68343c7 100644 --- a/osu.Android.props +++ b/osu.Android.props @@ -52,7 +52,7 @@ - + diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 6b722f00ea..e175444724 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -36,7 +36,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/osu.iOS.props b/osu.iOS.props index ce78bafb6d..aed6860f21 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -60,7 +60,7 @@ - + @@ -83,7 +83,7 @@ - + From e0629ba81c3afa3caac9ea1851cace6ad3f624e8 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 20 Nov 2021 13:31:10 +0900 Subject: [PATCH 13/15] Update all dependencies --- .../osu.Game.Rulesets.EmptyFreeform.Tests.csproj | 2 +- .../osu.Game.Rulesets.Pippidon.Tests.csproj | 2 +- .../osu.Game.Rulesets.EmptyScrolling.Tests.csproj | 2 +- .../osu.Game.Rulesets.Pippidon.Tests.csproj | 2 +- osu.Game.Benchmarks/osu.Game.Benchmarks.csproj | 2 +- .../osu.Game.Rulesets.Catch.Tests.csproj | 2 +- .../osu.Game.Rulesets.Mania.Tests.csproj | 2 +- .../osu.Game.Rulesets.Osu.Tests.csproj | 2 +- .../osu.Game.Rulesets.Taiko.Tests.csproj | 2 +- osu.Game.Tests/osu.Game.Tests.csproj | 2 +- .../osu.Game.Tournament.Tests.csproj | 2 +- osu.Game/osu.Game.csproj | 10 +++++----- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj index e9b92be0c3..3c6aaa39ca 100644 --- a/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj +++ b/Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj index e145dd7b69..0719dd30df 100644 --- a/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj +++ b/Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj index a301432a6c..d0db43cc81 100644 --- a/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj +++ b/Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj index e145dd7b69..0719dd30df 100644 --- a/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj +++ b/Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj index 03f39f226c..57b914bee6 100644 --- a/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj +++ b/osu.Game.Benchmarks/osu.Game.Benchmarks.csproj @@ -9,7 +9,7 @@ - + diff --git a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj index 4c8b9b2b08..13f2e25f05 100644 --- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj +++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj @@ -4,7 +4,7 @@ - + diff --git a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj index fad39ef9d6..d51a6da4f9 100644 --- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj +++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj @@ -4,7 +4,7 @@ - + diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj index 66f4ad3d3f..fea2e408f6 100644 --- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj +++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj index 568e35c221..ad3713e047 100644 --- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj +++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj @@ -4,7 +4,7 @@ - + diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index 57815d9273..3b115d43e5 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj index c0f94d49c7..130fcfaca1 100644 --- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj +++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj @@ -7,7 +7,7 @@ - + WinExe diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 6b722f00ea..2f26e45ba8 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -20,8 +20,8 @@ - - + + @@ -35,10 +35,10 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + From 50e18ccebbb8536d1422ad1700f3b699e054c75e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 20 Nov 2021 15:14:06 +0900 Subject: [PATCH 14/15] Update dependencies in mobile props files --- osu.Android.props | 4 ++-- osu.iOS.props | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Android.props b/osu.Android.props index cbd1c92fbe..d80fb858e9 100644 --- a/osu.Android.props +++ b/osu.Android.props @@ -52,10 +52,10 @@ - + - + diff --git a/osu.iOS.props b/osu.iOS.props index 00cbe2c849..07b529b5cd 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -70,7 +70,7 @@ - + @@ -99,6 +99,6 @@ - + From a8a2ffde420503aedf88507e1340270664e829cb Mon Sep 17 00:00:00 2001 From: Salman Ahmed Date: Sat, 20 Nov 2021 12:01:42 +0300 Subject: [PATCH 15/15] Sync iOS transitive dependency versions with game --- osu.iOS.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.iOS.props b/osu.iOS.props index 07b529b5cd..fbbccdc069 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -88,12 +88,12 @@ - - + + - +