From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 4 Mar 2020 23:12:02 +0000 (-0800)
Subject: [master] Switch to Windows Server queues (dotnet/Extensions#2927)
X-Git-Tag: submit/tizen/20210909.063632~8848^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62dba4fe2eae89d533ba8081064864da0c64b637;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

[master] Switch to Windows Server queues (dotnet/Extensions#2927)

- add debug information for `Assert` failures in `MaximumOSVersionTest`
- update src/TestingUtils/Microsoft.AspNetCore.Testing/test/MaximumOSVersionTest.cs
  - co-Authored-By: @Tratcher
- try with VS2019 queues
- skip `MaximumOSVersion` tests on .NET due to xunit issue
  - co-authored-by: @Tratcher


Commit migrated from https://github.com/dotnet/Extensions/commit/26ff835952efd87e6794d72c6d684d61f7ff7f6c
---

diff --git a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/MaximumOSVersionTest.cs b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/MaximumOSVersionTest.cs
index 6e983ce..3cafb03 100644
--- a/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/MaximumOSVersionTest.cs
+++ b/src/libraries/Common/tests/Extensions/TestingUtils/Microsoft.AspNetCore.Testing/test/MaximumOSVersionTest.cs
@@ -34,6 +34,7 @@ namespace Microsoft.AspNetCore.Testing
         }
 
         [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "https://github.com/xunit/xunit/issues/2076")]
         [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_RS4)]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         public void RunTest_Win10_RS4()
@@ -43,10 +44,11 @@ namespace Microsoft.AspNetCore.Testing
             Assert.NotNull(versionKey);
             var currentVersion = (string)versionKey.GetValue("CurrentBuildNumber");
             Assert.NotNull(currentVersion);
-            Assert.True(17134 >= int.Parse(currentVersion));
+            Assert.True(17134 >= int.Parse(currentVersion), $"Unexpected build number {currentVersion} on {Environment.OSVersion.Version}.");
         }
 
         [ConditionalFact]
+        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "https://github.com/xunit/xunit/issues/2076")]
         [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_19H2)]
         [OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
         public void RunTest_Win10_19H2()
@@ -56,7 +58,7 @@ namespace Microsoft.AspNetCore.Testing
             Assert.NotNull(versionKey);
             var currentVersion = (string)versionKey.GetValue("CurrentBuildNumber");
             Assert.NotNull(currentVersion);
-            Assert.True(18363 >= int.Parse(currentVersion));
+            Assert.True(18363 >= int.Parse(currentVersion), $"Unexpected build number {currentVersion} on {Environment.OSVersion.Version}.");
         }
     }