From 9283c010f9e5c4f11a76d85cfe4feab931f08ad9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Jan 2025 05:01:38 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20250114.11 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11 --- NuGet.config | 23 +++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba8e571ddcb4..f9a6134555a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,34 @@ + + + + + + + + + + + + + @@ -42,14 +55,24 @@ + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc43d164000d..e4ae893951b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -219,18 +219,18 @@ - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index aa752b006315..e46afc3f45ce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.25060.1 + 8.0.0-beta.25064.11 diff --git a/global.json b/global.json index 2b2357ed17a4..203525c3c615 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.110", + "dotnet": "8.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25060.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25064.11" } } From ee3dddd29e0071c2d9c0e49c45132f072dd39547 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Jan 2025 05:01:48 +0000 Subject: [PATCH 2/2] 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 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4ae893951b2..a4729495cf12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -219,18 +219,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 e46afc3f45ce..d8f45ea2930f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,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" } }