From 915ff7cba5a7c3f2b8a9b1d2eb3ee3cef1fc021d Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 24 Apr 2017 10:04:32 +0900 Subject: [PATCH 1/4] Add parallel compile flag. --- .vscode/tasks.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6918afa620..a745d96a9f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -12,7 +12,8 @@ "args": [ // Ask msbuild to generate full paths for file names. "/property:GenerateFullPaths=true", - "/property:DebugType=portable" + "/property:DebugType=portable", + "/m" ], // Use the standard MS compiler pattern to detect errors, warnings and infos "problemMatcher": "$msCompile", @@ -27,7 +28,8 @@ // Ask msbuild to generate full paths for file names. "/property:GenerateFullPaths=true", "/property:DebugType=portable", - "/target:Clean,Build" + "/target:Clean,Build", + "/m" ], // Use the standard MS compiler pattern to detect errors, warnings and infos "problemMatcher": "$msCompile", From 3c981703304b09fd29516d785fd7e33f286ce5c3 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 24 Apr 2017 13:45:18 +0900 Subject: [PATCH 2/4] Use method group for MusicController fault. --- osu.Game/Overlays/MusicController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 19e742facb..f960d9e0ae 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -294,7 +294,7 @@ namespace osu.Game.Overlays trackManager.SetExclusive(current.Track); current.Track.Start(); beatmapSource.Value = current; - }).ContinueWith(task => Schedule(() => task.ThrowIfFaulted()), TaskContinuationOptions.OnlyOnFaulted); + }).ContinueWith(task => Schedule(task.ThrowIfFaulted), TaskContinuationOptions.OnlyOnFaulted); updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev); } From 2d6fa711d1689ec67ef93ee6d763344596462797 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 24 Apr 2017 13:45:35 +0900 Subject: [PATCH 3/4] Remove unnecessary base.Update() in PlayerInputManager. --- osu.Game/Screens/Play/PlayerInputManager.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/osu.Game/Screens/Play/PlayerInputManager.cs b/osu.Game/Screens/Play/PlayerInputManager.cs index 6604dbfc7e..3ac28898a6 100644 --- a/osu.Game/Screens/Play/PlayerInputManager.cs +++ b/osu.Game/Screens/Play/PlayerInputManager.cs @@ -38,8 +38,6 @@ namespace osu.Game.Screens.Play protected override void Update() { - base.Update(); - if (parentClock == null) return; clock.Rate = parentClock.Rate; From b8bf942860ad2aeb881a44af58a96f6b23aa2288 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 24 Apr 2017 22:11:38 +0900 Subject: [PATCH 4/4] Don't use parallel compiling on non-windows platforms. This currently triggers a unhandled exception in msbuild. --- .vscode/tasks.json | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a745d96a9f..5eaeaa9899 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -10,11 +10,16 @@ "showOutput": "silent", "command": "msbuild", "args": [ - // Ask msbuild to generate full paths for file names. "/property:GenerateFullPaths=true", - "/property:DebugType=portable", - "/m" + "/property:DebugType=portable" ], + "windows": { + "args": [ + "/property:GenerateFullPaths=true", + "/property:DebugType=portable", + "/m" //parallel compiling support. doesn't work well with mono atm + ] + }, // Use the standard MS compiler pattern to detect errors, warnings and infos "problemMatcher": "$msCompile", "isBuildCommand": true @@ -28,9 +33,16 @@ // Ask msbuild to generate full paths for file names. "/property:GenerateFullPaths=true", "/property:DebugType=portable", - "/target:Clean,Build", - "/m" + "/target:Clean,Build" ], + "windows": { + "args": [ + "/property:GenerateFullPaths=true", + "/property:DebugType=portable", + "/target:Clean,Build", + "/m" //parallel compiling support. doesn't work well with mono atm + ] + }, // Use the standard MS compiler pattern to detect errors, warnings and infos "problemMatcher": "$msCompile", "isBuildCommand": true