From 868a221b6c31fc18a2c5e5434a19c014d4aab5b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Mar 2018 19:42:33 +0900
Subject: [PATCH] Fix VisualTests build configuration

---
 osu.Desktop/Properties/launchSettings.json | 9 ---------
 osu.Desktop/osu.Desktop.csproj             | 8 ++++++--
 osu.sln                                    | 1 -
 3 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 osu.Desktop/Properties/launchSettings.json

diff --git a/osu.Desktop/Properties/launchSettings.json b/osu.Desktop/Properties/launchSettings.json
deleted file mode 100644
index 3842c10a4e..0000000000
--- a/osu.Desktop/Properties/launchSettings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "profiles": {
-    "osu.Desktop": {
-      // this avoids an ugly command window appearing when running without debugger attached from VS2017
-      "commandName": "Executable",
-      "executablePath": ".\\osu!.exe"
-    }
-  }
-}
\ No newline at end of file
diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index 1e0d98620c..5d346603db 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -14,6 +14,7 @@
     <Title>osu!lazer</Title>
     <Product>osu!lazer</Product>
     <ApplicationIcon>lazer.ico</ApplicationIcon>
+    <Configurations>$(CONFIGURATIONS);VisualTests</Configurations>
     <Version>0.0.0.0</Version>
     <FileVersion>0.0.0.0</FileVersion>
     <!-- DeepEqual is not netstandard-compatible. This is fine since we run tests with .NET Framework anyway.
@@ -23,8 +24,11 @@
   <PropertyGroup Label="Defines">
     <DefineConstants Condition="'$(TargetFramework)' == 'net461'">$(DefineConstants);NET_FRAMEWORK</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>osu.Desktop.Program</StartupObject>
+  <PropertyGroup>
+    <StartupObject>osu.Desktop.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'VisualTests|AnyCPU'">
+    <StartArguments>--tests</StartArguments>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj" />
diff --git a/osu.sln b/osu.sln
index 3093c19868..5e99e838eb 100644
--- a/osu.sln
+++ b/osu.sln
@@ -71,7 +71,6 @@ Global
 		{48F4582B-7687-4621-9CBE-5C24197CB536}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{48F4582B-7687-4621-9CBE-5C24197CB536}.Release|Any CPU.Build.0 = Release|Any CPU
 		{48F4582B-7687-4621-9CBE-5C24197CB536}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU
-		{48F4582B-7687-4621-9CBE-5C24197CB536}.VisualTests|Any CPU.Build.0 = Debug|Any CPUı
 		{BAEA2F74-0315-4667-84E0-ACAC0B4BF785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BAEA2F74-0315-4667-84E0-ACAC0B4BF785}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BAEA2F74-0315-4667-84E0-ACAC0B4BF785}.VisualTests|Any CPU.ActiveCfg = Debug|Any CPU