From afc2796202c6077872a32d05c4ddd41a433a40fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 13:26:51 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20231213.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23612.2 -> To Version 9.0.0-beta.23613.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/templates/job/source-index-stage1.yml | 10 +++++----- eng/common/tools.ps1 | 5 ----- eng/common/tools.sh | 5 ----- global.json | 4 ++-- 6 files changed, 16 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09ccdc1f3..4b96bfa0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,18 +211,18 @@ - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ https://github.com/dotnet/arcade-services 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade - 1f6c5acef9bdf9d4bf1eded044eeec0d7d19560d + b6349a217d7e2f6b5c1831702f8beef5c171da3f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b3a71de8a..6b1aa5833 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 9.0.0-beta.23612.2 + 9.0.0-beta.23613.3 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b98202aa0..795233662 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexPackageVersion: 1.0.1-20231213.4 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -30,20 +30,20 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 162dee2b9..540393a66 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -165,11 +165,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 } - # Source Build uses DotNetCoreSdkDir variable - if ($env:DotNetCoreSdkDir -ne $null) { - $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir - } - # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { $dotnetExecutable = GetExecutableFileName 'dotnet' diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e98daf50c..9e979ac16 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -123,11 +123,6 @@ function InitializeDotNetCli { # so it doesn't output warnings to the console. export LTTNG_HOME="$HOME" - # Source Build uses DotNetCoreSdkDir variable - if [[ -n "${DotNetCoreSdkDir:-}" ]]; then - export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir" - fi - # Find the first path on $PATH that contains the dotnet.exe if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then local dotnet_path=`command -v dotnet` diff --git a/global.json b/global.json index 5ad922d74..293535aae 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23612.2", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23612.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23613.3", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23613.3" } }