Skip to content

Commit

Permalink
[net10.0] Update dependencies from dotnet/sdk (#22106)
Browse files Browse the repository at this point in the history
This pull request updates the following dependencies

## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

- **Coherency Updates**:
  - **Microsoft.NET.ILLink.Tasks**: from 10.0.0-alpha.1.25067.10 to 10.0.0-preview.2.25114.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 10.0.0-alpha.2.25067.2 to 10.0.0-preview.2.25114.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 10.0.0-alpha.1.25067.10 to 10.0.0-preview.2.25114.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 10.0.0-alpha.1.25067.10 to 10.0.0-preview.2.25114.1 (parent: Microsoft.NET.Sdk)

## From https://github.com/dotnet/sdk

- **Subscription**: 66b637af-e1e4-4839-b6a7-b0c0c22ca353
- **Build**: 20250218.3
- **Date Produced**: February 18, 2025 1:59:57 PM UTC
- **Commit**: fb527ca53046db031f4952c0438829593bb5d772
- **Branch**: refs/heads/main

- **Updates**:
  - **Microsoft.NET.Sdk**: [from 10.0.100-alpha.1.25067.41 to 10.0.100-preview.2.25118.3][38]

[38]: dotnet/sdk@526b872...fb527ca

---------

Co-authored-by: Alex Soto <alex@soto.dev>
  • Loading branch information
dotnet-maestro[bot] and dalexsoto authored Feb 19, 2025
1 parent eeb865e commit ffe781c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.25067.41">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.2.25118.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>526b872845c4259227360f6b8bef879e68a76ca8</Sha>
<Sha>fb527ca53046db031f4952c0438829593bb5d772</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-alpha.1.23556.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.25067.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.2.25114.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6c58f7992cfd628a53d9b90f258ac123cb803644</Sha>
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.NET.Sdk -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.25067.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.2.25114.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6c58f7992cfd628a53d9b90f258ac123cb803644</Sha>
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
</Dependency>
<!-- This is required for our test apps to build; in some cases Microsoft.AspNetCore.App is pulled in, and when building test apps the build needs to be able to resolve that -->
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.25067.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-preview.2.25114.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>fe21c9a711ca99731f7a2df03f086497161f6821</Sha>
<Sha>9c410aaf1ef3db65374bf237589ae8bc6910d37c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.25059.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-preview.2.25105.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>0de3165cb0d56323b6caaf8e9916d4d9e72da32d</Sha>
<Sha>c8c1ff004deb78cbd4b1599c96f9a19e9f09ca62</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24627.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25078.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>9e8bd520939ddfee686261267a1646c1b113d9e1</Sha>
<Sha>dfa03011d6474bd0e6c9d0363e4f3b18b99f2ad8</Sha>
</Dependency>
<!-- This is a subscription of the .NET 8/Xcode 16.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net8.0_18.0" Version="18.0.8314">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<!--Package versions-->
<PropertyGroup>
<!-- Versions updated by maestro -->
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.25067.41</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.25067.10</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-preview.2.25118.3</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.2.25114.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.25067.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.2.25114.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24627.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25078.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24610.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>9.0.0-beta.25058.5</MicrosoftDotNetArcadeSdkPackageVersion>
<!-- Manually updated versions -->
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "10.0.100-alpha.1.25067.41"
"version": "10.0.100-preview.2.25118.3"
},
"tools": {
"dotnet": "10.0.100-alpha.1.25067.41"
"dotnet": "10.0.100-preview.2.25118.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5"
Expand Down
2 changes: 1 addition & 1 deletion tests/xharness/Jenkins/TestServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ IEnumerable<ITestTask> find_tasks (StreamWriter writer, string ids)
using (var writer = new StreamWriter (response.OutputStream)) {
// We want to randomize the order the tests are added, so that we don't build first the test for one device,
// then for another, since that would not take advantage of running tests on several devices in parallel.
foreach (var task in find_tasks (writer, request.Url.Query).Shuffle ()) {
foreach (var task in System.Linq.Enumerable.Shuffle (find_tasks (writer, request.Url.Query))) {
if (task.InProgress || task.Waiting) {
writer.WriteLine ($"Test '{task.TestName}' is already executing.");
} else {
Expand Down

0 comments on commit ffe781c

Please # to comment.