From a2715b99ef16e319c512ae864fc91f5e1b0149f5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Oct 2023 12:16:52 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20231024.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23518.2 -> To Version 9.0.0-beta.23524.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23516.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/cross/toolchain.cmake | 10 +++++----- global.json | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 278dba8f020f..73d1b0b51919 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -402,30 +402,30 @@ - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 https://github.com/dotnet/runtime d775a3bb77add85dc30032b20c78c83f9a0e3c1f - + https://github.com/dotnet/xliff-tasks - d66a09c8b11e1235273c8e6cd946e5c8e247f189 + 83531fff1a39abe38de53e2e6b702bc1bb9c3bb4 diff --git a/eng/Versions.props b/eng/Versions.props index 26976af01927..3ad6ae532d87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 7.0.0 4.0.0 7.0.0 - 9.0.0-beta.23518.2 + 9.0.0-beta.23524.1 7.0.0-preview.22423.2 9.0.0-alpha.1.23523.13 4.3.0 @@ -172,7 +172,7 @@ - 1.0.0-beta.23516.1 + 1.0.0-beta.23523.1 @@ -191,7 +191,7 @@ 6.12.0 6.1.0 - 9.0.0-beta.23518.2 + 9.0.0-beta.23524.1 4.18.4 1.3.2 6.0.0-beta.22262.1 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 38e96724f5b8..00288a300653 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/13.1.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") diff --git a/global.json b/global.json index 58cc88cc2223..0c6e4ee5a59c 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23518.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23524.1" } } From cf318568f8607ebdad47b6bffdf07f0df1cb5cdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Oct 2023 12:17:20 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20231025.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23518.2 -> To Version 9.0.0-beta.23525.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23516.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73d1b0b51919..c9f173068bff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -402,22 +402,22 @@ - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3ad6ae532d87..5b5afeac0eac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 7.0.0 4.0.0 7.0.0 - 9.0.0-beta.23524.1 + 9.0.0-beta.23525.2 7.0.0-preview.22423.2 9.0.0-alpha.1.23523.13 4.3.0 @@ -191,7 +191,7 @@ 6.12.0 6.1.0 - 9.0.0-beta.23524.1 + 9.0.0-beta.23525.2 4.18.4 1.3.2 6.0.0-beta.22262.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91f85..e8def7e6a85f 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -158,7 +158,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we do not need all ASP.NET packages restored. - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $env:DOTNET_NOLOGO=1 # Disable telemetry on CI. if ($ci) { @@ -228,7 +228,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943341..710e64df967f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -112,7 +112,7 @@ function InitializeDotNetCli { export DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 # Disable telemetry on CI if [[ $ci == true ]]; then @@ -165,7 +165,7 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value _InitializeDotNetCli="$dotnet_root" diff --git a/global.json b/global.json index 0c6e4ee5a59c..7f0eaa880c3a 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23524.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23525.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23525.2" } }