diff --git a/osu.Android.props b/osu.Android.props
index 75ac298626..3682a44b9f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
-
+
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index a2638e95c8..2051beae21 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -53,5 +53,10 @@
+
+
+ 5.0.0
+
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
index 88b420ffad..2e6c10a02e 100644
--- a/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Catch.Tests.Android/osu.Game.Rulesets.Catch.Tests.Android.csproj
@@ -35,5 +35,10 @@
osu.Game
+
+
+ 5.0.0
+
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
index 0e557cb260..8c134c7114 100644
--- a/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Mania.Tests.Android/osu.Game.Rulesets.Mania.Tests.Android.csproj
@@ -35,5 +35,10 @@
osu.Game
+
+
+ 5.0.0
+
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
index dcf1573522..22fa605176 100644
--- a/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Osu.Tests.Android/osu.Game.Rulesets.Osu.Tests.Android.csproj
@@ -35,5 +35,10 @@
osu.Game
+
+
+ 5.0.0
+
+
\ No newline at end of file
diff --git a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
index 392442b713..a48110b354 100644
--- a/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests.Android/osu.Game.Rulesets.Taiko.Tests.Android.csproj
@@ -35,5 +35,10 @@
osu.Game
+
+
+ 5.0.0
+
+
\ No newline at end of file
diff --git a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
index c3d9cb5875..bf256f486c 100644
--- a/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
+++ b/osu.Game.Tests.Android/osu.Game.Tests.Android.csproj
@@ -75,6 +75,9 @@
+
+ 5.0.0
+
diff --git a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
index ab24a72a12..77f910c144 100644
--- a/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
+++ b/osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Online
var deserialized = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(apiMod));
- Assert.That(deserialized.Acronym, Is.EqualTo(apiMod.Acronym));
+ Assert.That(deserialized?.Acronym, Is.EqualTo(apiMod.Acronym));
}
[Test]
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Online
var deserialized = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(apiMod));
- Assert.That(deserialized.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
+ Assert.That(deserialized?.Settings, Contains.Key("test_setting").With.ContainValue(2.0));
}
[Test]
@@ -44,9 +44,9 @@ namespace osu.Game.Tests.Online
var apiMod = new APIMod(new TestMod { TestSetting = { Value = 2 } });
var deserialized = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(apiMod));
- var converted = (TestMod)deserialized.ToMod(new TestRuleset());
+ var converted = (TestMod)deserialized?.ToMod(new TestRuleset());
- Assert.That(converted.TestSetting.Value, Is.EqualTo(2));
+ Assert.That(converted?.TestSetting.Value, Is.EqualTo(2));
}
[Test]
@@ -61,11 +61,11 @@ namespace osu.Game.Tests.Online
});
var deserialised = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(apiMod));
- var converted = (TestModTimeRamp)deserialised.ToMod(new TestRuleset());
+ var converted = (TestModTimeRamp)deserialised?.ToMod(new TestRuleset());
- Assert.That(converted.AdjustPitch.Value, Is.EqualTo(false));
- Assert.That(converted.InitialRate.Value, Is.EqualTo(1.25));
- Assert.That(converted.FinalRate.Value, Is.EqualTo(0.25));
+ Assert.That(converted?.AdjustPitch.Value, Is.EqualTo(false));
+ Assert.That(converted?.InitialRate.Value, Is.EqualTo(1.25));
+ Assert.That(converted?.FinalRate.Value, Is.EqualTo(0.25));
}
[Test]
@@ -78,10 +78,10 @@ namespace osu.Game.Tests.Online
});
var deserialised = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(apiMod));
- var converted = (TestModDifficultyAdjust)deserialised.ToMod(new TestRuleset());
+ var converted = (TestModDifficultyAdjust)deserialised?.ToMod(new TestRuleset());
- Assert.That(converted.ExtendedLimits.Value, Is.True);
- Assert.That(converted.OverallDifficulty.Value, Is.EqualTo(11));
+ Assert.That(converted?.ExtendedLimits.Value, Is.True);
+ Assert.That(converted?.OverallDifficulty.Value, Is.EqualTo(11));
}
private class TestRuleset : Ruleset
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 582f72429b..aa1be143ea 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
+using System.Diagnostics;
using System.IO;
using System.Linq;
using Newtonsoft.Json;
@@ -43,10 +44,13 @@ namespace osu.Game.Tournament.Screens.Editors
private void addAllCountries()
{
List countries;
+
using (Stream stream = game.Resources.GetStream("Resources/countries.json"))
using (var sr = new StreamReader(stream))
countries = JsonConvert.DeserializeObject>(sr.ReadToEnd());
+ Debug.Assert(countries != null);
+
foreach (var c in countries)
Storage.Add(c);
}
diff --git a/osu.Game/Input/Handlers/ReplayInputHandler.cs b/osu.Game/Input/Handlers/ReplayInputHandler.cs
index 93ed3ca884..fba1bee0b8 100644
--- a/osu.Game/Input/Handlers/ReplayInputHandler.cs
+++ b/osu.Game/Input/Handlers/ReplayInputHandler.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Input.Handlers
public override bool IsActive => true;
- public override int Priority => 0;
-
public class ReplayState : IInput
where T : struct
{
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b90c938a8b..6d571218fc 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,20 +18,20 @@
-
+
-
-
-
+
+
+
-
-
+
+
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index ce182a3054..ceb46eae87 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
-
+
@@ -93,7 +93,7 @@
-
+