From b66d089400134245656d076f35cfc5dd8e367d78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 7 Feb 2018 17:12:12 +0900
Subject: [PATCH 1/3] Always put attributes on a separate line to their target

---
 osu.sln.DotSettings | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 8767e5374a..3b62dbe579 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -173,7 +173,9 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSOR_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AROUND_MULTIPLICATIVE_OP/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>

From 4f5bfdb888bce2c73afaf1578615d0ac32d83b17 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 8 Feb 2018 14:03:37 +0900
Subject: [PATCH 2/3] Remove explicit .Exit on IPC test

---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index 5398fb3ff3..490d4ec4d3 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -68,7 +68,6 @@ namespace osu.Game.Tests.Beatmaps.IO
                 waitForOrAssert(() => !File.Exists(temp), "Temporary still exists after IPC import", 5000);
 
                 host.Exit();
-                client.Exit();
             }
         }
 

From 48918b5324be01a24db5ead9fe7afed46d8ffd63 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 8 Feb 2018 14:07:12 +0900
Subject: [PATCH 3/3] Bring framework up-to-date

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 2d6169fc07..eba12eb4a0 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 2d6169fc07fdd50b8ce31d3a9124b4ec0123bdd1
+Subproject commit eba12eb4a0fa6238873dd266deb35bfdece21a6a