Skip to content
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.

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

[net10.0] Update dependencies from dotnet/sdk #21570

Merged
merged 60 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
ed162f1
Update dependencies from https://github.com/dotnet/sdk build 20241101.16
dotnet-maestro[bot] Nov 2, 2024
0c3e277
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 2, 2024
5a3c835
Update dependencies from https://github.com/dotnet/sdk build 20241103.1
dotnet-maestro[bot] Nov 3, 2024
6f8d5be
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 3, 2024
ffaf280
Update dependencies from https://github.com/dotnet/sdk build 20241103.6
dotnet-maestro[bot] Nov 4, 2024
9573767
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 4, 2024
cfac52d
Update dependencies from https://github.com/dotnet/sdk build 20241105.1
dotnet-maestro[bot] Nov 5, 2024
318ada3
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 5, 2024
6617a7c
Update dependencies from https://github.com/dotnet/sdk build 20241106.21
dotnet-maestro[bot] Nov 7, 2024
db4e7df
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 7, 2024
5313c2c
Merge remote-tracking branch 'origin/net10.0' into darc-net10.0-0c268…
rolfbjarne Nov 8, 2024
e2c4680
Update dependencies from https://github.com/dotnet/sdk build 20241107.22
dotnet-maestro[bot] Nov 8, 2024
d8f4124
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 8, 2024
744bdc5
Update dependencies from https://github.com/dotnet/sdk build 20241108.18
dotnet-maestro[bot] Nov 9, 2024
7353d36
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 9, 2024
6c974fe
Update dependencies from https://github.com/dotnet/sdk build 20241109.1
dotnet-maestro[bot] Nov 10, 2024
65da161
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 10, 2024
1701b2b
Update dependencies from https://github.com/dotnet/sdk build 20241110.6
dotnet-maestro[bot] Nov 11, 2024
6e215c0
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 11, 2024
5f67bcf
Update dependencies from https://github.com/dotnet/sdk build 20241111.7
dotnet-maestro[bot] Nov 12, 2024
d89753a
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 12, 2024
aa18411
Update dependencies from https://github.com/dotnet/sdk build 20241112.4
dotnet-maestro[bot] Nov 13, 2024
62c2100
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 13, 2024
22fb62f
Update dependencies from https://github.com/dotnet/sdk build 20241113.10
dotnet-maestro[bot] Nov 14, 2024
5966183
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 14, 2024
ad343b8
Update dependencies from https://github.com/dotnet/sdk build 20241114.1
dotnet-maestro[bot] Nov 15, 2024
8e804b9
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 15, 2024
1382ff3
Update after file move.
rolfbjarne Nov 15, 2024
95b7754
Update dependencies from https://github.com/dotnet/sdk build 20241115.16
dotnet-maestro[bot] Nov 16, 2024
274acee
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 16, 2024
3cde45e
Update dependencies from https://github.com/dotnet/sdk build 20241117.3
dotnet-maestro[bot] Nov 17, 2024
1aa20d4
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 17, 2024
1d5081f
Update dependencies from https://github.com/dotnet/sdk build 20241118.3
dotnet-maestro[bot] Nov 18, 2024
a9c969e
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 18, 2024
999cde4
Update dependencies from https://github.com/dotnet/sdk build 20241118.6
dotnet-maestro[bot] Nov 19, 2024
d66bd63
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 19, 2024
172fa36
Update dependencies from https://github.com/dotnet/sdk build 20241120.1
dotnet-maestro[bot] Nov 20, 2024
1cb203f
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 20, 2024
8cd1744
Update dependencies from https://github.com/dotnet/sdk build 20241121.2
dotnet-maestro[bot] Nov 21, 2024
0b9a124
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 21, 2024
35d8857
Update dependencies from https://github.com/dotnet/sdk build 20241122.2
dotnet-maestro[bot] Nov 22, 2024
44005da
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 22, 2024
ad9b7dd
Update dependencies from https://github.com/dotnet/sdk build 20241122.18
dotnet-maestro[bot] Nov 23, 2024
be9f4a6
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 23, 2024
abad662
Update dependencies from https://github.com/dotnet/sdk build 20241123.1
dotnet-maestro[bot] Nov 24, 2024
e0aee5c
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Nov 24, 2024
e0b85a5
Update dependencies from https://github.com/dotnet/sdk build 20241205.38
dotnet-maestro[bot] Dec 6, 2024
d11d8b9
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Dec 6, 2024
318e43d
Update dependencies from https://github.com/dotnet/sdk build 20241206.1
dotnet-maestro[bot] Dec 7, 2024
d1a4cb6
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Dec 7, 2024
76265c4
Update dependencies from https://github.com/dotnet/sdk build 20241208.1
dotnet-maestro[bot] Dec 8, 2024
1cc2a88
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Dec 8, 2024
f06fd3d
Update dependencies from https://github.com/dotnet/sdk build 20241209.2
dotnet-maestro[bot] Dec 9, 2024
710c9ad
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Dec 9, 2024
03e33eb
Update dependencies from https://github.com/dotnet/sdk build 20241209.4
dotnet-maestro[bot] Dec 10, 2024
8e37186
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Dec 10, 2024
5c5ef80
Update dependencies from https://github.com/dotnet/sdk build 20241210.7
dotnet-maestro[bot] Dec 11, 2024
67d95bb
Re-generate global.json for PR #21570: [net10.0] Update dependencies …
Dec 11, 2024
0ebaf23
Merge remote-tracking branch 'origin/net10.0' into darc-net10.0-0c268…
rolfbjarne Dec 11, 2024
0f1ef6e
[dotnet] Fix computing assemblies we should look for unmanaged entry …
rolfbjarne Dec 11, 2024
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
5 changes: 3 additions & 2 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -1337,8 +1337,9 @@
<IlcReference Include="@(ManagedAssemblyToLink)" Exclude="@(ManagedBinary)" />

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

