Skip to content

Commit baf16f1

Browse files
[build] fix ConfigureLocalWorkload target (#9124)
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.
1 parent 05bc90a commit baf16f1

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

build-tools/create-packs/Directory.Build.targets

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,12 @@
265265
<Exec Command="&quot;$(DotNetPreviewTool)&quot; pack @(_PackProps, ' ') &quot;$(XamarinAndroidSourcePath)src\Microsoft.Android.Templates\Microsoft.Android.Templates.csproj&quot;" />
266266
</Target>
267267

268-
<Target Name="InstallManifestAndDependencies">
268+
<Target Name="InstallManifestAndDependencies"
269+
DependsOnTargets="DeleteExtractedWorkloadPacks;_GetDefaultPackageVersion">
269270
<PropertyGroup>
270271
<_LocalSdkManifestsFolder>$(BuildOutputDirectory)lib\sdk-manifests\$(DotNetSdkManifestsFolder)\</_LocalSdkManifestsFolder>
271-
<_LocalAndroidManifestFolder>$(_LocalSdkManifestsFolder)microsoft.net.sdk.android\</_LocalAndroidManifestFolder>
272-
<_EmptyWorkloadDir>$(_LocalSdkManifestsFolder)android.deps.workload\</_EmptyWorkloadDir>
272+
<_LocalAndroidManifestFolder>$(_LocalSdkManifestsFolder)microsoft.net.sdk.android\$(AndroidPackVersionLong)\</_LocalAndroidManifestFolder>
273+
<_EmptyWorkloadDir>$(_LocalSdkManifestsFolder)android.deps.workload\0.0.1\</_EmptyWorkloadDir>
273274
<_EmptyWorkloadJsonContent>
274275
<![CDATA[
275276
{"version": "0.0.1", "workloads": { "android-deps": { "extends" : [ "microsoft-net-runtime-android", "microsoft-net-runtime-android-aot" ] } } }

0 commit comments

Comments
 (0)