From dfc4ef89c64805345ff9a4f805c9c5bbe70daf88 Mon Sep 17 00:00:00 2001
From: samadala <samadala@microsoft.com>
Date: Thu, 27 Oct 2016 14:17:57 +0530
Subject: [PATCH] add accepatance proj to sln

---
 TestPlatform.sln                                         | 9 +++++++++
 .../Microsoft.TestPlatform.AcceptanceTests.xproj         | 2 +-
 .../IntegrationTestBase.cs                               | 4 ++--
 test/TestAssets/SimpleTestProject/UnitTest1.cs           | 1 -
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/TestPlatform.sln b/TestPlatform.sln
index a3e60e7083..cd82c5d056 100644
--- a/TestPlatform.sln
+++ b/TestPlatform.sln
@@ -104,11 +104,15 @@ EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SimpleTestProject2", "test\TestAssets\SimpleTestProject2\SimpleTestProject2.xproj", "{7D9B9032-6689-46DA-A11F-DEECFBE06E78}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitTestProject1", "test\TestAssets\NUnitTestProject1\NUnitTestProject1.csproj", "{067456C0-086C-46A8-B37F-1405717B7BFC}"
+EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.ObjectModel.PlatformTests", "test\Performance\Microsoft.TestPlatform.ObjectModel.PlatformTests\Microsoft.TestPlatform.ObjectModel.PlatformTests.xproj", "{A4025AA7-FE2C-47B4-AB22-5FA32D0CA234}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PerfTestProject", "test\TestAssets\PerfTestProject\PerfTestProject.xproj", "{96B93E28-A33D-48E5-8793-73F686D3B999}"
+EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "testhost.UnitTests", "test\testhost.UnitTests\testhost.UnitTests.xproj", "{09599F77-A1F2-4366-BB8A-B4B90E05BCBC}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.AcceptanceTests", "test\Integration\Microsoft.TestPlatform.AcceptanceTests\Microsoft.TestPlatform.AcceptanceTests.xproj", "{70A1644A-7434-48CD-A9DE-450C0DA88B3F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -275,6 +279,10 @@ Global
 		{09599F77-A1F2-4366-BB8A-B4B90E05BCBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{09599F77-A1F2-4366-BB8A-B4B90E05BCBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{09599F77-A1F2-4366-BB8A-B4B90E05BCBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -325,5 +333,6 @@ Global
 		{A4025AA7-FE2C-47B4-AB22-5FA32D0CA234} = {44DABCFB-7AA0-4682-B7F7-067E0ABA1D14}
 		{96B93E28-A33D-48E5-8793-73F686D3B999} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18}
 		{09599F77-A1F2-4366-BB8A-B4B90E05BCBC} = {463031A2-7F16-4E38-9944-1F5161D04933}
+		{70A1644A-7434-48CD-A9DE-450C0DA88B3F} = {6DA46479-C688-4296-A6E7-F20C20CDA3A9}
 	EndGlobalSection
 EndGlobal
diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.xproj b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.xproj
index 856c216d79..3534e0d18d 100644
--- a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.xproj
+++ b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.xproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>c1497516-acb5-49af-a676-51db65ff8252</ProjectGuid>
+    <ProjectGuid>70a1644a-7434-48cd-a9de-450c0da88b3f</ProjectGuid>
     <RootNamespace>Microsoft.TestPlatform.SmokeTests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\</OutputPath>
diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
index 426c7caca3..7e58abe4f9 100644
--- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
+++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs
@@ -20,8 +20,8 @@ namespace Microsoft.TestPlatform.TestUtilities
     public class IntegrationTestBase
     {
         private const string TestSummaryStatusMessageFormat = "Total tests: {0}. Passed: {1}. Failed: {2}. Skipped: {3}";
-        private string standardTestOutput = String.Empty;
-        private string standardTestError = String.Empty;
+        private string standardTestOutput = string.Empty;
+        private string standardTestError = string.Empty;
 
         protected readonly IntegrationTestEnvironment testEnvironment;
 
diff --git a/test/TestAssets/SimpleTestProject/UnitTest1.cs b/test/TestAssets/SimpleTestProject/UnitTest1.cs
index 47568534c7..6def0b64ef 100644
--- a/test/TestAssets/SimpleTestProject/UnitTest1.cs
+++ b/test/TestAssets/SimpleTestProject/UnitTest1.cs
@@ -34,7 +34,6 @@ public void FailingTest()
         /// <summary>
         /// The skipping test.
         /// </summary>
-        [TestProperty("Property1", "Value1")]
         [Ignore]
         [TestMethod]
         public void SkippingTest()