<!-- Link in the output from ILC -->
<_NativeExecutableObjectFiles Include="$(NativeObject)" />
Expand Down
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.24530.16">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-alpha.1.24610.7">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e1baea780db86b823db688fbbd52b4e18a2e539b</Sha>
<Sha>138afc2ac17650f5cc1cf46de85f12ea756c54e7</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.24528.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-alpha.1.24610.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cca022b6212f33adc982630ab91469882250256c</Sha>
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</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.24528.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.24610.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cca022b6212f33adc982630ab91469882250256c</Sha>
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</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.24529.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24605.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>3f8edf130a14d34024a42ebd678fa3f699ef5916</Sha>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
</Dependency>
<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">
<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">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>e965cbbf7eae80e2a62e46f0fcf68ab8f47792c4</Sha>
<Sha>235d38cd586eeed59513cf865f4771914d654e4a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24521.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24569.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>b897087e8b76481a9213ae422f5dc16f64a124b5</Sha>
<Sha>7f4a1466b958a6ac42953d72ae6ddaabb1149a78</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.8303">
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.24530.16</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24528.7</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-alpha.1.24610.7</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-alpha.1.24610.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkVersion>8.0.0-beta.24413.2</MicrosoftDotNetSharedFrameworkSdkVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24528.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-alpha.1.24610.2</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.24521.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24569.4</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24575.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<!-- Manually updated versions -->
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
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.24530.16"
"version": "10.0.100-alpha.1.24610.7"
},
"tools": {
"dotnet": "10.0.100-alpha.1.24530.16"
"dotnet": "10.0.100-alpha.1.24610.7"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": ""
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</ProjectReference>
<!-- We need the net472 implementation, otherwise the Build agent needs to be a net5.0 app -->
<Reference Include="ILLink.Tasks">
<HintPath>$(PkgMicrosoft_NET_ILLink_Tasks)\tools\net472\ILLink.Tasks.dll</HintPath>
<HintPath>$(PkgMicrosoft_NET_ILLink_Tasks)\tools\netframework\ILLink.Tasks.dll</HintPath>
</Reference>
<Reference Include="ILStrip">
<!-- We need the net472 impl, otherwise the Build agent needs to be a net5.0 app -->
Expand Down
Loading