From 2abfad0244d0b8cf29c5eeab06550bb113a9d6df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 14:46:18 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20241112.13 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24562.13 --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- global.json | 4 ++-- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 955d034b04e4..66f5d2f4634d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,8 @@ - - @@ -30,10 +28,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8a34c4fe558..a20035f49576 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de - + https://github.com/dotnet/arcade - 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d + 1c7e09a8d9c9c9b15ba574cd6a496553505559de https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index c32a5d1b7569..a43bc1dc3a7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 - 9.0.0-beta.24516.2 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 + 9.0.0-beta.24562.13 9.0.0-alpha.1.24516.3 diff --git a/global.json b/global.json index def6b6f1a053..5215feea7741 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "11.0.24" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24516.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24516.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13" } } From c7bddd8f659787e2ec5105821597e0e36a9c5d44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Nov 2024 14:42:53 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20241122.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 9.0.0-beta.24516.2 -> To Version 9.0.0-beta.24572.2 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a20035f49576..df12e019a6bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms 9b822fd70005bf5632d12fe76811b97b3dd044e4 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 - + https://github.com/dotnet/arcade - 1c7e09a8d9c9c9b15ba574cd6a496553505559de + b41381d5cd633471265e9cd72e933a7048e03062 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index a43bc1dc3a7f..f3947e1f8a52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ 6.2.4 6.2.4 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 - 9.0.0-beta.24562.13 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 + 9.0.0-beta.24572.2 9.0.0-alpha.1.24516.3 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3fd9a..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.10.0-pre.4.0" -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 22954477a574..aa94fb174596 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,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/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/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 5215feea7741..e4674ed713f8 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "11.0.24" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24562.13", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24562.13" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24572.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24572.2" } }