[build] fix ConfigureLocalWorkload target#9124
Merged
grendello merged 1 commit intodotnet:mainfrom Jul 22, 2024
Merged
Conversation
After 580166e was merged, the `ConfigureLocalWorkload` target was no longer working as some of the structure of the `sdk-manifests` folder has changed. * We should run the `DeleteExtractedWorkloadPacks` target, as it will delete the `sdk-manifests/workloadset` folder. Without doing this, the .NET SDK will *always* attempt to use the 34.99.0-preview.6.340 version in the "baseline" manifest. * We also should put a versioned folder after each manifest directory. So, for example: bin\Debug\lib\sdk-manifests\microsoft.net.sdk.android\ -> bin\Debug\lib\sdk-manifests\microsoft.net.sdk.android\35.0.0-preview.x.x\ bin\Debug\lib\sdk-manifests\android.deps.workload\ -> bin\Debug\lib\sdk-manifests\android.deps.workload\0.0.1\ Now with a fresh checkout: dotnet msbuild -t:Prepare Xamarin.Android.sln .\dotnet-local.cmd build Xamarin.Android.sln .\dotnet-local.cmd build -t:ConfigureLocalWorkload build-tools\create-packs\Microsoft.Android.Sdk.proj At this point, I can build app projects and the `BuildBasicApplication` test passes locally.
grendello
approved these changes
Jul 22, 2024
Contributor
grendello
left a comment
grendello
left a comment
There was a problem hiding this comment.
Confirmed that the fix works locally :)
Contributor
|
Base build and smoke tests passed fine, merging since we have no tests that build any application with the local build. |
grendello
added a commit
that referenced
this pull request
Jul 23, 2024
* 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) ...
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.
2 participants
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.
After 580166e was merged, the
ConfigureLocalWorkloadtarget was no longer working as some of the structure of thesdk-manifestsfolder has changed.DeleteExtractedWorkloadPackstarget, as it will delete thesdk-manifests/workloadsetfolder.Without doing this, the .NET SDK will always attempt to use the 34.99.0-preview.6.340 version in the "baseline" manifest.
So, for example:
Now with a fresh checkout:
At this point, I can build app projects and the
BuildBasicApplicationtest passes locally.