Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove binding redirect of Newtonsoft.Json from testhost config file #663

Merged
merged 13 commits into from
Apr 4, 2017
Merged

Remove binding redirect of Newtonsoft.Json from testhost config file #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e59c5bc
Issues:
Mar 27, 2017
9748e98
merge from master
Mar 27, 2017
e062903
Address PR comment
Mar 27, 2017
986a98f
Addressing PR comment
Mar 28, 2017
25b77de
Merge branch 'master' into NewtonSoft
Mar 28, 2017
dc03e2f
Fixed "path too long exception"
Mar 30, 2017
d926246
Merge branch 'master' into NewtonSoft
Mar 30, 2017
ab7443d
fix Path too long warning
Mar 30, 2017
5e9af26
merge from master
Mar 31, 2017
e91a355
fix build issue
Mar 31, 2017
5fe548f
Binding redirect Newtonsoft.json
Apr 4, 2017
e1d7197
Merge branch 'master' into NewtonSoft
Apr 4, 2017
007e699
Adding assembly redirect for Newtonsoft.json in datacollector. We hav…
Apr 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions TestPlatform.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
18 changes: 14 additions & 4 deletions scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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"

Expand Down
5 changes: 0 additions & 5 deletions src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyModel">
<Version>1.0.3</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Diagnostics.Process">
<Version>4.3.0</Version>
Expand Down
9 changes: 2 additions & 7 deletions src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Friends.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#region Test Assemblies

[assembly: InternalsVisibleTo("Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
[assembly: InternalsVisibleTo("TranslationLayer.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]

#endregion
6 changes: 6 additions & 0 deletions src/datacollector/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,11 @@
<bindingRedirect oldVersion="11.0.0.0-14.0.0.0" newVersion="15.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
1 change: 1 addition & 0 deletions src/datacollector/datacollector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<AssemblyName>datacollector</AssemblyName>
<TargetFrameworks>netcoreapp1.0;netcoreapp2.0;net46</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors>
<PackageTargetFallback Condition=" '$(TargetFramework)' != 'net46' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
<PlatformTarget Condition="'$(TargetFramework)' == 'net46'">AnyCPU</PlatformTarget>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/package/nuspec/Microsoft.NET.Test.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
</PropertyGroup>

<!--
Generate config file for test project targeting .NET Framework. This config file has have binding redirect which is needed at time of running tests.
Generate config file for test project targeting .NET Framework. This config file has binding redirect which is needed at time of running tests.
Added below two lines because msbuild has following check:
https://github.com/Microsoft/msbuild/blob/dd5e8bc3f86ac98bd77d8971b00a6ad14f122f1a/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets#L2027
-->
<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<AutoGenerateBindingRedirects Condition="'$(AutoGenerateBindingRedirects)' == ''">true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType Condition="'$(GenerateBindingRedirectsOutputType)' == ''">true</GenerateBindingRedirectsOutputType>
</PropertyGroup>

<!--
Expand Down
4 changes: 0 additions & 4 deletions src/package/package/package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />

<!-- For net46, testhost is packaged along with runner, include it in publish -->
<ProjectReference Include="$(TestPlatformRoot)src\testhost\testhost.csproj" />
<ProjectReference Include="$(TestPlatformRoot)src\testhost.x86\testhost.x86.csproj" />
</ItemGroup>
<Import Project="$(TestPlatformRoot)scripts\build\TestPlatform.targets" />
<Target Name="CoreCompile" />
Expand Down
4 changes: 0 additions & 4 deletions src/testhost.x86/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
<assemblyIdentity name="Microsoft.VisualStudio.TestPlatform.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="11.0.0.0-14.0.0.0" newVersion="15.0.0.0" />
</dependentAssembly>

<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.TestWindow.Interfaces" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="11.0.0.0-14.0.0.0" newVersion="15.0.0.0"/>
</dependentAssembly>

<dependentAssembly>
<assemblyIdentity name="Microsoft.VisualStudio.QualityTools.UnitTestFramework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="10.1.0.0" newVersion="10.0.0.0"/>
Expand Down Expand Up @@ -45,11 +43,9 @@
<add name="TpTraceLevel" value="0" />
</switches>
</system.diagnostics>

<appSettings>
<!--<add key="ExecutionThreadApartmentState" value ="MTA"/>-->
<!--<add key="TraceLogMaxFileSizeInKb" value ="10240"/>-->

<!-- MsTest Adapter Specific AppSettings -->
<add key="TestProjectRetargetTo35Allowed" value="true" />
</appSettings>
Expand Down
5 changes: 3 additions & 2 deletions src/testhost.x86/testhost.x86.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
Expand All @@ -10,10 +10,11 @@
<WarningsAsErrors>true</WarningsAsErrors>
<PlatformTarget>x86</PlatformTarget>
<OutputType>Exe</OutputType>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
<PackageTargetFallback Condition=" '$(TargetFramework)' != 'net46' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp1.0'">
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comment why is this required. CrossPlatEngine no longer has a dependency on JSON.net.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after PR #659, we may not need this.

</PropertyGroup>
<ItemGroup>
<None Include="app.config" />
Expand Down
5 changes: 3 additions & 2 deletions src/testhost/testhost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TestPlatformRoot Condition="$(TestPlatformRoot) == ''">..\..\</TestPlatformRoot>
Expand All @@ -8,10 +8,11 @@
<AssemblyName>testhost</AssemblyName>
<TargetFrameworks>netcoreapp1.0;netcoreapp2.0;net46</TargetFrameworks>
<OutputType>Exe</OutputType>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
<PackageTargetFallback Condition=" '$(TargetFramework)' != 'net46' ">$(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50</PackageTargetFallback>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp1.0'">
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be this is not required since CrossPlatEngine is not dependent on JSON.net.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will remove after testing once Mayank fix will go in

</PropertyGroup>
<ItemGroup>
<Compile Include="..\testhost.x86\Program.cs;..\testhost.x86\DefaultEngineInvoker.cs;..\testhost.x86\IEngineInvoker.cs;..\testhost.x86\AppDomainEngineInvoker.cs;..\testhost.x86\Friends.cs" />
Expand Down
6 changes: 6 additions & 0 deletions src/vstest.console/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,11 @@
<bindingRedirect oldVersion="11.0.0.0-14.0.0.0" newVersion="15.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Loading