From 7397611ad1b72437ed85e7f8cba184253ebda269 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Apr 2025 02:17:44 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/dotnet build 20250425.2 Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , System.CommandLine , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 From Version 9.0.0-preview.25076.3 -> To Version 10.0.0-preview.25225.102 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 12 +++++------ global.json | 4 ++-- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7b43f0015b..949fbcfba77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,35 +12,35 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - - https://github.com/dotnet/command-line-api - 8b30ff9e4900d220c2979f1bbb5647154e438edd + + https://github.com/dotnet/dotnet + 919f64d9fd105eda6d412b926d9c20951383150f - - https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + + https://github.com/dotnet/dotnet + 919f64d9fd105eda6d412b926d9c20951383150f - - https://github.com/dotnet/arcade - ee01738f27521c74f77a20e279da69215d9a9d9c + + https://github.com/dotnet/dotnet + 919f64d9fd105eda6d412b926d9c20951383150f - - https://github.com/dotnet/arcade - ee01738f27521c74f77a20e279da69215d9a9d9c + + https://github.com/dotnet/dotnet + 919f64d9fd105eda6d412b926d9c20951383150f - - https://github.com/dotnet/arcade - ee01738f27521c74f77a20e279da69215d9a9d9c + + https://github.com/dotnet/dotnet + 919f64d9fd105eda6d412b926d9c20951383150f - - https://github.com/dotnet/arcade - ee01738f27521c74f77a20e279da69215d9a9d9c + + https://github.com/dotnet/dotnet + 919f64d9fd105eda6d412b926d9c20951383150f - - https://github.com/dotnet/arcade - ee01738f27521c74f77a20e279da69215d9a9d9c + + https://github.com/dotnet/dotnet + 919f64d9fd105eda6d412b926d9c20951383150f https://github.com/dotnet/diagnostics @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7c7f56f5af049b79488190d428ef257b92597766 - - https://github.com/dotnet/sdk - 282b182cacce41ba5307a28f530c91bced5bd60d + + https://github.com/dotnet/dotnet + 919f64d9fd105eda6d412b926d9c20951383150f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 786f7c9fa30..a23d1d89c45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,24 +48,24 @@ --> - 10.0.0-beta.25223.2 - 10.0.0-beta.25223.2 - 10.0.0-beta.25223.2 + 10.0.0-beta.25225.102 + 10.0.0-beta.25225.102 + 10.0.0-beta.25225.102 10.0.0-preview.5.25222.16 10.0.0-preview.5.25222.16 - 2.0.0-beta5.25222.1 + 2.0.0-beta5.25225.102 9.0.0-preview.25223.1 9.0.0-preview.25223.1 - 9.0.0-preview.25076.3 + 10.0.0-preview.25225.102 10.0.0-preview.4.25222.8 10.0.0-preview.4.25222.8 - 10.0.100-preview.5.25223.19 + 10.0.100-preview.5.25225.102 1.0.622301 diff --git a/global.json b/global.json index a4c50c4b38b..6f3317339a8 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.2" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25225.102" } } From b3f3a25b2c2c2f2fa9c439d3a2d30cf5c1be46f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Apr 2025 02:02:11 +0000 Subject: [PATCH 2/7] Failed to perform coherency update for one or more dependencies. From 0283b5b7fb9f401596a89de959e7dfde5d157386 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Apr 2025 02:01:18 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/dotnet build 20250427.1 Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , System.CommandLine , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 From Version 9.0.0-preview.25076.3 -> To Version 10.0.0-preview.25227.101 --- eng/Version.Details.xml | 32 +++++++++---------- eng/Versions.props | 12 +++---- .../steps/source-index-stage1-publish.yml | 4 +-- global.json | 4 +-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 949fbcfba77..6420671219c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,35 +12,35 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 https://github.com/dotnet/diagnostics @@ -54,9 +54,9 @@ https://github.com/dotnet/aspnetcore 7c7f56f5af049b79488190d428ef257b92597766 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a23d1d89c45..95f72e31ce9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,24 +48,24 @@ --> - 10.0.0-beta.25225.102 - 10.0.0-beta.25225.102 - 10.0.0-beta.25225.102 + 10.0.0-beta.25227.101 + 10.0.0-beta.25227.101 + 10.0.0-beta.25227.101 10.0.0-preview.5.25222.16 10.0.0-preview.5.25222.16 - 2.0.0-beta5.25225.102 + 2.0.0-beta5.25227.101 9.0.0-preview.25223.1 9.0.0-preview.25223.1 - 10.0.0-preview.25225.102 + 10.0.0-preview.25227.101 10.0.0-preview.4.25222.8 10.0.0-preview.4.25222.8 - 10.0.100-preview.5.25225.102 + 10.0.100-preview.5.25227.101 1.0.622301 diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index 473a22c4719..99c2326fc19 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - sourceIndexUploadPackageVersion: 2.0.0-20240522.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog diff --git a/global.json b/global.json index 6f3317339a8..efc34ce70e2 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25225.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25227.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25227.101" } } From 506a4e0db94ac676bfc73b31c42dd9a20a94a031 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Mon, 28 Apr 2025 08:50:26 -0700 Subject: [PATCH 4/7] Remove CoherentParentDependency and regroup versions --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 26 ++++++++++---------------- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6420671219c..fa3e32d06cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - - https://github.com/dotnet/aspnetcore - 7c7f56f5af049b79488190d428ef257b92597766 + + https://github.com/dotnet/dotnet + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 https://github.com/dotnet/diagnostics @@ -46,21 +46,21 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - - https://github.com/dotnet/runtime - 31289efa35151a4e60dcd2e6471c51f620f78c28 + + https://github.com/dotnet/dotnet + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - - https://github.com/dotnet/aspnetcore - 7c7f56f5af049b79488190d428ef257b92597766 + + https://github.com/dotnet/dotnet + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 https://github.com/dotnet/dotnet c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - - https://github.com/dotnet/runtime - 31289efa35151a4e60dcd2e6471c51f620f78c28 + + https://github.com/dotnet/dotnet + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 diff --git a/eng/Versions.props b/eng/Versions.props index 95f72e31ce9..0bafe33be55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,27 +47,21 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - - 10.0.0-beta.25227.101 - 10.0.0-beta.25227.101 - 10.0.0-beta.25227.101 - - 10.0.0-preview.5.25222.16 - 10.0.0-preview.5.25222.16 - - 2.0.0-beta5.25227.101 9.0.0-preview.25223.1 9.0.0-preview.25223.1 - + 1.0.622301 + + 10.0.100-preview.5.25227.101 10.0.0-preview.25227.101 - - 10.0.0-preview.4.25222.8 - 10.0.0-preview.4.25222.8 - + 10.0.0-beta.25227.101 + 10.0.0-beta.25227.101 + 10.0.0-beta.25227.101 + 10.0.100-preview.5.25227.101 + 2.0.0-beta5.25227.101 + 10.0.100-preview.5.25227.101 10.0.100-preview.5.25227.101 - - 1.0.622301 + 10.0.100-preview.5.25227.101 $(MicrosoftNETCoreApp80Version) From d24111a3ac9ff7ba9df2ff4677b8357ab5f4c08f Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Mon, 28 Apr 2025 09:05:32 -0700 Subject: [PATCH 5/7] Use runtime version instead of SDK version --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa3e32d06cf..f6cc8eb73ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/dotnet c71a5e287b51dabb97b7e0be5c4ba9b11f840402 @@ -46,11 +46,11 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - + https://github.com/dotnet/dotnet c71a5e287b51dabb97b7e0be5c4ba9b11f840402 @@ -58,7 +58,7 @@ https://github.com/dotnet/dotnet c71a5e287b51dabb97b7e0be5c4ba9b11f840402 - + https://github.com/dotnet/dotnet c71a5e287b51dabb97b7e0be5c4ba9b11f840402 From 211c0b69e6b3f5e4badb186a2408be879a647ac1 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Mon, 28 Apr 2025 09:07:04 -0700 Subject: [PATCH 6/7] Fix more runtime versions --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0bafe33be55..360a58c8d5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,16 +52,16 @@ 9.0.0-preview.25223.1 1.0.622301 - 10.0.100-preview.5.25227.101 + 10.0.0-preview.5.25227.101 10.0.0-preview.25227.101 10.0.0-beta.25227.101 10.0.0-beta.25227.101 10.0.0-beta.25227.101 - 10.0.100-preview.5.25227.101 + 10.0.0-preview.5.25227.101 2.0.0-beta5.25227.101 - 10.0.100-preview.5.25227.101 + 10.0.0-preview.5.25227.101 10.0.100-preview.5.25227.101 - 10.0.100-preview.5.25227.101 + 10.0.0-preview.5.25227.101 $(MicrosoftNETCoreApp80Version) From 6a78599234617cb2c59dc740bafc30e2d7700bb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Apr 2025 02:02:43 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/dotnet build 20250428.1 Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions , Microsoft.NETCore.App.Runtime.win-x64 , System.CommandLine , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0 , VS.Redist.Common.NetCore.SharedFramework.x64.10.0 From Version 10.0.0-preview.5.25222.16 -> To Version 10.0.0-preview.5.25228.101 --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- global.json | 4 ++-- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6cc8eb73ef..a3ec45b7c0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 https://github.com/dotnet/diagnostics @@ -12,55 +12,55 @@ https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 https://github.com/dotnet/diagnostics 06dd01b14c537a9d512feec44452f9dd255f32a7 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 diff --git a/eng/Versions.props b/eng/Versions.props index 360a58c8d5b..e8435a27690 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,16 +52,16 @@ 9.0.0-preview.25223.1 1.0.622301 - 10.0.0-preview.5.25227.101 - 10.0.0-preview.25227.101 - 10.0.0-beta.25227.101 - 10.0.0-beta.25227.101 - 10.0.0-beta.25227.101 - 10.0.0-preview.5.25227.101 - 2.0.0-beta5.25227.101 - 10.0.0-preview.5.25227.101 - 10.0.100-preview.5.25227.101 - 10.0.0-preview.5.25227.101 + 10.0.0-preview.5.25228.101 + 10.0.0-preview.25228.101 + 10.0.0-beta.25228.101 + 10.0.0-beta.25228.101 + 10.0.0-beta.25228.101 + 10.0.0-preview.5.25228.101 + 2.0.0-beta5.25228.101 + 10.0.0-preview.5.25228.101 + 10.0.100-preview.5.25228.101 + 10.0.0-preview.5.25228.101 $(MicrosoftNETCoreApp80Version) diff --git a/global.json b/global.json index efc34ce70e2..ffa15f47ad1 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25227.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25227.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25228.101" } }