Merge branch 'master' into Cakefy_osu!

osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj

@@ -5,6 +5,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs

@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
+using OpenTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -18,9 +19,6 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         public const float BASE_WIDTH = 512;
 
-        protected override Container<Drawable> Content => content;
-        private readonly Container<Drawable> content;
-
         private readonly CatcherArea catcherArea;
 
         protected override bool UserScrollSpeedAdjustment => false;
@@ -28,7 +26,6 @@ namespace osu.Game.Rulesets.Catch.UI
         protected override SpeedChangeVisualisationMethod VisualisationMethod => SpeedChangeVisualisationMethod.Constant;
 
         public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> getVisualRepresentation)
-            : base(BASE_WIDTH)
         {
             Direction.Value = ScrollingDirection.Down;
 
@@ -37,27 +34,27 @@ namespace osu.Game.Rulesets.Catch.UI
             Anchor = Anchor.TopCentre;
             Origin = Anchor.TopCentre;
 
-            base.Content.Anchor = Anchor.BottomLeft;
+            Size = new Vector2(0.86f); // matches stable's vertical offset for catcher plate
-            base.Content.Origin = Anchor.BottomLeft;
 
-            base.Content.AddRange(new Drawable[]
+            InternalChild = new PlayfieldAdjustmentContainer
             {
-                explodingFruitContainer = new Container
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    explodingFruitContainer = new Container
-                },
+                    {
-                catcherArea = new CatcherArea(difficulty)
+                        RelativeSizeAxes = Axes.Both,
-                {
+                    },
-                    GetVisualRepresentation = getVisualRepresentation,
+                    catcherArea = new CatcherArea(difficulty)
-                    ExplodingFruitTarget = explodingFruitContainer,
+                    {
-                    Anchor = Anchor.BottomLeft,
+                        GetVisualRepresentation = getVisualRepresentation,
-                    Origin = Anchor.TopLeft,
+                        ExplodingFruitTarget = explodingFruitContainer,
-                },
+                        Anchor = Anchor.BottomLeft,
-                content = new Container<Drawable>
+                        Origin = Anchor.TopLeft,
-                {
+                    },
-                    RelativeSizeAxes = Axes.Both,
+                    HitObjectContainer
-                },
+                }
-            });
+            };
 
             VisibleTimeRange.Value = BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
         }

osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs

@@ -13,7 +13,6 @@ using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -32,8 +31,6 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public override PassThroughInputManager CreateInputManager() => new CatchInputManager(Ruleset.RulesetInfo);
 
-        protected override Vector2 PlayfieldArea => new Vector2(0.86f); // matches stable's vertical offset for catcher plate
-
         protected override DrawableHitObject<CatchHitObject> GetVisualRepresentation(CatchHitObject h)
         {
             switch (h)

osu.Game.Rulesets.Catch/UI/CatcherArea.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Catch.UI
 {
     public class CatcherArea : Container
     {
-        public const float CATCHER_SIZE = 84;
+        public const float CATCHER_SIZE = 100;
 
         protected readonly Catcher MovableCatcher;
 

osu.Game.Rulesets.Catch/UI/PlayfieldAdjustmentContainer.cs

@@ -0,0 +1,42 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using OpenTK;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    public class PlayfieldAdjustmentContainer : Container
+    {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        public PlayfieldAdjustmentContainer()
+        {
+            InternalChild = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                FillMode = FillMode.Fit,
+                FillAspectRatio = 4f / 3,
+                Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both }
+            };
+        }
+
+        /// <summary>
+        /// A <see cref="Container"/> which scales its content relative to a target width.
+        /// </summary>
+        private class ScalingContainer : Container
+        {
+            protected override void Update()
+            {
+                base.Update();
+
+                Scale = new Vector2(Parent.ChildSize.X / CatchPlayfield.BASE_WIDTH);
+                Size = Vector2.Divide(Vector2.One, Scale);
+            }
+        }
+    }
+}

osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj

@@ -2,9 +2,10 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs

@@ -20,8 +20,7 @@ namespace osu.Game.Rulesets.Mania.Edit
         {
             Anchor = Anchor.Centre,
             Origin = Anchor.Centre,
+            Size = Vector2.One
         };
-
-        protected override Vector2 PlayfieldArea => Vector2.One;
     }
 }

