From 4e0cbc1bbb32edf09c4fddd638c4130140e9e229 Mon Sep 17 00:00:00 2001
From: Doug Bunting <dougbu@microsoft.com>
Date: Thu, 7 Jul 2016 12:42:32 -0700
Subject: [PATCH] One build to rule them all - well, at least VS and
 command-line builds will share output - part of aspnet/Coherence-Signed#277

---
 .../ServerComparison.FunctionalTests.xproj                | 4 ++--
 .../ServerComparison.TestSites.Standalone.xproj           | 8 ++------
 .../ServerComparison.TestSites.xproj                      | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.xproj b/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.xproj
index a53802bc22..61e890c093 100644
--- a/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.xproj
+++ b/test/ServerComparison.FunctionalTests/ServerComparison.FunctionalTests.xproj
@@ -7,8 +7,8 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>a319acce-060b-4385-9534-9f2202f6180e</ProjectGuid>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
diff --git a/test/ServerComparison.TestSites.Standalone/ServerComparison.TestSites.Standalone.xproj b/test/ServerComparison.TestSites.Standalone/ServerComparison.TestSites.Standalone.xproj
index 427962a094..1b7a85fc36 100644
--- a/test/ServerComparison.TestSites.Standalone/ServerComparison.TestSites.Standalone.xproj
+++ b/test/ServerComparison.TestSites.Standalone/ServerComparison.TestSites.Standalone.xproj
@@ -4,16 +4,12 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>a7c46df3-0a33-4919-a22c-1c8affadc0be</ProjectGuid>
-    <RootNamespace>ServerComparison.TestSites.Standalone</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
diff --git a/test/ServerComparison.TestSites/ServerComparison.TestSites.xproj b/test/ServerComparison.TestSites/ServerComparison.TestSites.xproj
index 18923dfc62..9ad0d6bf8b 100644
--- a/test/ServerComparison.TestSites/ServerComparison.TestSites.xproj
+++ b/test/ServerComparison.TestSites/ServerComparison.TestSites.xproj
@@ -7,8 +7,8 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>030225d8-4ee8-47e5-b692-2a96b3b51a38</ProjectGuid>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>