Skip to content

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

Merged
carlossanlop merged 13 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging
Nov 16, 2023
Merged

[manual] Merge release/7.0-staging into release/7.0#94818
carlossanlop merged 13 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

Copy link
Copy Markdown
Contributor

Merge commit!

carlossanlop and others added 13 commits October 17, 2023 13:06
…o-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
…ild 20231017.1 (#93612)

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 7.0.0-alpha.0.23411.1 -> To Version 7.0.0-alpha.0.23517.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
… dotnet/emsdk (#93651)

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

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 7.0.0-alpha.0.23517.1 -> To Version 7.0.0-alpha.0.23518.3

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

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

---------

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

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
Co-authored-by: Kunal Pathak <Kunal.Pathak@microsoft.com>
…08.10 (#94534)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…4401)

Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
…rtual generic methods (#94468)

Backport of #94437 to release/7.0-staging

Fixes #93770

* [mono] [imt] Don't increment vt_slot for non-virtual generic methods

   Interfaces can have static generic methods, for example.  They don't have a vt_slot.

   When building an IMT slot, we need to collect all the interface methods that map to a particular IMT slot along with their implementing vtable entries.  To do that, vt_slot starts at the interface offset of a particular interface and keeps incrementing as we iterate over the methods of the interface.  It is crtitical that vt_slot is accurate - otherwise we may dispatch the interface call to the wrong virtual method.

* [mono][imt] remove dead appdomain code

   the extra_interfaces argument was used to implement additional interfaces on cross-domain transparent proxy objects.

* [mono][imt] fixup ifdefed debug code

* Add test case

---------

Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
…94566)

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231108.6

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 7.0.0-beta.23179.6 -> To Version 7.0.0-beta.23558.6

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231108.6

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 7.0.0-beta.23179.6 -> To Version 7.0.0-beta.23558.6

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231108.6

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 7.0.0-beta.23179.6 -> To Version 7.0.0-beta.23558.6

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231108.6

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 7.0.0-beta.23179.6 -> To Version 7.0.0-beta.23558.6

* Update dependencies from https://github.com/dotnet/runtime-assets build 20231108.6

Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.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.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData
 From Version 7.0.0-beta.23179.6 -> To Version 7.0.0-beta.23558.6

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
…o-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
* Linux Kernel Regression Socket Test Failures Disable

* Fix formatting

* Delete spaces

* Format Connect.cs

* Revert "Format Connect.cs"

This reverts commit 6ee1383.

* Add spaces again

---------

Co-authored-by: Ahmet Ibrahim Aksoy <aaksoy@microsoft.com>
…d with specific conditions (#94719)

Fixed issue when DateTimeOffset.Now throws exception on Android with Arabic language & western hemisphere timezone

Backport of #94710

Co-authored-by: Taras Shevchuk <taras.v.shevchuk@gmail.com>
…114.5 (#94796)

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.23511.9 -> To Version 7.0.0-beta.23564.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Nov 15, 2023
@carlossanlop carlossanlop added this to the 7.0.15 milestone Nov 15, 2023
@carlossanlop carlossanlop self-assigned this Nov 15, 2023
@carlossanlop
carlossanlop merged commit a892f88 into dotnet:release/7.0 Nov 16, 2023
@carlossanlop
carlossanlop deleted the release/7.0-staging branch November 16, 2023 18:35
@github-actions github-actions Bot locked and limited conversation to collaborators Dec 17, 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.

2 participants