osu.Game.Rulesets.Mania/UI/Column.cs

@@ -30,8 +30,6 @@ namespace osu.Game.Rulesets.Mania.UI
         internal readonly Container TopLevelContainer;
         private readonly Container explosionContainer;
 
-        protected override Container<Drawable> Content => hitObjectArea;
-
         public Column()
         {
             RelativeSizeAxes = Axes.Y;
@@ -54,7 +52,10 @@ namespace osu.Game.Rulesets.Mania.UI
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        hitObjectArea = new ColumnHitObjectArea { RelativeSizeAxes = Axes.Both },
+                        hitObjectArea = new ColumnHitObjectArea(HitObjectContainer)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        },
                         explosionContainer = new Container
                         {
                             Name = "Hit explosions",

osu.Game.Rulesets.Mania/UI/Components/ColumnHitObjectArea.cs

@@ -8,28 +8,24 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using OpenTK.Graphics;
 
 namespace osu.Game.Rulesets.Mania.UI.Components
 {
-    public class ColumnHitObjectArea : Container, IHasAccentColour
+    public class ColumnHitObjectArea : CompositeDrawable, IHasAccentColour
     {
         private const float hit_target_height = 10;
         private const float hit_target_bar_height = 2;
 
-        private Container<Drawable> content;
-        protected override Container<Drawable> Content => content;
-
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 
-        private Container hitTargetLine;
+        private readonly Container hitTargetLine;
+        private readonly Drawable hitTargetBar;
 
-        [BackgroundDependencyLoader]
+        public ColumnHitObjectArea(HitObjectContainer hitObjectContainer)
-        private void load(IScrollingInfo scrollingInfo)
         {
-            Drawable hitTargetBar;
-
             InternalChildren = new[]
             {
                 hitTargetBar = new Box
@@ -45,13 +41,13 @@ namespace osu.Game.Rulesets.Mania.UI.Components
                     Masking = true,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
-                content = new Container
+                hitObjectContainer
-                {
-                    Name = "Hit objects",
-                    RelativeSizeAxes = Axes.Both,
-                },
             };
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(IScrollingInfo scrollingInfo)
+        {
             direction.BindTo(scrollingInfo.Direction);
             direction.BindValueChanged(direction =>
             {

osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs

@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Mania.Beatmaps;
 using osu.Game.Rulesets.Mania.Configuration;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using OpenTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -25,6 +26,8 @@ namespace osu.Game.Rulesets.Mania.UI
             if (stageDefinitions.Count <= 0)
                 throw new ArgumentException("Can't have zero or fewer stages.");
 
+            Size = new Vector2(1, 0.8f);
+
             GridContainer playfieldGrid;
             AddInternal(playfieldGrid = new GridContainer
             {

osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs

@@ -24,7 +24,6 @@ using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
-using OpenTK;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
@@ -110,8 +109,6 @@ namespace osu.Game.Rulesets.Mania.UI
             }
         }
 
-        protected override Vector2 PlayfieldArea => new Vector2(1, 0.8f);
-
         protected override ReplayInputHandler CreateReplayInputHandler(Replay replay) => new ManiaFramedReplayInputHandler(replay);
     }
 }

osu.Game.Rulesets.Mania/UI/ManiaScrollingPlayfield.cs

@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Rulesets.Mania.UI
 {
-    public class ManiaScrollingPlayfield : ScrollingPlayfield
+    public abstract class ManiaScrollingPlayfield : ScrollingPlayfield
     {
         private readonly IBindable<ScrollingDirection> direction = new Bindable<ScrollingDirection>();
 

osu.Game.Rulesets.Mania/UI/ManiaStage.cs

@@ -30,8 +30,7 @@ namespace osu.Game.Rulesets.Mania.UI
         public IReadOnlyList<Column> Columns => columnFlow.Children;
         private readonly FillFlowContainer<Column> columnFlow;
 
-        protected override Container<Drawable> Content => barLineContainer;
+        private readonly Container barLineContainer;
-        private readonly Container<Drawable> barLineContainer;
 
         public Container<DrawableManiaJudgement> Judgements => judgements;
         private readonly JudgementContainer<DrawableManiaJudgement> judgements;
@@ -105,6 +104,7 @@ namespace osu.Game.Rulesets.Mania.UI
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 RelativeSizeAxes = Axes.Y,
+                                Child = HitObjectContainer
                             }
                         },
                         judgements = new JudgementContainer<DrawableManiaJudgement>

osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj

@@ -2,9 +2,10 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs

@@ -4,6 +4,7 @@
 using osu.Framework.Graphics.Cursor;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.UI;
 using OpenTK;
 
 namespace osu.Game.Rulesets.Osu.Edit
@@ -15,8 +16,8 @@ namespace osu.Game.Rulesets.Osu.Edit
         {
         }
 
-        protected override Vector2 PlayfieldArea => Vector2.One;
-
         protected override CursorContainer CreateCursor() => null;
+
+        protected override Playfield CreatePlayfield() => new OsuPlayfield { Size = Vector2.One　};
     }
 }

osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
@@ -31,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Edit
             new HitObjectCompositionTool<Spinner>()
         };
 
-        protected override ScalableContainer CreateLayerContainer() => new ScalableContainer(OsuPlayfield.BASE_SIZE.X) { RelativeSizeAxes = Axes.Both };
+        protected override Container CreateLayerContainer() => new PlayfieldAdjustmentContainer { RelativeSizeAxes = Axes.Both };
 
         public override HitObjectMask CreateMaskFor(DrawableHitObject hitObject)
         {

osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs

@@ -23,29 +23,35 @@ namespace osu.Game.Rulesets.Osu.UI
         public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
 
         public OsuPlayfield()
-            : base(BASE_SIZE.X)
         {
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            AddRange(new Drawable[]
+            Size = new Vector2(0.75f);
+
+            InternalChild = new PlayfieldAdjustmentContainer
             {
-                connectionLayer = new FollowPointRenderer
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    connectionLayer = new FollowPointRenderer
-                    Depth = 2,
+                    {
-                },
+                        RelativeSizeAxes = Axes.Both,
-                judgementLayer = new JudgementContainer<DrawableOsuJudgement>
+                        Depth = 2,
-                {
+                    },
-                    RelativeSizeAxes = Axes.Both,
+                    judgementLayer = new JudgementContainer<DrawableOsuJudgement>
-                    Depth = 1,
+                    {
-                },
+                        RelativeSizeAxes = Axes.Both,
-                approachCircles = new Container
+                        Depth = 1,
-                {
+                    },
-                    RelativeSizeAxes = Axes.Both,
+                    HitObjectContainer,
-                    Depth = -1,
+                    approachCircles = new Container
-                },
+                    {
-            });
+                        RelativeSizeAxes = Axes.Both,
+                        Depth = -1,
+                    },
+                }
+            };
         }
 
         public override void Add(DrawableHitObject h)

osu.Game.Rulesets.Osu/UI/OsuRulesetContainer.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input;
-using OpenTK;
 using osu.Game.Beatmaps;
 using osu.Game.Input.Handlers;
 using osu.Game.Rulesets.Objects.Drawables;
@@ -58,12 +57,6 @@ namespace osu.Game.Rulesets.Osu.UI
             }
         }
 
-        protected override Vector2 GetAspectAdjustedSize()
-        {
-            var aspectSize = DrawSize.X * 0.75f < DrawSize.Y ? new Vector2(DrawSize.X, DrawSize.X * 0.75f) : new Vector2(DrawSize.Y * 4f / 3f, DrawSize.Y);
-            return new Vector2(aspectSize.X / DrawSize.X, aspectSize.Y / DrawSize.Y);
-        }
-
         protected override CursorContainer CreateCursor() => new GameplayCursor();
     }
 }

osu.Game.Rulesets.Osu/UI/PlayfieldAdjustmentContainer.cs

@@ -0,0 +1,42 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using OpenTK;
+
+namespace osu.Game.Rulesets.Osu.UI
+{
+    public class PlayfieldAdjustmentContainer : Container
+    {
+        protected override Container<Drawable> Content => content;
+        private readonly Container content;
+
+        public PlayfieldAdjustmentContainer()
+        {
+            InternalChild = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                FillMode = FillMode.Fit,
+                FillAspectRatio = 4f / 3,
+                Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both }
+            };
+        }
+
+        /// <summary>
+        /// A <see cref="Container"/> which scales its content relative to a target width.
+        /// </summary>
+        private class ScalingContainer : Container
+        {
+            protected override void Update()
+            {
+                base.Update();
+
+                Scale = new Vector2(Parent.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
+                Size = Vector2.Divide(Vector2.One, Scale);
+            }
+        }
+    }
+}

osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj

@@ -2,9 +2,10 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Rulesets.Taiko/UI/PlayfieldAdjustmentContainer.cs

@@ -0,0 +1,22 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics.Containers;
+using OpenTK;
+
+namespace osu.Game.Rulesets.Taiko.UI
+{
+    public class PlayfieldAdjustmentContainer : Container
+    {
+        private const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
+        private const float default_aspect = 16f / 9f;
+
+        protected override void Update()
+        {
+            base.Update();
+
+            float aspectAdjust = MathHelper.Clamp(Parent.ChildSize.X / Parent.ChildSize.Y, 0.4f, 4) / default_aspect;
+            Size = new Vector2(1, default_relative_height * aspectAdjust);
+        }
+    }
+}

osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs

@@ -47,9 +47,6 @@ namespace osu.Game.Rulesets.Taiko.UI
         private readonly Container<KiaiHitExplosion> kiaiExplosionContainer;
         private readonly JudgementContainer<DrawableTaikoJudgement> judgementContainer;
 
-        protected override Container<Drawable> Content => content;
-        private readonly Container content;
-
         private readonly Container topLevelHitContainer;
 
         private readonly Container barlineContainer;
@@ -64,138 +61,145 @@ namespace osu.Game.Rulesets.Taiko.UI
         {
             Direction.Value = ScrollingDirection.Left;
 
-            AddRangeInternal(new Drawable[]
+            InternalChild = new PlayfieldAdjustmentContainer
             {
-                backgroundContainer = new Container
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    Name = "Transparent playfield background",
+                    backgroundContainer = new Container
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    EdgeEffect = new EdgeEffectParameters
                     {
-                        Type = EdgeEffectType.Shadow,
+                        Name = "Transparent playfield background",
-                        Colour = Color4.Black.Opacity(0.2f),
+                        RelativeSizeAxes = Axes.Both,
-                        Radius = 5,
+                        Masking = true,
-                    },
+                        EdgeEffect = new EdgeEffectParameters
-                    Children = new Drawable[]
-                    {
-                        background = new Box
                         {
-                            RelativeSizeAxes = Axes.Both,
+                            Type = EdgeEffectType.Shadow,
-                            Alpha = 0.6f
+                            Colour = Color4.Black.Opacity(0.2f),
+                            Radius = 5,
                         },
-                    }
+                        Children = new Drawable[]
-                },
-                new Container
-                {
-                    Name = "Right area",
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Left = left_area_size },
-                    Children = new Drawable[]
-                    {
-                        new Container
                         {
-                            Name = "Masked elements before hit objects",
+                            background = new Box
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Masking = true,
-                            Children = new Drawable[]
                             {
-                                hitExplosionContainer = new Container<HitExplosion>
+                                RelativeSizeAxes = Axes.Both,
-                                {
+                                Alpha = 0.6f
-                                    RelativeSizeAxes = Axes.Both,
+                            },
-                                    FillMode = FillMode.Fit,
-                                    Blending = BlendingMode.Additive,
-                                },
-                                new HitTarget
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.Centre,
-                                    RelativeSizeAxes = Axes.Both,
-                                    FillMode = FillMode.Fit
-                                }
-                            }
-                        },
-                        barlineContainer = new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET }
-                        },
-                        content = new Container
-                        {
-                            Name = "Hit objects",
-                            RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Masking = true
-                        },
-                        kiaiExplosionContainer = new Container<KiaiHitExplosion>
-                        {
-                            Name = "Kiai hit explosions",
-                            RelativeSizeAxes = Axes.Both,
-                            FillMode = FillMode.Fit,
-                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Blending = BlendingMode.Additive
-                        },
-                        judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
-                        {
-                            Name = "Judgements",
-                            RelativeSizeAxes = Axes.Y,
-                            Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
-                            Blending = BlendingMode.Additive
-                        },
-                    }
-                },
-                overlayBackgroundContainer = new Container
-                {
-                    Name = "Left overlay",
-                    RelativeSizeAxes = Axes.Y,
-                    Size = new Vector2(left_area_size, 1),
-                    Children = new Drawable[]
-                    {
-                        overlayBackground = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new InputDrum(controlPoints)
-                        {
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
-                            Scale = new Vector2(0.9f),
-                            Margin = new MarginPadding { Right = 20 }
-                        },
-                        new Box
-                        {
-                            Anchor = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = 10,
-                            Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
-                        },
-                    }
-                },
-                new Container
-                {
-                    Name = "Border",
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    MaskingSmoothness = 0,
-                    BorderThickness = 2,
-                    AlwaysPresent = true,
-                    Children = new[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
                         }
+                    },
+                    new Container
+                    {
+                        Name = "Right area",
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Left = left_area_size },
+                        Children = new Drawable[]
+                        {
+                            new Container
+                            {
+                                Name = "Masked elements before hit objects",
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                                Masking = true,
+                                Children = new Drawable[]
+                                {
+                                    hitExplosionContainer = new Container<HitExplosion>
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        FillMode = FillMode.Fit,
+                                        Blending = BlendingMode.Additive,
+                                    },
+                                    new HitTarget
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.Centre,
+                                        RelativeSizeAxes = Axes.Both,
+                                        FillMode = FillMode.Fit
+                                    }
+                                }
+                            },
+                            barlineContainer = new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET }
+                            },
+                            new Container
+                            {
+                                Name = "Hit objects",
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                                Masking = true,
+                                Child = HitObjectContainer
+                            },
+                            kiaiExplosionContainer = new Container<KiaiHitExplosion>
+                            {
+                                Name = "Kiai hit explosions",
+                                RelativeSizeAxes = Axes.Both,
+                                FillMode = FillMode.Fit,
+                                Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                                Blending = BlendingMode.Additive
+                            },
+                            judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
+                            {
+                                Name = "Judgements",
+                                RelativeSizeAxes = Axes.Y,
+                                Margin = new MarginPadding { Left = HIT_TARGET_OFFSET },
+                                Blending = BlendingMode.Additive
+                            },
+                        }
+                    },
+                    overlayBackgroundContainer = new Container
+                    {
+                        Name = "Left overlay",
+                        RelativeSizeAxes = Axes.Y,
+                        Size = new Vector2(left_area_size, 1),
+                        Children = new Drawable[]
+                        {
+                            overlayBackground = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            new InputDrum(controlPoints)
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                Scale = new Vector2(0.9f),
+                                Margin = new MarginPadding { Right = 20 }
+                            },
+                            new Box
+                            {
+                                Anchor = Anchor.TopRight,
+                                RelativeSizeAxes = Axes.Y,
+                                Width = 10,
+                                Colour = Framework.Graphics.Colour.ColourInfo.GradientHorizontal(Color4.Black.Opacity(0.6f), Color4.Black.Opacity(0)),
+                            },
+                        }
+                    },
+                    new Container
+                    {
+                        Name = "Border",
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        MaskingSmoothness = 0,
+                        BorderThickness = 2,
+                        AlwaysPresent = true,
+                        Children = new[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                AlwaysPresent = true
+                            }
+                        }
+                    },
+                    topLevelHitContainer = new Container
+                    {
+                        Name = "Top level hit objects",
+                        RelativeSizeAxes = Axes.Both,
                     }
