[main] Update dependencies from dotnet/sdk by dotnet-maestro[bot] · Pull Request #9108 · dotnet/android

dotnet-maestro · 2024-07-15T13:31:44Z

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 9.0.0-preview.7.24352.15 to 9.0.0-preview.7.24366.18 (parent: VS.Tools.Net.Core.SDK.Resolver)
- Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-preview.7.24319.4 to 9.0.0-preview.7.24365.1 (parent: Microsoft.NETCore.App.Ref)
- Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.7.24352.15 to 9.0.0-preview.7.24366.18 (parent: VS.Tools.Net.Core.SDK.Resolver)

From https://github.com/dotnet/sdk

Subscription: 0d610a08-4874-477f-b4d5-08dc8b6aad52
Build: 20240717.21
Date Produced: July 17, 2024 8:38:20 PM UTC
Commit: 2f14fea98bd6e87f8583f59495a8a664155f1c8a
Branch: refs/heads/main

Updates:
- VS.Tools.Net.Core.SDK.Resolver: from 9.0.100-preview.7.24358.3 to 9.0.100-preview.7.24367.21
- Microsoft.NETCore.App.Ref: from 9.0.0-preview.7.24352.15 to 9.0.0-preview.7.24366.18
- Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport: from 9.0.0-preview.7.24319.4 to 9.0.0-preview.7.24365.1
- Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.7.24352.15 to 9.0.0-preview.7.24366.18

VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24358.3 -> To Version 9.0.100-preview.7.24365.8 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-preview.7.24352.15 -> To Version 9.0.0-preview.7.24363.5 (parent: VS.Tools.Net.Core.SDK.Resolver

jonathanpeppers · 2024-07-15T15:51:41Z

/azp run

azure-pipelines · 2024-07-15T15:52:05Z

Azure Pipelines successfully started running 1 pipeline(s).

VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24358.3 -> To Version 9.0.100-preview.7.24366.2 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-preview.7.24352.15 -> To Version 9.0.0-preview.7.24365.1 (parent: VS.Tools.Net.Core.SDK.Resolver

Any build would fail with: Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: SDK Resolver Failure: "The SDK resolver "Microsoft.DotNet.MSBuildWorkloadSdkResolver" failed while attempting to resolve the SDK "Microsoft.NET.SDK.WorkloadAutoImportPropsLocator". Exception: "System.IO.FileNotFoundException: Workload manifest microsoft.net.workload.mono.toolchain.current: 9.0.0-preview.7.24365.1/9.0.100-preview.7 from workload version 9.0.100-preview.7.24366.2 was not installed. Running "dotnet workload repair" may resolve this. Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadManifestReader.SdkDirectoryWorkloadManifestProvider.GetManifests() Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.LoadManifestsFromProvider(IWorkloadManifestProvider manifestProvider) Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.InitializeManifests() Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.GetInstalledWorkloadPacksOfKind(WorkloadPackKind kind)+MoveNext() Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.CachingWorkloadResolver.Resolve(String sdkReferenceName, IWorkloadManifestProvider manifestProvider, IWorkloadResolver workloadResolver) Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.CachingWorkloadResolver.Resolve(String sdkReferenceName, String dotnetRootPath, String sdkVersion, String userProfileDir, String globalJsonPath) Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.WorkloadSdkResolver.Resolve(SdkReference sdkReference, SdkResolverContext resolverContext, SdkResultFactory factory) Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.Build.BackEnd.SdkResolution.SdkResolverService.TryResolveSdkUsingSpecifiedResolvers(IReadOnlyList`1 resolvers, Int32 submissionId, SdkReference sdk, LoggingContext loggingContext, ElementLocation sdkReferenceLocation, String solutionPath, String projectPath, Boolean interactive, Boolean isRunningInVisualStudio, SdkResult& sdkResult, IEnumerable`1& errors, IEnumerable`1& warnings)"

Might fix: /Users/builder/.nuget/packages/gitinfo/2.1.2/build/GitInfo.targets(876,4): error MSB4186: Invalid static method invocation syntax: "[MSBuild]::Add('$(GitBaseVersionPatch)', '$(GitCommits)')". Method '[MSBuild]::Add' not found. Static method invocation should be of the form: $([FullTypeName]::Method()), e.g. $([System.IO.Path]::Combine(`a`, `b`)). Check that all parameters are defined, are of the correct type, and are specified in the right order. [/Users/builder/azdo/_work/14/s/xamarin-android/external/xamarin-android-tools/src/Microsoft.Android.Build.BaseTasks/Microsoft.Android.Build.BaseTasks.csproj::TargetFramework=net6.0]

build-tools/scripts/XAVersionInfo.targets(43,5): error MSB4044: The "GitCommitsInRange" task was not given a value for the required parameter "StartCommit". [build-tools/create-packs/Microsoft.Android.Sdk.proj]

This reverts commit 705b106.

This reverts commit 2ce3d9c.

* Add version to manifest folder * Create `$(BuildOutputDirectory)lib\sdk-manifests` if needed

dellis1972 · 2024-07-17T18:12:43Z

 - name: RunMAUITestJob
 value: true
+# Workaround: https://github.com/dotnet/msbuild/issues/10378
+- name: MSBUILDDISABLEFEATURESFROMVERSION


looks like they reverted the PR which caused this. Should we wait?

I think it's fine to merge this sooner if I get it green.
The next bump, I'll try to take it out.

Context: dotnet/runtime@8b9ea5e This private field was renamed.

grendello · 2024-07-17T19:59:26Z

Do we have any control over which commit from the dotnet/runtime repo is included? If yes, can we bump it so that 8e6df8de0266f7dc6befeaf9daf14d565fbc0b16 is in?

grendello · 2024-07-17T20:03:13Z

dotnet/sdk@efe6ade contains the commit I mentioned (it bumps to dotnet/runtime@1f70f0c)

VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24358.3 -> To Version 9.0.100-preview.7.24367.21 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-preview.7.24352.15 -> To Version 9.0.0-preview.7.24366.18 (parent: VS.Tools.Net.Core.SDK.Resolver

jonathanpeppers · 2024-07-17T21:34:57Z

dotnet/sdk@efe6ade contains the commit I mentioned (it bumps to dotnet/runtime@1f70f0c)

I just triggered it again, and I think I see dotnet/sdk@efe6ade in here now.

Now, to get this green, is another story...

* main: (23 commits) Localized file check-in by OneLocBuild Task (#9129) [ci] Disable CodeQL on CI/PR pipelines (#9128) Refine 16k page alignment support (#9075) [build] fix `ConfigureLocalWorkload` target (#9124) Bump to NDK r27 (#9020) [ci] Use drop service for SDK insertion artifacts (#9116) Fix up all mapping paths (#9121) [ci] Fix maestro publishing for stable packages (#9118) Bump to dotnet/sdk@2f14fea98b 9.0.100-preview.7.24367.21 (#9108) Missing androidx.window.[extensions|sidecar] warnings (#9085) [ci] Use sign-artifacts template for macOS signing (#9091) [ci] Use DotNetCoreCLI to sign macOS files (#9102) [ci] Disable CodeQL on macOS, Linux, non-main jobs (#9111) [tests] re-enable `JavaAbstractMethodTest` (#9097) [Microsoft.Android.Sdk.ILLink] preserve types with `IJniNameProviderAttribute` (#9099) [Mono.Android] Data sharing and Close() overrides (#9103) [AndroidManifest] Add `Android.App.PropertyAttribute` (#9016) [Mono.Android] Add support for AndroidMessageHandler ClientCertificates (#8961) [Mono.Android] Bind and enumify API-35 (#9043) Bump to dotnet/java-interop@7a058c0e (#9066) ...

dotnet-maestroBot requested review from jonathanpeppers, jonpryor and pjcollins as code owners July 15, 2024 13:31

dotnet-maestroBotand others added 2 commits July 16, 2024 13:37

jonathanpeppers requested a review from grendello as a code owner July 16, 2024 14:02

grendello approved these changes Jul 16, 2024
View reviewed changes

jonathanpeppers added 11 commits July 16, 2024 11:18

Update GitCommitsInRange.cs
705b106
build-tools/scripts/XAVersionInfo.targets(43,5): error MSB4044: The "GitCommitsInRange" task was not given a value for the required parameter "StartCommit". [build-tools/create-packs/Microsoft.Android.Sdk.proj]

Revert "Update GitCommitsInRange.cs"
a8d8eaf
This reverts commit 705b106.

Revert "[build] set $(GitCommits) to 0"
1dbf1b8
This reverts commit 2ce3d9c.

Try $MSBUILDDISABLEFEATURESFROMVERSION=17.10
0d6ba01

Fix ExtractWorkloadPacks target
7ad0567
* Add version to manifest folder * Create `$(BuildOutputDirectory)lib\sdk-manifests` if needed

MSBUILDDISABLEFEATURESFROMVERSION=17.12
7d4aa55

Update Directory.Build.targets
2c9ac6d

Delete 9.0.100-preview.6 baseline manifest
9536773

Delete workload set
ed7a983

Update .apkdesc files
b57310e

jonathanpeppers requested a review from dellis1972 as a code owner July 17, 2024 17:27

Update Directory.Build.targets
73bf89c

dellis1972 reviewed Jul 17, 2024
View reviewed changes

[Mono.Android] use HttpClientHandler._nativeUnderlyingHandler
17c145e
Context: dotnet/runtime@8b9ea5e This private field was renamed.

jonathanpeppers mentioned this pull request Jul 17, 2024
Fix type parsing issues in ILLink and ILC dotnet/runtime#104060
Merged

FIXME:dotnet/runtime#105044
4e75345

jonathanpeppers approved these changes Jul 18, 2024
View reviewed changes

jonathanpeppers merged commit 580166e into mainJul 18, 2024

jonathanpeppers deleted the darc-main-f31078ef-4133-477a-b4fa-bc707640c109 branch July 18, 2024 16:40

github-actionsBot locked and limited conversation to collaborators Aug 19, 2024

Navigation Menu

Uh oh!

[main] Update dependencies from dotnet/sdk - #9108

[main] Update dependencies from dotnet/sdk#9108
jonathanpeppers merged 18 commits into
mainfrom
darc-main-f31078ef-4133-477a-b4fa-bc707640c109

dotnet-maestroBot commented Jul 15, 2024•
edited
Loading

Uh oh!

jonathanpeppers commented Jul 15, 2024

Uh oh!

azure-pipelinesBot commented Jul 15, 2024

Uh oh!

dellis1972Jul 17, 2024

Uh oh!

jonathanpeppersJul 17, 2024

Uh oh!

grendello commented Jul 17, 2024

Uh oh!

grendello commented Jul 17, 2024

Uh oh!

jonathanpeppers commented Jul 17, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

dotnet-maestroBot commented Jul 15, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coherency Updates

From https://github.com/dotnet/sdk

Uh oh!

jonathanpeppers commented Jul 15, 2024

Uh oh!

azure-pipelinesBot commented Jul 15, 2024

Uh oh!

dellis1972Jul 17, 2024

Choose a reason for hiding this comment

Uh oh!

jonathanpeppersJul 17, 2024

Choose a reason for hiding this comment

Uh oh!

grendello commented Jul 17, 2024

Uh oh!

grendello commented Jul 17, 2024

Uh oh!

jonathanpeppers commented Jul 17, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dotnet-maestroBot commented Jul 15, 2024•
edited
Loading