From ac6213d1fadd8362580b482de0b1355981a25c8e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 17 Nov 2017 14:26:33 +0900
Subject: [PATCH] CI fixes

---
 osu.Game.Rulesets.Catch/CatchDifficultyCalculator.cs           | 2 +-
 osu.Game.Rulesets.Mania/ManiaDifficultyCalculator.cs           | 2 +-
 osu.Game.Rulesets.Osu/Mods/OsuMod.cs                           | 1 -
 osu.Game.Rulesets.Osu/OsuDifficulty/OsuDifficultyCalculator.cs | 2 +-
 osu.Game.Rulesets.Osu/OsuRuleset.cs                            | 1 -
 osu.Game.Rulesets.Taiko/TaikoDifficultyCalculator.cs           | 2 +-
 osu.Game/Beatmaps/DifficultyCalculator.cs                      | 2 +-
 osu.Game/Rulesets/Mods/IApplicableToHitObject.cs               | 2 +-
 osu.Game/Rulesets/Ruleset.cs                                   | 1 -
 9 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/CatchDifficultyCalculator.cs
index 127fde74ef..db88e04dd0 100644
--- a/osu.Game.Rulesets.Catch/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/CatchDifficultyCalculator.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Catch
         {
         }
 
-        public override double Calculate(Dictionary<string, string> categoryDifficulty) => 0;
+        public override double Calculate(Dictionary<string, string> categoryDifficulty = null) => 0;
 
         protected override BeatmapConverter<CatchBaseHit> CreateBeatmapConverter() => new CatchBeatmapConverter();
     }
diff --git a/osu.Game.Rulesets.Mania/ManiaDifficultyCalculator.cs b/osu.Game.Rulesets.Mania/ManiaDifficultyCalculator.cs
index d5c6d21131..070fc2b4dd 100644
--- a/osu.Game.Rulesets.Mania/ManiaDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Mania/ManiaDifficultyCalculator.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania
         {
         }
 
-        public override double Calculate(Dictionary<string, string> categoryDifficulty) => 0;
+        public override double Calculate(Dictionary<string, string> categoryDifficulty = null) => 0;
 
         protected override BeatmapConverter<ManiaHitObject> CreateBeatmapConverter() => new ManiaBeatmapConverter(true, (int)Math.Max(1, Math.Round(Beatmap.BeatmapInfo.BaseDifficulty.CircleSize)));
     }
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuMod.cs b/osu.Game.Rulesets.Osu/Mods/OsuMod.cs
index 596fe27504..71349285b3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuMod.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuMod.cs
@@ -9,7 +9,6 @@ using osu.Game.Rulesets.Osu.Objects;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
diff --git a/osu.Game.Rulesets.Osu/OsuDifficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/OsuDifficulty/OsuDifficultyCalculator.cs
index 9f279ccae4..f7909f8335 100644
--- a/osu.Game.Rulesets.Osu/OsuDifficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/OsuDifficulty/OsuDifficultyCalculator.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty
                 (h as Slider)?.Curve?.Calculate();
         }
 
-        public override double Calculate(Dictionary<string, string> categoryDifficulty)
+        public override double Calculate(Dictionary<string, string> categoryDifficulty = null)
         {
             OsuDifficultyBeatmap beatmap = new OsuDifficultyBeatmap(Beatmap.HitObjects);
             Skill[] skills =
diff --git a/osu.Game.Rulesets.Osu/OsuRuleset.cs b/osu.Game.Rulesets.Osu/OsuRuleset.cs
index 8b7a014ea8..9c11474f97 100644
--- a/osu.Game.Rulesets.Osu/OsuRuleset.cs
+++ b/osu.Game.Rulesets.Osu/OsuRuleset.cs
@@ -14,7 +14,6 @@ using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Settings;
 using osu.Framework.Input.Bindings;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Osu
 {
diff --git a/osu.Game.Rulesets.Taiko/TaikoDifficultyCalculator.cs b/osu.Game.Rulesets.Taiko/TaikoDifficultyCalculator.cs
index adb7ace5f9..e06582500f 100644
--- a/osu.Game.Rulesets.Taiko/TaikoDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Taiko/TaikoDifficultyCalculator.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Taiko
         {
         }
 
-        public override double Calculate(Dictionary<string, string> categoryDifficulty)
+        public override double Calculate(Dictionary<string, string> categoryDifficulty = null)
         {
             // Fill our custom DifficultyHitObject class, that carries additional information
             difficultyHitObjects.Clear();
diff --git a/osu.Game/Beatmaps/DifficultyCalculator.cs b/osu.Game/Beatmaps/DifficultyCalculator.cs
index 3c32b718bc..351154623e 100644
--- a/osu.Game/Beatmaps/DifficultyCalculator.cs
+++ b/osu.Game/Beatmaps/DifficultyCalculator.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Beatmaps
         {
         }
 
-        protected DifficultyCalculator(Beatmap beatmap, Mod[] mods)
+        protected DifficultyCalculator(Beatmap beatmap, Mod[] mods = null)
         {
             Beatmap = CreateBeatmapConverter().Convert(beatmap);
             Mods = mods ?? new Mod[0];
diff --git a/osu.Game/Rulesets/Mods/IApplicableToHitObject.cs b/osu.Game/Rulesets/Mods/IApplicableToHitObject.cs
index 099234d9c1..7f39def343 100644
--- a/osu.Game/Rulesets/Mods/IApplicableToHitObject.cs
+++ b/osu.Game/Rulesets/Mods/IApplicableToHitObject.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Mods
     /// <summary>
     /// An interface for <see cref="Mod"/>s that can be applied to <see cref="HitObject"/>s.
     /// </summary>
-    public interface IApplicableToHitObject<TObject>
+    public interface IApplicableToHitObject<in TObject>
         where TObject : HitObject
     {
         /// <summary>
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index e8919c4bda..ed2fdf4157 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -10,7 +10,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Settings;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets