Skip to content

[Manual] Merge release/7.0-staging into release/7.0#97064

Merged
carlossanlop merged 24 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging
Jan 17, 2024
Merged

[Manual] Merge release/7.0-staging into release/7.0#97064
carlossanlop merged 24 commits into
dotnet:release/7.0from
carlossanlop:release/7.0-staging

Conversation

@carlossanlop

@carlossanlop carlossanlop commented Jan 17, 2024

Copy link
Copy Markdown
Contributor

Merge commit

carlossanlop and others added 23 commits November 27, 2023 14:57
…o-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
#95861)

* [tests] Use shorter path for temp directory on Apple mobile platforms

* [tests] Test shorter temporary directory path

* [tests] Test shorter temporary directory path

* [tests] Test macros condition for temp directory

* [tests] Disable tests on Apple mobile platforms

* [tests] Fix lint

---------

Co-authored-by: Milos Kotlar <kotlarmilos@gmail.com>
…cific image to fix android app build/run issues. (#95883)
Co-authored-by: Parker Bibus <parkerbibus@microsoft.com>
…g_Succeeds (#96053)

The 3rd party service has expired certificate

Co-authored-by: Radek Zikmund <radekzikmund@microsoft.com>
…220.3 (#96673)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
* fix SslStream.IsMutuallyAuthenticated with cached credentials (#79128)

* fix SslStream.IsMutuallyAuthenticated with cached credentials

* nano

* protocol

* fix test

* Apply suggestions from code review

Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>

* fix CertificateValidationClientServer_EndToEnd_Ok test

Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>

* fix IsMutuallyAuthenticated with NegotiateClientCertificateAsync (#88488)

* Port rest of the changes from #79898

* Update src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Windows.cs

Co-authored-by: Stephen Toub <stoub@microsoft.com>

* Code review feedback

---------

Co-authored-by: Tomas Weinfurt <tweinfurt@yahoo.com>
Co-authored-by: Simon Rozsival <simon@rozsival.com>
Co-authored-by: Stephen Toub <stoub@microsoft.com>
…o-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
There is a build warning about the old version now. eng/common usages are handled by dotnet/arcade#14314

Backport of #96651
…ld 20240110.3 (#96764)

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.23566.2 -> To Version 7.0.0-beta.24060.3

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

Microsoft.DotNet.HotReload.Utils.Generator.BuildTool
 From Version 7.0.0-alpha.0.23566.1 -> To Version 7.0.0-alpha.0.24060.2

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 7.0.0-rtm.23565.2 -> To Version 7.0.0-rtm.24060.3

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
The latest build of VS carries a C/C++ compiler which produces warning C5271:
```
src\native\corehost\test\ijw\ijw.cpp(6): warning C5271: consider replacing #using <System.Console.dll>  with command line argument /FU "F:\dotnet\runtime2\.dotnet\packs\Microsoft.NETCore.App.Ref\8.0.0-rc.1.23414.4\ref\net8.0\System.Console.dll"
src\native\corehost\test\ijw\ijw.cpp(7): warning C5271: consider replacing #using <System.Runtime.Loader.dll>  with command line argument /FU "F:\dotnet\runtime2\.dotnet\packs\Microsoft.NETCore.App.Ref\8.0.0-rc.1.23414.4\ref\net8.0\System.Runtime.Loader.dll"
```

This breaks the build on Windows. For now I'm disabling the warning as the real fix is more complex (we would need to calculate the path to the required assemblies in CMake somehow).

Co-authored-by: vitek-karas <10670590+vitek-karas@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/emsdk build 20240104.2

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

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

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

---------

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>
…40104.3 (#96778)

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

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>
…109.5 (#96780)

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.23620.3 -> To Version 7.0.0-beta.24059.5

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Radek Zikmund <r.zikmund.rz@gmail.com>
Co-authored-by: Radek Zikmund <32671551+rzikm@users.noreply.github.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
Co-authored-by: Kevin Jones <kevin@vcsjones.com>
* Recover from failed OCSP download. (#96448)

* Recover from failed OCSP check.

* Add 5s back-off after failed OCSP querry

* Do not OCSP staple invalid OCSP responses

* Add entire issuer chain to trusted X509_STORE when validating OCSP_Response

Code review feedback

More code review feedback

Update src/libraries/System.Net.Security/src/System/Net/Security/SslStreamCertificateContext.Linux.cs

Co-authored-by: Jeremy Barton <jbarton@microsoft.com>

Fix compilation

Always include root certificate

* Fix compilation

* Don't shorten OCSP expriation on failed server OCSP fetch (#96972)

* Don't shorten OCSP expriation on failed server OCSP fetch

* Code review feedback

---------

Co-authored-by: Kevin Jones <kevin@vcsjones.com>
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
@carlossanlop carlossanlop added Servicing-approved Approved for servicing release area-codeflow for labeling automated codeflow labels Jan 17, 2024
@carlossanlop carlossanlop added this to the 7.0.16 milestone Jan 17, 2024
@carlossanlop carlossanlop self-assigned this Jan 17, 2024
@carlossanlop
carlossanlop requested a review from radical as a code owner January 17, 2024 01:07
@carlossanlop
carlossanlop merged commit 342951d into dotnet:release/7.0 Jan 17, 2024
@carlossanlop
carlossanlop deleted the release/7.0-staging branch January 17, 2024 01:57
@github-actions github-actions Bot locked and limited conversation to collaborators Feb 16, 2024
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.

8 participants