-                },
-                topLevelHitContainer = new Container
-                {
-                    Name = "Top level hit objects",
-                    RelativeSizeAxes = Axes.Both,
                 }
-            });
+            };
 
             VisibleTimeRange.Value = 7000;
         }

osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
@@ -13,7 +12,6 @@ using osu.Game.Rulesets.Taiko.Objects.Drawables;
 using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.Taiko.Replays;
-using OpenTK;
 using System.Linq;
 using osu.Framework.Input;
 using osu.Game.Input.Handlers;
@@ -74,27 +72,11 @@ namespace osu.Game.Rulesets.Taiko.UI
             }
         }
 
-        protected override Vector2 GetAspectAdjustedSize()
-        {
-            const float default_relative_height = TaikoPlayfield.DEFAULT_HEIGHT / 768;
-            const float default_aspect = 16f / 9f;
-
-            float aspectAdjust = MathHelper.Clamp(DrawWidth / DrawHeight, 0.4f, 4) / default_aspect;
-
-            return new Vector2(1, default_relative_height * aspectAdjust);
-        }
-
-        protected override Vector2 PlayfieldArea => Vector2.One;
-
         public override ScoreProcessor CreateScoreProcessor() => new TaikoScoreProcessor(this);
 
         public override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);
 
-        protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo)
+        protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo);
-        {
-            Anchor = Anchor.CentreLeft,
-            Origin = Anchor.CentreLeft
-        };
 
         protected override DrawableHitObject<TaikoHitObject> GetVisualRepresentation(TaikoHitObject h)
         {

osu.Game.Tests/Visual/TestCaseScrollingHitObjects.cs

@@ -121,14 +121,21 @@ namespace osu.Game.Tests.Visual
                 Direction = direction;
 
                 Padding = new MarginPadding(2);
-                Content.Masking = true;
 
-                AddInternal(new Box
+                InternalChildren = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    new Box
-                    Alpha = 0.5f,
+                    {
-                    Depth = float.MaxValue
+                        RelativeSizeAxes = Axes.Both,
-                });
+                        Alpha = 0.5f,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Masking = true,
+                        Child = HitObjectContainer
+                    }
+                };
             }
         }
 

