From 89eb78d5666c3fc6e19aad6491518c90f957e318 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Oct 2020 14:32:54 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/arcade build 20201015.7 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.ApiCompat From Version 6.0.0-beta.20514.1 -> To Version 6.0.0-beta.20515.7 --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- global.json | 8 +++--- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ee584e737d698..fa4562578dd163 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,61 +10,61 @@ - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + d4de3ce701c2ba697d71cc70e2db69d7568913dc https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index fba8cc2613e0e4..a117a7fb660e1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,16 +53,16 @@ 6.0.0-preview1.20513.4 3.8.0-4.20503.2 - 6.0.0-beta.20514.1 - 6.0.0-beta.20514.1 - 6.0.0-beta.20514.1 - 6.0.0-beta.20514.1 - 6.0.0-beta.20514.1 - 6.0.0-beta.20514.1 - 2.5.1-beta.20514.1 - 6.0.0-beta.20514.1 - 6.0.0-beta.20514.1 - 6.0.0-beta.20514.1 + 6.0.0-beta.20515.7 + 6.0.0-beta.20515.7 + 6.0.0-beta.20515.7 + 6.0.0-beta.20515.7 + 6.0.0-beta.20515.7 + 6.0.0-beta.20515.7 + 2.5.1-beta.20515.7 + 6.0.0-beta.20515.7 + 6.0.0-beta.20515.7 + 6.0.0-beta.20515.7 5.0.0-rc.1.20451.14 6.0.0-alpha.1.20501.4 diff --git a/global.json b/global.json index 75c15a7544e1f5..17d9a6a5cbdf58 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20514.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20514.1", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20514.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20514.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20515.7", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20515.7", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20515.7", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20515.7", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "2.0.1", From edc2d35541fe874c3e60af0cb2b46ea0e6d1f53d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Oct 2020 14:42:05 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/xharness build 20201019.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.20516.1 -> To Version 1.0.0-prerelease.20519.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa4562578dd163..26195d41c0d2b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,13 +190,13 @@ https://github.com/mono/linker 388d3905692d220e758f2f76987bf41aa8a8bb85 - + https://github.com/dotnet/xharness - 653143a33490a41e52d366669515dc8bb158db8b + ce8656a484b3eeed00139ae2271feab280da6cfa - + https://github.com/dotnet/xharness - 653143a33490a41e52d366669515dc8bb158db8b + ce8656a484b3eeed00139ae2271feab280da6cfa diff --git a/eng/Versions.props b/eng/Versions.props index a117a7fb660e1c..bf7a96fd3377c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,8 +137,8 @@ 4.9.4 16.8.0-release-20201009-01 - 1.0.0-prerelease.20516.1 - 1.0.0-prerelease.20516.1 + 1.0.0-prerelease.20519.2 + 1.0.0-prerelease.20519.2 2.4.1 2.4.2 1.3.0 From 5908c084461dfdf2be7d83d7d69d0c8dd52d28c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Oct 2020 13:10:52 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/mono/linker build 20201020.1 Microsoft.NET.ILLink.Tasks From Version 6.0.0-alpha.1.20516.1 -> To Version 6.0.0-alpha.1.20520.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26195d41c0d2b1..2422e3a6fb85c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/mono/linker - 388d3905692d220e758f2f76987bf41aa8a8bb85 + 8c41e53bbc6223fbb320885e8944794f283b6135 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index bf7a96fd3377c1..7c28fc6182476e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ 5.0.0-preview-20201009.2 - 6.0.0-alpha.1.20516.1 + 6.0.0-alpha.1.20520.1 6.0.0-alpha.1.20512.1 From 5b675d0bd427bae26c6b9fdfa10a1df3b5714cd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Oct 2020 14:17:57 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/mono/linker build 20201020.2 Microsoft.NET.ILLink.Tasks From Version 6.0.0-alpha.1.20516.1 -> To Version 6.0.0-alpha.1.20520.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2422e3a6fb85c5..43f5de8e676f0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -186,9 +186,9 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/mono/linker - 8c41e53bbc6223fbb320885e8944794f283b6135 + 3f21706683db65d3ba7d31d13e39f4c550d7c1bb https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 7c28fc6182476e..b6ef26bed9a9ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,7 +149,7 @@ 5.0.0-preview-20201009.2 - 6.0.0-alpha.1.20520.1 + 6.0.0-alpha.1.20520.2 6.0.0-alpha.1.20512.1 From 0357ea75ffda52f4be4e86854c91787d34317ee5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Oct 2020 15:14:45 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/arcade build 20201016.5 Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.ApiCompat From Version 6.0.0-beta.20514.1 -> To Version 6.0.0-beta.20516.5 --- eng/Version.Details.xml | 56 +++++++++++------------ eng/Versions.props | 20 ++++---- eng/common/performance/crossgen_perf.proj | 27 +++++++++-- global.json | 8 ++-- 4 files changed, 64 insertions(+), 47 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43f5de8e676f0c..8a601c9c6731cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,61 +10,61 @@ - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d4de3ce701c2ba697d71cc70e2db69d7568913dc + e7a79ce64f0703c231e6da88b5279dd0bf681b3d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index b6ef26bed9a9ec..281d4e8ffa4300 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,16 +53,16 @@ 6.0.0-preview1.20513.4 3.8.0-4.20503.2 - 6.0.0-beta.20515.7 - 6.0.0-beta.20515.7 - 6.0.0-beta.20515.7 - 6.0.0-beta.20515.7 - 6.0.0-beta.20515.7 - 6.0.0-beta.20515.7 - 2.5.1-beta.20515.7 - 6.0.0-beta.20515.7 - 6.0.0-beta.20515.7 - 6.0.0-beta.20515.7 + 6.0.0-beta.20516.5 + 6.0.0-beta.20516.5 + 6.0.0-beta.20516.5 + 6.0.0-beta.20516.5 + 6.0.0-beta.20516.5 + 6.0.0-beta.20516.5 + 2.5.1-beta.20516.5 + 6.0.0-beta.20516.5 + 6.0.0-beta.20516.5 + 6.0.0-beta.20516.5 5.0.0-rc.1.20451.14 6.0.0-alpha.1.20501.4 diff --git a/eng/common/performance/crossgen_perf.proj b/eng/common/performance/crossgen_perf.proj index 4264920382e1ee..3b8dfc2b1fb3a1 100644 --- a/eng/common/performance/crossgen_perf.proj +++ b/eng/common/performance/crossgen_perf.proj @@ -27,11 +27,18 @@ - - - - - + + + + + + + + + + + + @@ -51,6 +58,13 @@ + + + $(WorkItemDirectory) + $(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --single %(Identity) --singlethreaded True + + + @@ -60,6 +74,9 @@ 4:00 + + 4:00 + $(WorkItemDirectory) $(Python) $(Crossgen2Directory)test.py crossgen2 --core-root $(CoreRoot) --composite $(Crossgen2Directory)framework-r2r.dll.rsp diff --git a/global.json b/global.json index 17d9a6a5cbdf58..9a9ce5514d7e88 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20515.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20515.7", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20515.7", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20515.7", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20516.5", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20516.5", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20516.5", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20516.5", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "2.0.1", From 5775d0e33953426264edd3d7b1d02473f0be9cdc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Oct 2020 18:03:56 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/llvm-project build 20201019.1 runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk From Version 9.0.1-alpha.1.20512.1 -> To Version 9.0.1-alpha.1.20519.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a601c9c6731cd..8e1e93d7e1d60c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -126,37 +126,37 @@ https://github.com/dotnet/runtime-assets ed9af8227ff01d9ab010cab1f32f0f362b81cb1f - + https://github.com/dotnet/llvm-project - 57e96f31cf9115bd0ae2f5318338984abd2bbd88 + b3a5d9b05b0c3a8561682159988cf430861373eb - + https://github.com/dotnet/llvm-project - 57e96f31cf9115bd0ae2f5318338984abd2bbd88 + b3a5d9b05b0c3a8561682159988cf430861373eb - + https://github.com/dotnet/llvm-project - 57e96f31cf9115bd0ae2f5318338984abd2bbd88 + b3a5d9b05b0c3a8561682159988cf430861373eb - + https://github.com/dotnet/llvm-project - 57e96f31cf9115bd0ae2f5318338984abd2bbd88 + b3a5d9b05b0c3a8561682159988cf430861373eb - + https://github.com/dotnet/llvm-project - 57e96f31cf9115bd0ae2f5318338984abd2bbd88 + b3a5d9b05b0c3a8561682159988cf430861373eb - + https://github.com/dotnet/llvm-project - 57e96f31cf9115bd0ae2f5318338984abd2bbd88 + b3a5d9b05b0c3a8561682159988cf430861373eb - + https://github.com/dotnet/llvm-project - 57e96f31cf9115bd0ae2f5318338984abd2bbd88 + b3a5d9b05b0c3a8561682159988cf430861373eb - + https://github.com/dotnet/llvm-project - 57e96f31cf9115bd0ae2f5318338984abd2bbd88 + b3a5d9b05b0c3a8561682159988cf430861373eb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 281d4e8ffa4300..e3d506dac833ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,14 +153,14 @@ 6.0.0-alpha.1.20512.1 - 9.0.1-alpha.1.20512.1 - 9.0.1-alpha.1.20512.1 - 9.0.1-alpha.1.20512.1 - 9.0.1-alpha.1.20512.1 - 9.0.1-alpha.1.20512.1 - 9.0.1-alpha.1.20512.1 - 9.0.1-alpha.1.20512.1 - 9.0.1-alpha.1.20512.1 + 9.0.1-alpha.1.20519.1 + 9.0.1-alpha.1.20519.1 + 9.0.1-alpha.1.20519.1 + 9.0.1-alpha.1.20519.1 + 9.0.1-alpha.1.20519.1 + 9.0.1-alpha.1.20519.1 + 9.0.1-alpha.1.20519.1 + 9.0.1-alpha.1.20519.1