Skip to content

[main] Update dependencies from xamarin/xamarin-android#1577

Merged
mattleibow merged 25 commits intomainfrom
darc-main-90168b46-91fb-421a-99dc-36cee90a77c6
Jul 19, 2021
Merged

[main] Update dependencies from xamarin/xamarin-android#1577
mattleibow merged 25 commits intomainfrom
darc-main-90168b46-91fb-421a-99dc-36cee90a77c6

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented Jul 8, 2021

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

  • Coherency Updates:
    • Microsoft.NETCore.App.Ref: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.Dotnet.Sdk.Internal: from 6.0.100-preview.6.21355.2 to 6.0.100-preview.7.21327.2 (parent: Microsoft.Android.Sdk.Windows)
    • Microsoft.Extensions.Primitives: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21326.8 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-preview.6.21355.2 to 6.0.0-preview.7.21325.3 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.Extensions.Hosting.Abstractions: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.DependencyInjection.Abstractions: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.DependencyInjection: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Configuration.Abstractions: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Configuration: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Logging.Abstractions: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Logging: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Logging.Console: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.Logging.Debug: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.FileProviders.Abstractions: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)
    • Microsoft.Extensions.FileProviders.Embedded: from 6.0.0-preview.6.21355.2 to 6.0.0-preview.7.21325.3 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Authorization: from 6.0.0-preview.6.21355.2 to 6.0.0-preview.7.21325.3 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Components.WebView: from 6.0.0-preview.6.21355.2 to 6.0.0-preview.7.21325.3 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.AspNetCore.Components.Web: from 6.0.0-preview.6.21355.2 to 6.0.0-preview.7.21325.3 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.JSInterop: from 6.0.0-preview.6.21355.2 to 6.0.0-preview.7.21325.3 (parent: Microsoft.Dotnet.Sdk.Internal)
    • Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21353.1 to 6.0.0-preview.7.21323.1 (parent: Microsoft.Dotnet.Sdk.Internal)
    • System.CodeDom: from 6.0.0-preview.6.21352.12 to 6.0.0-preview.7.21324.24 (parent: Microsoft.AspNetCore.App.Runtime.win-x64)

From https://github.com/xamarin/xamarin-android

  • Subscription: 63fe8ad0-daf0-49c9-9959-08d920866296
  • Build: main-24f272bd357d67a5e326d4cce55899a5b98905ae-1
  • Date Produced: 7/16/2021 7:00 PM
  • Commit: 24f272bd357d67a5e326d4cce55899a5b98905ae
  • Branch: refs/heads/main

dotnet-maestro Bot and others added 5 commits July 8, 2021 11:19
…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`.
@jonathanpeppers
Copy link
Copy Markdown
Member

jonathanpeppers commented Jul 8, 2021

This currently hits a failure on Windows about these workload packs missing:

MissingWorkloadPacks
    Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm
        Version = 6.0.0-preview.7.21326.8
    Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64
        Version = 6.0.0-preview.7.21326.8

Error is:

D:\a\1\s\bin\dotnet\sdk\6.0.100-preview.7.21327.2\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.ImportWorkloads.targets(33,5): error MSB4018: The "ShowMissingWorkloads" task failed unexpectedly.
System.Exception: Workload not found
   at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.<>c__DisplayClass20_0.<<GetPacksInWorkload>g__ExpandPacks|0>d.MoveNext()
   at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.<>c__DisplayClass20_0.<<GetPacksInWorkload>g__ExpandPacks|0>d.MoveNext()
   at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.<>c__DisplayClass20_0.<<GetPacksInWorkload>g__ExpandPacks|0>d.MoveNext()
   at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.<>c__DisplayClass20_0.<<GetPacksInWorkload>g__ExpandPacks|0>d.MoveNext()
   at System.Collections.Generic.HashSet`1.UnionWith(IEnumerable`1 other)
   at System.Collections.Generic.HashSet`1..ctor(IEnumerable`1 collection, IEqualityComparer`1 comparer)
   at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.<GetWorkloadSuggestionForMissingPacks>b__22_1(KeyValuePair`2 w)
   at System.Linq.Enumerable.WhereSelectEnumerableIterator`2.MoveNext()
   at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadSuggestionFinder.FindPartialSuggestionsAndSimpleCompleteSuggestions(HashSet`1 requestedPacks, IEnumerable`1 expandedWorkloads, List`1& partialSuggestions, HashSet`1& completeSuggestions)
   at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadSuggestionFinder..ctor(HashSet`1 installedPacks, HashSet`1 requestedPacks, IEnumerable`1 expandedWorkloads)
   at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.GetWorkloadSuggestionForMissingPacks(IList`1 packIds)
   at Microsoft.NET.Build.Tasks.ShowMissingWorkloads.ExecuteCore()
   at Microsoft.NET.Build.Tasks.TaskBase.Execute()
   at Microsoft.Build.BackEnd.TaskExecutionHost.Microsoft.Build.BackEnd.ITaskExecutionHost.Execute()
   at Microsoft.Build.BackEnd.TaskBuilder.<ExecuteInstantiatedTask>d__26.MoveNext() [D:\a\1\s\src\Controls\samples\Controls.Sample.iOS\Maui.Controls.Sample.iOS-net6.csproj]

Looking into this, it doesn't make sense...

dotnet-maestro Bot and others added 2 commits July 8, 2021 14:42
…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`.
@jonathanpeppers
Copy link
Copy Markdown
Member

I'm going to try bumping iOS and Android at the same time.

dotnet-maestro Bot and others added 18 commits July 10, 2021 12:21
…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
…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
…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
…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
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"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 thread src/DotNet/DotNet.csproj
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=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst&quot;"
NewValue="Condition=&quot;%24([MSBuild]::IsOSPlatform('osx'))&quot; Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst&quot;"
/>
<ReplaceText
Input="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
Output="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
OldValue="Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm&quot;"
NewValue="Condition=&quot;%24([MSBuild]::IsOSPlatform('osx'))&quot; Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm&quot;"
/>
<ReplaceText
Input="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
Output="$(DotNetSdkManifestsDirectory)microsoft.net.workload.mono.toolchain/WorkloadManifest.targets"
OldValue="Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64&quot;"
NewValue="Condition=&quot;%24([MSBuild]::IsOSPlatform('osx'))&quot; Sdk=&quot;Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64&quot;"
/>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, we should be able to remove this later ^^

When this lands: dotnet/android#6097

@mattleibow mattleibow merged commit 51d8407 into main Jul 19, 2021
@mattleibow mattleibow deleted the darc-main-90168b46-91fb-421a-99dc-36cee90a77c6 branch July 19, 2021 18:48
@Eilon Eilon added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Sep 30, 2021
@github-actions github-actions Bot locked and limited conversation to collaborators Dec 25, 2023
@samhouts samhouts added the fixed-in-6.0.100-preview.7.3 Look for this fix in 6.0.100-preview.7.3! label Aug 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions fixed-in-6.0.100-preview.7.3 Look for this fix in 6.0.100-preview.7.3!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants