Skip to content

[build] Generate workload-dependencies.json #9613

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

Merged
merged 7 commits into from
Dec 18, 2024
Merged

[build] Generate workload-dependencies.json #9613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26e4019
[build] Generate `workload-dependencies.json`
jonpryor Dec 11, 2024
52182a0
Address feedback
jonpryor Dec 13, 2024
9504691
Emit preview platform only when we have a preview.
jonpryor Dec 13, 2024
781d8c4
Merge remote-tracking branch 'origin/main' into dev/jonp/jonp-release…
jonpryor Dec 17, 2024
1510e87
Prefer versions from android-platform-support
jonpryor Dec 17, 2024
58099a6
"recommendedVersion", not "requestedVersion".
jonpryor Dec 17, 2024
cdad1e9
Address feedback
jonpryor Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions build-tools/create-packs/Microsoft.NET.Sdk.Android.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ about the various Microsoft.Android workloads.
<Target Name="_GenerateXAWorkloadContent"
DependsOnTargets="_GetDefaultPackageVersion;_GetLicense">
<PropertyGroup>
<WorkloadDependenciesPath Condition="'$(WorkloadDependenciesPath)' == ''">$(OutputPath)workload-manifest\WorkloadDependencies.json</WorkloadDependenciesPath>
<WorkloadManifestJsonPath Condition="'$(WorkloadManifestJsonPath)' == ''">$(OutputPath)workload-manifest\WorkloadManifest.json</WorkloadManifestJsonPath>
<WorkloadManifestTargetsPath Condition="'$(WorkloadManifestTargetsPath)' == ''">$(OutputPath)workload-manifest\WorkloadManifest.targets</WorkloadManifestTargetsPath>
<WorkloadVersion Condition="'$(WorkloadVersion)' == ''">$(AndroidPackVersionLong)</WorkloadVersion>
Expand All @@ -43,9 +44,27 @@ about the various Microsoft.Android workloads.
Replacements="@NET_PREVIOUS_VERSION@=$(AndroidNetPreviousVersion)">
</ReplaceFileContents>

<ItemGroup>
<_WorkloadDepProp Include="AndroidLatestStablePlatformId=$(AndroidLatestStablePlatformId)" />
<_WorkloadDepProp Include="AndroidLatestUnstablePlatformId=$(AndroidLatestUnstablePlatformId)" />
<_WorkloadDepProp Include="DotNetStableTargetFramework=$(DotNetStableTargetFramework)" />
<_WorkloadDepProp Include="MicrosoftAndroidSdkOutDir=$(MicrosoftAndroidSdkOutDir)" />
<_WorkloadDepProp Include="MonoOptionsVersion=$(MonoOptionsVersion)" />
<_WorkloadDepProp Include="NewtonsoftJsonPackageVersion=$(NewtonsoftJsonPackageVersion)" />
<_WorkloadDepProp Include="WorkloadDependenciesPath=$(WorkloadDependenciesPath)" />
<_WorkloadDepProp Include="WorkloadVersion=$(WorkloadVersion)" />
</ItemGroup>

<MSBuild
Projects="$(MSBuildThisFileDirectory)/../../tools/workload-dependencies/WorkloadDependencies.proj"
Properties="@(_WorkloadDepProp)"
Targets="GenerateWorkloadDependencies"
/>

<ItemGroup>
<_PackageFiles Include="$(WorkloadManifestJsonPath)" PackagePath="data" />
<_PackageFiles Include="$(WorkloadManifestTargetsPath)" PackagePath="data" />
<_PackageFiles Include="$(WorkloadDependenciesPath)" PackagePath="data" />
</ItemGroup>
</Target>

Expand Down
8 changes: 8 additions & 0 deletions tools/workload-dependencies/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<!--
This file exists so that we do NOT import top-level Configuration.props/etc.

This is so that we can cleanly import Xamarin.Installer.Common.props and
Xamarin.Android.Common.props from WorkloadDependencies.proj.
-->
</Project>
Loading