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 #86296

Merged
merged 36 commits into from
May 16, 2023

Conversation

carlossanlop
Copy link
Member

Merge commit.

carlossanlop and others added 30 commits April 10, 2023 22:17
…inker dotnet/emsdk dotnet/icu (dotnet#84648)

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

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.23164.3 -> To Version 7.0.0-beta.23211.2

* Update dependencies from https://github.com/dotnet/linker build 20230411.1

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

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

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

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

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 7.0.0-rtm.23115.1 -> To Version 7.0.0-rtm.23211.1

---------

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

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.

Co-authored-by: Stephen Toub <stoub@microsoft.com>
…/7.0-to-release/7.0-staging

[automated] Merge branch 'release/7.0' => 'release/7.0-staging'
Co-authored-by: Chris Sienkiewicz <chsienki@microsoft.com>
….4 (dotnet#85005)

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

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

* [PERF] Remove Android Maui Scenarios from Runtime Repo (dotnet#81453)

Remove references to Maui Android testing as the testing for it has moved to the performance repo.

* Removed pipeline dependencies and steps for running Maui-iOS as it has been moved to the performance repo. (dotnet#84363)

* Remove commented out code.

* Completely remove maui net6 and net7 build scripts.
Co-authored-by: Andrew Au <andrewau@microsoft.com>
…dotnet#85352)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…ook for it first (dotnet#85270)

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

Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
… to release/7.0 (dotnet#84495)

* Ported over changes from PR: 84339 to release/7.0

* used the MAX_YP_SPIN_COUNT_UNIT variable instead of the hardcoded value
Co-authored-by: Juan Sebastian Hoyos Ayala <juan.s.hoyos@outlook.com>
…/7.0-to-release/7.0-staging

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

Co-authored-by: carlossanlop <1175054+carlossanlop@users.noreply.github.com>
…et#85726)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Premek Vysoky <premek.vysoky@microsoft.com>
…tnet#85656)

* 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

* 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

* Enable MS.W.C for servicing

* Reference latest Microsoft.Extensions.Logging.Abstractions

This package has been serviced and we compile against the serviced
version of its assemblies.

None of the directly referenced projects have been serviced so our
package doesn't restore the serviced versions.

Lift up the dependency on Logging.Abstractions to ensure we reference
the serviced package.

---------

Co-authored-by: Vladimir Sadov <vsadov@microsoft.com>
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>
Co-authored-by: Daniel Ramos <danielramos@dsomar20.redmond.corp.microsoft.com>
…otnet#85784)

Co-authored-by: pavelsavara <pavel.savara@gmail.com>
Co-authored-by: Ilona Tomkowicz <itomkowicz@microsoft.com>
* 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>
…11.1 (dotnet#86126)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Fixup data can assist native debugging tools in providing more accurate data

(cherry picked from commit 4c814fa)

Co-authored-by: Andy Gocke <angocke@microsoft.com>
…s with '-' in the base part. (dotnet#86282)

* Microsoft.NETCore.Platforms: support adding rids with '-' in the base part.

Currently when trying to add a rid like 'linux-musl-x64'
the rid is not understood to be base = 'linux-musl', arch = 'x64'.

Instead the parser considers a potential optional qualifier.
This causes the rid to be parsed as base = 'linux', arch = 'musl',
and qualifier = 'x64'.

We know the rids being added won't have a qualifier. If we take
this into account while parsing, we can parse the rid correctly.

* Update src/libraries/Microsoft.NETCore.Platforms/src/RuntimeGroupCollection.cs

Co-authored-by: Eric StJohn <ericstj@microsoft.com>

---------

Co-authored-by: Tom Deseyn <tom.deseyn@gmail.com>
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@carlossanlop carlossanlop requested a review from ericstj May 16, 2023 04:36
@carlossanlop carlossanlop self-assigned this May 16, 2023
@carlossanlop carlossanlop changed the title [manual] Merge release/6.0-staging into release/6.0 [manual] Merge release/7.0-staging into release/7.0 May 16, 2023
@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label May 16, 2023
@carlossanlop
Copy link
Member Author

There are some CI failures in WASM and Mono that I am seeing for the first time. @lewing, @steveisok, @radical, @akoeplinger do they look familiar to you?:


Affected queues:

  • Build Browser wasm Linux Release LibraryTests_EAT
  • Build Browser wasm Linux Release LibraryTests_AOT
  • Build Browser wasm windows Release LibraryTests_AOT

Failures:

##[error]resource ILLink.Substitutions.xml in FSharp.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a(5,6): error IL2040: (NETCORE_ENGINEERING_TELEMETRY=Build) FSharp.Core: Could not find embedded resource 'FSharpSignatureCompressedData.FSharp.Core' to remove in assembly 'FSharp.Core'.
##[error].packages/microsoft.net.illink.tasks/7.0.100-1.23211.1/build/Microsoft.NET.ILLink.targets(86,5): error NETSDK1144: (NETCORE_ENGINEERING_TELEMETRY=Build) Optimizing assemblies for size failed. Optimization can be disabled by setting the PublishTrimmed property to false.

Affected queues:

  • Build windows x64 Release AllSubsets_Mono

Failure:

Failed to load app-local ICU: icuuc68.2.0.9.dll
    System.Globalization.Tests.IcuAppLocalTests.TestIcuAppLocal [FAIL]
      Exit code was -1073740791 but it should have been 42

Affected queues:

  • Build Linux_bionic arm64 Release AllSubsets_Mono

Failure:

                   Starting:    System.Diagnostics.Process.Tests (parallel test collections = on, max threads = 8)
                       System.FormatException : The input is not a valid Base-64 string as it contains a non-base 64 character, more than two padding characters, or an illegal character among the padding characters.
                       Stack Trace:
                         /_/src/libraries/System.Private.CoreLib/src/System/Convert.cs(2906,0): at System.Convert.FromBase64_ComputeResultLength(Char* inputPtr, Int32 inputLength)
                         /_/src/libraries/System.Private.CoreLib/src/System/Convert.cs(2836,0): at System.Convert.FromBase64CharPtr(Char* inputPtr, Int32 inputLength)
                         /_/src/libraries/System.Private.CoreLib/src/System/Convert.cs(2643,0): at System.Convert.FromBase64String(String s)
                         /_/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs(373,0): at System.Diagnostics.Tests.ProcessStartInfoTests.<>c.<ExecuteProcessAndReturnParsedOutput>b__9_0(String s)
                         /_/src/libraries/System.Linq/src/System/Linq/Select.SpeedOpt.cs(83,0): at System.Linq.Enumerable.SelectArrayIterator`2[[System.String, System.Private.CoreLib, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].ToArray()
                         /_/src/libraries/System.Linq/src/System/Linq/ToCollection.cs(17,0): at System.Linq.Enumerable.ToArray[String](IEnumerable`1 source)
                         /_/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs(373,0): at System.Diagnostics.Tests.ProcessStartInfoTests.ExecuteProcessAndReturnParsedOutput(Dictionary`2 envVars, Func`1 processWork)
                         /_/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs(289,0): at System.Diagnostics.Tests.ProcessStartInfoTests.EnvironmentGetEnvironmentVariablesIsCaseSensitive()
                         /_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodInvoker.Mono.cs(33,0): at System.Reflection.MethodInvoker.InterpretedInvoke(Object obj, Span`1 args, BindingFlags invokeAttr)

Note: This failure in all-configurations is expected until we push to nuget the OOB packages generated last month:

artifacts\bin\testPackages\projects\Microsoft.Extensions.Hosting.WindowsServices\project.csproj(0,0): error NU1103: (NETCORE_ENGINEERING_TELEMETRY=Build) Unable to find a stable package Microsoft.Extensions.Logging.Abstractions with version (>= 7.0.1)
  - Found 1562 version(s) in dotnet7 [ Nearest version: 7.0.0-rtm.22511.4 ]
  - Found 112 version(s) in dotnet-public [ Nearest version: 8.0.0-preview.1.23110.8 ]
  - Found 1 version(s) in dotnet7-transport [ Nearest version: 7.0.0-rc.1.22426.10 ]
  - Found 0 version(s) in D:\a\_work\1\s\artifacts\packages\Debug\
  - Found 0 version(s) in richnav
  - Found 0 version(s) in darc-pub-dotnet-emsdk-b3cf128
  - Found 0 version(s) in dotnet-eng
  - Found 0 version(s) in dotnet-libraries
  - Found 0 version(s) in dotnet-tools

@carlossanlop
Copy link
Member Author

We have one more RID incoming. The CI will be reset.

dviererbe and others added 2 commits May 16, 2023 11:10
* 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>
@lewing
Copy link
Member

lewing commented May 16, 2023

There are some CI failures in WASM and Mono that I am seeing for the first time. @lewing, @steveisok, @radical, @akoeplinger do they look familiar to you?:

Affected queues:

  • Build Browser wasm Linux Release LibraryTests_EAT
  • Build Browser wasm Linux Release LibraryTests_AOT
  • Build Browser wasm windows Release LibraryTests_AOT

Failures:

##[error]resource ILLink.Substitutions.xml in FSharp.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a(5,6): error IL2040: (NETCORE_ENGINEERING_TELEMETRY=Build) FSharp.Core: Could not find embedded resource 'FSharpSignatureCompressedData.FSharp.Core' to remove in assembly 'FSharp.Core'.
##[error].packages/microsoft.net.illink.tasks/7.0.100-1.23211.1/build/Microsoft.NET.ILLink.targets(86,5): error NETSDK1144: (NETCORE_ENGINEERING_TELEMETRY=Build) Optimizing assemblies for size failed. Optimization can be disabled by setting the PublishTrimmed property to false.

Affected queues:

  • Build windows x64 Release AllSubsets_Mono

Failure:

Failed to load app-local ICU: icuuc68.2.0.9.dll
    System.Globalization.Tests.IcuAppLocalTests.TestIcuAppLocal [FAIL]
      Exit code was -1073740791 but it should have been 42

Affected queues:

  • Build Linux_bionic arm64 Release AllSubsets_Mono

Failure:

                   Starting:    System.Diagnostics.Process.Tests (parallel test collections = on, max threads = 8)
                       System.FormatException : The input is not a valid Base-64 string as it contains a non-base 64 character, more than two padding characters, or an illegal character among the padding characters.
                       Stack Trace:
                         /_/src/libraries/System.Private.CoreLib/src/System/Convert.cs(2906,0): at System.Convert.FromBase64_ComputeResultLength(Char* inputPtr, Int32 inputLength)
                         /_/src/libraries/System.Private.CoreLib/src/System/Convert.cs(2836,0): at System.Convert.FromBase64CharPtr(Char* inputPtr, Int32 inputLength)
                         /_/src/libraries/System.Private.CoreLib/src/System/Convert.cs(2643,0): at System.Convert.FromBase64String(String s)
                         /_/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs(373,0): at System.Diagnostics.Tests.ProcessStartInfoTests.<>c.<ExecuteProcessAndReturnParsedOutput>b__9_0(String s)
                         /_/src/libraries/System.Linq/src/System/Linq/Select.SpeedOpt.cs(83,0): at System.Linq.Enumerable.SelectArrayIterator`2[[System.String, System.Private.CoreLib, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e],[System.String, System.Private.CoreLib, Version=7.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]].ToArray()
                         /_/src/libraries/System.Linq/src/System/Linq/ToCollection.cs(17,0): at System.Linq.Enumerable.ToArray[String](IEnumerable`1 source)
                         /_/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs(373,0): at System.Diagnostics.Tests.ProcessStartInfoTests.ExecuteProcessAndReturnParsedOutput(Dictionary`2 envVars, Func`1 processWork)
                         /_/src/libraries/System.Diagnostics.Process/tests/ProcessStartInfoTests.cs(289,0): at System.Diagnostics.Tests.ProcessStartInfoTests.EnvironmentGetEnvironmentVariablesIsCaseSensitive()
                         /_/src/mono/System.Private.CoreLib/src/System/Reflection/MethodInvoker.Mono.cs(33,0): at System.Reflection.MethodInvoker.InterpretedInvoke(Object obj, Span`1 args, BindingFlags invokeAttr)

Note: This failure in all-configurations is expected until we push to nuget the OOB packages generated last month:

artifacts\bin\testPackages\projects\Microsoft.Extensions.Hosting.WindowsServices\project.csproj(0,0): error NU1103: (NETCORE_ENGINEERING_TELEMETRY=Build) Unable to find a stable package Microsoft.Extensions.Logging.Abstractions with version (>= 7.0.1)
  - Found 1562 version(s) in dotnet7 [ Nearest version: 7.0.0-rtm.22511.4 ]
  - Found 112 version(s) in dotnet-public [ Nearest version: 8.0.0-preview.1.23110.8 ]
  - Found 1 version(s) in dotnet7-transport [ Nearest version: 7.0.0-rc.1.22426.10 ]
  - Found 0 version(s) in D:\a\_work\1\s\artifacts\packages\Debug\
  - Found 0 version(s) in richnav
  - Found 0 version(s) in darc-pub-dotnet-emsdk-b3cf128
  - Found 0 version(s) in dotnet-eng
  - Found 0 version(s) in dotnet-libraries
  - Found 0 version(s) in dotnet-tools

The wasm failures look trimming related and like something @sbomer or @vitek-karas was aware of?

@mmitche
Copy link
Member

mmitche commented May 16, 2023

Note: This failure in all-configurations is expected until we push to nuget the OOB packages generated last month:

That will not happen till June.

@ViktorHofer
Copy link
Member

@carlossanlop you can disable the failing validation meanwhile by adding the packages here:

<ExcludePackages Include="runtime.native.System.IO.Ports" />

@sbomer
Copy link
Member

sbomer commented May 16, 2023

##[error]resource ILLink.Substitutions.xml in FSharp.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a(5,6): error IL2040: (NETCORE_ENGINEERING_TELEMETRY=Build) FSharp.Core: Could not find embedded resource 'FSharpSignatureCompressedData.FSharp.Core' to remove in assembly 'FSharp.Core'.

This is a problem in the fsharp ILLink.Substitutions.xml. It is being fixed in dotnet/fsharp#14395. You can work around it like we do in these runtime tests:

<!-- FSharp.Core: Could not find embedded resource 'FSharpOptimizationCompressedData.FSharp.Core' to remove in assembly 'FSharp.Core'. See https://github.com/dotnet/fsharp/pull/14395 -->
<NoWarn>$(NoWarn);IL2040</NoWarn>

@ViktorHofer
Copy link
Member

ViktorHofer commented May 16, 2023

Why does this error show up in the merge PR only?

@carlossanlop
Copy link
Member Author

Why does this error show up in the merge PR only?

All those errors showed up in the runtime-extra-platforms CI legs, which got executed automatically in this PR. I had not seen these legs being executed manually or automatically in any servicing PR from the past month.

@carlossanlop
Copy link
Member Author

Failures in the latest run are known. I think it's good to merge.

@carlossanlop carlossanlop merged commit 7c002df into dotnet:release/7.0 May 16, 2023
@carlossanlop carlossanlop deleted the release/7.0-staging branch May 16, 2023 22:49
@ghost ghost locked as resolved and limited conversation to collaborators Jun 16, 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.