[release/7.0][manual] Merge release/7.0-staging into release/7.0 #90560
Conversation
This file contains hidden or 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
…o-release/7.0-staging [automated] Merge branch 'release/7.0' => 'release/7.0-staging'
…cu dotnet/emsdk (#88764) * Update dependencies from https://github.com/dotnet/arcade build 20230711.2 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23313.4 -> To Version 7.0.0-beta.23361.2 * Update dependencies from https://github.com/dotnet/icu build 20230712.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-rtm.23315.2 -> To Version 7.0.0-rtm.23362.1 * Update dependencies from https://github.com/dotnet/emsdk build 20230712.2 Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.9 -> To Version 7.0.10 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
… 3.26" (#88809) * [7.0] Backport "Fix MSBuild integration for the host build with CMake 3.26" * net8.0 -> net7.0
…2.13_jtk (#89517) * Update zlib -> 1.2.13 * Update intel zlib -> 1.2.13_jtk * Revert readme, cherry-pick changes * Delete zlib.3.pdf * Update zlib version text files. --------- Co-authored-by: Levi Broderick <[email protected]> Co-authored-by: Levi Broderick <[email protected]>
) * Find Navtive Signal SIMD Context * Fix coding format * Set fregs to 0 when SIMD registers were not found --------- Co-authored-by: Fan Yang <[email protected]>
* Write perfmap and jitdump files to /tmp by default * Simplify perfmap path generation * Minor comment update --------- Co-authored-by: David Mason <[email protected]>
…30621.1 (#88766) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 7.0.0-prerelease.23309.1 -> To Version 7.0.0-prerelease.23321.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Carlos Sánchez López <[email protected]>
… dotnet/linker dotnet/emsdk (#89008) * Update dependencies from https://github.com/dotnet/hotreload-utils build 20230717.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 7.0.0-alpha.0.23316.2 -> To Version 7.0.0-alpha.0.23367.2 * Update dependencies from https://github.com/dotnet/linker build 20230801.1 Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.23321.1 -> To Version 7.0.100-1.23401.1 * Update dependencies from https://github.com/dotnet/emsdk build 20230801.3 Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.10 -> To Version 7.0.11 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Carlos Sánchez López <[email protected]>
…d by zlib (#89532) * Add guards to zlib memory allocator * Fix whitespace * Remove heap LFH flag, simplify publishing logic * Remove dead code from cmake file * Normalize cmake files * Slight zlib PAL & allocator restructuring - Move allocator files under Compression.Native dir - Update pal_zlib includes, use calloc instead of malloc - Remove custom typedefs from zlib unix allocator * Add env var for Windows * Add env var for Unix * Fix mono compilation - Mono defines HOST_WIN32, not CLR_CMAKE_HOST_WIN32 - Follow same pattern from src\native\eventpipe\CMakeLists.txt --------- Co-authored-by: Levi Broderick <[email protected]>
…o-release/7.0-staging [automated] Merge branch 'release/7.0' => 'release/7.0-staging'
The tests have been getting randomly aborted with: `The active test run was aborted. Reason: Test host process crashed` This might be due to the shutdown taking too long. The default timeout is 100ms. Increasing that to 2000ms. Issue: #89409 Co-authored-by: Ankit Jain <[email protected]>
…o-release/7.0-staging [automated] Merge branch 'release/7.0' => 'release/7.0-staging'
…30807.3 (#90250) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 7.0.0-prerelease.23321.1 -> To Version 7.0.0-prerelease.23407.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…cu (#90247) * Update dependencies from https://github.com/dotnet/arcade build 20230808.3 Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23361.2 -> To Version 7.0.0-beta.23408.3 * Update dependencies from https://github.com/dotnet/icu build 20230809.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 7.0.0-rtm.23362.1 -> To Version 7.0.0-rtm.23409.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Koritzinsky <[email protected]> Co-authored-by: Jeremy Koritzinsky <[email protected]>
* SBLK_MASK_LOCK_THREADID allow tid up to 65535 * copy comment from NativeAOT ObjectHeader.cs --------- Co-authored-by: DIcKeNs <[email protected]> Co-authored-by: dickens <[email protected]>
Backport of #89743 to 7.0. The local var ref count for OSR locals can be misleading, since some of the appearances may be in the "tier0" parts of the methods and won't be visible once we trim the OSR method down to just the part we're going to compile. Fix by giving OSR-exposed locals an implicit ref count. Fixes #89666.
Co-authored-by: Thays Grazia <[email protected]>
…s are loaded from the correct location. (#90320) Fixes #90030. Co-authored-by: Zoltan Varga <[email protected]>
…ild 20230811.1 (#90370) Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 7.0.0-alpha.0.23367.2 -> To Version 7.0.0-alpha.0.23411.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
carlossanlop
added
Servicing-approved
carlossanlop
requested review from
SamMonoRT,
lambdageek,
radical,
thaystg and
vargaz
as code owners
hoyosjs
approved these changes
Aug 15, 2023
This was referenced Aug 15, 2023
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.
7 participants
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.
Merge commit