[manual] Merge branch 'release/6.0-staging' => 'release/6.0' #84593
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
These tests require precise GC, which mono does not support. Upstream disabled them, so following up here. Contributes to dotnet#83424 Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
…hes (dotnet#83303) * [mono] Use `unsigned char` when computing UTF8 string hashes The C standard does not specify whether `char` is signed or unsigned, it is implementation defined. Apparently Android aarch64 makes a different choice than other platforms (at least macOS arm64 and Windows x64 give different results). Mono uses `mono_metadata_str_hash` in the AOT compiler and AOT runtime to optimize class name lookup. As a result, classes whose names include UTF-8 continuation bytes (with the high bit = 1) will hash differently in the AOT compiler and on the device. Fixes dotnet#82187 Fixes dotnet#78638 * Add regression test --------- Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
…et#67589) (dotnet#83965) * Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (dotnet#83857) Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.15 -> To Version 6.0.16 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Use CLOCK_BOOTTIME to calculate BootTime on linux (dotnet#67589) Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com> Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com> Co-authored-by: Simon Rozsival <simon@rozsival.com> * Replace LibraryImport with DllImport in .NET 6.0 * Fix backport * Revert "Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 (dotnet#83857)" This reverts commit f2db6d6. * Define TARGET_LINUX --------- Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com> Co-authored-by: Adam Sitnik <adam.sitnik@gmail.com> Co-authored-by: Jeff Handley <jeffhandley@users.noreply.github.com>
…u dotnet/msquic dotnet/runtime-assets (dotnet#84146) * Update dependencies from https://github.com/dotnet/emsdk build 20230323.2 Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.15 -> To Version 6.0.16 * Update dependencies from https://github.com/dotnet/icu build 20230320.3 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-rtm.22108.1 -> To Version 6.0.0-rtm.23170.3 * Update dependencies from https://github.com/dotnet/msquic build 20220405.1 System.Net.MsQuic.Transport From Version 6.0.0-preview.7.21417.1 -> To Version 6.0.0-servicing.22205.1 * Update dependencies from https://github.com/dotnet/runtime-assets build 20230329.5 Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21518.1 -> To Version 6.0.0-beta.23179.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…x list containing many items (dotnet#83742) Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com> Co-authored-by: Eric StJohn <ericstj@microsoft.com>
…05.2 (dotnet#84359) Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.16 -> To Version 6.0.17 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…84386) Co-authored-by: Tarek Mahmoud Sayed <tarekms@microsoft.com>
* Eight packable projects pin their assembly version for .NET Framework compatibility. The incremental package servicing infrastructure didn't check if the assembly version is pinned and changed it during servicing. As an example, System.Speech pins its assembly version to 4.0.0.0 but that version gets overwritten during servicing. I.e. for .NET 7 the version would then change to "7.0.0.$(ServicingVersion)" which is incorrect. Please find the full list of impacted assemblies below: - System.ComponentModel.Composition - System.DirectoryServices - System.DirectoryServices.AccountManagement - System.DirectoryServices.Protocols - System.Management - System.Reflection.Context - System.Runtime.Caching - System.Speech For System.DirectoryServices.Protocols and System.Management we'll only pin the version for the .NETStandard assembly since those previously shipped the newer versions in servicing. * Enable System.Management and System.DirectoryServices.Protocols in servicing * Address feedback
[manual] Merge branch 'release/6.0' => 'release/6.0-staging'
Disables the failing tests for hardware intrinsics on Mono llvmaot linux arm64.
…4568) backport of dotnet#84354 The android builds are running out of disk space when building the library test apps. This change tries to recoup some of that space by deleting artifacts after each test was built. Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
Co-authored-by: carlossanlop <carlossanlop@users.noreply.github.com>
carlossanlop
added
Servicing-approved
carlossanlop
requested review from
lewing,
steveisok,
jeffhandley,
mmitche and
hoyosjs
carlossanlop
requested review from
thaystg,
steveharter,
layomia and
eiriktsarpalis
as code owners
hoyosjs
approved these changes
Apr 11, 2023
This was referenced Apr 11, 2023
|
All failures known. |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Important: Use Merge commit.
Snapped from my fork to prevent unexpected merges in staging branch to flow here.