diff options
| author | Karthik Rajasekaran <karajas@microsoft.com> | 2016-12-06 03:42:19 +0300 |
|---|---|---|
| committer | Karthik Rajasekaran <karajas@microsoft.com> | 2016-12-12 22:05:48 +0300 |
| commit | c80f37644dc33d422d1c048e8dae22db28d3a4bc (patch) | |
| tree | 0903faf9d601b4ef53881e98c554c0e02bc4230d /build.proj | |
| parent | 5f83628ee8eef2c3d6d6b7e7c9f4ca0b966a6c11 (diff) | |
Use TestNugetTargetMoniker instead of FilterToTestTFM in order to select correct assets
Fix System.Runtime.Serialization.* test builds files
Diffstat (limited to 'build.proj')
| -rw-r--r-- | build.proj | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/build.proj b/build.proj index 2c4488dea0..6c623d87d5 100644 --- a/build.proj +++ b/build.proj @@ -149,6 +149,20 @@ </PropertyGroup> <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Using RuntimeIdentifier = '$(TestNugetRuntimeId)'" /> + + <PropertyGroup> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'netcoreapp1.0'">.NETCoreApp,Version=v1.0</FilterTestNugetTargetMoniker> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'netcoreapp1.1'">.NETCoreApp,Version=v1.1</FilterTestNugetTargetMoniker> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net463'">.NETFramework,Version=v4.6.3</FilterTestNugetTargetMoniker> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net462'">.NETFramework,Version=v4.6.2</FilterTestNugetTargetMoniker> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net461'">.NETFramework,Version=v4.6.1</FilterTestNugetTargetMoniker> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net46'">.NETFramework,Version=v4.6</FilterTestNugetTargetMoniker> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net45'">.NETFramework,Version=v4.5</FilterTestNugetTargetMoniker> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net451'">.NETFramework,Version=v4.5.1</FilterTestNugetTargetMoniker> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'net452'">.NETFramework,Version=v4.5.2</FilterTestNugetTargetMoniker> + <!-- Project template for UWP Apps uses uap10.0, this mapping allows support for the Debug and Release scenarios --> + <FilterTestNugetTargetMoniker Condition="'$(FilterToTestTFM)' == 'netcore50aot' Or '$(FilterToTestTFM)' == 'netcore50'">UAP,Version=v10.0</FilterTestNugetTargetMoniker> + </PropertyGroup> <AddDependenciesToProjectJson AdditionalDependencies="@(_InjectProjectReferenceDependency)" PackagesDrops="@(_PackagesDropsForCommonProjectJson)" @@ -159,7 +173,7 @@ UseNewestAvailablePackages="$(UseNewestAvailablePackages)" SupportsFile="$(CommonTestProjectJson)" TestRuntime="$(TestNugetRuntimeId)" - TestTargetFramework="$(FilterToTestTFM)" + TestTargetFramework="$(FilterTestNugetTargetMoniker)" /> </Target> |