Skip to content

Commit 2c369e9

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[net10.0] Update dependencies from dotnet/sdk (#21570)
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.24528.7 to 10.0.0-alpha.1.24610.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 10.0.0-alpha.1.24528.7 to 10.0.0-alpha.1.24610.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport**: from 10.0.0-alpha.1.24524.3 to 10.0.0-alpha.1.24575.2 (parent: Microsoft.NETCore.App.Ref) - **Microsoft.NETCore.App.Ref**: from 10.0.0-alpha.1.24528.7 to 10.0.0-alpha.1.24610.2 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Cecil**: from 0.11.5-alpha.24521.1 to 0.11.5-alpha.24569.4 (parent: Microsoft.NETCore.App.Ref) ## From https://github.com/dotnet/sdk - **Subscription**: 66b637af-e1e4-4839-b6a7-b0c0c22ca353 - **Build**: 20241210.7 - **Date Produced**: December 10, 2024 10:28:37 PM UTC - **Commit**: 138afc2ac17650f5cc1cf46de85f12ea756c54e7 - **Branch**: refs/heads/main - **Updates**: - **Microsoft.NET.Sdk**: [from 10.0.100-alpha.1.24530.16 to 10.0.100-alpha.1.24610.7][53] - **Microsoft.NET.ILLink.Tasks**: [from 10.0.0-alpha.1.24528.7 to 10.0.0-alpha.1.24610.2][54] - **Microsoft.NETCore.App.Ref**: [from 10.0.0-alpha.1.24528.7 to 10.0.0-alpha.1.24610.2][54] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport**: [from 10.0.0-alpha.1.24524.3 to 10.0.0-alpha.1.24575.2][55] - **Microsoft.NETCore.App.Ref**: [from 10.0.0-alpha.1.24528.7 to 10.0.0-alpha.1.24610.2][54] - **Microsoft.DotNet.Cecil**: [from 0.11.5-alpha.24521.1 to 0.11.5-alpha.24569.4][56] [53]: dotnet/sdk@e1baea7...138afc2 [54]: dotnet/runtime@cca022b...920a17a [55]: dotnet/emsdk@e965cbb...235d38c [56]: dotnet/cecil@b897087...7f4a146
1 parent 27ef26d commit 2c369e9

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

‎dotnet/targets/Xamarin.Shared.Sdk.targets‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,8 +1337,9 @@
13371337
<IlcReference Include="@(ManagedAssemblyToLink)" Exclude="@(ManagedBinary)" />
13381338

13391339
<!-- Process UnmanagedCallersOnly attributes from every assembly -->
1340-
<UnmanagedEntryPointsAssembly Remove="System.Private.CoreLib" />
1341-
<UnmanagedEntryPointsAssembly Include="@(_UpdatedManagedAssemblyToLink->'%(Filename)')" />
1340+
<_UnmanagedEntryPointsAssembliesToAdd Include="@(_UpdatedManagedAssemblyToLink->'%(Filename)')" />
1341+
<_UnmanagedEntryPointsAssembliesToAdd Remove="System.Private.CoreLib" />
1342+
<UnmanagedEntryPointsAssembly Include="@(_UnmanagedEntryPointsAssembliesToAdd)" />
13421343

13431344
<!-- Link in the output from ILC -->
13441345
<_NativeExecutableObjectFiles Include="$(NativeObject)" />

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.24530.16">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.24610.7">
44
<Uri>https://github.com/dotnet/sdk</Uri>
5-
<Sha>e1baea780db86b823db688fbbd52b4e18a2e539b</Sha>
5+
<Sha>138afc2ac17650f5cc1cf46de85f12ea756c54e7</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NET.ILLink" Version="9.0.0-alpha.1.23556.4">
88
<Uri>https://github.com/dotnet/runtime</Uri>
99
<Sha>cf47d9ff6827a3e1d6f2acbf925cd618418f20dd</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.24528.7" CoherentParentDependency="Microsoft.NET.Sdk">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.24610.2" CoherentParentDependency="Microsoft.NET.Sdk">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>cca022b6212f33adc982630ab91469882250256c</Sha>
13+
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
1414
</Dependency>
1515
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if removing the CoherentParentDependency on Microsoft.NET.Sdk -->
16-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.24528.7" CoherentParentDependency="Microsoft.NET.Sdk">
16+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.24610.2" CoherentParentDependency="Microsoft.NET.Sdk">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>cca022b6212f33adc982630ab91469882250256c</Sha>
18+
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
1919
</Dependency>
2020
<!-- 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 -->
21-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24529.6" CoherentParentDependency="Microsoft.NET.Sdk">
21+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24605.2" CoherentParentDependency="Microsoft.NET.Sdk">
2222
<Uri>https://github.com/dotnet/aspnetcore</Uri>
23-
<Sha>3f8edf130a14d34024a42ebd678fa3f699ef5916</Sha>
23+
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24524.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
25+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.0-alpha.1.24575.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
2626
<Uri>https://github.com/dotnet/emsdk</Uri>
27-
<Sha>e965cbbf7eae80e2a62e46f0fcf68ab8f47792c4</Sha>
27+
<Sha>235d38cd586eeed59513cf865f4771914d654e4a</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24521.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
29+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24569.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
3030
<Uri>https://github.com/dotnet/cecil</Uri>
31-
<Sha>b897087e8b76481a9213ae422f5dc16f64a124b5</Sha>
31+
<Sha>7f4a1466b958a6ac42953d72ae6ddaabb1149a78</Sha>
3232
</Dependency>
3333
<!-- This is a subscription of the .NET 8/Xcode 16.0 versions of our packages -->
3434
<Dependency Name="Microsoft.MacCatalyst.Sdk.net8.0_18.0" Version="18.0.8303">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<!--Package versions-->
33
<PropertyGroup>
44
<!-- Versions updated by maestro -->
5-
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.24530.16</MicrosoftNETSdkPackageVersion>
6-
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24528.7</MicrosoftNETILLinkTasksPackageVersion>
5+
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.24610.7</MicrosoftNETSdkPackageVersion>
6+
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftNETILLinkTasksPackageVersion>
77
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
99
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
10-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24528.7</MicrosoftNETCoreAppRefPackageVersion>
10+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftNETCoreAppRefPackageVersion>
1111
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
1212
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-rc.2.24462.10</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
1313
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
14-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24521.1</MicrosoftDotNetCecilPackageVersion>
14+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24569.4</MicrosoftDotNetCecilPackageVersion>
1515
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24575.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
1616
<!-- Manually updated versions -->
1717
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-alpha.1.24530.16"
3+
"version": "10.0.100-alpha.1.24610.7"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-alpha.1.24530.16"
6+
"dotnet": "10.0.100-alpha.1.24610.7"
77
},
88
"msbuild-sdks": {
99
"Microsoft.DotNet.Arcade.Sdk": ""

‎msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</ProjectReference>
3939
<!-- We need the net472 implementation, otherwise the Build agent needs to be a net5.0 app -->
4040
<Reference Include="ILLink.Tasks">
41-
<HintPath>$(PkgMicrosoft_NET_ILLink_Tasks)\tools\net472\ILLink.Tasks.dll</HintPath>
41+
<HintPath>$(PkgMicrosoft_NET_ILLink_Tasks)\tools\netframework\ILLink.Tasks.dll</HintPath>
4242
</Reference>
4343
<Reference Include="ILStrip">
4444
<!-- We need the net472 impl, otherwise the Build agent needs to be a net5.0 app -->

0 commit comments

Comments
 (0)