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

Add netcoreapp1.0 support to Microsoft.TestPlatform.TestHost NuGet #2569

Merged
6 commits merged into from
Sep 17, 2020
Merged

Add netcoreapp1.0 support to Microsoft.TestPlatform.TestHost NuGet #2569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07d3c8e
Restore netcoreapp1.0 support for testhost
sharwell Sep 3, 2020
a28dbd6
Updated nuspec files to include netstandard13 and netcoreapp10.
Haplois Sep 15, 2020
8dcbe2c
Merge remote-tracking branch 'origin/master' into fix-netstandard1
Haplois Sep 16, 2020
a0ce726
Merge branch 'master' into fix-netstandard1
Haplois Sep 16, 2020
bb8b094
PR fixes
Haplois Sep 16, 2020
e13d28c
Merge branch 'fix-netstandard1' of https://github.com/Haplois/vstest …
Haplois Sep 16, 2020
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
218 changes: 146 additions & 72 deletions scripts/build.ps1
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions scripts/verify-nupkgs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ function Verify-Nuget-Packages($packageDirectory)
Write-Log "Starting Verify-Nuget-Packages."
$expectedNumOfFiles = @{
"Microsoft.CodeCoverage" = 29;
"Microsoft.NET.Test.Sdk" = 13;
"Microsoft.NET.Test.Sdk" = 18;
"Microsoft.TestPlatform" = 477;
"Microsoft.TestPlatform.Build" = 19;
"Microsoft.TestPlatform.CLI" = 350;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
"Microsoft.TestPlatform.ObjectModel" = 62;
"Microsoft.TestPlatform.ObjectModel" = 91;
"Microsoft.TestPlatform.Portable" = 566;
"Microsoft.TestPlatform.TestHost" = 145;
"Microsoft.TestPlatform.TestHost" = 197;
"Microsoft.TestPlatform.TranslationLayer" = 121}

$nugetPackages = Get-ChildItem -Filter "*.nupkg" $packageDirectory | % { $_.FullName}
Expand Down
18 changes: 9 additions & 9 deletions src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
<ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.ComponentModel.EventBasedAsync" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.TypeConverter" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Json" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XmlDocument" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'" >
<PackageReference Include="System.ComponentModel.EventBasedAsync" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
<PackageReference Include="NuGet.Frameworks" Version="4.6.4" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
Expand Down
6 changes: 6 additions & 0 deletions src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<!-- TestHost gets shipped as ExtensionSDKs with name TestPlatform.Universal. -->
<!-- Currently code coverage not supported for uap10.0. -->
</group>
<group targetFramework="netcoreapp1.0">
<dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
<dependency id="Microsoft.CodeCoverage" version="$Version$" />
</group>
<group targetFramework="netcoreapp2.1">
<dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
<dependency id="Microsoft.CodeCoverage" version="$Version$" />
Expand All @@ -33,10 +37,12 @@
</dependencies>
</metadata>
<files>
<file src="netcoreapp\*" target="build\netcoreapp1.0\" />
<file src="netcoreapp\*" target="build\netcoreapp2.1\" />
<file src="netfx\*" target="build\net40\" />

<file src="Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\" />
<file src="Microsoft.NET.Test.Sdk.props" target="build\netcoreapp1.0\" />
<file src="Microsoft.NET.Test.Sdk.props" target="build\netcoreapp2.1\" />
<file src="Microsoft.NET.Test.Sdk.props" target="build\net40\" />
<file src="Microsoft.NET.Test.Sdk.props" target="build\uap10.0\" />
Expand Down
Loading