diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index 077bc47da8a..cfbb6d44413 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -46,18 +46,18 @@ protected override async Task Execute (Context context) return false; } - var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests", context.Properties.GetRequiredValue (KnownProperties.DotNetSdkManifestsFolder)); + var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests"); // Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj // NOTE: the packages that actually *exist* in .NET 8 are mismatched right now... var dotnets = new [] { ".net6", ".net7", "" }; foreach (var dotnet in dotnets) { - var destination = Path.Combine (sdk_manifests, $"microsoft.net.workload.mono.toolchain{dotnet}"); + var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain{dotnet}"); foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "WorkloadManifest.*")) { Utilities.CopyFileToDir (file, destination); } if (dotnet != "") { - destination = Path.Combine (sdk_manifests, $"microsoft.net.workload.emscripten{dotnet}"); + destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten{dotnet}"); foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) { Utilities.CopyFileToDir (file, destination); }