From 2a650dc3e323a66e7934a0121666f1b6eda0a318 Mon Sep 17 00:00:00 2001 From: jagarg Date: Thu, 7 Dec 2017 19:09:47 +0530 Subject: [PATCH 1/3] Fix for csv x64 scenario --- .../Data/CsvDataConnection.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Adapter/PlatformServices.Desktop/Data/CsvDataConnection.cs b/src/Adapter/PlatformServices.Desktop/Data/CsvDataConnection.cs index eb5dd01729..9972c24dbe 100644 --- a/src/Adapter/PlatformServices.Desktop/Data/CsvDataConnection.cs +++ b/src/Adapter/PlatformServices.Desktop/Data/CsvDataConnection.cs @@ -22,6 +22,7 @@ internal sealed class CsvDataConnection : TestDataConnection { // Template used to map from a filename to a DB connection string private const string CsvConnectionTemplate = "Provider=Microsoft.Jet.OLEDB.4.0;Data Source={0};Persist Security Info=False;Extended Properties=\"text;HDR=YES;FMT=Delimited\""; + private const string CsvConnectionTemplate64 = "Provider=Microsoft.Ace.OLEDB.12.0;Data Source={0};Persist Security Info=False;Extended Properties=\"text;HDR=YES;FMT=Delimited\""; private string fileName; @@ -93,7 +94,16 @@ public DataTable ReadTable(string tableName, IEnumerable columns, int maxRows) using (OleDbCommand command = new OleDbCommand()) { // We have to use the name of the folder which contains the CSV file in the connection string - connection.ConnectionString = string.Format(CultureInfo.InvariantCulture, CsvConnectionTemplate, Path.GetDirectoryName(fullPath)); + // If target platform is x64, then use CsvConnectionTemplate64 connection string. + if (IntPtr.Size == 8) + { + connection.ConnectionString = string.Format(CultureInfo.InvariantCulture, CsvConnectionTemplate64, Path.GetDirectoryName(fullPath)); + } + else + { + connection.ConnectionString = string.Format(CultureInfo.InvariantCulture, CsvConnectionTemplate, Path.GetDirectoryName(fullPath)); + } + WriteDiagnostics("Connection String: {0}", connection.ConnectionString); // We have to open the connection now, before we try to quote From fdbb75e6cf2f480b0f954bc89a842e2501b53b85 Mon Sep 17 00:00:00 2001 From: jagarg Date: Fri, 8 Dec 2017 17:59:34 +0530 Subject: [PATCH 2/3] Adding E2E Test For CSV DataSource --- TestFx.sln | 27 ++++++++ .../Smoke.E2E.Tests/DataSourceTests.cs | 28 ++++++++ .../Smoke.E2E.Tests/Smoke.E2E.Tests.csproj | 1 + .../DataSourceTestProject.csproj | 64 +++++++++++++++++++ .../Properties/AssemblyInfo.cs | 22 +++++++ .../DataSourceTestProject/UnitTest1.cs | 23 +++++++ .../TestAssets/DataSourceTestProject/a.csv | 5 ++ 7 files changed, 170 insertions(+) create mode 100644 test/E2ETests/Smoke.E2E.Tests/DataSourceTests.cs create mode 100644 test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj create mode 100644 test/E2ETests/TestAssets/DataSourceTestProject/Properties/AssemblyInfo.cs create mode 100644 test/E2ETests/TestAssets/DataSourceTestProject/UnitTest1.cs create mode 100644 test/E2ETests/TestAssets/DataSourceTestProject/a.csv diff --git a/TestFx.sln b/TestFx.sln index e787ced7eb..f9b598b4f6 100644 --- a/TestFx.sln +++ b/TestFx.sln @@ -168,6 +168,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParallelMethodsTestProject" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParallelClassesTestProject", "test\E2ETests\TestAssets\ParallelTestClass\ParallelClassesTestProject.csproj", "{CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSourceTestProject", "test\E2ETests\TestAssets\DataSourceTestProject\DataSourceTestProject.csproj", "{1A63671D-FD36-4880-AF13-C2AF13F7E3DA}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\TestFramework\Extension.Shared\Extension.Shared.projitems*{272ca5e1-8e81-4825-9e47-86cce02f700d}*SharedItemsImports = 13 @@ -909,6 +911,30 @@ Global {CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220}.Release|x64.Build.0 = Release|Any CPU {CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220}.Release|x86.ActiveCfg = Release|Any CPU {CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220}.Release|x86.Build.0 = Release|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|Any CPU.Build.0 = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|ARM.ActiveCfg = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|ARM.Build.0 = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|x64.ActiveCfg = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|x64.Build.0 = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|x86.ActiveCfg = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|x86.Build.0 = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|ARM.Build.0 = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|x64.ActiveCfg = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|x64.Build.0 = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|x86.ActiveCfg = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|x86.Build.0 = Debug|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|Any CPU.Build.0 = Release|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|ARM.ActiveCfg = Release|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|ARM.Build.0 = Release|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|x64.ActiveCfg = Release|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|x64.Build.0 = Release|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|x86.ActiveCfg = Release|Any CPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -963,6 +989,7 @@ Global {655001BB-C00F-4EF7-A324-7F7C48656D35} = {F2D0BF2C-38F2-4244-80E3-4AAD1C3F4C89} {4004757A-0082-4410-B94A-6166B20F153C} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} {CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9} diff --git a/test/E2ETests/Smoke.E2E.Tests/DataSourceTests.cs b/test/E2ETests/Smoke.E2E.Tests/DataSourceTests.cs new file mode 100644 index 0000000000..2224f2f6f2 --- /dev/null +++ b/test/E2ETests/Smoke.E2E.Tests/DataSourceTests.cs @@ -0,0 +1,28 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace MSTestAdapter.Smoke.E2ETests +{ + using Microsoft.MSTestV2.CLIAutomation; + using Microsoft.VisualStudio.TestTools.UnitTesting; + + [TestClass] + public class DataSourceTests : CLITestBase + { + private const string TestAssembly = "DataSourceTestProject.dll"; + + [TestMethod] + public void ExecuteCsvTestDataSourceTests() + { + this.InvokeVsTestForExecution(new string[] { TestAssembly }); + + this.ValidatePassedTestsContain( + "CsvTestMethod (Data Row 0)", + "CsvTestMethod (Data Row 2)"); + + this.ValidateFailedTestsContain( + "CsvTestMethod (Data Row 1)", + "CsvTestMethod (Data Row 3)"); + } + } +} diff --git a/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj b/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj index 0e0ddd9c83..6005ad1c50 100644 --- a/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj +++ b/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj @@ -39,6 +39,7 @@ + diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj new file mode 100644 index 0000000000..ee62b4a662 --- /dev/null +++ b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj @@ -0,0 +1,64 @@ + + + + ..\..\..\..\ + + + Debug + AnyCPU + {1A63671D-FD36-4880-AF13-C2AF13F7E3DA} + Library + Properties + DataSourceTestProject + DataSourceTestProject + v4.5.2 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + $(TestFxRoot)artifacts\TestAssets\ + + + true + full + false + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + TRACE + prompt + 4 + + + + + + + + + + + + {a7ea583b-a2b0-47da-a058-458f247c7575} + Extension.Desktop + + + {7252d9e3-267d-442c-96bc-c73aef3241d6} + MSTest.Core + + + + + Always + + + + + \ No newline at end of file diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/Properties/AssemblyInfo.cs b/test/E2ETests/TestAssets/DataSourceTestProject/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..e285115fae --- /dev/null +++ b/test/E2ETests/TestAssets/DataSourceTestProject/Properties/AssemblyInfo.cs @@ -0,0 +1,22 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System.Reflection; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("DataSourceTestProject")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("DataSourceTestProject")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +[assembly: ComVisible(false)] + +[assembly: Guid("1a63671d-fd36-4880-af13-c2af13f7e3da")] + +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/UnitTest1.cs b/test/E2ETests/TestAssets/DataSourceTestProject/UnitTest1.cs new file mode 100644 index 0000000000..d548846b8b --- /dev/null +++ b/test/E2ETests/TestAssets/DataSourceTestProject/UnitTest1.cs @@ -0,0 +1,23 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +namespace DataSourceTestProject +{ + using Microsoft.VisualStudio.TestTools.UnitTesting; + + [TestClass] + public class UnitTest1 + { + public TestContext TestContext + { + get; + set; + } + + [TestMethod, DataSource("Microsoft.VisualStudio.TestTools.DataSource.CSV", "a.csv", "a#csv", DataAccessMethod.Sequential)] + public void CsvTestMethod() + { + Assert.AreEqual(1, TestContext.DataRow["Item1"]); + } + } +} diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/a.csv b/test/E2ETests/TestAssets/DataSourceTestProject/a.csv new file mode 100644 index 0000000000..c7ef7a1b19 --- /dev/null +++ b/test/E2ETests/TestAssets/DataSourceTestProject/a.csv @@ -0,0 +1,5 @@ +Item1,Item2,Item3 +1,2,3 +4,5,6 +1,7,8 +9,10,11 From 681fe220cc1048c2dcf42eb0257675110edcc15c Mon Sep 17 00:00:00 2001 From: jagarg Date: Fri, 8 Dec 2017 19:44:22 +0530 Subject: [PATCH 3/3] Moving Project to CPS based --- TestFx.sln | 52 +++++++------- .../DataSourceTestProject.csproj | 70 +++++-------------- .../Properties/AssemblyInfo.cs | 22 ------ .../DataSourceTestProject/UnitTest1.cs | 4 +- 4 files changed, 46 insertions(+), 102 deletions(-) delete mode 100644 test/E2ETests/TestAssets/DataSourceTestProject/Properties/AssemblyInfo.cs diff --git a/TestFx.sln b/TestFx.sln index f9b598b4f6..714c2d1dcf 100644 --- a/TestFx.sln +++ b/TestFx.sln @@ -168,7 +168,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParallelMethodsTestProject" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParallelClassesTestProject", "test\E2ETests\TestAssets\ParallelTestClass\ParallelClassesTestProject.csproj", "{CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSourceTestProject", "test\E2ETests\TestAssets\DataSourceTestProject\DataSourceTestProject.csproj", "{1A63671D-FD36-4880-AF13-C2AF13F7E3DA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataSourceTestProject", "test\E2ETests\TestAssets\DataSourceTestProject\DataSourceTestProject.csproj", "{5A4967CD-B527-4D43-81C2-4CA90EE10222}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -911,30 +911,30 @@ Global {CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220}.Release|x64.Build.0 = Release|Any CPU {CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220}.Release|x86.ActiveCfg = Release|Any CPU {CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220}.Release|x86.Build.0 = Release|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|Any CPU.Build.0 = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|ARM.ActiveCfg = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|ARM.Build.0 = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|x64.ActiveCfg = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|x64.Build.0 = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|x86.ActiveCfg = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Code Analysis Debug|x86.Build.0 = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|ARM.ActiveCfg = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|ARM.Build.0 = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|x64.ActiveCfg = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|x64.Build.0 = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|x86.ActiveCfg = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Debug|x86.Build.0 = Debug|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|Any CPU.Build.0 = Release|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|ARM.ActiveCfg = Release|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|ARM.Build.0 = Release|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|x64.ActiveCfg = Release|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|x64.Build.0 = Release|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|x86.ActiveCfg = Release|Any CPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA}.Release|x86.Build.0 = Release|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Code Analysis Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Code Analysis Debug|Any CPU.Build.0 = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Code Analysis Debug|ARM.ActiveCfg = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Code Analysis Debug|ARM.Build.0 = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Code Analysis Debug|x64.ActiveCfg = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Code Analysis Debug|x64.Build.0 = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Code Analysis Debug|x86.ActiveCfg = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Code Analysis Debug|x86.Build.0 = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Debug|ARM.ActiveCfg = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Debug|ARM.Build.0 = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Debug|x64.ActiveCfg = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Debug|x64.Build.0 = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Debug|x86.ActiveCfg = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Debug|x86.Build.0 = Debug|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Release|Any CPU.Build.0 = Release|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Release|ARM.ActiveCfg = Release|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Release|ARM.Build.0 = Release|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Release|x64.ActiveCfg = Release|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Release|x64.Build.0 = Release|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Release|x86.ActiveCfg = Release|Any CPU + {5A4967CD-B527-4D43-81C2-4CA90EE10222}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -989,7 +989,7 @@ Global {655001BB-C00F-4EF7-A324-7F7C48656D35} = {F2D0BF2C-38F2-4244-80E3-4AAD1C3F4C89} {4004757A-0082-4410-B94A-6166B20F153C} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} {CD0CA7CD-CED3-45FF-9F36-B1C8DF7A9220} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} + {5A4967CD-B527-4D43-81C2-4CA90EE10222} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9} diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj index ee62b4a662..5b3ec27ed2 100644 --- a/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj +++ b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj @@ -1,64 +1,30 @@ - - + + ..\..\..\..\ + - Debug - AnyCPU - {1A63671D-FD36-4880-AF13-C2AF13F7E3DA} - Library - Properties - DataSourceTestProject - DataSourceTestProject - v4.5.2 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest + net452 + false + false $(TestFxRoot)artifacts\TestAssets\ + - - true - full - false - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - TRACE - prompt - 4 - - - - - + - - + + + - - {a7ea583b-a2b0-47da-a058-458f247c7575} - Extension.Desktop - - - {7252d9e3-267d-442c-96bc-c73aef3241d6} - MSTest.Core - - - - + Always - - - \ No newline at end of file + + + + + + diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/Properties/AssemblyInfo.cs b/test/E2ETests/TestAssets/DataSourceTestProject/Properties/AssemblyInfo.cs deleted file mode 100644 index e285115fae..0000000000 --- a/test/E2ETests/TestAssets/DataSourceTestProject/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("DataSourceTestProject")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DataSourceTestProject")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("1a63671d-fd36-4880-af13-c2af13f7e3da")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/UnitTest1.cs b/test/E2ETests/TestAssets/DataSourceTestProject/UnitTest1.cs index d548846b8b..16c9c03d98 100644 --- a/test/E2ETests/TestAssets/DataSourceTestProject/UnitTest1.cs +++ b/test/E2ETests/TestAssets/DataSourceTestProject/UnitTest1.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. namespace DataSourceTestProject @@ -20,4 +20,4 @@ public void CsvTestMethod() Assert.AreEqual(1, TestContext.DataRow["Item1"]); } } -} +} \ No newline at end of file