From c9384ebae7d31211e7a01cdc1b6d598ecfd03b56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Feb 2020 13:24:52 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/arcade build 20200210.11 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20110.11 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20110.11 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20110.11 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20110.11 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20110.11 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20110.11 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20110.11 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20110.11 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20110.11 --- eng/Version.Details.xml | 60 ++++++++++++++++---------------- eng/Versions.props | 20 +++++------ eng/common/cross/toolchain.cmake | 12 ++++++- global.json | 8 ++--- 4 files changed, 55 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 413207fe677c4c..346cc79c25f464 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,65 +42,65 @@ - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 - + https://github.com/dotnet/arcade - b0e8d3944155f94f83deea8afe025debe369e69f + 56e162725058d80918f7aa7e0e689e1fde5c2106 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c8a49752b09d82..ac18a49f23da99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,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.20110.11 + 5.0.0-beta.20110.11 + 5.0.0-beta.20110.11 + 5.0.0-beta.20110.11 + 5.0.0-beta.20110.11 + 5.0.0-beta.20110.11 + 2.5.1-beta.20110.11 + 5.0.0-beta.20110.11 + 5.0.0-beta.20110.11 + 5.0.0-beta.20110.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 0eea7d1df3e413..556da2e1355f7f 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/global.json b/global.json index a8e4392ae97774..c2f643a85495a3 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.20110.11", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20110.11", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20110.11", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20110.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", From f82f85a0f36d5bb71a3ffaecb41b798ba8a432ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Feb 2020 20:25:53 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/arcade build 20200211.3 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20111.3 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20111.3 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20111.3 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20111.3 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20111.3 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20111.3 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20111.3 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20111.3 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20111.3 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20111.3 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20111.3 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- global.json | 8 +++--- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 346cc79c25f464..be534ec1acb787 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,65 +42,65 @@ - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f - + https://github.com/dotnet/arcade - 56e162725058d80918f7aa7e0e689e1fde5c2106 + 6063fd2b23a44a98c9fb5a0ef243269f795e226f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ac18a49f23da99..86d54d7e87d06d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,16 @@ - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 2.5.1-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 - 5.0.0-beta.20110.11 + 5.0.0-beta.20111.3 + 5.0.0-beta.20111.3 + 5.0.0-beta.20111.3 + 5.0.0-beta.20111.3 + 5.0.0-beta.20111.3 + 5.0.0-beta.20111.3 + 2.5.1-beta.20111.3 + 5.0.0-beta.20111.3 + 5.0.0-beta.20111.3 + 5.0.0-beta.20111.3 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/global.json b/global.json index c2f643a85495a3..6e8b1639a270fd 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.20110.11", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20110.11", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20110.11", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20110.11", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20111.3", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20111.3", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20111.3", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20111.3", "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", From 514eacb24c6aa237bb9e9d332837e24ea14d441b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Feb 2020 22:28:01 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/arcade build 20200211.5 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20111.5 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20111.5 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20111.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20111.5 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20111.5 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20111.5 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20111.5 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20111.5 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20111.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20111.5 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20111.5 --- eng/Version.Details.xml | 60 +++++++++---------- eng/Versions.props | 20 +++---- .../templates/post-build/post-build.yml | 26 ++++++++ global.json | 8 +-- 4 files changed, 70 insertions(+), 44 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be534ec1acb787..5f02826857e857 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,65 +42,65 @@ - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 - + https://github.com/dotnet/arcade - 6063fd2b23a44a98c9fb5a0ef243269f795e226f + a2873caf73351c17da6c51adbe61675ed678a951 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 86d54d7e87d06d..a3bd6340e2e419 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,16 @@ - 5.0.0-beta.20111.3 - 5.0.0-beta.20111.3 - 5.0.0-beta.20111.3 - 5.0.0-beta.20111.3 - 5.0.0-beta.20111.3 - 5.0.0-beta.20111.3 - 2.5.1-beta.20111.3 - 5.0.0-beta.20111.3 - 5.0.0-beta.20111.3 - 5.0.0-beta.20111.3 + 5.0.0-beta.20111.5 + 5.0.0-beta.20111.5 + 5.0.0-beta.20111.5 + 5.0.0-beta.20111.5 + 5.0.0-beta.20111.5 + 5.0.0-beta.20111.5 + 2.5.1-beta.20111.5 + 5.0.0-beta.20111.5 + 5.0.0-beta.20111.5 + 5.0.0-beta.20111.5 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 70cb65f50b48b2..eff0d9ac7983d1 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/global.json b/global.json index 6e8b1639a270fd..d9be782f0a5740 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.20111.3", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20111.3", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20111.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20111.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20111.5", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20111.5", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20111.5", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20111.5", "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", From b9ac454870874cde7af056e9d158f71e7938e660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Ko=CC=88plinger?= Date: Tue, 11 Feb 2020 23:32:00 +0100 Subject: [PATCH 4/7] React to changes from https://github.com/dotnet/arcade/pull/4799 --- .../tests/HttpListenerAuthenticationTests.cs | 2 +- .../System.Net.HttpListener/tests/HttpListenerContextTests.cs | 2 +- .../tests/HttpListenerPrefixCollectionTests.cs | 2 +- .../System.Net.HttpListener/tests/HttpListenerRequestTests.cs | 2 +- .../tests/HttpListenerResponseTests.Cookies.cs | 2 +- .../tests/HttpListenerResponseTests.Headers.cs | 2 +- .../tests/HttpListenerResponseTests.cs | 2 +- .../System.Net.HttpListener/tests/HttpListenerTests.cs | 2 +- .../tests/HttpListenerTimeoutManagerTests.cs | 2 +- .../tests/HttpListenerWebSocketTests.cs | 2 +- .../System.Net.HttpListener/tests/HttpRequestStreamTests.cs | 2 +- .../System.Net.HttpListener/tests/HttpResponseStreamTests.cs | 2 +- .../tests/InvalidClientRequestTests.cs | 4 ++-- .../System.Net.HttpListener/tests/SimpleHttpTests.cs | 2 +- src/libraries/System.Net.HttpListener/tests/WebSocketTests.cs | 2 +- .../System.Runtime.Extensions/tests/System/AppDomainTests.cs | 1 - .../System.Threading/tests/SynchronizationContextTests.cs | 2 +- 17 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs index bf0dcc4d4dfa8b..53b8edefe24bf4 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 f4db00e05d9361..b7f22775d776fd 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 cc11a486fcf892..1cdefd357dd690 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 54dc264e2e2cb7..956f4c31799814 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 66a12b64697fb4..71da72b99a9d9e 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 23df8d5d66523d..6a8bcf14d96248 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 0e50509d0d12cc..156578cdab766f 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 8875ebdcc6b131..50d07851bd0416 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 e7c2e5a175be1f..afcea1a4fb08a2 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 ac0876956d90c4..0f6500a9516923 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 b219dc82011f88..3aa08763756287 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 ec09067a3c5737..4fd9f9869c1a53 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 6cc81bf75c098d..9323b17b5d8ed0 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 8a7c421acfb6ac..81c1eed52eadcb 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 eb4d2406c7a296..66cfd990b092c0 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 6db9dc31cf6e5e..47f1ef16c4763f 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.Threading/tests/SynchronizationContextTests.cs b/src/libraries/System.Threading/tests/SynchronizationContextTests.cs index a972878c77b718..4d24a3ae2737b8 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(() => From 8d2a2c634579e73f9a579bd545796c94c22e31ed Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 12 Feb 2020 14:00:52 +0100 Subject: [PATCH 5/7] Downgrade compiler version --- eng/Versions.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index a3bd6340e2e419..a65391c416c382 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,6 +16,8 @@ release true + + 3.5.0-beta2-20074-05 true false From 006505d322b9436690fe19988613ac4bec37bb09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Feb 2020 14:03:36 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/arcade build 20200211.11 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20111.11 - Microsoft.DotNet.VersionTools.Tasks - 5.0.0-beta.20111.11 - Microsoft.DotNet.ApiCompat - 5.0.0-beta.20111.11 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.Configuration - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.Feed - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.Packaging - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20111.11 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20111.11 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.20111.11 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20111.11 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20111.11 - Microsoft.DotNet.RemoteExecutor - 5.0.0-beta.20111.11 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- eng/common/tools.ps1 | 7 ++++- global.json | 8 +++--- 4 files changed, 50 insertions(+), 45 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f02826857e857..75abad2338c25a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,65 +42,65 @@ - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 - + https://github.com/dotnet/arcade - a2873caf73351c17da6c51adbe61675ed678a951 + 998b715ed1fbb966437345a1996af64e22c83368 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index a65391c416c382..9c6281e0d4d5f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,16 +59,16 @@ - 5.0.0-beta.20111.5 - 5.0.0-beta.20111.5 - 5.0.0-beta.20111.5 - 5.0.0-beta.20111.5 - 5.0.0-beta.20111.5 - 5.0.0-beta.20111.5 - 2.5.1-beta.20111.5 - 5.0.0-beta.20111.5 - 5.0.0-beta.20111.5 - 5.0.0-beta.20111.5 + 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/tools.ps1 b/eng/common/tools.ps1 index fef7e5a3fdceda..a45302b377f2bc 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 d9be782f0a5740..360a2921860fc1 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.20111.5", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20111.5", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20111.5", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20111.5", + "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", From 81e935dd76fb0e2b1bb876fe971fb1b4e1a1120f Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 12 Feb 2020 19:20:23 +0100 Subject: [PATCH 7/7] Disable serialization test on Mono --- .../tests/FormatterServicesTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.cs b/src/libraries/System.Runtime.Serialization.Formatters/tests/FormatterServicesTests.cs index 7315602ffb9c8f..16eb1e101ac5d5 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");