Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[main] Update dependencies from dotnet/sdk #9108

Merged
merged 18 commits into from
Jul 18, 2024
Merged

[main] Update dependencies from dotnet/sdk #9108

merged 18 commits into from
Jul 18, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jul 15, 2024 •
edited
Loading

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

@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240715.8
e478da5 
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
Copy link
Member

/azp run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

dotnet-maestro bot and others added 2 commits July 16, 2024 13:37
@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240716.2
a430b6f 
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
@jonathanpeppers
Workload manifests, require versioned folder now
09a88ef 
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)"
@jonathanpeppers
[build] set $(GitCommits) to 0
2ce3d9c 
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]
@jonathanpeppers
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]
@jonathanpeppers
Revert "Update GitCommitsInRange.cs"
a8d8eaf 
This reverts commit 705b106.
@jonathanpeppers
Revert "[build] set $(GitCommits) to 0"
1dbf1b8 
This reverts commit 2ce3d9c.
@jonathanpeppers
Try $MSBUILDDISABLEFEATURESFROMVERSION=17.10
0d6ba01
@jonathanpeppers
Fix ExtractWorkloadPacks target
7ad0567 
* Add version to manifest folder
* Create `$(BuildOutputDirectory)lib\sdk-manifests` if needed
@jonathanpeppers
MSBUILDDISABLEFEATURESFROMVERSION=17.12
7d4aa55
@jonathanpeppers
Update Directory.Build.targets
2c9ac6d
@jonathanpeppers
Delete 9.0.100-preview.6 baseline manifest
9536773
@jonathanpeppers
Delete workload set
ed7a983
@jonathanpeppers
Update .apkdesc files
b57310e
dellis1972
dellis1972 reviewed Jul 17, 2024
View reviewed changes
build-tools/automation/yaml-templates/variables.yaml
@@ -56,3 +56,6 @@ variables:
value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization'
- name: RunMAUITestJob
value: true
# Workaround: https://github.com/dotnet/msbuild/issues/10378
- name: MSBUILDDISABLEFEATURESFROMVERSION
Copy link
Contributor

Choose a reason for hiding this comment

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

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

Copy link
Member

Choose a reason for hiding this comment

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

I think it's fine to merge this sooner if I get it green.

The next bump, I'll try to take it out.

@jonathanpeppers jonathanpeppers mentioned this pull request Jul 17, 2024
Merged
@grendello
Copy link
Contributor

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
Copy link
Contributor

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

@dotnet-maestro
Update dependencies from https://github.com/dotnet/sdk build 20240717.21
e91fd37 
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
Copy link
Member

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...

@jonathanpeppers jonathanpeppers merged commit 580166e into main Jul 18, 2024
55 of 57 checks passed
@jonathanpeppers jonathanpeppers deleted the darc-main-f31078ef-4133-477a-b4fa-bc707640c109 branch July 18, 2024 16:40
grendello added a commit that referenced this pull request Jul 23, 2024
@grendello
Merge branch 'main' into dev/grendel/perfetto-integration
37c8656 
* 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)
  ...
@github-actions github-actions bot locked and limited conversation to collaborators Aug 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dellis1972 dellis1972 dellis1972 left review comments

@jonathanpeppers jonathanpeppers jonathanpeppers approved these changes

@grendello grendello grendello approved these changes

@pjcollins pjcollins Awaiting requested review from pjcollins pjcollins is a code owner

@jonpryor jonpryor Awaiting requested review from jonpryor jonpryor is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jonathanpeppers @grendello @dellis1972