From bde993fc5e1b052c13e00a6f5dc958683fa8e620 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jul 2021 12:12:59 +0000 Subject: [PATCH 1/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210712.2 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21361.3 -> To Version 1.0.0-prerelease.21362.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73444fdb70f5ed..9b5f624c75bd18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,21 +198,21 @@ https://github.com/dotnet/arcade 286d98094b830b8dad769542b2669cb1b75f7097 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - ae45cbdfa6d15fce7e3cf089462f0d2b55727273 + a83e4392b6d3f377239726eedc19b6dc85b85496 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - ae45cbdfa6d15fce7e3cf089462f0d2b55727273 + a83e4392b6d3f377239726eedc19b6dc85b85496 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - ae45cbdfa6d15fce7e3cf089462f0d2b55727273 + a83e4392b6d3f377239726eedc19b6dc85b85496 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - ae45cbdfa6d15fce7e3cf089462f0d2b55727273 + a83e4392b6d3f377239726eedc19b6dc85b85496 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 4f3f2a4c21aad3..e9b973c281e313 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,10 +124,10 @@ 6.0.0-beta.21358.1 6.0.0-beta.21358.1 - 1.0.0-prerelease.21361.3 - 1.0.0-prerelease.21361.3 - 1.0.0-prerelease.21361.3 - 1.0.0-prerelease.21361.3 + 1.0.0-prerelease.21362.2 + 1.0.0-prerelease.21362.2 + 1.0.0-prerelease.21362.2 + 1.0.0-prerelease.21362.2 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 882c992605ec18cb4e891041a30a5d7f9801a192 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jul 2021 13:20:34 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/arcade build 20210709.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21357.3 -> To Version 6.0.0-beta.21359.3 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- eng/common/tools.ps1 | 4 +-- eng/common/tools.sh | 4 +-- global.json | 8 ++--- 5 files changed, 55 insertions(+), 55 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b5f624c75bd18..52e74974ea385d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,69 +14,69 @@ - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 https://github.com/microsoft/vstest @@ -194,9 +194,9 @@ https://github.com/dotnet/xharness c6d444eaf7e95339589ceef371cbef0a90a4add5 - + https://github.com/dotnet/arcade - 286d98094b830b8dad769542b2669cb1b75f7097 + 55262f114b0c1b82f0b081bca0d919b657ba24c5 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e9b973c281e313..e0071021df2e8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,19 +52,19 @@ 3.10.0 6.0.0-rc1.21356.1 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 2.5.1-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 - 6.0.0-beta.21357.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 2.5.1-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 + 6.0.0-beta.21359.3 6.0.0-preview.1.102 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4b255203249311..2df0909937d105 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dot.net/v1/dotnet-install.ps1 +# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -223,7 +223,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 05ca99c6b2813c..828119be411b3d 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dot.net/v1/dotnet-install.sh +# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dot.net/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index e9516bcfa8f5a9..e25c47c09f7133 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21357.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21359.3", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21357.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21357.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21359.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21359.3", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21361.10" From 572294ede9d541897568ddc036ba898499d70666 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jul 2021 13:21:12 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/icu build 20210712.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-preview.7.21328.1 -> To Version 6.0.0-preview.7.21362.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 52e74974ea385d..861ca3d635d58b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - e7626ad8c04b150de635f920b5e8dede0aafaf73 + 1782cd21854f8cb2b60355f4773714a8e0130696 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index e0071021df2e8f..df18c472eb68b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,7 +167,7 @@ 6.0.100-preview.6.21358.3 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-preview.7.21328.1 + 6.0.0-preview.7.21362.1 6.0.0-preview.7.21357.1 From 51342b1b27c05336393e30afb8f1abed44e85c58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jul 2021 13:21:48 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/llvm-project build 20210712.1 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-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21357.1 -> To Version 11.1.0-alpha.1.21362.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 861ca3d635d58b..943bab9ca30e6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -118,37 +118,37 @@ https://github.com/dotnet/runtime-assets 3db3f0a34f73db72e5b918ad22e1fbe9f1c5c4da - + https://github.com/dotnet/llvm-project - a05e5e9fb80f9bb6fd9100775dfe55be6f84729d + 97d42b6f43e31449758c353cfbaf83322941611b - + https://github.com/dotnet/llvm-project - a05e5e9fb80f9bb6fd9100775dfe55be6f84729d + 97d42b6f43e31449758c353cfbaf83322941611b - + https://github.com/dotnet/llvm-project - a05e5e9fb80f9bb6fd9100775dfe55be6f84729d + 97d42b6f43e31449758c353cfbaf83322941611b - + https://github.com/dotnet/llvm-project - a05e5e9fb80f9bb6fd9100775dfe55be6f84729d + 97d42b6f43e31449758c353cfbaf83322941611b - + https://github.com/dotnet/llvm-project - a05e5e9fb80f9bb6fd9100775dfe55be6f84729d + 97d42b6f43e31449758c353cfbaf83322941611b - + https://github.com/dotnet/llvm-project - a05e5e9fb80f9bb6fd9100775dfe55be6f84729d + 97d42b6f43e31449758c353cfbaf83322941611b - + https://github.com/dotnet/llvm-project - a05e5e9fb80f9bb6fd9100775dfe55be6f84729d + 97d42b6f43e31449758c353cfbaf83322941611b - + https://github.com/dotnet/llvm-project - a05e5e9fb80f9bb6fd9100775dfe55be6f84729d + 97d42b6f43e31449758c353cfbaf83322941611b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index df18c472eb68b1..ff3edc90b0f49f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -171,14 +171,14 @@ 6.0.0-preview.7.21357.1 - 11.1.0-alpha.1.21357.1 - 11.1.0-alpha.1.21357.1 - 11.1.0-alpha.1.21357.1 - 11.1.0-alpha.1.21357.1 - 11.1.0-alpha.1.21357.1 - 11.1.0-alpha.1.21357.1 - 11.1.0-alpha.1.21357.1 - 11.1.0-alpha.1.21357.1 + 11.1.0-alpha.1.21362.1 + 11.1.0-alpha.1.21362.1 + 11.1.0-alpha.1.21362.1 + 11.1.0-alpha.1.21362.1 + 11.1.0-alpha.1.21362.1 + 11.1.0-alpha.1.21362.1 + 11.1.0-alpha.1.21362.1 + 11.1.0-alpha.1.21362.1 6.0.0-preview.7.21358.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 076111e18b1681c247afb0d4becc82a655497571 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jul 2021 13:22:29 +0000 Subject: [PATCH 5/7] Update dependencies from https://github.com/mono/linker build 20210712.3 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.6.21358.3 -> To Version 6.0.100-preview.6.21362.3 --- 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 943bab9ca30e6a..afaa4c59e9dfa6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -182,9 +182,9 @@ https://github.com/dotnet/runtime 98b7ed1a3b0543a31b5a0f9069cf44cb70c9230c - + https://github.com/mono/linker - b9501922637806f4135df09a9922d5540e203858 + 664e78edc72dd0a48e6f55e352051b6ba61bba9a https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index ff3edc90b0f49f..335122db0bcbf8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21358.3 + 6.0.100-preview.6.21362.3 $(MicrosoftNETILLinkTasksVersion) 6.0.0-preview.7.21362.1 From 1bd864b6abb07003afd7e98ebe4db0528065d905 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jul 2021 13:23:08 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210712.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21361.1 -> To Version 1.0.1-alpha.0.21362.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 afaa4c59e9dfa6..6e9a1a104f9f8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,9 +214,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization a83e4392b6d3f377239726eedc19b6dc85b85496 - + https://github.com/dotnet/hotreload-utils - 640e908a67b5bc63fa615d31c7877e62c2b15062 + 33219d2b3fbc957e05f8e52a33363cf9b858bb08 https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index 335122db0bcbf8..c34d042ae9f6cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,7 +153,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21357.4 1.0.0-prerelease.21357.4 - 1.0.1-alpha.0.21361.1 + 1.0.1-alpha.0.21362.1 2.4.1 2.4.2 1.3.0 From 4b9362d9fd0b1c3ff0774d535c1b4954bba79602 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jul 2021 15:46:26 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/emsdk build 20210713.1 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.0-preview.7.21362.2 -> To Version 6.0.0-preview.7.21363.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 6e9a1a104f9f8b..58a2c18606c851 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/msquic d7db669b70f4dd67ec001c192f9809c218cab88b - + https://github.com/dotnet/emsdk - 7e218d66bf9ec3ca4fc70c0b63e9a162f2e33451 + 8a6313ffbdbef76fd01e32e37c802b57945531d3 diff --git a/eng/Versions.props b/eng/Versions.props index c34d042ae9f6cf..1e7be3b4cb9806 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,7 +180,7 @@ 11.1.0-alpha.1.21362.1 11.1.0-alpha.1.21362.1 - 6.0.0-preview.7.21358.1 + 6.0.0-preview.7.21363.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version)