-
Notifications
You must be signed in to change notification settings - Fork 533
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
[main] Update dependencies from dotnet/installer #6072
[main] Update dependencies from dotnet/installer #6072
Conversation
…210704.4 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.7.21327.2 -> To Version 6.0.100-preview.7.21354.4 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21322.1 -> To Version 6.0.100-preview.6.21330.1 (parent: Microsoft.Dotnet.Sdk.Internal
....Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
Outdated
Show resolved
Hide resolved
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
I'm not sure what to make of this unit test failure: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=4952636&view=ms.vss-test-web.build-test-results-tab&runId=23305012&resultId=100052&paneView=debug
Probably failing in: https://github.com/xamarin/xamarin-android/blob/7c5fab13329ee898fb1562f83576a7ca881f2881/src/Mono.Android/Android.Runtime/XmlPullParserReader.cs#L78-L83 This doesn't really make sense to me, as the Tests are currently re-running. We'll see if this requires more mental energy. |
…GeneratedAttribute from api compat check
Context: dotnet/runtime#55375 There are lots of tests in `tests/Mono.Android-Tests`, but only two tests are failing. Add a `[Category("dotnet-runtime-55375")]` to the failing tests so that we can more easily execute *just* the tests in question: adb shell am instrument -e include dotnet-runtime-55375 -e loglevel Verbose -w Mono.Android.NET_Tests/xamarin.android.runtimetests.NUnitInstrumentation
Context: #6072 Context: dotnet/runtime#55375 Context: https://discord.com/channels/732297728826277939/732297837953679412/862829757460512788 @vargaz wondered if dotnet/runtime#55375 is because of the linker. Disable the linker, and lets see what happens!
Context: dotnet/runtime#55375 (comment) This reverts commit 004725d. > Disable the linker, and lets see what happens! What happens is…all the tests pass! Which suggests that this *is* a linker-related (adjacent?) issue, *not* a JIT issue, as I had previously believed. (I still don't understand *how* it's linker-related, and now I have to wonder if I can't "believe" the output of `ikdasm`, which is an equally troubling thought…) Re-enable the linker, so that tests once again *fail*. (I'm also not able to repro the crash locally, so if I want to further explore things, exploring CI output is the only path forward.)
This reverts commit 5062dd8. Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=4963171&view=results Context: #6072 (comment) I *thought* that re-enabling the linker (23310da) would cause the unit tests to once again start failing. The **APKs .NET** tests are *passing*. Meaning `Android.RuntimeTests.XmlReaderPullParserTest.ToLocalJniHandle()` is now *passing*. I had thought this was due to the linker, but could it instead be due to commit 5062dd8? Revert 5062dd8; let's see if it once again breaks. *Locally*, `XmlReaderPullParserTest.ToLocalJniHandle()` fails when commit 5062dd88is not applied.
…210710.1 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.7.21327.2 -> To Version 6.0.100-preview.7.21360.1 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21322.1 -> To Version 6.0.100-preview.6.21358.3 (parent: Microsoft.Dotnet.Sdk.Internal
…210719.3 Microsoft.Dotnet.Sdk.Internal From Version 6.0.100-preview.7.21327.2 -> To Version 6.0.100-rc.1.21369.3 Dependency coherency updates Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21322.1 -> To Version 6.0.100-preview.6.21366.2 (parent: Microsoft.Dotnet.Sdk.Internal
I'm seeing failures on CI such as: C:\a\_work\2\s\build-tools\xaprepare\xaprepare\package-download.proj : warning MSB4242: The SDK resolver "Microsoft.DotNet.MSBuildWorkloadSdkResolver" failed to run. Inconsistency in workload manifest 'microsoft.net.workload.mono.toolchain': missing dependency 'Microsoft.NET.Workload.Emscripten' C:\Users\cloudtest\android-toolchain\dotnet\sdk\6.0.100-preview.7.21369.2\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.ImportWorkloads.props(14,3): warning MSB4242: The SDK resolver "Microsoft.DotNet.MSBuildWorkloadSdkResolver" failed to run. Inconsistency in workload manifest 'microsoft.net.workload.mono.toolchain': missing dependency 'Microsoft.NET.Workload.Emscripten' C:\Users\cloudtest\android-toolchain\dotnet\sdk\6.0.100-preview.7.21369.2\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4236: The SDK 'Microsoft.NET.SDK.WorkloadAutoImportPropsLocator' specified could not be found. [C:\a\_work\2\s\build-tools\xaprepare\xaprepare\package-download.proj] Error: dotnet restore C:\a\_work\2\s\build-tools\xaprepare\xaprepare\package-download.proj failed. Step Xamarin.Android.Prepare.Step_InstallDotNetPreview failed System.InvalidOperationException: Step Xamarin.Android.Prepare.Step_InstallDotNetPreview failed at Xamarin.Android.Prepare.Scenario.<Run>d__26.MoveNext() in C:\a\_work\2\s\build-tools\xaprepare\xaprepare\Application\Scenario.cs:line 50 --- End of stack trace from previous location where exception was thrown --- at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw() at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task) at Xamarin.Android.Prepare.Context.<Execute>d__210.MoveNext() in C:\a\_work\2\s\build-tools\xaprepare\xaprepare\Application\Context.cs:line 827 --- End of stack trace from previous location where exception was thrown --- at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw() at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task) at Xamarin.Android.Prepare.App.<Run>d__3.MoveNext() in C:\a\_work\2\s\build-tools\xaprepare\xaprepare\Main.cs:line 171 I saw the same thing locally, and noticed this folder was out of date: ~/android-toolchain/dotnet/sdk-manifests/6.0.100/microsoft.net.workload.mono.toolchain If we have an outdated `WorkloadManifest.json` or `WorkloadManifest.targets`, the build can get in a state where this step can't succeed. I manually deleted this folder to solve the problem: ~/android-toolchain/dotnet/ Going forward, let's make the `Prepare` step do this every time. This should simplify our .NET 6 provisioning & upgrade process.
…o darc-main-ad9c41ae-32fa-4740-9606-7b7e381226b3
Builds were failing with: error NETSDK1031: It is not supported to build or publish a self-contained application without specifying a RuntimeIdentifier. You must either specify a RuntimeIdentifier or set SelfContained to false. This seemed to be caused by reordering such as: dotnet/sdk#18639 In the past, we weren't actually overwriting `$(SelfContained)` *at all*, and with these changes we now are. I set this value in the days of .NET 5. We should just remove where we set `$(SelfContained)` and let the dotnet/sdk manage this value.
Changes: dotnet/java-interop@a5ed891...4fb7c14 We need "[build] set $(DisableImplicitNamespaceImports) by default".
We don't need to assert for the presence of this file anyway.
* Use `$(TargetFramework)` and `monoandroid10` checks, so they will continue to work in a future .NET 7. * Fixed mixed tabs/spaces in `AndroidMessageHandler` * Removed `goto done` where it could simply be `return proxy`.
Context: https://github.com/xamarin/xamarin-android/blob/0b9395a7786ef36a17c2bfd6dd2f00dd3e65301c/tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs#L360-L377 Context: https://github.com/dotnet/runtime/blob/ccfe21882e4a2206ce49cd5b32d3eb3cab3e530f/src/libraries/Common/src/System/Net/Http/HttpHandlerDefaults.cs Some tests that check 301 redirects were failing with: System.Net.Http.HttpRequestException : net_http_message_not_success_statuscode, 301, Moved Permanently at System.Net.Http.HttpResponseMessage.EnsureSuccessStatusCode() in System.Net.Http.dll:token 0x6000298+0x39 at Xamarin.Android.NetTests.AndroidClientHandlerTests.Redirect_Without_Protocol_Works() in Mono.Android.NET-Tests.dll:token 0x600002e+0x7b at System.Reflection.RuntimeMethodInfo.Invoke(Object , BindingFlags , Binder , Object[] , CultureInfo ) in System.Private.CoreLib.dll:token 0x600281b+0x6a We originally were inheriting some default values from `AndroidClientHandler`. Now that we have `AndroidMessageHandler` in .NET 6, we need to specify these defaults ourselves.
* MaxAutomaticRedirections should throw if <= 0 * UseCookies defaults to true * CookieContainer creates a new instance on first call * Catch TargetInvocationException, see: dotnet/runtime#56089 * Catch PlatformNotSupportedException for ClientCertificateOptions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm thinking this will be green now.
Bump to dotnet/installer/main@9c463710 6.0.100-rc.1.21369 (#6072)
Fixes: https://github.com/xamarin/java.interop/issues/854
Changes: https://github.com/dotnet/installer/compare/e8b3b6bea1e37086869ba9aeafe65caa298537e7...9c463710a333a48301a211fbd7b8ca3b15d4f1f7
% git diff --shortstat e8b3b6be...9c463710
103 files changed, 2301 insertions(+), 2757 deletions(-)
Changes: https://github.com/mono/linker/compare/a07cab7b71a1321a9e68571c0b6095144a177b4e...460dd6ddb329a5588d9e4399f4257ce28dfadaca
% git diff --shortstat a07cab7b...460dd6dd
84 files changed, 2403 insertions(+), 258 deletions(-)
Changes: https://github.com/dotnet/runtime/compare/02f70d0b903422282cd7ba8037de6b66ea0b7a2d...96ce6b35359b3c159ef3e685dd67cf30bb46769b
% git diff --shortstat 02f70d0b90...96ce6b3535
2586 files changed, 123677 insertions(+), 34433 deletions(-)
Changes: https://github.com/xamarin/java.interop/compare/a5ed8919fb2ec894cb8144e51ae7c29b4811ee2a...4fb7c147f8c6eb9bf94d9bfb8305c7d2a7a9fb33
* xamarin/java.interop@4fb7c147: [build] set $(DisableImplicitNamespaceImports) by default (#859)
* xamarin/java.interop@855ecfa3: [generator] Don't generate unexpected NRT types like `void?` (#856)
* xamarin/java.interop@4a02bc32: Revert "[Xamarin.Android.Tools.Bytecode] hide nested types (#827)" (#855)
* xamarin/java.interop@95c9b79d: [generator] Avoid 'error (…):' construct in diagnostic messages (#851)
* xamarin/java.interop@7c4f7db0: [build] Bump to Mono with MSBuild 16.10 (#848)
* xamarin/java.interop@0227cdae: [generator] Gracefully handle BindingGeneratorException. (#845)
* xamarin/java.interop@ce1750fd: Add SECURITY.md (#846)
Context: https://github.com/dotnet/runtime/pull/55384
Context: https://github.com/dotnet/sdk/pull/18639
Updates:
* Microsoft.Dotnet.Sdk.Internal: from 6.0.100-preview.7.21327.2 to 6.0.100-rc.1.21369.3
* Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21322.1 to 6.0.100-preview.6.21366.2
* Microsoft.NETCore.App.Ref: from 6.0.0-preview.7.21326.8 to 6.0.0-rc.1.21368.1
dotnet/runtime#55384 broke how .NET 6 interacts with
`AndroidClientHandler`. Fix this by introducing a new
`Xamarin.Android.Net.AndroidMessageHandler` type for use on .NET 6,
and update the .NET 6 `AndroidClientHandler` to delegate to
`AndroidMessageHandler`.
`AndroidMessageHandler` doesn't exist on Legacy.
Update `.apkdesc` files:
* `BuildReleaseArm64SimpleDotNet` is ~37KB smaller
* `BuildReleaseArm64XFormsDotNet` is ~62KB larger.
Update `tests/api-compatibility/api-compat-exclude-attributes.txt`
so that `T:System.Runtime.CompilerServices.CompilerGeneratedAttribute`
is ignored. `[CompilerGeneratedAttribute]` is emitted as part of
C# 3 "auto-props":
public T Property { get; set; }
Converting this into a "real" property:
T value;
public T Property {
get => value;
set => this.value = value;
}
results in the `_CheckApiCompatibility` target complaining about an
API break. We don't care; ignore `[CompilerGeneratedAttribute]`.
Remove `$(SelfContained)` property: early on in .NET 5 (yes 5)
development, the Xamarin.Android SDK needed to specify
`$(SelfContained)` by default in order to produce `.apk` files.
After we became a proper workload, setting the value became
unnecessary. It also didn't actually do anything because
dotnet/sdk overwrote the value.
Starting in dotnet/sdk#18639,
`Microsoft.NET.RuntimeIdentifierInference.targets` is now being
imported *after* a workload, which meant that dotnet/sdk no longer
overwrote our `$(SelfContained)` value, which broke things:
error NETSDK1031: It is not supported to build or publish a self-contained application without specifying a RuntimeIdentifier. You must either specify a RuntimeIdentifier or set SelfContained to false.
We can simply remove `$(SelfContained)` now, and rely on
dotnet/sdk to set this value.
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Steve Pfister <steve.pfister@microsoft.com> |
One part to add is about the removal of
|
…er_unhandled_exception * origin/main: Bump to dotnet/installer@19943da 6.0.100-rc.1.21372.10 (dotnet#6110) [xaprepare] don't install microsoft-net-runtime-android workload (dotnet#6114) [Mono.Android] Use `mono_unhandled_exception` for NET6 (dotnet#6104) Bump to dotnet/installer@9c463710 6.0.100-rc.1.21369 (dotnet#6072) Bump to xamarin/xamarin-android-binutils/2.37-XA.1@77618674 v2.37 (dotnet#6096) [Mono.Android.Export] Fix DynamicDependency to JavaArray (dotnet#6105) [xaprepare] always delete ~/android-toolchain/dotnet (dotnet#6098) [CI] Add nuget to msi conversion and VS insert stage (dotnet#6030) [build] delete platform-31 folder on test jobs (dotnet#6103)
Context: #6234 Context: 1e5bfa3 Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=5132407&view=logs&jobId=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&j=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&t=65256bb7-a34c-5353-bc4d-c02ee25dc133 Changes: dotnet/java-interop@48766c0...476bb5b * dotnet/java-interop@476bb5b7: [build] .NET 6 P7 Support (#869) * dotnet/java-interop@0028e32c: [build] set $(DisableImplicitNamespaceImports) by default (#859) We don't actually *care* about dotnet/installer@9c463710 bump. We care that the attempt to build PR #6234 fails to build: …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CompatApi command: /Users/builder/.nuget/packages/microsoft.dotnet.apicompat/5.0.0-beta.20181.7/tools/net472/Microsoft.DotNet.ApiCompat.exe "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/reference/Mono.Android.dll" -i "/Users/builder/azdo/_work/2/s/xamarin-android/bin/Release/lib/xamarin.android/xbuild-frameworks/Microsoft.Android/net6.0" --allow-default-interface-methods --baseline "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/acceptable-breakages-vReference.txt" --validate-baseline --exclude-attributes "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/api-compat-exclude-attributes.txt" …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CheckApiCompatibility found nonacceptable Api breakages for ApiLevel: v12.0. …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Compat issues with assembly Mono.Android: …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : TypesMustExist : Type 'Xamarin.Android.Net.AndroidMessageHandler' does not exist in the implementation but it does exist in the contract. …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Total Issues: 1 It fails to build because we `CheckApiCompatibility` expects the `Xamarin.Android.Net.AndroidMessageHandler` type to exist, and it doesn't exist, because it was added until… 1e5bfa3. That's the primary thing we're after. Everything else is fluff, and the dotnet/runtime-related changes are not otherwise needed -- or cared about -- on d16-11. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
Context: #6234 Context: 1e5bfa3 Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=5132407&view=logs&jobId=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&j=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&t=65256bb7-a34c-5353-bc4d-c02ee25dc133 Changes: dotnet/java-interop@48766c0...476bb5b * dotnet/java-interop@476bb5b7: [build] .NET 6 P7 Support (#869) * dotnet/java-interop@0028e32c: [build] set $(DisableImplicitNamespaceImports) by default (#859) We don't actually *care* about dotnet/installer@9c463710 bump. We care that the attempt to build PR #6234 fails to build: …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CompatApi command: /Users/builder/.nuget/packages/microsoft.dotnet.apicompat/5.0.0-beta.20181.7/tools/net472/Microsoft.DotNet.ApiCompat.exe "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/reference/Mono.Android.dll" -i "/Users/builder/azdo/_work/2/s/xamarin-android/bin/Release/lib/xamarin.android/xbuild-frameworks/Microsoft.Android/net6.0" --allow-default-interface-methods --baseline "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/acceptable-breakages-vReference.txt" --validate-baseline --exclude-attributes "/Users/builder/azdo/_work/2/s/xamarin-android/tests/api-compatibility/api-compat-exclude-attributes.txt" …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : CheckApiCompatibility found nonacceptable Api breakages for ApiLevel: v12.0. …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Compat issues with assembly Mono.Android: …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : TypesMustExist : Type 'Xamarin.Android.Net.AndroidMessageHandler' does not exist in the implementation but it does exist in the contract. …/xamarin-android/src/Mono.Android/Mono.Android.targets(247,5): error : Total Issues: 1 It fails to build because we `CheckApiCompatibility` expects the `Xamarin.Android.Net.AndroidMessageHandler` type to exist, and it doesn't exist, because it was added until… 1e5bfa3. That's the primary thing we're after. Everything else is fluff, and the dotnet/runtime-related changes are not otherwise needed -- or cared about -- on d16-11. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Steve Pfister <steve.pfister@microsoft.com>
This pull request updates the following dependencies
Coherency Updates
The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format
From https://github.com/dotnet/installer