diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c06c0a4834be5..af653e5ac1d48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/icu - 0f1dc5572da0246e68c92fdeed02d589e5965efd + 18e6b6f8ac75c6ceff0be934d863df94be035bf1 https://github.com/dotnet/msquic a7213b4676c1803bb251771291a525482d42e511 - + https://github.com/dotnet/emsdk - 9d801337aab87a186ea73db11a75fb97a97e45b8 + dc2e6e52d5b1be78da00ef57eed69461badcc720 https://github.com/dotnet/wcf @@ -18,77 +18,77 @@ - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 https://github.com/microsoft/vstest @@ -134,37 +134,37 @@ https://github.com/dotnet/runtime-assets 84788d11ca8c96c61a9cf7847c46bc012cef2b8b - + https://github.com/dotnet/llvm-project - 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 + 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 - + https://github.com/dotnet/llvm-project - 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 + 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 - + https://github.com/dotnet/llvm-project - 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 + 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 - + https://github.com/dotnet/llvm-project - 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 + 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 - + https://github.com/dotnet/llvm-project - 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 + 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 - + https://github.com/dotnet/llvm-project - 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 + 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 - + https://github.com/dotnet/llvm-project - 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 + 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 - + https://github.com/dotnet/llvm-project - 60d4a5fe85546a2ed5ab6f7909b7da93d3ba1146 + 75fa01d7eba1a283c7f2513bffa72c6bea440ac2 https://github.com/dotnet/runtime @@ -210,9 +210,9 @@ https://github.com/dotnet/xharness 6a2e0d8e1ed28e1209a887c77c951337ee9e9160 - + https://github.com/dotnet/arcade - a7c57abb74deaee6dac921dd68f9c3c58059ebfb + fecf65bedcee9036b8ba9d8d7feef5413f294914 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -230,9 +230,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 93aae682a468b3c7858d497da5cf79d8ac8eecdc - + https://github.com/dotnet/hotreload-utils - b2b9b361d92ebb4ba574ea693aa20b37e7d6b1e9 + a445d89f31358546e8d6d60a04a75643abd7de64 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index fa61942077860..f489d6c930159 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,21 +57,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 2.5.1-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 - 7.0.0-beta.21555.2 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 2.5.1-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 + 7.0.0-beta.21559.3 6.0.0-preview.1.102 @@ -156,7 +156,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21558.2 1.0.0-prerelease.21558.2 - 1.0.2-alpha.0.21551.2 + 1.0.2-alpha.0.21558.2 2.4.2-pre.9 2.4.2 1.3.0 @@ -172,20 +172,20 @@ 7.0.100-1.21528.2 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-alpha.1.21551.1 + 7.0.0-alpha.1.21558.1 7.0.0-alpha.1.21529.3 - 11.1.0-alpha.1.21554.1 - 11.1.0-alpha.1.21554.1 - 11.1.0-alpha.1.21554.1 - 11.1.0-alpha.1.21554.1 - 11.1.0-alpha.1.21554.1 - 11.1.0-alpha.1.21554.1 - 11.1.0-alpha.1.21554.1 - 11.1.0-alpha.1.21554.1 + 11.1.0-alpha.1.21558.1 + 11.1.0-alpha.1.21558.1 + 11.1.0-alpha.1.21558.1 + 11.1.0-alpha.1.21558.1 + 11.1.0-alpha.1.21558.1 + 11.1.0-alpha.1.21558.1 + 11.1.0-alpha.1.21558.1 + 11.1.0-alpha.1.21558.1 - 7.0.0-alpha.1.21554.1 + 7.0.0-alpha.1.21558.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index eea19cd8452fd..f041e5ddd9589 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -6,6 +6,7 @@ Param( [switch] $ci, [switch] $prepareMachine, [switch] $excludePrereleaseVS, + [string] $msbuildEngine = $null, [Parameter(ValueFromRemainingArguments=$true)][String[]]$extraArgs ) diff --git a/global.json b/global.json index 96ea4109b5478..480e6d2396331 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21555.2", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21555.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21555.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21555.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.21559.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21559.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21559.3", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.21559.3", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21556.5"