osu.Game.Tests/osu.Game.Tests.csproj

@@ -2,9 +2,11 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="DeepEqual" Version="1.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game/Rulesets/Edit/HitObjectComposer.cs

@@ -165,6 +165,6 @@ namespace osu.Game.Rulesets.Edit
         /// <summary>
         /// Creates a <see cref="ScalableContainer"/> which provides a layer above or below the <see cref="Playfield"/>.
         /// </summary>
-        protected virtual ScalableContainer CreateLayerContainer() => new ScalableContainer { RelativeSizeAxes = Axes.Both };
+        protected virtual Container CreateLayerContainer() => new Container { RelativeSizeAxes = Axes.Both };
     }
 }

osu.Game/Rulesets/UI/HitObjectContainer.cs

@@ -14,6 +14,11 @@ namespace osu.Game.Rulesets.UI
         public IEnumerable<DrawableHitObject> Objects => InternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
         public IEnumerable<DrawableHitObject> AliveObjects => AliveInternalChildren.Cast<DrawableHitObject>().OrderBy(h => h.HitObject.StartTime);
 
+        public HitObjectContainer()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
         public virtual void Add(DrawableHitObject hitObject) => AddInternal(hitObject);
         public virtual bool Remove(DrawableHitObject hitObject) => RemoveInternal(hitObject);
 

osu.Game/Rulesets/UI/Playfield.cs

