From 2b68a00da344dc0aae215ff83ee13b24ca0a8834 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 8 Feb 2017 20:18:09 -0800 Subject: [PATCH] Cleanup MSBuild conversion Resolves #739 --- .gitignore | 1 + MusicStore.sln | 26 +------------------ makefile.shade | 4 +-- test/E2ETests/E2ETests.csproj | 34 ------------------------- test/E2ETests/SmokeTestsOnNanoServer.cs | 2 +- 5 files changed, 5 insertions(+), 62 deletions(-) diff --git a/.gitignore b/.gitignore index aacd4c880c..11a9ba71a4 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ node_modules .testpublish/ launchSettings.json .vscode/ +TestResults/ diff --git a/MusicStore.sln b/MusicStore.sln index 63a47628e9..3e722c8499 100644 --- a/MusicStore.sln +++ b/MusicStore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.25605.0 +VisualStudioVersion = 15.0.26206.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7D749BDA-4638-4517-B66A-D40DEDEEB141}" ProjectSection(SolutionItems) = preProject @@ -21,45 +21,21 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Debug|x86.ActiveCfg = Debug|Any CPU {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|Any CPU.ActiveCfg = Release|Any CPU {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|Any CPU.Build.0 = Release|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A319ACCE-060B-4385-9534-9F2202F6180E}.Release|x86.ActiveCfg = Release|Any CPU {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Debug|x86.ActiveCfg = Debug|Any CPU {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.ActiveCfg = Release|Any CPU {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Any CPU.Build.0 = Release|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3CFBED5D-2ED8-49DB-96FB-BDAA748DC5A0}.Release|x86.ActiveCfg = Release|Any CPU {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {CA663205-77DE-4E55-B300-85594181B5A9}.Debug|x86.Build.0 = Debug|Any CPU {CA663205-77DE-4E55-B300-85594181B5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA663205-77DE-4E55-B300-85594181B5A9}.Release|Any CPU.Build.0 = Release|Any CPU - {CA663205-77DE-4E55-B300-85594181B5A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CA663205-77DE-4E55-B300-85594181B5A9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CA663205-77DE-4E55-B300-85594181B5A9}.Release|x86.ActiveCfg = Release|Any CPU - {CA663205-77DE-4E55-B300-85594181B5A9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/makefile.shade b/makefile.shade index a0ccc1c675..1b9f56e474 100644 --- a/makefile.shade +++ b/makefile.shade @@ -1,8 +1,8 @@ use-standard-lifecycle k-standard-goals -#run-nano-tests .compile +#run-nano-tests .initialize @{ var e2eTestsDirectory = Path.Combine(Directory.GetCurrentDirectory(), "test", "E2ETests"); - Dotnet("msbuild /t:TestNano /p:Configuration=" + E("Configuration"), e2eTestsDirectory); + Dotnet("test --logger:trx --filter E2ETests=NanoServer --configuration " + E("Configuration"), e2eTestsDirectory); } \ No newline at end of file diff --git a/test/E2ETests/E2ETests.csproj b/test/E2ETests/E2ETests.csproj index cecd0da8c1..7a95a01356 100644 --- a/test/E2ETests/E2ETests.csproj +++ b/test/E2ETests/E2ETests.csproj @@ -5,7 +5,6 @@ netcoreapp1.1 MusicStore.E2ETests - Exe true win7-x86;win7-x64;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.14.10-x64;ubuntu.15.04-x64;ubuntu.16.04-x64;centos.7-x64;debian.8-x64 @@ -35,37 +34,4 @@ - - - 2.2.0-preview2-build1029 - - - - - - - - - - - dotnet-test-xunit.dll - - - dotnet-test-xunit.deps.json - - - dotnet-test-xunit.runtimeconfig.json - - - dotnet-test-xunit.runtimeconfig.dev.json - - - - - - - - - diff --git a/test/E2ETests/SmokeTestsOnNanoServer.cs b/test/E2ETests/SmokeTestsOnNanoServer.cs index 69550d762d..199f621ba9 100644 --- a/test/E2ETests/SmokeTestsOnNanoServer.cs +++ b/test/E2ETests/SmokeTestsOnNanoServer.cs @@ -26,7 +26,7 @@ namespace E2ETests _smokeTestsOnNanoServer = new SmokeTestsOnNanoServer(output, _remoteDeploymentConfig, _logger); } - [ConditionalTheory, Trait("E2Etests", "NanoServer")] + [ConditionalTheory, Trait("E2ETests", "NanoServer")] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] [SkipIfEnvironmentVariableNotEnabled("RUN_TESTS_ON_NANO")]