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

[manual] Merge release/7.0-staging into release/7.0 #88646

Merged
merged 21 commits into from
Jul 11, 2023

Conversation

carlossanlop
Copy link
Member

Merge commit.

carlossanlop and others added 21 commits June 13, 2023 10:43
…/7.0-to-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
…lity for Jitdump (dotnet#87428)

* added support for JITDEBUG_INFO

* added comments

* Update mini-runtime.c

* made changes to coding conventions

* Update mini-runtime.c

* Update mini-runtime.c

* Update mini-runtime.c

* Update mini-runtime.c

---------

Co-authored-by: Sanjam Panda <[email protected]>
Co-authored-by: Sanjam Panda <[email protected]>
…/7.0-to-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
…cu dotnet/hotreload-utils dotnet/emsdk (dotnet#87655)

* Update dependencies from https://github.com/dotnet/arcade build 20230613.4

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.23228.7 -> To Version 7.0.0-beta.23313.4

* Update dependencies from https://github.com/dotnet/icu build 20230615.2

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 7.0.0-rtm.23218.4 -> To Version 7.0.0-rtm.23315.2

* Update dependencies from https://github.com/dotnet/hotreload-utils build 20230616.2

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 7.0.0-alpha.0.23226.5 -> To Version 7.0.0-alpha.0.23316.2

* Update dependencies from https://github.com/dotnet/emsdk build 20230616.2

Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.8 -> To Version 7.0.8

* Update dependencies from https://github.com/dotnet/emsdk build 20230620.2

Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100 , Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.8 -> To Version 7.0.9

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…n launched with empty DOTNET_MULTILEVEL_LOOKUP (dotnet#87734)

* dotnet.exe prints error messages to console when launched with empty DOTNET_MULTILEVEL_LOOKUP

* reuse err variable instead of invoking GetLastError another time

Co-authored-by: Vitek Karas <[email protected]>

* another useless call to GetLastError

* add tests

* fix spacing

* add asserts to another test

* delete empty instruction

* use EnableTracingAndCaptureOutputs

* check just that no error is logged

* rollback change correctly

---------

Co-authored-by: pedrobsaila <[email protected]>
Co-authored-by: Badre BSAILA <[email protected]>
Co-authored-by: Vitek Karas <[email protected]>
…tnet#87933)

* ILStrip now sorts custom attribute table to prevent assembly corruption.

* Whitespace.

* More whitespace.

* Commented the final sorting.

---------

Co-authored-by: Jan Dupej <[email protected]>
…roperties are not shown (dotnet#87175)

dotnet#76881 Add internal properties in GetRuntimeProperties
---------
Co-authored-by: Meri Khamoyan <[email protected]>
…30609.1 (dotnet#87650)

Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit
 From Version 7.0.0-prerelease.23253.3 -> To Version 7.0.0-prerelease.23309.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
…621.1 (dotnet#87897)

Microsoft.NET.ILLink.Tasks
 From Version 7.0.100-1.23211.1 -> To Version 7.0.100-1.23321.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…/7.0-to-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
…fter vscode-js-debug bump on VS (dotnet#88336)

* Backport dotnet#87154 dotnet#87870 dotnet#87979

* fix compilation

* Backporting more changes
…tnet#88153)

Deflater/Inflater's ctor calls a P/Invoke that initializes a SafeHandle.  Previously this was being done to directly initialize a field, but I'd changed that months ago due to it leaving a handle for finalization.  What I failed to notice, however, was that these types themselves defined finalizers, and those finalizers expected that SafeHandle field to have been initialized; now that it's not, if a rare zlib initialization error occurs (e.g. zlib couldn't be found/loaded), the finalizer may crash the process due to an unhandled null reference exception.

For Deflater, it'd be possible to just call GC.SuppressFinalize(this) inside the existing catch block that's disposing of the SafeHandle in the event of an exception.  But it's more complicated for Inflater, where the SafeHandle might be recreated during the Inflater's lifetime, and thus the existing catch block is inside of a helper method that's used from more than just the ctor, and we shouldn't be suppressing finalization in that case.

So, rather than do something complicated for the small gains this provided (it was part of a much larger sweep to clean up non-disposed SafeHandles), I've just reverted these cases.

Co-authored-by: Stephen Toub <[email protected]>
…otnet#88602)

* fix debugger performance

* Update src/mono/wasm/debugger/BrowserDebugProxy/DebugStore.cs

Co-authored-by: Ankit Jain <[email protected]>

* addressing @radical comments

---------

Co-authored-by: Ankit Jain <[email protected]>
@carlossanlop carlossanlop added the area-codeflow for labeling automated codeflow label Jul 11, 2023
@carlossanlop carlossanlop self-assigned this Jul 11, 2023
@ViktorHofer ViktorHofer merged commit e3034a1 into dotnet:release/7.0 Jul 11, 2023
248 of 279 checks passed
@carlossanlop carlossanlop deleted the release/7.0-staging branch July 11, 2023 17:23
@ghost ghost locked as resolved and limited conversation to collaborators Aug 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants