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

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

Merged
merged 54 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
458ebdf
Update dependencies from https://github.com/dotnet/sdk build 20240820.21
dotnet-maestro[bot] Aug 21, 2024
d166660
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Aug 21, 2024
69bd7b4
Update dependencies from https://github.com/dotnet/sdk build 20240822.24
dotnet-maestro[bot] Aug 23, 2024
e513ce7
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Aug 23, 2024
745e4b5
Update dependencies from https://github.com/dotnet/sdk build 20240823.15
dotnet-maestro[bot] Aug 24, 2024
0e2856b
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Aug 24, 2024
39efcf5
Update dependencies from https://github.com/dotnet/sdk build 20240826.2
dotnet-maestro[bot] Aug 26, 2024
fd6c0f5
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Aug 26, 2024
72679f1
Merge remote-tracking branch 'origin/net9.0' into darc-net9.0-5769ade…
rolfbjarne Aug 26, 2024
9faf9f1
Fix build with new Cecil.
rolfbjarne Aug 23, 2024
b0b2fca
Add a 8.0.9 feed.
rolfbjarne Aug 22, 2024
9f9bbd9
[devops] Give another hour to the tests.
rolfbjarne Aug 27, 2024
d8fa3ae
Update dependencies from https://github.com/dotnet/sdk build 20240826.11
dotnet-maestro[bot] Aug 27, 2024
1728392
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Aug 27, 2024
88b8363
Update dependencies from https://github.com/dotnet/sdk build 20240827.16
dotnet-maestro[bot] Aug 28, 2024
d1916dc
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Aug 28, 2024
4287fbb
Update dependencies from https://github.com/dotnet/sdk build 20240828.9
dotnet-maestro[bot] Aug 29, 2024
ad3b453
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Aug 29, 2024
69b49c6
Update dependencies from https://github.com/dotnet/sdk build 20240830.10
dotnet-maestro[bot] Aug 30, 2024
4b1ec18
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Aug 30, 2024
0a2f137
Update dependencies from https://github.com/dotnet/sdk build 20240902.3
dotnet-maestro[bot] Sep 2, 2024
38bd00a
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 2, 2024
2feb1aa
Update dependencies from https://github.com/dotnet/sdk build 20240903.2
dotnet-maestro[bot] Sep 3, 2024
2017943
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 3, 2024
5a980e3
Update dependencies from https://github.com/dotnet/sdk build 20240903.35
dotnet-maestro[bot] Sep 4, 2024
fd41cf8
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 4, 2024
65be126
Update dependencies from https://github.com/dotnet/sdk build 20240904.6
dotnet-maestro[bot] Sep 5, 2024
7e42d31
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 5, 2024
a195be9
Revert "[devops] Give another hour to the tests."
rolfbjarne Sep 6, 2024
3380b43
[tests] Update DotNetProjectTest.BuildFSharpLibraryTest to handle mor…
rolfbjarne Sep 4, 2024
8589d28
Merge remote-tracking branch 'origin/net9.0' into darc-net9.0-5769ade…
rolfbjarne Sep 6, 2024
a1bf998
Update dependencies from https://github.com/dotnet/sdk build 20240905.8
dotnet-maestro[bot] Sep 6, 2024
b8e8c66
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 6, 2024
27eb3b3
Merge remote-tracking branch 'origin/net9.0' into darc-net9.0-5769ade…
rolfbjarne Sep 6, 2024
1f096fb
Update dependencies from https://github.com/dotnet/sdk build 20240906.5
dotnet-maestro[bot] Sep 7, 2024
d0ecedb
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 7, 2024
8e13b9c
Update dependencies from https://github.com/dotnet/sdk build 20240907.1
dotnet-maestro[bot] Sep 8, 2024
4a94db0
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 8, 2024
ee332d3
Update dependencies from https://github.com/dotnet/sdk build 20240909.3
dotnet-maestro[bot] Sep 9, 2024
04da998
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 9, 2024
bd24225
Update dependencies from https://github.com/dotnet/sdk build 20240910.1
dotnet-maestro[bot] Sep 10, 2024
bbd7ed4
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 10, 2024
c305023
Update dependencies from https://github.com/dotnet/sdk build 20240911.5
dotnet-maestro[bot] Sep 11, 2024
e48fbcf
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 11, 2024
3fd49be
Merge remote-tracking branch 'origin/net9.0' into darc-net9.0-5769ade…
rolfbjarne Sep 12, 2024
08da794
Update dependencies from https://github.com/dotnet/sdk build 20240912.6
dotnet-maestro[bot] Sep 12, 2024
e58ce62
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 12, 2024
4119d8b
Update dependencies from https://github.com/dotnet/sdk build 20240913.6
dotnet-maestro[bot] Sep 13, 2024
6fc06a9
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 13, 2024
4e7b83a
Update dependencies from https://github.com/dotnet/sdk build 20240913.45
dotnet-maestro[bot] Sep 14, 2024
3f93a22
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 14, 2024
6b7d517
Update dependencies from https://github.com/dotnet/sdk build 20240914.3
dotnet-maestro[bot] Sep 15, 2024
ba2a081
Re-generate global.json for PR #21085: [net9.0] Update dependencies f…
Sep 15, 2024
8c3823d
Add a 8.0.10 feed.
rolfbjarne Sep 16, 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
6 changes: 6 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
<!-- Add a 8.0.8 feed -->
<add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-2d5c0b7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-2d5c0b72/nuget/v3/index.json" />
<!-- Add a 8.0.9 feed -->
<add key="darc-pub-dotnet-emsdk-2674f58" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2674f580/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-ed13b35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json" />
<!-- Add a 8.0.10 feed -->
<add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-ca415e9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ca415e95/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
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="9.0.100-rc.2.24420.1">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.2.24464.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>e2b7b9d2b412cb2254d504789e29df8687d0f68e</Sha>
<Sha>1a658dfc714a5064eea57af48d5fd68a3ffab7ef</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.24414.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0fbd81404d1f211572387498474063bc6f407f0f</Sha>
<Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</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.24414.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24462.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0fbd81404d1f211572387498474063bc6f407f0f</Sha>
<Sha>9bff9c5017d8444fdf76959c112dd9fed2da9317</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.24412.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-rc.2.24463.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>abbd67b97144c14ef60cdeb416ad9c5d75356c7f</Sha>
<Sha>4f2a59c5352e399830e09b22ecbcfd5d5312c5b3</Sha>
</Dependency>
<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">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.2.24455.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>edf3e90fa25b1fc4f7f63ceb45ef70f49c6b121a</Sha>
<Sha>6e079c23aee94577c17bae34522b52df0d646ca5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24379.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.24419.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>b9d928a9d65ed39b9257846e1b8e853cea609c00</Sha>
<Sha>c667bfea9cdbc5b5493e49e7ddc8dd635a217891</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.8030">
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>9.0.100-rc.2.24420.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24414.5</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-rc.2.24464.3</MicrosoftNETSdkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.2.24462.10</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>9.0.0-rc.1.24414.5</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.2.24462.10</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.24379.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24419.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24459.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
<!-- Manually updated versions -->
<Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "9.0.100-rc.2.24420.1"
"version": "9.0.100-rc.2.24464.3"
}
}
8 changes: 7 additions & 1 deletion tests/dotnet/UnitTests/ProjectTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,13 @@ public void BuildFSharpLibraryTest (string platform)
Assert.That (asm, Does.Exist, "Assembly existence");
// Verify that there's no resources in the assembly
var ad = AssemblyDefinition.ReadAssembly (asm, new ReaderParameters { ReadingMode = ReadingMode.Deferred });
Assert.That (ad.MainModule.Resources.Count (), Is.EqualTo (2), "2 resources"); // There are 2 embedded resources by default by the F# compiler.
var expectedFSharpResources = new string [] {
"FSharpOptimizationCompressedData.fsharplibrary",
"FSharpSignatureCompressedData.fsharplibrary",
"FSharpSignatureCompressedDataB.fsharplibrary",
};
var actualFSharpResources = ad.MainModule.Resources.Select (v => v.Name).OrderBy (v => v).ToArray ();
Assert.That (actualFSharpResources, Is.EqualTo (expectedFSharpResources), "F# resources:"); // There are some embedded resources by default by the F# compiler.
}

[TestCase (ApplePlatform.iOS)]
Expand Down
3 changes: 3 additions & 0 deletions tools/linker/CustomSymbolWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,8 @@ static ImageDebugHeaderEntry ProcessEntry (ImageDebugHeaderEntry entry)
public void Write (MethodDebugInformation info) => _symbolWriter.Write (info);
public void Write () => _symbolWriter.Write ();
public void Dispose () => _symbolWriter.Dispose ();
#if NET
public void Write (ICustomDebugInformationProvider provider) => _symbolWriter.Write (provider);
#endif
}
}