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/8.0-staging into release/8.0 #95148

Merged
merged 25 commits into from
Nov 23, 2023

Conversation

carlossanlop
Copy link
Member

@carlossanlop carlossanlop commented Nov 22, 2023

Merge commit!

carlossanlop and others added 25 commits November 13, 2023 15:54
…/8.0-to-release/8.0-staging

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
… validation source generator (dotnet#94857)

Co-authored-by: Tarek Mahmoud Sayed <[email protected]>
…/8.0-to-release/8.0-staging

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
…16.4 (dotnet#94883)

Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.1-servicing.23563.2 -> To Version 8.0.1-servicing.23566.4

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

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
…dotnet#94809)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
Co-authored-by: Alexander Köplinger <[email protected]>
- Add `g_EntryAssemblyPath` global variable holding the full path to the entry assembly
  - Set right before loading the entry assembly (so also before startup hooks are run) - NULL if there is no entry assembly
- Ensure value is included dumps
  - For triage dumps, the dumped value is updated to only be the assembly file name instead of the full path
* Fix Vector512.CopyTo

* Also unify Vector

* Handle float vectors too

* Fix legacy vectors

* Simplify the change

* Update Vector_1.cs

* Add tests

* Fix build

---------

Co-authored-by: Michał Petryka <[email protected]>
…ence-packages build 20231115.1 (dotnet#95008)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 8.0.0-alpha.1.23556.3 -> To Version 8.0.0-alpha.1.23565.1

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

* Re-enable MD5 for FIPS with OpenSSL 3

* Permit MD5 on OpenSSL 1.1.1 regardless of FIPS

* Fix build

---------

Co-authored-by: Kevin Jones <[email protected]>
…tion (dotnet#94966)

* [mono][interp] Don't link bblock after rethrow

* [mono][interp] Small code refactoring

* [mono][interp] Fix incorrect stack type information

Assume we have a basic block that it is a forward branch destination, then its stack type information will be initialized at the moment of branching (let's say there is a value of type Obj1). If later in the code we reach this bblock by falling through (let's say the current stack contains a value of Obj2), the current stack state will be copied from the original state, with the type Obj1. If later on we do a virtual call, we will try to devirtualize it as if this is Obj1 which is incorrect, since the fallthrough path would produce an Obj2.

This commit adds missing checks for removing type information if we have different types on the execution types on incoming paths.

---------

Co-authored-by: Vlad Brezae <[email protected]>
…otnet#94919)

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

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 8.0.0-beta.23558.5 -> To Version 8.0.0-beta.23566.1

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

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 8.0.0-beta.23558.5 -> To Version 8.0.0-beta.23566.1

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

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 8.0.0-beta.23558.5 -> To Version 8.0.0-beta.23566.1

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

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 8.0.0-beta.23558.5 -> To Version 8.0.0-beta.23566.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Larry Ewing <[email protected]>
…et#94459)

* [release/8.0-staging] Use live M.Bcl.AsyncInterfaces dependency

Manual backport of dotnet#94451

* Update Microsoft.Bcl.TimeProvider.csproj

* Update Microsoft.Bcl.TimeProvider.csproj

* Update Microsoft.Bcl.TimeProvider.csproj
…ternals (dotnet#94918)

* Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2

* Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2

* Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2

* Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2

* Update dependencies from https://github.com/dotnet/source-build-externals build 20231120.1

Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23570.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
The related methods (`EmitDebugInfo`, `EmitEHClauseInfo`) already do this - if the node is not a method node, don't emit anything. It is not clear what purpose the "if this is not a method, emit broken debug information" serves. I traced it all the way back to https://github.com/dotnet/corert/blob/d78cf62480331f63b26eb08b86b838ffa355ff0d/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/ObjectWriter.cs#L427-L447 - it was surrounded by TODOs so maybe it didn't fully stand out but it doesn't look right there already.

Co-authored-by: Michal Strehovský <[email protected]>
…4932)

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

Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.1-servicing.23566.4 -> To Version 8.0.1-servicing.23567.1

Dependency coherency updates

runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.osx-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.osx-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools
 From Version 16.0.5-alpha.1.23558.12 -> To Version 16.0.5-alpha.1.23566.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100

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

Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.1-servicing.23567.1 -> To Version 8.0.1-servicing.23571.1

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <[email protected]>
* Fix incremental servicing condition

Makes non shipping packages always ship during servicing

* Update packaging.targets

* Update Directory.Build.props

* Update Microsoft.Internal.Runtime.AspNetCore.Transport.proj

* Update Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj

* Update packaging.targets
…otnet#94882)

* Fix JsonArray.Add and ReplaceWith regressions.

* Add comment

* Address feedback.

* Update packaging metadata

* Bring back removed using statement

* Fix the build error that was showing up after bumping the ServicingVersion prop:

Assembly 'System.Text.Json.TestLibrary.Roslyn3.11' with identity 'System.Text.Json.TestLibrary.Roslyn3.11, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' uses 'System.Text.Json, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51' which has a higher version than referenced assembly 'System.Text.Json' with identity 'System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'

* Update src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.TestLibrary/System.Text.Json.TestLibrary.targets

* Fix incremental servicing props ordering issue

---------

Co-authored-by: Eirik Tsarpalis <[email protected]>
Co-authored-by: Carlos Sánchez López <[email protected]>
Co-authored-by: Viktor Hofer <[email protected]>
…/8.0-to-release/8.0-staging

[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
@carlossanlop carlossanlop added the area-codeflow for labeling automated codeflow label Nov 22, 2023
@carlossanlop carlossanlop added this to the 8.0.1 milestone Nov 22, 2023
@carlossanlop carlossanlop merged commit 8557ef2 into dotnet:release/8.0 Nov 23, 2023
348 of 367 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Dec 23, 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