Skip to content

Add netstandard2 target to object model and lower #2074

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

Closed
Claire Novotny (clairernovotny) wants to merge 10 commits into from
Closed

Add netstandard2 target to object model and lower #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b7fc595
Create netstandard2.0 target for objectmodel
Jun 26, 2019
0014c6d
add netstandard2.0 targets
Jun 26, 2019
855194c
Add netcoreapp2.1 tests to validate netstandard2.0 targets
Jun 26, 2019
9f1b862
don't use 1.6 lib for newer platforms
Jun 26, 2019
43e8be8
user newer deps
Jun 26, 2019
6cf3753
fix more refs
Jun 26, 2019
89dd127
remove lib that's in the runtime
Jun 26, 2019
de0b8db
fix packaging
Jun 26, 2019
87e3991
fix verify
Jun 26, 2019
932cbc5
update SRM
Jun 27, 2019
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
2 changes: 1 addition & 1 deletion scripts/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ function Create-NugetPackages
}

Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version $additionalArgs"
& $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;JsonNetVersion=$JsonNetVersion`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework=$TPB_TargetFrameworkCore20 $additionalArgs
& $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;JsonNetVersion=$JsonNetVersion`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework20=$TPB_TargetFrameworkCore20`;NetCoreTargetFramework=$TPB_TargetFrameworkCore $additionalArgs

Set-ScriptFailedOnError
}
Expand Down
3 changes: 0 additions & 3 deletions scripts/build/TestPlatform.Settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
<!-- Disable default inclusion of .resx file. We generate files in the Resources directory only
if localization is enabled, default inclusion ends up including the generated files by default. -->
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<!-- .NetStandardLibrary1.6.0 brings in dependencies which are supported in UWP,
any higher version will bring in dependencies which are not supported by current UWP version -->
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
Expand Down
2 changes: 1 addition & 1 deletion scripts/verify-nupkgs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function Verify-Nuget-Packages($packageDirectory)
"Microsoft.NET.Test.Sdk" = 13;
"Microsoft.TestPlatform" = 421;
"Microsoft.TestPlatform.Build" = 19;
"Microsoft.TestPlatform.CLI" = 303;
"Microsoft.TestPlatform.CLI" = 305;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
"Microsoft.TestPlatform.ObjectModel" = 65;
"Microsoft.TestPlatform.Portable" = 472;
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<AssemblyName>Microsoft.TestPlatform.CoreUtilities</AssemblyName>
<TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
<TargetFrameworks>netstandard1.4;net451;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
Expand All @@ -22,7 +22,7 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
<PackageReference Include="System.Diagnostics.FileVersionInfo">
<Version>4.0.0</Version>
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static TraceLevel TraceLevel

#endif

#if NETSTANDARD1_4
#if NETSTANDARD1_4 || NETSTANDARD2_0
public static PlatformTraceLevel TraceLevel
{
get
Expand Down
6 changes: 3 additions & 3 deletions ...soft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="System.Collections.NonGeneric">
<Version>4.0.1</Version>
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Security.Principal.Windows">
<Version>4.0.0</Version>
<Version>4.5.1</Version>
</PackageReference>
<PackageReference Include="System.Collections.Specialized">
<Version>4.0.1</Version>
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
14 changes: 8 additions & 6 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 @@ -6,7 +6,7 @@
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<AssemblyName>Microsoft.VisualStudio.TestPlatform.ObjectModel</AssemblyName>
<TargetFrameworks>net451;netstandard1.4</TargetFrameworks>
<TargetFrameworks>net451;netstandard1.4;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
<PackageId>Microsoft.TestPlatform.ObjectModel</PackageId>
</PropertyGroup>
Expand All @@ -31,11 +31,8 @@
<ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Metadata">
<Version>1.3.0</Version>
<Version>1.6.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
Expand All @@ -57,7 +54,12 @@
<PackageReference Include="System.Reflection.TypeExtensions">
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Xml.XPath.XmlDocument">
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Update="Resources\CommonResources.Designer.cs">
<DesignTime>True</DesignTime>
Expand Down
4 changes: 2 additions & 2 deletions ...soft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
<TargetFrameworks>netstandard1.0;netcoreapp1.0;net451;uap10.0</TargetFrameworks>
<TargetFrameworks>netstandard1.0;netcoreapp1.0;net451;uap10.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.0;netcoreapp1.0</TargetFrameworks>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<EnableCodeAnalysis>true</EnableCodeAnalysis>
Expand All @@ -31,7 +31,7 @@
<Compile Include="Interfaces\**\*.cs" />
<Compile Include="Properties\**\*.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' or '$(TargetFramework)' == 'netstandard2.0' ">
<Compile Include="netstandard1.0\**\*.cs" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
Expand Down
6 changes: 0 additions & 6 deletions ...TestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@
<PackageReference Include="System.Runtime.Serialization.Primitives">
<Version>4.1.1</Version>
</PackageReference>
<PackageReference Include="System.Xml.XPath.XmlDocument">
<Version>4.0.1</Version>
</PackageReference>
<PackageReference Include="System.Runtime.InteropServices">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.TypeConverter">
<Version>4.1.0</Version>
</PackageReference>
Expand Down
7 changes: 1 addition & 6 deletions src/datacollector/datacollector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,9 @@
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
<PackageReference Include="System.Runtime.Loader">
<Version>4.0.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Reflection">
<Version>4.1.0</Version>
<Version>4.3.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
Expand Down
1 change: 0 additions & 1 deletion src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,6 @@
<file src="netcoreapp2.0\TestHost\Newtonsoft.Json.dll" target="tools\netcoreapp2.0\TestHost\Newtonsoft.Json.dll" />
<file src="netcoreapp2.0\TestHost\System.Collections.Immutable.dll" target="tools\netcoreapp2.0\TestHost\System.Collections.Immutable.dll" />
<file src="netcoreapp2.0\TestHost\System.Reflection.Metadata.dll" target="tools\netcoreapp2.0\TestHost\System.Reflection.Metadata.dll" />
<file src="netcoreapp2.0\TestHost\System.Runtime.InteropServices.RuntimeInformation.dll" target="tools\netcoreapp2.0\TestHost\System.Runtime.InteropServices.RuntimeInformation.dll" />
<file src="netcoreapp2.0\TestHost\testhost.exe" target="tools\netcoreapp2.0\TestHost\testhost.exe" />
<file src="netcoreapp2.0\TestHost\testhost.exe.config" target="tools\netcoreapp2.0\TestHost\testhost.exe.config" />
<file src="netcoreapp2.0\TestHost\testhost.x86.exe" target="tools\netcoreapp2.0\TestHost\testhost.x86.exe" />
Expand Down
60 changes: 40 additions & 20 deletions src/package/nuspec/TestPlatform.ObjectModel.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,17 @@
<tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
<dependencies>
<group targetFramework="net451">
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
<dependency id="System.Reflection.Metadata" version="[1.3.0, )" />
<dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
</group>
<group targetFramework="netstandard1.5">
<dependency id="NETStandard.Library" version="[1.6.0, )" />
<dependency id="System.ComponentModel.EventBasedAsync" version="[4.0.11, )" />
<dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
<dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
<dependency id="System.Reflection.Metadata" version="[1.3.0, )" />
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
<dependency id="System.Runtime.Loader" version="[4.0.0, )" />
<dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
<dependency id="System.Runtime.Serialization.Json" version="[4.0.2, )" />
<dependency id="System.Xml.XPath.XmlDocument" version="[4.0.1, )" />

<!-- Dependencies for core utilities -->
<dependency id="System.Diagnostics.Process" version="[4.1.0, )" />
<dependency id="System.Diagnostics.TextWriterTraceListener" version="[4.0.0, )" />
<dependency id="System.Diagnostics.TraceSource" version="[4.0.0, )" />
<dependency id="System.Threading.Thread" version="[4.0.0, )" />
<dependency id="NETStandard.Library" version="[1.6.1, )" />
<dependency id="System.Xml.XPath.XmlDocument" version="[4.3.0, )" />
</group>
<group targetFramework="netstandard1.4">
<dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
<dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
<dependency id="System.Diagnostics.FileVersionInfo" version="[4.3.0, )" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="System.Xml.XPath.XmlDocument" version="[4.3.0, )" />
</group>
</dependencies>
<frameworkAssemblies>
Expand All @@ -60,6 +47,10 @@
<file src="$NetCoreTargetFramework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.5\" />
<file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard1.5\" />
<file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard1.5\" />

<file src="$NetCoreTargetFramework20$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.5\" />
<file src="$NetCoreTargetFramework20$\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard1.5\" />
<file src="$NetCoreTargetFramework20$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard1.5\" />

<file src="Microsoft.TestPlatform.TestHost\netstandard1.4\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.4\" />
<file src="Microsoft.TestPlatform.TestHost\netstandard1.4\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard1.4\" />
Expand Down Expand Up @@ -122,5 +113,34 @@
<file src="$NetCoreTargetFramework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.5\zh-Hans" />
<file src="$NetCoreTargetFramework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.5\zh-Hant" />

<file src="$NetCoreTargetFramework20$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\cs" />
<file src="$NetCoreTargetFramework20$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\de" />
<file src="$NetCoreTargetFramework20$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\es" />
<file src="$NetCoreTargetFramework20$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\fr" />
<file src="$NetCoreTargetFramework20$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\it" />
<file src="$NetCoreTargetFramework20$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ja" />
<file src="$NetCoreTargetFramework20$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ko" />
<file src="$NetCoreTargetFramework20$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\pl" />
<file src="$NetCoreTargetFramework20$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\pt-BR" />
<file src="$NetCoreTargetFramework20$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ru" />
<file src="$NetCoreTargetFramework20$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\tr" />
<file src="$NetCoreTargetFramework20$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hans" />
<file src="$NetCoreTargetFramework20$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hant" />

<file src="$NetCoreTargetFramework20$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\cs" />
<file src="$NetCoreTargetFramework20$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\de" />
<file src="$NetCoreTargetFramework20$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\es" />
<file src="$NetCoreTargetFramework20$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\fr" />
<file src="$NetCoreTargetFramework20$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\it" />
<file src="$NetCoreTargetFramework20$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ja" />
<file src="$NetCoreTargetFramework20$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ko" />
<file src="$NetCoreTargetFramework20$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pl" />
<file src="$NetCoreTargetFramework20$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pt-BR" />
<file src="$NetCoreTargetFramework20$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ru" />
<file src="$NetCoreTargetFramework20$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\tr" />
<file src="$NetCoreTargetFramework20$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
<file src="$NetCoreTargetFramework20$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />


</files>
</package>
3 changes: 0 additions & 3 deletions src/vstest.console/vstest.console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
<PackageReference Include="System.Diagnostics.Contracts">
<Version>4.0.1</Version>
</PackageReference>
<PackageReference Include="System.Xml.XPath">
<Version>4.0.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Reference Include="System" />
Expand Down
4 changes: 2 additions & 2 deletions ...estPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">Exe</OutputType>
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
<OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' or '$(TargetFramework)' == 'netcoreapp2.1' ">Exe</OutputType>
<TargetFrameworks>netcoreapp1.0;net451;netcoreapp2.1</TargetFrameworks>
<AssemblyName>Microsoft.TestPlatform.CoreUtilities.UnitTests</AssemblyName>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
Expand Down
4 changes: 2 additions & 2 deletions ...latform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">Exe</OutputType>
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
<OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' or '$(TargetFramework)' == 'netcoreapp2.1'">Exe</OutputType>
<TargetFrameworks>netcoreapp1.0;net451;netcoreapp2.1</TargetFrameworks>
<AssemblyName>Microsoft.TestPlatform.ObjectModel.PlatformTests</AssemblyName>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...ft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</PropertyGroup>
<Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
<PropertyGroup>
<OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">Exe</OutputType>
<TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
<OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' or '$(TargetFramework)' == 'netcoreapp2.1' ">Exe</OutputType>
<TargetFrameworks>netcoreapp1.0;net451;netcoreapp2.1</TargetFrameworks>
<AssemblyName>Microsoft.TestPlatform.ObjectModel.UnitTests</AssemblyName>
</PropertyGroup>
<ItemGroup>
Expand Down