@@ -9,17 +9,26 @@ using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Configuration;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
+using OpenTK;
 
 namespace osu.Game.Rulesets.UI
 {
-    public abstract class Playfield : ScalableContainer
+    public abstract class Playfield : CompositeDrawable
     {
         /// <summary>
         /// The <see cref="DrawableHitObject"/> contained in this Playfield.
         /// </summary>
-        public HitObjectContainer HitObjectContainer { get; private set; }
+        public HitObjectContainer HitObjectContainer => hitObjectContainerLazy.Value;
+
+        private readonly Lazy<HitObjectContainer> hitObjectContainerLazy;
+
+        /// <summary>
+        /// A function that converts gamefield coordinates to screen space.
+        /// </summary>
+        public Func<Vector2, Vector2> GamefieldToScreenSpace => HitObjectContainer.ToScreenSpace;
 
         /// <summary>
         /// All the <see cref="DrawableHitObject"/>s contained in this <see cref="Playfield"/> and all <see cref="NestedPlayfields"/>.
@@ -39,18 +48,13 @@ namespace osu.Game.Rulesets.UI
         public readonly BindableBool DisplayJudgements = new BindableBool(true);
 
         /// <summary>
-        /// A container for keeping track of DrawableHitObjects.
+        /// Creates a new <see cref="Playfield"/>.
         /// </summary>
-        /// <param name="customWidth">The width to scale the internal coordinate space to.
+        protected Playfield()
-        /// May be null if scaling based on <paramref name="customHeight"/> is desired. If <paramref name="customHeight"/> is also null, no scaling will occur.
-        /// </param>
-        /// <param name="customHeight">The height to scale the internal coordinate space to.
-        /// May be null if scaling based on <paramref name="customWidth"/> is desired. If <paramref name="customWidth"/> is also null, no scaling will occur.
-        /// </param>
-        protected Playfield(float? customWidth = null, float? customHeight = null)
-            : base(customWidth, customHeight)
         {
             RelativeSizeAxes = Axes.Both;
+
+            hitObjectContainerLazy = new Lazy<HitObjectContainer>(CreateHitObjectContainer);
         }
 
         private WorkingBeatmap beatmap;
@@ -59,11 +63,6 @@ namespace osu.Game.Rulesets.UI
         private void load(IBindableBeatmap beatmap)
         {
             this.beatmap = beatmap.Value;
-
-            HitObjectContainer = CreateHitObjectContainer();
-            HitObjectContainer.RelativeSizeAxes = Axes.Both;
-
-            Add(HitObjectContainer);
         }
 
         /// <summary>
@@ -94,10 +93,14 @@ namespace osu.Game.Rulesets.UI
             nestedPlayfields.Value.Add(otherPlayfield);
         }
 
-        /// <summary>
+        protected override void LoadComplete()
-        /// Creates the container that will be used to contain the <see cref="DrawableHitObject"/>s.
+        {
-        /// </summary>
+            base.LoadComplete();
-        protected virtual HitObjectContainer CreateHitObjectContainer() => new HitObjectContainer();
+
+            // in the case a consumer forgets to add the HitObjectContainer, we will add it here.
+            if (HitObjectContainer.Parent == null)
+                AddInternal(HitObjectContainer);
+        }
 
         protected override void Update()
         {
@@ -108,5 +111,10 @@ namespace osu.Game.Rulesets.UI
                     if (mod is IUpdatableByPlayfield updatable)
                         updatable.Update(this);
         }
+
+        /// <summary>
+        /// Creates the container that will be used to contain the <see cref="DrawableHitObject"/>s.
+        /// </summary>
+        protected virtual HitObjectContainer CreateHitObjectContainer() => new HitObjectContainer();
     }
 }

osu.Game/Rulesets/UI/RulesetContainer.cs

@@ -22,7 +22,6 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets.Configuration;
 using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
-using OpenTK;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -309,26 +308,6 @@ namespace osu.Game.Rulesets.UI
                 mod.ApplyToDrawableHitObjects(Playfield.HitObjectContainer.Objects);
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            Playfield.Size = GetAspectAdjustedSize() * PlayfieldArea;
-        }
-
-        /// <summary>
-        /// Computes the size of the <see cref="Playfield"/> in relative coordinate space after aspect adjustments.
-        /// </summary>
-        /// <returns>The aspect-adjusted size.</returns>
-        protected virtual Vector2 GetAspectAdjustedSize() => Vector2.One;
-
-        /// <summary>
-        /// The area of this <see cref="RulesetContainer"/> that is available for the <see cref="Playfield"/> to use.
-        /// Must be specified in relative coordinate space to this <see cref="RulesetContainer"/>.
-        /// This affects the final size of the <see cref="Playfield"/> but does not affect the <see cref="Playfield"/>'s scale.
-        /// </summary>
-        protected virtual Vector2 PlayfieldArea => new Vector2(0.75f); // A sane default
-
         /// <summary>
         /// Creates a DrawableHitObject from a HitObject.
         /// </summary>

osu.Game/Rulesets/UI/ScalableContainer.cs

