From 7a4f81eef7e18ba980a5ed51a5ba9c3fe6c3623c Mon Sep 17 00:00:00 2001
From: Karthik Rajasekaran <karajas@microsoft.com>
Date: Fri, 6 Jan 2017 11:04:28 -0800
Subject: [PATCH] For full framework test build, pass in win-x64 as
 testnugetruntimeid (dotnet/corefx#14907)

* For full framework test build, pass in win-x64 as testnugetruntimeid

This is because of the simple exact string match required by the FilterRuntimeForSupports.

* Make System.Composition.Convention.Tests target netstandard1.3


Commit migrated from https://github.com/dotnet/corefx/commit/c3f912f2ca14562826c37e9cb7a2d2153eac5a07
---
 .../tests/System.Composition.Convention.Tests.csproj          | 1 +
 src/libraries/buildpipeline/pipeline.json                     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
index b8a8a5f2d7f..3f191b24377 100644
--- a/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
+++ b/src/libraries/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj
@@ -5,6 +5,7 @@
     <ProjectGuid>{853BB14F-8A5B-42B4-A053-21DE1AEBB335}</ProjectGuid>
     <RootNamespace>ConventionsUnitTests</RootNamespace>
     <AssemblyName>System.Composition.Convention.Tests</AssemblyName>
+    <NugetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NugetTargetMoniker>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/libraries/buildpipeline/pipeline.json b/src/libraries/buildpipeline/pipeline.json
index cd57c3c1e7d..8b64f611e6c 100644
--- a/src/libraries/buildpipeline/pipeline.json
+++ b/src/libraries/buildpipeline/pipeline.json
@@ -529,7 +529,7 @@
             "TestContainerSuffix": "windows10desktop",
             "TargetTestCategory": "Full Framework",
             "FilterToTestTFM": "net46",
-            "TestNugetRuntimeId": "win10-x64",
+            "TestNugetRuntimeId": "win-x64",
             "EnableCloudTest": "true"
           },
           "ReportingParameters": {
@@ -903,7 +903,7 @@
             "TestContainerSuffix": "windows10desktop",
             "TargetTestCategory": "Full Framework",            
             "FilterToTestTFM": "net46",
-            "TestNugetRuntimeId": "win10-x64",
+            "TestNugetRuntimeId": "win-x64",
             "EnableCloudTest": "true"
           },
           "ReportingParameters": {
-- 
GitLab