Skip to content

[feature/10.0] Update dependencies from dotnet/dotnet #8156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 29, 2025
Merged

[feature/10.0] Update dependencies from dotnet/dotnet #8156

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7397611
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Apr 26, 2025
b3f3a25
Failed to perform coherency update for one or more dependencies.
dotnet-maestro[bot] Apr 27, 2025
0283b5b
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Apr 28, 2025
506a4e0
Remove CoherentParentDependency and regroup versions
jander-msft Apr 28, 2025
d24111a
Use runtime version instead of SDK version
jander-msft Apr 28, 2025
211c0b6
Fix more runtime versions
jander-msft Apr 28, 2025
a139f47
Merge branch 'feature/10.0' of https://github.com/dotnet/dotnet-monit…
jander-msft Apr 28, 2025
6a78599
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Apr 29, 2025
bdb1695
Merge branch 'feature/10.0' of https://github.com/dotnet/dotnet-monit…
jander-msft Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25222.16" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7c7f56f5af049b79488190d428ef257b92597766</Sha>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25223.1">
<Uri>https://github.com/dotnet/diagnostics</Uri>
Expand All @@ -12,55 +12,55 @@
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>06dd01b14c537a9d512feec44452f9dd255f32a7</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25222.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>8b30ff9e4900d220c2979f1bbb5647154e438edd</Sha>
<Dependency Name="System.CommandLine" Version="2.0.0-beta5.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25076.3">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25223.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee01738f27521c74f77a20e279da69215d9a9d9c</Sha>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25223.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee01738f27521c74f77a20e279da69215d9a9d9c</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25223.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee01738f27521c74f77a20e279da69215d9a9d9c</Sha>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25223.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee01738f27521c74f77a20e279da69215d9a9d9c</Sha>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25223.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ee01738f27521c74f77a20e279da69215d9a9d9c</Sha>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="Microsoft.FileFormats" Version="1.0.622301">
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>06dd01b14c537a9d512feec44452f9dd255f32a7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25222.8" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>31289efa35151a4e60dcd2e6471c51f620f78c28</Sha>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25222.16" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>7c7f56f5af049b79488190d428ef257b92597766</Sha>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.5.25223.19">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>282b182cacce41ba5307a28f530c91bced5bd60d</Sha>
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.5.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25222.8" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>31289efa35151a4e60dcd2e6471c51f620f78c28</Sha>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25227.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c71a5e287b51dabb97b7e0be5c4ba9b11f840402</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
28 changes: 11 additions & 17 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,21 @@
See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc.
-->
<PropertyGroup Label="Automated">
<!-- dotnet/arcade references -->
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25223.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25223.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25223.2</MicrosoftDotNetXUnitExtensionsVersion>
<!-- dotnet/aspnetcore references -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.5.25222.16</MicrosoftAspNetCoreAppRuntimewinx64Version>
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25222.16</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
<!-- dotnet/command-line-api references -->
<SystemCommandLineVersion>2.0.0-beta5.25222.1</SystemCommandLineVersion>
<!-- dotnet/diagnostics references -->
<MicrosoftDiagnosticsMonitoringVersion>9.0.0-preview.25223.1</MicrosoftDiagnosticsMonitoringVersion>
<MicrosoftDiagnosticsMonitoringEventPipeVersion>9.0.0-preview.25223.1</MicrosoftDiagnosticsMonitoringEventPipeVersion>
<!-- dotnet/roslyn-analyzers -->
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25076.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- dotnet/runtime references -->
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25222.8</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25222.8</VSRedistCommonNetCoreSharedFrameworkx64100Version>
<!-- dotnet/sdk references -->
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.5.25223.19</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
<!-- dotnet/symstore references -->
<MicrosoftFileFormatsVersion>1.0.622301</MicrosoftFileFormatsVersion>
<!-- dotnet/dotnet references -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.100-preview.5.25227.101</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25227.101</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25227.101</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25227.101</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25227.101</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.100-preview.5.25227.101</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemCommandLineVersion>2.0.0-beta5.25227.101</SystemCommandLineVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.100-preview.5.25227.101</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.5.25227.101</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.100-preview.5.25227.101</VSRedistCommonNetCoreSharedFrameworkx64100Version>
</PropertyGroup>
<PropertyGroup Label="Runtime Versions">
<MicrosoftAspNetCoreApp80Version>$(MicrosoftNETCoreApp80Version)</MicrosoftAspNetCoreApp80Version>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/source-index-stage1-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.25227.101",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25227.101"
}
}
Loading