diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ee584e737d698..8e1e93d7e1d60c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,61 +10,61 @@ - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d - + https://github.com/dotnet/arcade - d3cea00bba6539c68436ac9b3d9665318d76b47d + e7a79ce64f0703c231e6da88b5279dd0bf681b3d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -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 @@ -186,17 +186,17 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/mono/linker - 388d3905692d220e758f2f76987bf41aa8a8bb85 + 3f21706683db65d3ba7d31d13e39f4c550d7c1bb - + 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 fba8cc2613e0e4..e3d506dac833ef 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.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 @@ -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 @@ -149,18 +149,18 @@ 5.0.0-preview-20201009.2 - 6.0.0-alpha.1.20516.1 + 6.0.0-alpha.1.20520.2 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 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 75c15a7544e1f5..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.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.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",