From e9b397f06fb397bde9039451c865fbb0db786c89 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 11 Jul 2017 10:41:18 +0900 Subject: [PATCH 1/3] Remove assert which is not always true on some operating systems --- osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index 910918297f..239c9f59e3 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -75,18 +75,16 @@ namespace osu.Game.Tests.Beatmaps.IO var temp = prepareTempCopy(osz_path); - Assert.IsTrue(File.Exists(temp)); + Assert.IsTrue(File.Exists(temp), "Temporary file copy never substantiated"); using (File.OpenRead(temp)) host.Dependencies.Get().Import(temp); ensureLoaded(host); - Assert.IsTrue(File.Exists(temp)); - File.Delete(temp); - Assert.IsFalse(File.Exists(temp)); + Assert.IsFalse(File.Exists(temp), "We likely help a read lock not he file when we shouldn't"); } } From 327327ea92a6a0cb574186eb1264ae03953f8a30 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 11 Jul 2017 10:43:43 +0900 Subject: [PATCH 2/3] Remove custom windows configuration from tasks.json No longer required as mono 5.0 upwards handles this gracefully (while not yet adding full parallel support). --- .vscode/tasks.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f285ebde67..b0fd5fbb0d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,15 +9,9 @@ "showOutput": "silent", "args": [ "/property:GenerateFullPaths=true", - "/property:DebugType=portable" + "/property:DebugType=portable", + "/m" //parallel compiling support. ], - "windows": { - "args": [ - "/property:GenerateFullPaths=true", - "/property:DebugType=portable", - "/m" //parallel compiling support. doesn't work well with mono atm - ] - }, "tasks": [ { "taskName": "Build (Debug)", From 55d999e4a1f440d391b23846070b151403191cce Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 11 Jul 2017 10:45:43 +0900 Subject: [PATCH 3/3] Fix comment --- osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs index 239c9f59e3..e467df0c53 100644 --- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs +++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs @@ -84,7 +84,7 @@ namespace osu.Game.Tests.Beatmaps.IO File.Delete(temp); - Assert.IsFalse(File.Exists(temp), "We likely help a read lock not he file when we shouldn't"); + Assert.IsFalse(File.Exists(temp), "We likely held a read lock on the file when we shouldn't"); } }