diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs index 1ada940a77f..c26df75a5e1 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs @@ -329,7 +329,7 @@ public static partial class Paths public static string MicrosoftNETWorkloadMonoPackageDir => Path.Combine ( XAPackagesDir, - $"microsoft.net.workload.mono.toolchain{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}", + $"microsoft.net.workload.mono.toolchain.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand)}", ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion) ); @@ -337,7 +337,7 @@ public static partial class Paths public static string MicrosoftNETWorkloadEmscriptenPackageDir => Path.Combine ( XAPackagesDir, - $"microsoft.net.workload.emscripten{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}", + $"microsoft.net.workload.emscripten.{{0}}.manifest-{ctx.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand)}", ctx.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion) ); diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index e2c15d75d14..705b2b11da9 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -54,18 +54,15 @@ protected override async Task Execute (Context context) 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", "" }; + var dotnets = new [] { "net6", "net7", "current" }; foreach (var dotnet in dotnets) { - var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"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, 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); - } + 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); } } diff --git a/build-tools/xaprepare/xaprepare/package-download.proj b/build-tools/xaprepare/xaprepare/package-download.proj index 6d6d4805ac5..ec7b895af10 100644 --- a/build-tools/xaprepare/xaprepare/package-download.proj +++ b/build-tools/xaprepare/xaprepare/package-download.proj @@ -20,9 +20,10 @@ Otherwise, $(MicrosoftNETCoreAppRefPackageVersion) from eng/Versions.props will - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4907216b6f3..33b4096ba6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/installer - 779a6442daf6b95c5662d2f0c20801de5e179a05 + dec120944450abb58bc07a2fcdae2f4383bfd6bf https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - ddb69889684da95dc8d83a51b987774de5e47598 + 9529803ae29c2804880c6bd8ca710b8c037cb498 - + https://github.com/dotnet/emsdk - 5b46122b31036064483ce2e55b5e2240e5548204 + 0fe864fc71191ff4ee18e59ef0af2929ca367a11 diff --git a/eng/Versions.props b/eng/Versions.props index b6912ea71dc..926781e3a0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,22 +1,23 @@ - 8.0.100-alpha.1.23070.23 + 8.0.100-alpha.1.23080.11 8.0.100-1.23067.1 - 8.0.0-alpha.1.23070.1 + 8.0.0-alpha.1.23080.2 7.0.0-beta.22103.1 7.0.0-beta.22103.1 - 8.0.0-alpha.1.23066.1 - $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) + 8.0.0-alpha.1.23077.4 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version) 7.0.100-rc.1.22410.7 - $([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `^\d+\.\d+\.\d`))00 - $(DotNetPreviewVersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`)) + $([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `^\d+\.\d+\.\d`))00 + $(VersionBand)$([System.Text.RegularExpressions.Regex]::Match($(MicrosoftDotnetSdkInternalPackageVersion), `\-(preview|rc|alpha).\d+`)) + $(DotNetPreviewVersionBand) $(DotNetPreviewVersionBand) - 8.0.100 - 8.0.100 + $(DotNetPreviewVersionBand) + $(DotNetPreviewVersionBand)