Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions

View File

@@ -2,8 +2,8 @@
<UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
<ItemGroup>
<TestTargetFramework Include=".NETCoreApp,Version=v1.0">
<Folder>netcoreapp1.0</Folder>
<TestTargetFramework Include=".NETCoreApp,Version=v2.2">
<Folder>netcoreapp2.1</Folder>
</TestTargetFramework>
</ItemGroup>
<!--

View File

@@ -69,8 +69,8 @@
<!-- Default Test platform to deploy the netstandard compiled tests to -->
<PropertyGroup>
<!-- we default TestTFM and FilterToTestTFM to netcoreapp1.0 if they are not explicity defined -->
<DefaultTestTFM Condition="'$(DefaultTestTFM)'==''">netcoreapp1.0</DefaultTestTFM>
<!-- we default TestTFM and FilterToTestTFM to netcoreapp2.1 if they are not explicity defined -->
<DefaultTestTFM Condition="'$(DefaultTestTFM)'==''">netcoreapp2.1</DefaultTestTFM>
<TestTFM Condition="'$(TestTFM)'==''">$(DefaultTestTFM)</TestTFM>
<FilterToTestTFM Condition="'$(FilterToTestTFM)'==''">$(DefaultTestTFM)</FilterToTestTFM>
</PropertyGroup>