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/6.0-staging into release/6.0 #86295

Merged
merged 30 commits into from
May 16, 2023

Commits on Apr 11, 2023

  1. Configuration menu
    Copy the full SHA
    e05b303 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. [release/6.0-staging] Update dependencies from dotnet/arcade dotnet/e…

    …msdk (dotnet#84705)
    
    * Update dependencies from https://github.com/dotnet/arcade build 20230411.7
    
    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.Sdk , 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 6.0.0-beta.23167.1 -> To Version 6.0.0-beta.23211.7
    
    * Update dependencies from https://github.com/dotnet/emsdk build 20230412.1
    
    Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
     From Version 6.0.17 -> To Version 6.0.17
    
    ---------
    
    Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    7883684 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Fix AwaitableSocketAsyncEventArgs reorderings on weaker memory models (

    …dotnet#84432)
    
    There are a couple of places where we read the _continuation field and then read some other state which we assume to be consistent with the value we read in _continuation.  But without a fence, those secondary reads could be reordered with respect to the first.
    stephentoub authored Apr 14, 2023
    Configuration menu
    Copy the full SHA
    789d7ab View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Update dependencies from https://github.com/dotnet/runtime-assets bui…

    …ld 20230412.1 (dotnet#84784)
    
    Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.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.Windows.Extensions.TestData
     From Version 6.0.0-beta.23179.5 -> To Version 6.0.0-beta.23212.1
    
    Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Apr 18, 2023
    Configuration menu
    Copy the full SHA
    e8be5ae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f548a84 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Merge pull request dotnet#84610 from dotnet-maestro-bot/merge/release…

    …/6.0-to-release/6.0-staging
    
    [automated] Merge branch 'release/6.0' => 'release/6.0-staging'
    carlossanlop authored Apr 19, 2023
    Configuration menu
    Copy the full SHA
    a8ab59b View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. [release/6.0-staging][wasm][debugger] Remove error message when brows…

    …er is closed (dotnet#85062)
    
    * remove error message when browser is closed
    
    * remove error message when browser is closed
    thaystg authored Apr 24, 2023
    Configuration menu
    Copy the full SHA
    a81beb7 View commit details
    Browse the repository at this point in the history
  2. Update dependencies from https://github.com/dotnet/icu build 20230418…

    ….5 (dotnet#85003)
    
    Microsoft.NETCore.Runtime.ICU.Transport
     From Version 6.0.0-rtm.23170.3 -> To Version 6.0.0-rtm.23218.5
    
    Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Apr 24, 2023
    Configuration menu
    Copy the full SHA
    d73ace4 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. [release/6.0] Port perfmap environment variable change to 6.0 (dotnet…

    …#84681)
    
    * Port perfmap work to 6
    
    * Update perfmap.cpp
    
    ---------
    
    Co-authored-by: Daniel Ramos <danielramos@dsomar20.redmond.corp.microsoft.com>
    davmason and Daniel Ramos authored Apr 25, 2023
    Configuration menu
    Copy the full SHA
    eb5611b View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. [native-library] If a dllimport is specified with an absolute path, l…

    …ook for it first (dotnet#85271)
    
    The unmanaged native library probing documentation says to try
    absolute paths without variations
    
    https://learn.microsoft.com/en-us/dotnet/core/dependency-loading/default-probing#unmanaged-native-library-probing
    
    Manual backport of  dotnet#85255 to net6
    lambdageek authored Apr 26, 2023
    Configuration menu
    Copy the full SHA
    e8876e4 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. [release/6.0-staging] Update dependencies from dotnet/hotreload-utils (

    …dotnet#85353)
    
    Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Apr 27, 2023
    Configuration menu
    Copy the full SHA
    4af6023 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b393a37 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Configuration menu
    Copy the full SHA
    832c3f2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a416043 View commit details
    Browse the repository at this point in the history
  3. Merge pull request dotnet#85718 from dotnet-maestro-bot/merge/release…

    …/6.0-to-release/6.0-staging
    
    [automated] Merge branch 'release/6.0' => 'release/6.0-staging'
    carlossanlop authored May 3, 2023
    Configuration menu
    Copy the full SHA
    34f40ad View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    809b82e View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. [release/6.0-staging] Update dependencies from xharness, arcade (dotn…

    …et#85725)
    
    Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    Co-authored-by: Premek Vysoky <premek.vysoky@microsoft.com>
    3 people authored May 4, 2023
    Configuration menu
    Copy the full SHA
    7d7cce6 View commit details
    Browse the repository at this point in the history
  2. [release/6.0-staging] Make WindowsServiceLifetime gracefully stop (do…

    …tnet#85661)
    
    * Make WindowsServiceLifetime gracefully stop (dotnet#83892)
    
    * Make WindowsServiceLifetime gracefully stop
    
    WindowsServiceLifetime was not waiting for ServiceBase to stop the service.  As a result
    we would sometimes end the process before notifying service control manager that the service
    had stopped -- resulting in an error in the eventlog and sometimes a service restart.
    
    We also were permitting multiple calls to Stop to occur - through SCM callbacks, and through
    public API.  We must not call SetServiceStatus again once the service is marked as stopped.
    
    * Alternate approach to ensuring we only ever set STATE_STOPPED once.
    
    * Avoid calling ServiceBase.Stop on stopped service
    
    I fixed double-calling STATE_STOPPED in ServiceBase, but this fix will
    not be present on .NETFramework.  Workaround that by avoiding calling
    ServiceBase.Stop when the service has already been stopped by SCM.
    
    * Add tests for WindowsServiceLifetime
    
    These tests leverage RemoteExecutor to avoid creating a separate service
    assembly.
    
    * Respond to feedback and add more tests.
    
    This better integrates with the RemoteExecutor component as well,
    by hooking up the service process and fetching its handle.
    
    This gives us the correct logging and exitcode handling from
    RemoteExecutor.
    
    * Honor Cancellation in StopAsync
    
    * Fix bindingRedirects in RemoteExecutor
    
    * Use Async lambdas for service testing
    
    * Fix issue on Win7 where duplicate service descriptions are disallowed
    
    * Respond to feedback
    
    * Fix comment and add timeout
    
    * Fix test condition
    
    # Conflicts:
    #	src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/UseWindowsServiceTests.cs
    
    * Enable M.E.H.WindowsServices and S.SP.ServiceController for servicing
    
    * Make service wait on its state before stopping (dotnet#84447)
    
    * Fix WindowsService Tests where RemoteExecutor is unsupported
    
    # Conflicts:
    #	src/libraries/Microsoft.Extensions.Hosting.WindowsServices/tests/UseWindowsServiceTests.cs
    
    * Port changes to 6.0 codebase
    
    * Version Microsoft.Windows.Compatibility
    
    ---------
    
    Co-authored-by: Vladimir Sadov <vsadov@microsoft.com>
    ericstj and VSadov authored May 4, 2023
    Configuration menu
    Copy the full SHA
    d628263 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Servicing docs improvements (dotnet#85729) (dotnet#85955)

    Adding more details to our servicing documentation, particularly around the check-servicing-labels CI leg.
    
    Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
    carlossanlop and hoyosjs authored May 9, 2023
    Configuration menu
    Copy the full SHA
    710285a View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Configuration menu
    Copy the full SHA
    2ab41dc View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Update dependencies from https://github.com/dotnet/emsdk build 202305…

    …11.2 (dotnet#86123)
    
    Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
     From Version 6.0.17 -> To Version 6.0.18
    
    Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    dotnet-maestro[bot] and dotnet-maestro[bot] authored May 15, 2023
    Configuration menu
    Copy the full SHA
    921fb22 View commit details
    Browse the repository at this point in the history
  2. Fix HTTP3 header decoder buffer allocation (dotnet#78862) (dotnet#85976)

    * Add test for literal field without name reference
    
    * Fix header name buffer allocation
    
    * Add more tests
    
    * Unified QPackDecoderTest test files
    
    * Fix variable name
    
    * Fixed HPackDecoder and ported QPack tests
    
    * Feedback
    
    ---------
    
    Co-authored-by: Bruno Blanes <bruno.blanes@outlook.com>
    ManickaP and BrunoBlanes authored May 15, 2023
    Configuration menu
    Copy the full SHA
    c93a40e View commit details
    Browse the repository at this point in the history
  3. [release/6.0] Suppress clang-16 warnings (backport dotnet#81573) (dot…

    …net#84443)
    
    * Suppress clang-16 warnings (dotnet#81573)
    
    * Fix DBI loading problem on Linux (dotnet#82461)
    ayakael authored May 15, 2023
    Configuration menu
    Copy the full SHA
    2f007ae View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Configuration menu
    Copy the full SHA
    52b3b98 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3a5fb66 View commit details
    Browse the repository at this point in the history
  3. Add Ubuntu 22.10 kinetic kudu RIDs for .NET 6 (dotnet#84983)

    * Add Ubuntu 22.10 kinetic kudu RIDs
    
    * Add required OOB package authoring changes.
    
    ---------
    
    Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
    dviererbe and carlossanlop authored May 16, 2023
    Configuration menu
    Copy the full SHA
    79da5ef View commit details
    Browse the repository at this point in the history
  4. [6.0-staging] Reset OOB packages from 6.0.17 (dotnet#84598)

    * [6.0-staging] Reset OOB packages from 6.0.17
    
    * Avoid resetting M.W.C
    carlossanlop authored May 16, 2023
    Configuration menu
    Copy the full SHA
    162601f View commit details
    Browse the repository at this point in the history
  5. Add Ubuntu 23.10 (Mantic Minotaur) RIDs to .NET 6 (dotnet#86309)

    * Add Ubuntu 23.10 (Mantic Minotaur) RIDs
    
    * library Microsoft.NETCore.Platforms
      - added RIDs to runtime.compatibility.json
      - added RIDs to runtime.json
      - added Mantic Version Id to Ubuntu runtimeGroups.props
      - incremented ServicingVersion in Microsoft.NETCore.Platforms.csproj
    
    * Update src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
    
    ---------
    
    Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
    dviererbe and carlossanlop authored May 16, 2023
    Configuration menu
    Copy the full SHA
    187cb47 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    464babb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6c46bd1 View commit details
    Browse the repository at this point in the history