diff --git a/TestPlatform.sln b/TestPlatform.sln index 0ff32b6a25..2553cb8a81 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -59,8 +59,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Utilities.UnitTests", "test\Microsoft.TestPlatform.Utilities.UnitTests\Microsoft.TestPlatform.Utilities.UnitTests.csproj", "{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests", "test\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj", "{8FD97A6B-5C83-4985-9432-08347A2C2A47}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "testhost.UnitTests", "test\testhost.UnitTests\testhost.UnitTests.csproj", "{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console.UnitTests", "test\vstest.console.UnitTests\vstest.console.UnitTests.csproj", "{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}" @@ -147,10 +145,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{37 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.CommunicationUtilities.PlatformTests", "test\Microsoft.TestPlatform.CommunicationUtilities.PlatformTests\Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj", "{3E698655-0701-482E-9AA7-F956F6337FC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.TestHostProvider", "src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj", "{F6624DEC-C1F7-4076-8488-93EE30C163C4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TranslationLayer.UnitTests", "test\TranslationLayer.UnitTests\TranslationLayer.UnitTests.csproj", "{7B48115A-B766-4B55-93A8-C08A42C37710}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.TestHostProvider.UnitTests", "test\Microsoft.TestPlatform.TestHostProvider.UnitTests\Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj", "{FBF74C8F-695C-4967-84AC-358EEFB1376D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.TestHostProvider", "src\Microsoft.TestPlatform.TestHostProvider\Microsoft.TestPlatform.TestHostProvider.csproj", "{11ECCB8B-6958-42A7-BD58-88C09CB149B2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -425,18 +425,6 @@ Global {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x64.Build.0 = Release|Any CPU {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x86.ActiveCfg = Release|Any CPU {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x86.Build.0 = Release|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|x64.ActiveCfg = Debug|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|x64.Build.0 = Debug|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|x86.ActiveCfg = Debug|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|x86.Build.0 = Debug|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|Any CPU.Build.0 = Release|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|x64.ActiveCfg = Release|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|x64.Build.0 = Release|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|x86.ActiveCfg = Release|Any CPU - {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|x86.Build.0 = Release|Any CPU {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -761,18 +749,18 @@ Global {3E698655-0701-482E-9AA7-F956F6337FC7}.Release|x64.Build.0 = Release|Any CPU {3E698655-0701-482E-9AA7-F956F6337FC7}.Release|x86.ActiveCfg = Release|Any CPU {3E698655-0701-482E-9AA7-F956F6337FC7}.Release|x86.Build.0 = Release|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Debug|x64.ActiveCfg = Debug|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Debug|x64.Build.0 = Debug|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Debug|x86.ActiveCfg = Debug|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Debug|x86.Build.0 = Debug|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Release|Any CPU.Build.0 = Release|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Release|x64.ActiveCfg = Release|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Release|x64.Build.0 = Release|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Release|x86.ActiveCfg = Release|Any CPU - {F6624DEC-C1F7-4076-8488-93EE30C163C4}.Release|x86.Build.0 = Release|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|x64.ActiveCfg = Debug|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|x64.Build.0 = Debug|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|x86.ActiveCfg = Debug|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Debug|x86.Build.0 = Debug|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Release|Any CPU.Build.0 = Release|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Release|x64.ActiveCfg = Release|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Release|x64.Build.0 = Release|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Release|x86.ActiveCfg = Release|Any CPU + {7B48115A-B766-4B55-93A8-C08A42C37710}.Release|x86.Build.0 = Release|Any CPU {FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FBF74C8F-695C-4967-84AC-358EEFB1376D}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -785,6 +773,18 @@ Global {FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|x64.Build.0 = Release|Any CPU {FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|x86.ActiveCfg = Release|Any CPU {FBF74C8F-695C-4967-84AC-358EEFB1376D}.Release|x86.Build.0 = Release|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x64.ActiveCfg = Debug|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x64.Build.0 = Debug|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x86.ActiveCfg = Debug|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Debug|x86.Build.0 = Debug|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|Any CPU.Build.0 = Release|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x64.ActiveCfg = Release|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x64.Build.0 = Release|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x86.ActiveCfg = Release|Any CPU + {11ECCB8B-6958-42A7-BD58-88C09CB149B2}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -816,7 +816,6 @@ Global {376A7588-50DF-46CD-955B-0309F491D830} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {5DF3CF65-3E11-4639-964D-7BEB4109DCF9} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} - {8FD97A6B-5C83-4985-9432-08347A2C2A47} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03} = {020E15EA-731F-4667-95AF-226671E0C3AE} @@ -849,7 +848,8 @@ Global {E141A226-CC0A-4F26-BD17-4AE427D81C3B} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29} {376C19DE-31E2-4FF6-88FC-0D0D6233C999} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {3E698655-0701-482E-9AA7-F956F6337FC7} = {376C19DE-31E2-4FF6-88FC-0D0D6233C999} - {F6624DEC-C1F7-4076-8488-93EE30C163C4} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {7B48115A-B766-4B55-93A8-C08A42C37710} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} {FBF74C8F-695C-4967-84AC-358EEFB1376D} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {11ECCB8B-6958-42A7-BD58-88C09CB149B2} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} EndGlobalSection EndGlobal diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 6153d33560..b25ccf4f1c 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -218,15 +218,16 @@ function Publish-Package Write-Log "Package: Publish testhost.x86\testhost.x86.csproj" Publish-PackageInternal $testHostx86Project $TPB_TargetFramework $testhostFullPackageDir - # Copy over the Full CLR built testhost package assemblies to the $fullCLRPackageDir - Copy-Item $testhostFullPackageDir\* $fullCLRPackageDir -Force - - # Copy over the Full CLR built testhost package assemblies to the Core CLR package folder. + # Copy over the Full CLR built testhost package assemblies to the Core CLR and Full CLR package folder. $netFull_Dir = "TestHost" $fullDestDir = Join-Path $coreCLR20PackageDir $netFull_Dir New-Item -ItemType directory -Path $fullDestDir -Force | Out-Null Copy-Item $testhostFullPackageDir\* $fullDestDir -Force + $fullDestDir = Join-Path $fullCLRPackageDir $netFull_Dir + New-Item -ItemType directory -Path $fullDestDir -Force | Out-Null + Copy-Item $testhostFullPackageDir\* $fullDestDir -Force + if ($lastExitCode -ne 0) { Set-ScriptFailed } @@ -267,6 +268,15 @@ function Publish-Package Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force } + # Copy dependency of Microsoft.TestPlatform.TestHostProvider + $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\9.0.1\lib\net45\Newtonsoft.Json.dll" + Write-Verbose "Copy-Item $newtonsoft $fullCLRPackageDir -Force" + Copy-Item $newtonsoft $fullCLRPackageDir -Force + + $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\9.0.1\lib\netstandard1.0\Newtonsoft.Json.dll" + Write-Verbose "Copy-Item $newtonsoft $coreCLR20PackageDir -Force" + Copy-Item $newtonsoft $coreCLR20PackageDir -Force + # For libraries that are externally published, copy the output into artifacts. These will be signed and packaged independently. Copy-PackageItems "Microsoft.TestPlatform.Build" diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj index 6152fcd415..11a5eb54b3 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj @@ -21,11 +21,6 @@ true - - - 1.0.3 - - 4.3.0 diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs index 9675e2ad17..27392cb58b 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs +++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs @@ -163,14 +163,9 @@ public virtual TestProcessStartInfo GetTestHostProcessStartInfo( var testHostProcessName = (this.architecture == Architecture.X86) ? X86TestHostProcessName : X64TestHostProcessName; var currentWorkingDirectory = Path.Combine(Path.GetDirectoryName(typeof(DefaultTestHostManager).GetTypeInfo().Assembly.Location), "..//"); var argumentsString = " " + connectionInfo.ToCommandLineOptions(); - var currentProcessPath = this.processHelper.GetCurrentProcessFileName(); - if (currentProcessPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase) - || currentProcessPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase)) - { - // "TestHost" is the name of the folder which contain Full CLR built testhost package assemblies inside Core CLR package folder. - testHostProcessName = Path.Combine("TestHost", testHostProcessName); - } + // "TestHost" is the name of the folder which contain Full CLR built testhost package assemblies. + testHostProcessName = Path.Combine("TestHost", testHostProcessName); if (!this.Shared) { diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs index b56ccc3713..42031bcad3 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs @@ -9,6 +9,6 @@ #region Test Assemblies -[assembly: InternalsVisibleTo("Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] +[assembly: InternalsVisibleTo("TranslationLayer.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] #endregion diff --git a/src/datacollector/app.config b/src/datacollector/app.config index ac8e029312..5edc6ad20a 100644 --- a/src/datacollector/app.config +++ b/src/datacollector/app.config @@ -12,5 +12,11 @@ + + + + + + \ No newline at end of file diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index e1230bec65..7d1f0b2aaa 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -11,6 +11,7 @@ datacollector netcoreapp1.0;netcoreapp2.0;net46 true + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 AnyCPU Exe diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets index 494a3ba2c4..a04c8e4582 100644 --- a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets +++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets @@ -43,13 +43,13 @@ - true - true + true + true - - diff --git a/src/testhost.x86/app.config b/src/testhost.x86/app.config index aee4c416a3..a0275126c1 100644 --- a/src/testhost.x86/app.config +++ b/src/testhost.x86/app.config @@ -12,12 +12,10 @@ - - @@ -45,11 +43,9 @@ - - diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj index a366e761f4..dcf5cdc9e6 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -10,10 +10,11 @@ true x86 Exe - $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 win7-x64 + false diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index 19eeaf0785..ec543a7e68 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -8,10 +8,11 @@ testhost netcoreapp1.0;netcoreapp2.0;net46 Exe - $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 win7-x64 + false diff --git a/src/vstest.console/app.config b/src/vstest.console/app.config index ac8e029312..5edc6ad20a 100644 --- a/src/vstest.console/app.config +++ b/src/vstest.console/app.config @@ -12,5 +12,11 @@ + + + + + + \ No newline at end of file diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj index bd868f6c34..ad2f63c377 100644 --- a/src/vstest.console/vstest.console.csproj +++ b/src/vstest.console/vstest.console.csproj @@ -9,14 +9,14 @@ netcoreapp1.0;netcoreapp2.0;net46 true Exe - $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 AnyCPU win7-x64 - + diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj index bf32b80203..9f03057aee 100644 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj @@ -10,6 +10,9 @@ Microsoft.TestPlatform.CrossPlatEngine.UnitTests netcoreapp1.0;net46 $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + true + true diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DefaultTestHostManagerTests.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DefaultTestHostManagerTests.cs index 936927dd15..0e676b6c19 100644 --- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DefaultTestHostManagerTests.cs +++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DefaultTestHostManagerTests.cs @@ -64,7 +64,6 @@ public void ConstructorShouldSetX64ProcessForX64Architecture() public void GetTestHostProcessStartInfoShouldIncludeFileNameFromSubFolderTestHostWhenCurrentProcessIsDotnet() { string subFoler = "TestHost"; - this.mockProcessHelper.Setup(ph => ph.GetCurrentProcessFileName()).Returns("dotnet.exe"); var startInfo = this.testHostManager.GetTestHostProcessStartInfo(Enumerable.Empty(), null, default(TestRunnerConnectionInfo)); diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Program.cs b/test/TranslationLayer.UnitTests/Program.cs similarity index 100% rename from test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Program.cs rename to test/TranslationLayer.UnitTests/Program.cs diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Properties/AssemblyInfo.cs b/test/TranslationLayer.UnitTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Properties/AssemblyInfo.cs rename to test/TranslationLayer.UnitTests/Properties/AssemblyInfo.cs diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj similarity index 84% rename from test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj rename to test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj index 2e64820c4f..41c958236b 100644 --- a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj +++ b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj @@ -8,8 +8,11 @@ Exe netcoreapp1.0;net46 - Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests + TranslationLayer.UnitTests $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + true + true diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs b/test/TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs similarity index 100% rename from test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs rename to test/TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs b/test/TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs similarity index 100% rename from test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs rename to test/TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj index f0004e66c3..a2ee1c6300 100644 --- a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj +++ b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj @@ -9,7 +9,7 @@ Exe netcoreapp1.0;net46 vstest.console.UnitTests - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8