From ac121cf57d6d167bd0733983a4c6fb7e8dce5493 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Oct 2023 12:15:17 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20231004.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23504.4 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.DotNet.XliffTasks From Version 9.0.0-alpha.1.23456.3 -> To Version 9.0.0-alpha.1.23471.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 14 +++++------ eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 6 ++--- global.json | 4 +-- 6 files changed, 41 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 580412928..a86327e94 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9a55fc66..ccff8db3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + bfe4ef2faa611d3c597d08fdcf73f7142d8a02e0 - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + bfe4ef2faa611d3c597d08fdcf73f7142d8a02e0 - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + bfe4ef2faa611d3c597d08fdcf73f7142d8a02e0 - + https://github.com/dotnet/windowsdesktop - 52e969f93c15d4eaa2f709ebbfe168fb1bb09fa2 + bfe4ef2faa611d3c597d08fdcf73f7142d8a02e0 https://github.com/dotnet/runtime @@ -30,7 +30,7 @@ https://github.com/dotnet/runtime 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 @@ -128,13 +128,13 @@ https://github.com/dotnet/wpf 3a8376ca92de4c85dd92b05fba8a1c0a49b14cb9 - + https://github.com/dotnet/fsharp - 767ffa73e8147418ecf54df376e6685b03efd6e4 + 10f956e631a1efc0f7f5e49c626c494cd32b1f50 - + https://github.com/dotnet/fsharp - 767ffa73e8147418ecf54df376e6685b03efd6e4 + 10f956e631a1efc0f7f5e49c626c494cd32b1f50 @@ -146,19 +146,19 @@ https://github.com/dotnet/runtime 736dabeca728ccf8b911d96d1b4c575b4d0db7d2 - + https://github.com/dotnet/roslyn - 79963f8a40c6429cd25667c4c62e717b4ca72098 + a0f635227f57c805c30ebb06a5afecacc77035f5 - + https://github.com/dotnet/msbuild - 60ae06f6d20616f524a751373aea071df8c2ae48 + 6cdef424154c976f04802b101e6be6292f8a8897 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 @@ -202,18 +202,18 @@ - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + f1868a684ed9766d4247d672fd5f96bba4d4bb00 https://github.com/dotnet/arcade-services @@ -232,9 +232,9 @@ 26ce96327dd346534926c4551f8b8d62a6fc724f - + https://github.com/dotnet/xliff-tasks - 194f32828726c3f1f63f79f3dc09b9e99c157b11 + 0f36b29fb7374379609c3ee6a0b70caf457d8a0e diff --git a/eng/Versions.props b/eng/Versions.props index 8216aada6..b982be8ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.23463.1 + 9.0.0-beta.23504.4 @@ -93,7 +93,7 @@ - 4.8.0-3.23470.12 + 4.8.0-3.23477.1 @@ -111,10 +111,10 @@ - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 - 9.0.0-alpha.1.23456.3 + 9.0.0-alpha.1.23471.7 + 9.0.0-alpha.1.23471.7 + 9.0.0-alpha.1.23471.7 + 9.0.0-alpha.1.23471.7 @@ -126,7 +126,7 @@ - 6.8.0-rc.112 + 6.8.0-rc.122 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 6c4ac6fec..91f8196cc 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.6.0-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -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 aa74ab4a8..84cfe7cd9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '17.6' + $vsMinVersionReqdStr = '17.7' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # 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.6.0-2 - $defaultXCopyMSBuildVersion = '17.6.0-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 + $defaultXCopyMSBuildVersion = '17.7.2-1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 44e4a3092..f0db4f0e9 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23463.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23504.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23504.4" } }