From f5f95d6a7a711f3f389b8e27dc66461f5c2a9d0c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 13:06:50 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20240130.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24080.1 -> To Version 9.0.0-beta.24080.3 --- eng/Version.Details.xml | 80 +++++++++---------- eng/Versions.props | 32 ++++---- .../templates/job/source-index-stage1.yml | 2 +- global.json | 6 +- 4 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc1bbd64c4e751..1b8df5d7d72d29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness f49b5c0db06528a9580686a5b63b0e5b4aba566b - + https://github.com/dotnet/arcade - dd50030a0278e8c82f45624446fbec120b83c26b + b4e9225c6c2f9da42fbb611a5e8942a08476fe89 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 9450607d748547..63cfd1a217c440 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-alpha.1.24072.3 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 2.6.7-beta.24080.1 - 9.0.0-beta.24080.1 - 2.6.7-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 - 9.0.0-beta.24080.1 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 2.6.7-beta.24080.3 + 9.0.0-beta.24080.3 + 2.6.7-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 + 9.0.0-beta.24080.3 1.4.0 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 795233662623dc..b5a3e5c4a6c847 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-20231213.4 + sourceIndexPackageVersion: 1.0.1-20240129.2 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: [] diff --git a/global.json b/global.json index c21a25a6283fde..72b437cf06150b 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24080.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24080.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24080.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24080.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.24072.1" From 7cda437470e7986321875d74beadaaf32e7993ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Feb 2024 13:07:39 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20240131.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24080.1 -> To Version 9.0.0-beta.24081.4 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 +-- global.json | 6 ++-- 5 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b8df5d7d72d29..ceb14e14b06033 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,82 +111,82 @@ - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d https://github.com/dotnet/runtime-assets @@ -333,9 +333,9 @@ https://github.com/dotnet/xharness f49b5c0db06528a9580686a5b63b0e5b4aba566b - + https://github.com/dotnet/arcade - b4e9225c6c2f9da42fbb611a5e8942a08476fe89 + 438a8e2488313fb3aa1b24a741a85c2669ee7e0d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 63cfd1a217c440..dfa6ac6c86c15b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-alpha.1.24072.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 2.6.7-beta.24080.3 - 9.0.0-beta.24080.3 - 2.6.7-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 - 9.0.0-beta.24080.3 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 2.6.7-beta.24081.4 + 9.0.0-beta.24081.4 + 2.6.7-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 + 9.0.0-beta.24081.4 1.4.0 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 73828dd30d3179..091023970f1c9c 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.8.5" -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 0da65b5748a7f8..a8f8edb3291580 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,8 +379,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.8.5 + $defaultXCopyMSBuildVersion = '17.8.5' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 72b437cf06150b..afa48bc9a673d6 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-alpha.1.23615.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24080.3", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24080.3", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24080.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24081.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24081.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24081.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.24072.1"