diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62f21c3165a3b..bee214c170afd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - d5c6ceec99d8ed785f0243895a761ca13b6b19cb + 8ba6d649968752d87aec0689083c82317dee92f8 https://github.com/dotnet/msquic @@ -90,9 +90,9 @@ 1a6a83a8f50e1119f1007b1e3c211d3289ba6901 - + https://github.com/dotnet/emsdk - f69a540dc6c1539f6df09893d41c94d832cd4b28 + 1f68fcee45ca75a2cb780edaff1e695af4d4f787 diff --git a/eng/Versions.props b/eng/Versions.props index 16c9af48408e1..367400294fb9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -213,7 +213,7 @@ 0.11.4-alpha.23360.2 - 8.0.0-preview.7.23367.1 + 8.0.0-rc.1.23368.2 2.1.7 8.0.0-alpha.1.23180.2 @@ -236,7 +236,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport --> - 8.0.0-preview.7.23367.1 + 8.0.0-rc.1.23368.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 0a331737c90eb..423aa4a5561f6 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -10,6 +10,7 @@ using System.Linq; using System.Text.Json; using System.Text.Json.Serialization; +using System.Text.RegularExpressions; using System.Xml.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; @@ -18,7 +19,7 @@ namespace Microsoft.Workload.Build.Tasks { - public class InstallWorkloadFromArtifacts : Task + public partial class InstallWorkloadFromArtifacts : Task { [Required, NotNull] public ITaskItem[] WorkloadIds { get; set; } = Array.Empty(); @@ -48,6 +49,9 @@ public class InstallWorkloadFromArtifacts : Task private string _tempDir = string.Empty; private string _nugetCachePath = string.Empty; + [GeneratedRegex(@"^\d+\.\d+\.\d+(-[A-z]*\.*\d*)?")] + private static partial Regex bandVersionRegex(); + public override bool Execute() { _tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}"); @@ -292,8 +296,15 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v } string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name); + var bandVersion = VersionBandForManifestPackages; + // regex matching the version band, e.g. 6.0.100-preview.3.21202.5 => 6.0.100-preview.3 + string packagePreleaseVersion = bandVersionRegex().Match(version).Groups[1].Value; + string bandPreleaseVersion = bandVersionRegex().Match(bandVersion).Groups[1].Value; + + if (packagePreleaseVersion != bandPreleaseVersion && packagePreleaseVersion != "-dev" && packagePreleaseVersion != "-ci") + bandVersion = bandVersion.Replace (bandPreleaseVersion, packagePreleaseVersion); - PackageReference pkgRef = new(Name: $"{name}.Manifest-{VersionBandForManifestPackages}", + PackageReference pkgRef = new(Name: $"{name}.Manifest-{bandVersion}", Version: version, OutputDir: outputDir, relativeSourceDir: "data");