From 32fc20a023d31e98eb168de4460e669c0098016f Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Mon, 18 Sep 2017 14:35:13 -0700
Subject: [PATCH 1/2] Stop running Math.Clamp tests on UAP as API is not there

---
 .../tests/System.Runtime.Extensions.Tests.csproj               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
index 3b72334f4fe6..c157886cad68 100644
--- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
+++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
@@ -33,13 +33,14 @@
     <Compile Include="System\MarshalByRefObjectTest.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp'">
+    <!-- Math.Clamp is not yet in CoreRT -->
+    <Compile Include="System\MathTests.netcoreapp.cs" />
     <Compile Include="System\Random.netcoreapp.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)'!='netstandard'">
     <Compile Include="System\BitConverterSpan.cs" />
     <Compile Include="System\BitConverter.netcoreapp.cs" />
     <Compile Include="System\IO\Path.GetRelativePath.cs" />
-    <Compile Include="System\MathTests.netcoreapp.cs" />
     <Compile Include="System\MathF.netcoreapp.cs" />
     <Compile Include="System\StringComparer.netcoreapp.cs" />
     <Compile Include="System\UnloadingAndProcessExitTests.netcoreapp.cs" />

From 608d43db9bfddde28001de9e75fc299f801045ce Mon Sep 17 00:00:00 2001
From: danmosemsft <danmose@microsoft.com>
Date: Mon, 18 Sep 2017 16:04:53 -0700
Subject: [PATCH 2/2] Disable only for AOT

---
 .../tests/System.Runtime.Extensions.Tests.csproj               | 3 +--
 .../tests/System/MathTests.netcoreapp.cs                       | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
index c157886cad68..3b72334f4fe6 100644
--- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
+++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
@@ -33,14 +33,13 @@
     <Compile Include="System\MarshalByRefObjectTest.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)'=='netcoreapp'">
-    <!-- Math.Clamp is not yet in CoreRT -->
-    <Compile Include="System\MathTests.netcoreapp.cs" />
     <Compile Include="System\Random.netcoreapp.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)'!='netstandard'">
     <Compile Include="System\BitConverterSpan.cs" />
     <Compile Include="System\BitConverter.netcoreapp.cs" />
     <Compile Include="System\IO\Path.GetRelativePath.cs" />
+    <Compile Include="System\MathTests.netcoreapp.cs" />
     <Compile Include="System\MathF.netcoreapp.cs" />
     <Compile Include="System\StringComparer.netcoreapp.cs" />
     <Compile Include="System\UnloadingAndProcessExitTests.netcoreapp.cs" />
diff --git a/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs b/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs
index 2439880d91aa..f1792140768d 100644
--- a/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs
+++ b/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs
@@ -7,6 +7,7 @@
 
 namespace System.Tests
 {
+    [SkipOnTargetFramework(TargetFrameworkMonikers.UapAot, "Math.Clamp is not in CoreRT yet.")]
     public static partial class MathTests
     {
         public static IEnumerable<object[]> Clamp_UnsignedInt_TestData()