Skip to content

[net9.0] Update dependencies from dotnet/sdk #20994

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
rolfbjarne merged 8 commits into from
Aug 12, 2024
Merged

[net9.0] Update dependencies from dotnet/sdk #20994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12c7c73
Update dependencies from https://github.com/dotnet/sdk build 20240806.36
dotnet-maestro[bot] Aug 7, 2024
8e0f25c
Re-generate global.json for PR #20994: [net9.0] Update dependencies f…
Aug 7, 2024
2a0603c
Merge branch 'net9.0' into darc-net9.0-4ba2d1f7-1518-4783-9df1-55699f…
rolfbjarne Aug 8, 2024
37348da
Update dependencies from https://github.com/dotnet/sdk build 20240808.2
dotnet-maestro[bot] Aug 8, 2024
7b832d2
Re-generate global.json for PR #20994: [net9.0] Update dependencies f…
Aug 8, 2024
8b3c56e
Update dependencies from https://github.com/dotnet/sdk build 20240809.1
dotnet-maestro[bot] Aug 9, 2024
385c65b
Re-generate global.json for PR #20994: [net9.0] Update dependencies f…
Aug 9, 2024
606796c
[tests] Fix the ParameterInfoName test according to recent linker cha…
rolfbjarne Aug 9, 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
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.1.24380.5">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.1.24409.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>10803eca35eef6e685924886ba74caf0bd9439ad</Sha>
<Sha>43360291a50c9c7c471551f8f8363919d38014ea</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="9.0.0-rc.1.24378.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.1.24408.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0912e94a6c81f4743946831137ba6c3ec3f1a179</Sha>
<Sha>68511fd27fe4055ce5203742998ba12019dfcbd4</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="9.0.0-rc.1.24378.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.1.24408.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0912e94a6c81f4743946831137ba6c3ec3f1a179</Sha>
<Sha>68511fd27fe4055ce5203742998ba12019dfcbd4</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="9.0.0-rc.1.24379.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.1.24407.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>27f2a011a4211118552dfb8f38d36e8629267d2b</Sha>
<Sha>257d69079e0f7fc84e3f6cd5047272d7f79b4d66</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.1.24373.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.1.24402.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>40781ca2fc6be1dd81143d8773105a0f9f77d923</Sha>
<Sha>edf3e90fa25b1fc4f7f63ceb45ef70f49c6b121a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24365.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24379.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>e05101e694b7c86f03f767014fc203cec5dc7f18</Sha>
<Sha>b9d928a9d65ed39b9257846e1b8e853cea609c00</Sha>
</Dependency>
<!-- This is a subscription of the .NET 8/Xcode 15.4 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net8.0_17.5" Version="17.5.8016">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<!--Package versions-->
<PropertyGroup>
<!-- Versions updated by maestro -->
<MicrosoftNETSdkPackageVersion>9.0.100-rc.1.24380.5</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24378.5</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-rc.1.24409.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24408.12</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETILLinkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.24225.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24378.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24408.12</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rtm.23511.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24365.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24379.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>9.0.0-prerelease.24379.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<!-- Manually updated versions -->
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.100-rc.1.24380.5"
"version": "9.0.100-rc.1.24409.1"
}
}
2 changes: 1 addition & 1 deletion tests/linker/ios/link sdk/ReflectionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void ParameterInfoName ()

var mi = GetType ().Assembly.GetType ("Linker.Shared.Reflection.ReflectionTestClass").GetMethod ("MethodWithParameters");
var p = mi.GetParameters ();
#if DEBUG && !NET
#if DEBUG
// dotnet has adopted (and adapted) the metadata reducer and runs it on it's own conditions
var optimized = false;
#else
Expand Down