@@ -1,99 +0,0 @@
-// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using OpenTK;
-
-namespace osu.Game.Rulesets.UI
-{
-    /// <summary>
-    /// A <see cref="Container"/> which can have its internal coordinate system scaled to a specific size.
-    /// </summary>
-    public class ScalableContainer : Container
-    {
-        /// <summary>
-        /// A function that converts coordinates from gamefield to screen space.
-        /// </summary>
-        public Func<Vector2, Vector2> GamefieldToScreenSpace => scaledContent.GamefieldToScreenSpace;
-
-        /// <summary>
-        /// The scaled content.
-        /// </summary>
-        private readonly ScaledContainer scaledContent;
-        protected override Container<Drawable> Content => scaledContent;
-
-        /// <summary>
-        /// A <see cref="Container"/> which can have its internal coordinate system scaled to a specific size.
-        /// </summary>
-        /// <param name="customWidth">The width to scale the internal coordinate space to.
-        /// May be null if scaling based on <paramref name="customHeight"/> is desired. If <paramref name="customHeight"/> is also null, no scaling will occur.
-        /// </param>
-        /// <param name="customHeight">The height to scale the internal coordinate space to.
-        /// May be null if scaling based on <paramref name="customWidth"/> is desired. If <paramref name="customWidth"/> is also null, no scaling will occur.
-        /// </param>
-        public ScalableContainer(float? customWidth = null, float? customHeight = null)
-        {
-            AddInternal(scaledContent = new ScaledContainer
-            {
-                CustomWidth = customWidth,
-                CustomHeight = customHeight,
-                RelativeSizeAxes = Axes.Both,
-            });
-        }
-
-        private class ScaledContainer : Container
-        {
-            /// <summary>
-            /// A function that converts coordinates from gamefield to screen space.
-            /// </summary>
-            public Func<Vector2, Vector2> GamefieldToScreenSpace => content.ToScreenSpace;
-
-            /// <summary>
-            /// The value to scale the width of the content to match.
-            /// If null, <see cref="CustomHeight"/> is used.
-            /// </summary>
-            public float? CustomWidth;
-
-            /// <summary>
-            /// The value to scale the height of the content to match.
-            /// if null, <see cref="CustomWidth"/> is used.
-            /// </summary>
-            public float? CustomHeight;
-
-            private readonly Container content;
-            protected override Container<Drawable> Content => content;
-
-            public ScaledContainer()
-            {
-                AddInternal(content = new Container { RelativeSizeAxes = Axes.Both });
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                content.Scale = sizeScale;
-                content.Size = Vector2.Divide(Vector2.One, sizeScale);
-            }
-
-            /// <summary>
-            /// The scale that is required for the size of the content to match <see cref="CustomWidth"/> and <see cref="CustomHeight"/>.
-            /// </summary>
-            private Vector2 sizeScale
-            {
-                get
-                {
-                    if (CustomWidth.HasValue && CustomHeight.HasValue)
-                        return Vector2.Divide(DrawSize, new Vector2(CustomWidth.Value, CustomHeight.Value));
-                    if (CustomWidth.HasValue)
-                        return new Vector2(DrawSize.X / CustomWidth.Value);
-                    if (CustomHeight.HasValue)
-                        return new Vector2(DrawSize.Y / CustomHeight.Value);
-                    return Vector2.One;
-                }
-            }
-        }
-    }
-}

osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs

@@ -65,20 +65,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
 
         protected virtual SpeedChangeVisualisationMethod VisualisationMethod => SpeedChangeVisualisationMethod.Sequential;
 
-        /// <summary>
-        /// Creates a new <see cref="ScrollingPlayfield"/>.
-        /// </summary>
-        /// <param name="customWidth">The width to scale the internal coordinate space to.
-        /// May be null if scaling based on <paramref name="customHeight"/> is desired. If <paramref name="customHeight"/> is also null, no scaling will occur.
-        /// </param>
-        /// <param name="customHeight">The height to scale the internal coordinate space to.
-        /// May be null if scaling based on <paramref name="customWidth"/> is desired. If <paramref name="customWidth"/> is also null, no scaling will occur.
-        /// </param>
-        protected ScrollingPlayfield(float? customWidth = null, float? customHeight = null)
-            : base(customWidth, customHeight)
-        {
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {

osu.Game/osu.Game.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Humanizer" Version="2.5.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.4" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="ppy.osu.Framework" Version="2018.1012.0" />

osu.TestProject.props

@@ -10,10 +10,6 @@
     <ProjectReference Include="..\osu.Game\osu.Game.csproj" />
     <ProjectReference Include="..\osu-resources\osu.Game.Resources\osu.Game.Resources.csproj" />
   </ItemGroup>
-  <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.3" />
-    <PackageReference Include="DeepEqual" Version="1.6.0" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\osu.Game\Tests\VisualTestRunner.cs">
       <Link>VisualTestRunner.cs</Link>

osu.sln.DotSettings

@@ -666,6 +666,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>