[build] Fix local workload template creation #9250
Merged
Conversation
This file contains 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
The targets that set up the local workload have been moved into a
separate ConfigureLocalWorkload.targets, as the Directory.Build.targets
file was getting crowded.
The template pack is no longer deleted by DeleteExtractedWorkloadPacks,
allowing dotnet-local scripts to create new templates again.
The workload files and metadata created when installing the temporary
`android-deps` workload are now cleaned up, which should fix issues
where bin/Debug/dotnet/dotnet invocations could fail with:
System.Collections.Generic.KeyNotFoundException: The given key 'android-deps' was not present in the dictionary.
at System.Collections.Generic.Dictionary`2.get_Item(TKey key)
at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.GetManifestFromWorkload(WorkloadId workloadId)
at Microsoft.DotNet.Cli.WorkloadCommandParser.ShowWorkloadsInfo(ParseResult parseResult, WorkloadInfoHelper workloadInfoHelper, IReporter reporter, String dotnetDir, Boolean showVersion)
at Microsoft.DotNet.Cli.CommandLineInfo.PrintInfo()
at Microsoft.DotNet.Cli.Program.ProcessArgs(String[] args, TimeSpan startupTime, ITelemetry telemetryClient)
at Microsoft.DotNet.Cli.Program.Main(String[] args)
The temporary `android-deps` workload will now install all of the
runtime workloads that our workload extends, rather than a hard-coded
subset. This should allow the local workload setup to build projects
targeting both net9.0-android and net8.0-android.
jonathanpeppers
approved these changes
Aug 27, 2024
Comment on lines
65
to
71
| if (startIndex != -1) { | ||
| startIndex += startElement.Length; | ||
| var endIndex = jsonContent.IndexOf("]", startIndex); | ||
| if (endIndex != -1) { | ||
| ExtendsElement = jsonContent.Substring(startIndex, endIndex - startIndex)?.Trim(); | ||
| } | ||
| } |
There was a problem hiding this comment.
Should we maybe LogError() in the else block for both of these? I imagine some change in the .json could silently fail.
There was a problem hiding this comment.
Sounds good, I figured we would fail during the android-deps workload install in that case but better to error earlier
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.
The targets that set up the local workload have been moved into a
separate ConfigureLocalWorkload.targets, as the Directory.Build.targets
file was getting crowded.
The template pack is no longer deleted by DeleteExtractedWorkloadPacks,
allowing dotnet-local scripts to create new templates again.
The workload files and metadata created when installing the temporary
android-depsworkload are now cleaned up, which should fix issueswhere
bin/Debug/dotnet/dotnetinvocations could fail with:The temporary
android-depsworkload will now install all of theruntime workloads that our workload extends, rather than a hard-coded
subset. This should allow the local workload setup to build projects
targeting both net9.0-android and net8.0-android.
The Windows build stage has been updated to use the local workload
configuration for all tests, including creating and building a template.