diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 413207fe677c4..75abad2338c25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,65 +42,65 @@ - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 998b715ed1fbb966437345a1996af64e22c83368 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c8a49752b09d8..9c6281e0d4d5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,6 +16,8 @@ release true + + 3.5.0-beta2-20074-05 true false @@ -57,16 +59,16 @@ - 5.0.0-beta.20109.1 - 5.0.0-beta.20109.1 - 5.0.0-beta.20109.1 - 5.0.0-beta.20109.1 - 5.0.0-beta.20109.1 - 5.0.0-beta.20109.1 - 2.5.1-beta.20109.1 - 5.0.0-beta.20109.1 - 5.0.0-beta.20109.1 - 5.0.0-beta.20109.1 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 2.5.1-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 + 5.0.0-beta.20111.11 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 0eea7d1df3e41..556da2e1355f7 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -71,7 +71,17 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") add_compile_options(-mthumb) - add_compile_options(-mfpu=vfpv3) + if (NOT DEFINED CLR_ARM_FPU_TYPE) + set (CLR_ARM_FPU_TYPE vfpv3) + endif (NOT DEFINED CLR_ARM_FPU_TYPE) + + add_compile_options (-mfpu=${CLR_ARM_FPU_TYPE}) + if (NOT DEFINED CLR_ARM_FPU_CAPABILITY) + set (CLR_ARM_FPU_CAPABILITY 0x7) + endif (NOT DEFINED CLR_ARM_FPU_CAPABILITY) + + add_definitions (-DCLR_ARM_FPU_CAPABILITY=${CLR_ARM_FPU_CAPABILITY}) + if(TARGET_ARCH_NAME STREQUAL "armel") add_compile_options(-mfloat-abi=softfp) if(DEFINED TIZEN_TOOLCHAIN) diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 70cb65f50b48b..eff0d9ac7983d 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -170,6 +170,32 @@ stages: shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_Preview1_Publish' + channelName: '.NET 5 Preview 1' + channelId: 737 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + +- template: \eng\common\templates\post-build\channels\generic-public-channel.yml + parameters: + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + dependsOn: ${{ parameters.publishDependsOn }} + publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }} + symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }} + stageName: 'Net5_Preview2_Publish' + channelName: '.NET 5 Preview 2' + channelId: 738 + transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json' + shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json' + symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json' + - template: \eng\common\templates\post-build\channels\generic-public-channel.yml parameters: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fef7e5a3fdced..a45302b377f2b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -399,7 +399,12 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' - Invoke-WebRequest "https://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + try { + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + } + catch { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message $_ + } } if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } diff --git a/global.json b/global.json index a8e4392ae9777..360a2921860fc 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20109.1", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20109.1", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20109.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20109.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20111.11", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20111.11", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20111.11", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20111.11", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs index bf0dcc4d4dfa8..53b8edefe24bf 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs @@ -14,7 +14,7 @@ namespace System.Net.Tests { [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeConfiguration.Checked)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerAuthenticationTests : IDisposable { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs index f4db00e05d936..b7f22775d776f 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs @@ -15,7 +15,7 @@ namespace System.Net.Tests { [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeConfiguration.Checked)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerContextTests : IDisposable { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerPrefixCollectionTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerPrefixCollectionTests.cs index cc11a486fcf89..1cdefd357dd69 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerPrefixCollectionTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerPrefixCollectionTests.cs @@ -9,7 +9,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerPrefixCollectionTests { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerRequestTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerRequestTests.cs index 54dc264e2e2cb..956f4c3179981 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerRequestTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerRequestTests.cs @@ -12,7 +12,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerRequestTests : IDisposable { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs index 66a12b64697fb..71da72b99a9d9 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Cookies.cs @@ -10,7 +10,7 @@ namespace System.Net.Tests { [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeConfiguration.Checked)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerResponseCookiesTests : HttpListenerResponseTestBase { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Headers.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Headers.cs index 23df8d5d66523..6a8bcf14d9624 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Headers.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.Headers.cs @@ -9,7 +9,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerResponseHeadersTests : HttpListenerResponseTestBase { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs index 0e50509d0d12c..156578cdab766 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs @@ -58,7 +58,7 @@ protected async Task GetResponse(string httpVersion = "1.1 } [SkipOnCoreClr("System.Net.Tests may timeout in stress configurations", RuntimeConfiguration.Checked)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerResponseTests : HttpListenerResponseTestBase { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerTests.cs index 8875ebdcc6b13..50d07851bd041 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerTests.cs @@ -12,7 +12,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerTests { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerTimeoutManagerTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerTimeoutManagerTests.cs index e7c2e5a175be1..afcea1a4fb08a 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerTimeoutManagerTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerTimeoutManagerTests.cs @@ -8,7 +8,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerTimeoutManagerTests { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerWebSocketTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerWebSocketTests.cs index ac0876956d90c..0f6500a951692 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerWebSocketTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerWebSocketTests.cs @@ -11,7 +11,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpListenerWebSocketTests : IDisposable { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpRequestStreamTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpRequestStreamTests.cs index b219dc82011f8..3aa0876375628 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpRequestStreamTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpRequestStreamTests.cs @@ -14,7 +14,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpRequestStreamTests : IDisposable { diff --git a/src/libraries/System.Net.HttpListener/tests/HttpResponseStreamTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpResponseStreamTests.cs index ec09067a3c573..4fd9f9869c1a5 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpResponseStreamTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpResponseStreamTests.cs @@ -13,7 +13,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class HttpResponseStreamTests : IDisposable { diff --git a/src/libraries/System.Net.HttpListener/tests/InvalidClientRequestTests.cs b/src/libraries/System.Net.HttpListener/tests/InvalidClientRequestTests.cs index 6cc81bf75c098..9323b17b5d8ed 100644 --- a/src/libraries/System.Net.HttpListener/tests/InvalidClientRequestTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/InvalidClientRequestTests.cs @@ -11,7 +11,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class InvalidClientRequestTests : IDisposable { @@ -97,7 +97,7 @@ public static IEnumerable InvalidRequest_TestData() yield return new object[] { "PUT {path} HTTP/1.1", null, null, null, "Length Required" }; } - [ActiveIssue("https://github.com/dotnet/runtime/issues/2284", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2284", TestRuntimes.Mono)] [Fact] public async Task GetContext_InvalidRequest_DoesNotGetContext() { diff --git a/src/libraries/System.Net.HttpListener/tests/SimpleHttpTests.cs b/src/libraries/System.Net.HttpListener/tests/SimpleHttpTests.cs index 8a7c421acfb6a..81c1eed52eadc 100644 --- a/src/libraries/System.Net.HttpListener/tests/SimpleHttpTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/SimpleHttpTests.cs @@ -13,7 +13,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class SimpleHttpTests : IDisposable { diff --git a/src/libraries/System.Net.HttpListener/tests/WebSocketTests.cs b/src/libraries/System.Net.HttpListener/tests/WebSocketTests.cs index eb4d2406c7a29..66cfd990b092c 100644 --- a/src/libraries/System.Net.HttpListener/tests/WebSocketTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/WebSocketTests.cs @@ -10,7 +10,7 @@ namespace System.Net.Tests { - [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/2391", TestRuntimes.Mono)] [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoServer))] // httpsys component missing in Nano. public class WebSocketTests : IDisposable { diff --git a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs index 6db9dc31cf6e5..47f1ef16c4763 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs @@ -45,7 +45,6 @@ public void RelativeSearchPath_Is_Null() } [Fact] - [SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "Corefx has limitations to build a UWP executable that can be launched directly using Process.Start")] public void TargetFrameworkTest() { const int ExpectedExitCode = 0; diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.cs index 7315602ffb9c8..16eb1e101ac5d 100644 --- a/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.cs +++ b/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.cs @@ -150,6 +150,7 @@ public void GetUninitializedObject_ByRefLikeType_NonNetfx_ThrowsNotSupportedExce [Fact] [SkipOnTargetFramework(~TargetFrameworkMonikers.Netcoreapp, "The coreclr doesn't support GetUninitializedObject for shared generic instances")] + [SkipOnMonoAttribute("System.__Canon doesn't exist on Mono")] public void GetUninitializedObject_SharedGenericInstance_NetCore_ThrowsNotSupportedException() { Type canonType = Type.GetType("System.__Canon"); diff --git a/src/libraries/System.Threading/tests/SynchronizationContextTests.cs b/src/libraries/System.Threading/tests/SynchronizationContextTests.cs index a972878c77b71..4d24a3ae2737b 100644 --- a/src/libraries/System.Threading/tests/SynchronizationContextTests.cs +++ b/src/libraries/System.Threading/tests/SynchronizationContextTests.cs @@ -42,7 +42,7 @@ public static void WaitTest_ChangedInDotNetCore() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/31977", TargetFrameworkMonikers.Mono)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/31977", TestRuntimes.Mono)] public static void WaitNotificationTest() { ThreadTestHelpers.RunTestInBackgroundThread(() =>