From 6bc24124bc2b89ff7beb8645a8817038f39b19d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Jan 2025 05:02:08 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20250116.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.25064.11 -> To Version 8.0.0-beta.25066.6 --- NuGet.config | 27 +++++++++++---------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 6 files changed, 23 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e44e1dfac64..6307db2abe6a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,9 @@ + + + @@ -29,14 +32,10 @@ - - - - - - - - + + + + @@ -65,14 +64,10 @@ - - - - - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27def07fee9a..c336a656b443 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4b36eeb5beb8..2d30eb7db243 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.25064.11 + 8.0.0-beta.25066.6 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 73828dd30d31..4f0546dce120 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 60352ede194e..a00577ed17aa 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2 - $defaultXCopyMSBuildVersion = '17.8.1-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 203525c3c615..408ccf8072a2 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25064.11" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25066.6" } }