From 95aa6b262d0fb1165a2446e71debb20c09e529ec Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Mon, 30 Jul 2018 16:01:02 +0900 Subject: [PATCH 1/4] Use .NET Core CFS --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7c08eb9e9c..e1691f0708 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,9 +9,9 @@ install: - cmd: git submodule update --init --recursive --depth=5 - cmd: choco install resharper-clt -y - cmd: choco install nvika -y - - cmd: appveyor DownloadFile https://github.com/peppy/CodeFileSanity/releases/download/v0.2.5/CodeFileSanity.exe + - cmd: dotnet tool install CodeFileSanity --version 13.0.0 --global --add-source https://ci.appveyor.com/nuget/codefilesanity before_build: - - cmd: CodeFileSanity.exe + - cmd: codefilesanity - cmd: nuget restore -verbosity quiet environment: TargetFramework: net471 From d9435d24a6270e3a123fc9edc4c7c0c789ea2b20 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 31 Jul 2018 12:35:33 +0900 Subject: [PATCH 2/4] Use nuget version --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e1691f0708..58e22633d0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ install: - cmd: git submodule update --init --recursive --depth=5 - cmd: choco install resharper-clt -y - cmd: choco install nvika -y - - cmd: dotnet tool install CodeFileSanity --version 13.0.0 --global --add-source https://ci.appveyor.com/nuget/codefilesanity + - cmd: dotnet tool install CodeFileSanity --version 0.0.16 --global before_build: - cmd: codefilesanity - cmd: nuget restore -verbosity quiet From 64b2189df88a795811aa573deaa6cf5ad1d79f36 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 31 Jul 2018 12:50:49 +0900 Subject: [PATCH 3/4] Fix case, just in case --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 58e22633d0..36bc79324d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ install: - cmd: choco install nvika -y - cmd: dotnet tool install CodeFileSanity --version 0.0.16 --global before_build: - - cmd: codefilesanity + - cmd: CodeFileSanity - cmd: nuget restore -verbosity quiet environment: TargetFramework: net471 From ae8bf34fd1df55510646b5e90d6f218925ee92ea Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Tue, 31 Jul 2018 13:42:47 +0900 Subject: [PATCH 4/4] Fix breadcrumb testcase failures --- .../Visual/TestCaseScreenBreadcrumbControl.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs b/osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs index 83bbbfddd1..b70117a3ad 100644 --- a/osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs +++ b/osu.Game.Tests/Visual/TestCaseScreenBreadcrumbControl.cs @@ -54,11 +54,11 @@ namespace osu.Game.Tests.Visual breadcrumbs.Current.TriggerChange(); - assertCurrent(); + waitForCurrent(); pushNext(); - assertCurrent(); + waitForCurrent(); pushNext(); - assertCurrent(); + waitForCurrent(); AddStep(@"make start current", () => { @@ -66,8 +66,9 @@ namespace osu.Game.Tests.Visual currentScreen = startScreen; }); - assertCurrent(); + waitForCurrent(); pushNext(); + waitForCurrent(); AddAssert(@"only 2 items", () => breadcrumbs.Items.Count() == 2); AddStep(@"exit current", () => changedScreen.Exit()); AddAssert(@"current screen is first", () => startScreen == changedScreen); @@ -80,7 +81,7 @@ namespace osu.Game.Tests.Visual } private void pushNext() => AddStep(@"push next screen", () => currentScreen = ((TestScreen)currentScreen).PushNext()); - private void assertCurrent() => AddAssert(@"changedScreen correct", () => currentScreen == changedScreen); + private void waitForCurrent() => AddUntilStep(() => currentScreen.IsCurrentScreen, "current screen"); private abstract class TestScreen : OsuScreen {