Skip to content

Commit 976f8c2

Browse files
committed
Merge branch 'main' into no-ndk-lib-stubs
* main: [xaprepare] use 8.0.100 version band for Mono workloads (dotnet#7530)
2 parents c121ad4 + 88f0b29 commit 976f8c2

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ protected override async Task<bool> Execute (Context context)
4646
return false;
4747
}
4848

49-
var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests", context.Properties.GetRequiredValue (KnownProperties.DotNetSdkManifestsFolder));
49+
var sdk_manifests = Path.Combine (dotnetPath, "sdk-manifests");
5050

5151
// Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj
5252
// NOTE: the packages that actually *exist* in .NET 8 are mismatched right now...
5353
var dotnets = new [] { ".net6", ".net7", "" };
5454
foreach (var dotnet in dotnets) {
55-
var destination = Path.Combine (sdk_manifests, $"microsoft.net.workload.mono.toolchain{dotnet}");
55+
var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain{dotnet}");
5656
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "WorkloadManifest.*")) {
5757
Utilities.CopyFileToDir (file, destination);
5858
}
5959
if (dotnet != "") {
60-
destination = Path.Combine (sdk_manifests, $"microsoft.net.workload.emscripten{dotnet}");
60+
destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten{dotnet}");
6161
foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "WorkloadManifest.*")) {
6262
Utilities.CopyFileToDir (file, destination);
6363
}

0 commit comments

Comments
 (0)