[main] Update dependencies from xamarin/xamarin-android#1577
Merged
mattleibow merged 25 commits intomainfrom Jul 19, 2021
Merged
[main] Update dependencies from xamarin/xamarin-android#1577mattleibow merged 25 commits intomainfrom
mattleibow merged 25 commits intomainfrom
Conversation
…uild main-e5103b0f97d542ce14f2ceb9f2d3a247aa6d5964-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.73 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal
…ild 20210707.26 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142
If you don't need AOT, the `android` workload excludes it. Note that AOT isn't working yet, but we have the Mono packs setup.
The names are now `maccatalyst`, `macos`, `ios`, and `tvos`.
Member
|
This currently hits a failure on Windows about these workload packs missing: Error is: Looking into this, it doesn't make sense... |
…ild 20210707.26
Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142
Conflicts:
eng/Versions.props
The names are now `maccatalyst`, `macos`, `ios`, and `tvos`.
Member
|
I'm going to try bumping iOS and Android at the same time. |
…uild main-7c5fab13329ee898fb1562f83576a7ca881f2881-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.75 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal
…ild 20210709.17 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.150
…ild 20210713.6 Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.159
…rc-main-90168b46-91fb-421a-99dc-36cee90a77c6 Conflicts: eng/Version.Details.xml eng/Versions.props src/DotNet/DotNet.csproj
This reverts commit 5231ec3.
…uild main-e06d71320c8f5cebb31c42b15d8172b087a98761-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.77 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal
Conflicts: eng/Version.Details.xml eng/Versions.props src/DotNet/DotNet.csproj
This reverts commit d7212d4.
…uild main-1d53c0095871293c38d16196982e83485a091a3f-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.81 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal
…fb-421a-99dc-36cee90a77c6
…uild main-7dacdd751dd0bd7b02ac443c32824f353a6da380-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.83 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal
…uild main-24f272bd357d67a5e326d4cce55899a5b98905ae-1 Microsoft.Android.Sdk.Windows From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.84 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal
mattleibow
reviewed
Jul 19, 2021
| displayName: install dotnet tools | ||
| - powershell: | | ||
| & dotnet cake --target=VS-WINUI-CI --configuration=${{ BuildCondition }} | ||
| $msbuild = "$env:ProgramFiles/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe" |
Member
There was a problem hiding this comment.
Because VS 2022 is so wildly different for some reason, it requires a reboot:
[14:14:09 WRN] Visual Studio installer exited with code 3010, indicating a reboot is needed.
[14:14:09 WRN] Visual Studio installer requested a reboot--this typically means that installation succeeded, but vswhere will *not* find the newly installed VS until reboot. Treating this item as if it was provisioned successfully!
[14:14:09 INF] Finished!
So for now I just hardcode the path to VS2022 MSBuild. We can fix later. I also have a PR which makes all this stuff irrelevant since it is using all the new things like .NET 6 to build.
Comment on lines
+176
to
+194
| <!-- HACK: temporary fixes for iOS and MacCatalyst workloads --> | ||
| <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"" | ||
| /> |
Member
There was a problem hiding this comment.
Ok, we should be able to remove this later ^^
When this lands: dotnet/android#6097
jonathanpeppers
approved these changes
Jul 19, 2021
This file contains hidden or 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
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