From 2d914002394352b201c91afff40121bd579332ad Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sat, 22 Apr 2017 15:35:57 +0900
Subject: [PATCH 1/6] Fix nullref due to framework change.

---
 .../Options/Sections/Graphics/LayoutOptions.cs       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
index b04f853ec4..9f5e3458f3 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
@@ -12,8 +12,8 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
     {
         protected override string Header => "Layout";
 
-        private OptionSlider<int> letterboxPositionX;
-        private OptionSlider<int> letterboxPositionY;
+        private OptionSlider<double> letterboxPositionX;
+        private OptionSlider<double> letterboxPositionY;
 
         private Bindable<bool> letterboxing;
 
@@ -35,15 +35,15 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
                     LabelText = "Letterboxing",
                     Bindable = letterboxing,
                 },
-                letterboxPositionX = new OptionSlider<int>
+                letterboxPositionX = new OptionSlider<double>
                 {
                     LabelText = "Horizontal position",
-                    Bindable = (BindableInt)config.GetBindable<int>(FrameworkConfig.LetterboxPositionX)
+                    Bindable = config.GetBindable<double>(FrameworkConfig.LetterboxPositionX)
                 },
-                letterboxPositionY = new OptionSlider<int>
+                letterboxPositionY = new OptionSlider<double>
                 {
                     LabelText = "Vertical position",
-                    Bindable = (BindableInt)config.GetBindable<int>(FrameworkConfig.LetterboxPositionY)
+                    Bindable = config.GetBindable<double>(FrameworkConfig.LetterboxPositionY)
                 },
             };
 

From 307dc3e2e11150d55e59fb6a0ec7b662e3655956 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sat, 22 Apr 2017 15:36:40 +0900
Subject: [PATCH 2/6] Make VSCode use CLR on Windows platform.

---
 .vscode/launch.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index c836ff97bc..876f960836 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -3,6 +3,9 @@
     "configurations": [
         {
             "name": "Launch VisualTests",
+            "windows": {
+                "type": "clr"
+            },
             "type": "mono",
             "request": "launch",
             "program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe",
@@ -15,6 +18,9 @@
         },
         {
             "name": "Launch Desktop",
+            "windows": {
+                "type": "clr"
+            },
             "type": "mono",
             "request": "launch",
             "program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe",

From 8dd77819252f735172cb4da9bf758e406ca064e5 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sat, 22 Apr 2017 16:18:00 +0900
Subject: [PATCH 3/6] Add clr-specific attach request.

---
 .vscode/launch.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 876f960836..0e07b0a067 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -33,6 +33,11 @@
         },
         {
             "name": "Attach",
+            "windows": {
+                "type": "clr",
+                "request": "attach",
+                "processName": "osu!"
+            },
             "type": "mono",
             "request": "attach",
             "address": "localhost",

From 0b67cf0e91e3724d7cb5334b7b793371e6362e2b Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sat, 22 Apr 2017 16:30:21 +0900
Subject: [PATCH 4/6] Bring framework up to date.

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

diff --git a/osu-framework b/osu-framework
index b4e1b9a0eb..d0f7f3a97c 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit b4e1b9a0eb1782ab8cfc48e305fd295a25c0579e
+Subproject commit d0f7f3a97c11650b2b599a96cd55a446422ac94f

From c108a7b48edcae12f4ffedc22cec5323f705bb56 Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Sat, 22 Apr 2017 16:59:15 +0900
Subject: [PATCH 5/6] Generate portable PDBs + add rebuild task.

---
 .vscode/tasks.json | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 433e5fd2a9..6918afa620 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -11,7 +11,23 @@
             "command": "msbuild",
             "args": [
                 // Ask msbuild to generate full paths for file names.
-                "/property:GenerateFullPaths=true"
+                "/property:GenerateFullPaths=true",
+                "/property:DebugType=portable"
+            ],
+            // Use the standard MS compiler pattern to detect errors, warnings and infos
+            "problemMatcher": "$msCompile",
+            "isBuildCommand": true
+        },
+        {
+            "taskName": "rebuild",
+            "isShellCommand": true,
+            "showOutput": "silent",
+            "command": "msbuild",
+            "args": [
+                // Ask msbuild to generate full paths for file names.
+                "/property:GenerateFullPaths=true",
+                "/property:DebugType=portable",
+                "/target:Clean,Build"
             ],
             // Use the standard MS compiler pattern to detect errors, warnings and infos
             "problemMatcher": "$msCompile",

From 35cf4af9e72176f93fc5470cc6692ebcd05ac4c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 Apr 2017 23:17:59 +0900
Subject: [PATCH 6/6] Update framework.

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

diff --git a/osu-framework b/osu-framework
index d0f7f3a97c..9204b83850 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit d0f7f3a97c11650b2b599a96cd55a446422ac94f
+Subproject commit 9204b838504a51ffe7577c103b91270a2687bfb8