[main] Update dependencies from xamarin/xamarin-android #1443
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dotnet-maestro[bot]](https://avatars.githubusercontent.com/in/16706?s=60&v=4){kind=small}
…uild 6.0.1xx-preview6-03b91941bf31a562b3243d3ac76846f0bac71636-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.51 -> To Version 30.0.100-preview.6.53 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21323.1 (parent: Microsoft.Android.Sdk.Windows
Context: dotnet/sdk#18516 Attempts to workaround the failure: > D:\agent\1\s\bin\dotnet\dotnet workload install microsoft-android-sdk-full --skip-manifest-update --verbosity diag ... Workload installation failed: Source and destination path must have identical roots. Move will not work across volumes. If `dotnet` is in `D:\agent\1\s\bin\dotnet\dotnet` and `%TEMP%` is `C:\Users\XAMARI~1\AppData\Local\Temp`, this seems to fail. Setting `%TEMP%` to `.\bin\temp` in the current directory instead.
|
This will need changes to flow from dotnet/runtime for:
Build fails with: |
…uild 6.0.1xx-preview6-d515a1c8112c700ae9f22f9c27829cf54a79931e-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.51 -> To Version 30.0.100-preview.6.54 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21323.1 (parent: Microsoft.Android.Sdk.Windows
…uild 6.0.1xx-preview6-9bc7166b808aa4c4456c960adb127970d9580fa1-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.51 -> To Version 30.0.100-preview.6.55 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21324.9 (parent: Microsoft.Android.Sdk.Windows
|
We need this to land before we can merge this: xamarin/xamarin-macios#11989 We'll probably also need to bump Android/iOS at the same time; I can help with this. |
…uild 6.0.1xx-preview6-f57c5c2a195d47a699a4043aa7ba5b3000278531-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.51 -> To Version 30.0.100-preview.6.56 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21328.1 (parent: Microsoft.Android.Sdk.Windows
…ild 20210629.4 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.60 -> To Version 12.0.100-preview.6.61
We should no longer need to set `$(GenerateRuntimeConfigurationFiles)` to `false`.
Context: https://github.com/xamarin/xamarin-macios/blob/a64b030fcc06da4a12b0b7e3580c9d349c14daaf/dotnet/targets/WorkloadManifest.MacCatalyst.template.json Currently, the build fails with: error NETSDK1147: To build this project, the following workloads must be installed: microsoft-net-runtime-maccatalyst It appears we are missing an `extends` for some xamarin-macios workloads.
This reverts commit 7e10ac4.
Context: https://github.com/dotnet/runtime/blob/d4baa2bd2b009cdd0886bba925ce32517041bfa0/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets Previously I just tried installing an extra workload: Workload with id microsoft-net-runtime-maccatalyst is not supported on this platform. This workload will not install on Windows. For now I can just patch the `WorkloadManifest.json` from xamarin/xamarin-macios to depend on the missing workload. Even after this, usage of `Microsoft.NETCore.App.Runtime.AOT.Cross` in the dotnet/runtime `WorkloadManifest.targets` fails on Windows: <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst" /> ... <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm" /> <Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64" /> I can manually patch these files with a condition to not do this on Windows.
Comment on lines
+184
to
+201
| <ReplaceText | ||
| Input="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets" | ||
| Output="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets" | ||
| OldValue="Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst"" | ||
| NewValue="Condition="%24([MSBuild]::IsOSPlatform('osx'))" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst"" | ||
| /> | ||
| <ReplaceText | ||
| Input="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets" | ||
| Output="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets" | ||
| OldValue="Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm"" | ||
| NewValue="Condition="%24([MSBuild]::IsOSPlatform('osx'))" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm"" | ||
| /> | ||
| <ReplaceText | ||
| Input="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets" | ||
| Output="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets" | ||
| OldValue="Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64"" | ||
| NewValue="Condition="%24([MSBuild]::IsOSPlatform('osx'))" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64"" | ||
| /> |
There was a problem hiding this comment.
/cc @Redth @steveisok
I had to manually patch up microsoft.net.workload.mono.toolchain/WorkloadManifest.targets for iOS and MacCatalyst projects to be able to build on Windows.
These AOT packs have platforms limiting to osx:
And so on Windows, imports such as these would fail:
Not sure if we should merge without this fixed, as it would probably break anyone doing maui-check --main.
There was a problem hiding this comment.
Created an issue on the runtime end and we'll see what we can do.
There was a problem hiding this comment.
If you try to build an iOS or Mac Catalyst project on Windows right now, you'll hit:
C:\src\maui\bin\dotnet\sdk-manifests\6.0.100\microsoft.net.workload.mono.toolchain\WorkloadManifest.targets(23,9): error : C:\src\maui\bin\dotnet\sdk\6.0.100-preview.6.21328.1\Sdks\Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm\Sdk not found. Check that a recent enough .NET SDK is installed and/or increase the version specified in global.json.
C:\src\maui\bin\dotnet\sdk-manifests\6.0.100\microsoft.net.workload.mono.toolchain\WorkloadManifest.targets(24,9): error : C:\src\maui\bin\dotnet\sdk\6.0.100-preview.6.21328.1\Sdks\Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64\Sdk not found. Check that a recent enough .NET SDK is installed and/or increase the version specified in global.json.
C:\src\maui\bin\dotnet\sdk-manifests\6.0.100\microsoft.net.workload.mono.toolchain\WorkloadManifest.targets(29,9): error : C:\src\maui\bin\dotnet\sdk\6.0.100-preview.6.21328.1\Sdks\Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst\Sdk not found. Check that a recent enough .NET SDK is installed and/or increase the version specified in global.json.
…uild 6.0.1xx-preview6-3ed60bd3e4728f2ee08c6ceae1091d476743b5f0-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.51 -> To Version 30.0.100-preview.6.58 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21328.1 (parent: Microsoft.Android.Sdk.Windows
…ild 20210630.10 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.60 -> To Version 12.0.100-preview.6.62
This reverts commit 6eeee59.
mattleibow
reviewed
Jul 1, 2021
Comment on lines
-182
to
+204
| Command=""$(DotNetToolPath)" workload install %(_WorkloadIds.Identity) --skip-manifest-update --verbosity diag" | ||
| Command=""$(DotNetToolPath)" workload install @(_WorkloadIds, ' ') --skip-manifest-update --verbosity diag --temp-dir $(DotNetTempDirectory)" |
Context: dotnet/android#6054 This solves the warning (that is turned into an error): src/Essentials/src/AssemblyInfo/AssemblyInfo.android.cs(3,12): error CS0618: 'LinkerSafeAttribute' is obsolete: 'For .NET 6+, please use: [assembly: global::System.Reflection.AssemblyMetadata("IsTrimmable", "True")]'
…uild 6.0.1xx-preview6-52a34e9c48bad7ae2cb16d28af9700f605163dda-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.51 -> To Version 30.0.100-preview.6.60 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21329.10 (parent: Microsoft.Android.Sdk.Windows
jonathanpeppers
approved these changes
Jul 1, 2021
…73-476a-b29b-e70150a67406
…73-476a-b29b-e70150a67406
…uild 6.0.1xx-preview6-ac0333b7828fd72de2afb43c67d8212f18d5be43-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.51 -> To Version 30.0.100-preview.6.61 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.100-preview.6.21313.2 -> To Version 6.0.100-preview.6.21351.1 (parent: Microsoft.Android.Sdk.Windows
Csaba8472
added a commit
to Csaba8472/maui
that referenced
this pull request
Sep 6, 2021
* upstream/main: (270 commits) Automated dotnet-format update (dotnet#1533) Add tests for default colors (dotnet#1532) Don't extract native defaults, meaning users can no longer reset a color back to a platform theme (dotnet#1485) Avoid show the virtual keyboard in the Android TimePicker (dotnet#1428) Implement VerticalTextAlignment in WinUI Label (dotnet#1479) Changes in the Gallery: include custom fonts, reorganize some pages, etc. (dotnet#1526) Don't pack and force a signing failure (dotnet#1527) [main] Update dependencies from xamarin/xamarin-android (dotnet#1443) Implements EntryHandler IsPassword in WinUI (dotnet#802) Automated dotnet-format update (dotnet#1523) [Build] Fix net6 Microsoft.Maui.Handlers.Benchmarks assembly (dotnet#1525) Update WinUI to 0.8 stable (dotnet#1522) Implement the basic WindowHandler (dotnet#1468) Automated dotnet-format update (dotnet#1510) Implement Alerts (Alert, Prompt and ActionSheet) (dotnet#1328) Avoid create a drawable to set the Background if is not necessary (dotnet#1504) Android Gestures (dotnet#1489) Revert to using Navigation Page Shims (dotnet#1495) Allow to navigate to the same item after navigate back (dotnet#1503) Automated dotnet-format update (dotnet#1499) ...
Eilon
added
the
area-infrastructure
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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/xamarin/xamarin-android