From 075c79d7f60ee948fc7f174746a71714529364b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jul 2023 23:28:12 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/emsdk build 20230718.3 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.7.23367.1 -> To Version 8.0.0-rc.1.23368.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62f21c3165a3b..5c05214785b8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,9 +90,9 @@ 1a6a83a8f50e1119f1007b1e3c211d3289ba6901 - + https://github.com/dotnet/emsdk - f69a540dc6c1539f6df09893d41c94d832cd4b28 + 1f68fcee45ca75a2cb780edaff1e695af4d4f787 diff --git a/eng/Versions.props b/eng/Versions.props index 16c9af48408e1..d363f5ad70bc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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 From 015258c4f106d64569d171b166a9fc42aa0f83f2 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 18 Jul 2023 20:21:23 -0500 Subject: [PATCH 2/6] Compute the package name from the version --- src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 0a331737c90eb..8e63b07ac7332 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; @@ -292,8 +293,10 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v } string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name); + // regex matching the version band, e.g. 6.0.100-preview.3.21202.5 => 6.0.100-preview.3 + string bandVersion = Regex.Match(version, @"^\d+\.\d+\.\d+(-[A-z]*\.*\d*)?").Value; - PackageReference pkgRef = new(Name: $"{name}.Manifest-{VersionBandForManifestPackages}", + PackageReference pkgRef = new(Name: $"{name}.Manifest-{bandVersion}", Version: version, OutputDir: outputDir, relativeSourceDir: "data"); From 7a6628999e99ae5256928db3c62115ecc20f5232 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 18 Jul 2023 20:38:30 -0500 Subject: [PATCH 3/6] Use a generated regex --- .../WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 8e63b07ac7332..d4be65b4da50a 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -19,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(); @@ -49,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()}"); @@ -294,7 +297,7 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name); // regex matching the version band, e.g. 6.0.100-preview.3.21202.5 => 6.0.100-preview.3 - string bandVersion = Regex.Match(version, @"^\d+\.\d+\.\d+(-[A-z]*\.*\d*)?").Value; + string bandVersion = bandVersionRegex().Match(version).Value; PackageReference pkgRef = new(Name: $"{name}.Manifest-{bandVersion}", Version: version, From ac970075c0d4d2dc21abc978478bb0e770b06bbd Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 18 Jul 2023 22:09:31 -0500 Subject: [PATCH 4/6] Use VersionBandForManifestPackages for CI/dev versions --- src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index d4be65b4da50a..5fe68e0cae7fd 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -298,6 +298,10 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name); // regex matching the version band, e.g. 6.0.100-preview.3.21202.5 => 6.0.100-preview.3 string bandVersion = bandVersionRegex().Match(version).Value; + // use VersionBandForManifestPackages for CI/dev builds + // ideally we could compare against PackageVersion but that isn't available in the task + if (bandVersion.EndsWith("-ci") || bandVersion.EndsWith("-dev")) + bandVersion = VersionBandForManifestPackages; PackageReference pkgRef = new(Name: $"{name}.Manifest-{bandVersion}", Version: version, From 674d2711045b084075457dd614842654188afef9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jul 2023 12:03:13 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/icu build 20230718.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 8.0.0-preview.7.23367.1 -> To Version 8.0.0-rc.1.23368.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c05214785b8e..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 diff --git a/eng/Versions.props b/eng/Versions.props index d363f5ad70bc0..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 From db87d7693220291b43c8c2831580e54fbc05c801 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 19 Jul 2023 12:31:10 -0500 Subject: [PATCH 6/6] Fix band calculation --- .../InstallWorkloadFromArtifacts.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs index 5fe68e0cae7fd..423aa4a5561f6 100644 --- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs +++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs @@ -296,12 +296,13 @@ 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 bandVersion = bandVersionRegex().Match(version).Value; - // use VersionBandForManifestPackages for CI/dev builds - // ideally we could compare against PackageVersion but that isn't available in the task - if (bandVersion.EndsWith("-ci") || bandVersion.EndsWith("-dev")) - bandVersion = VersionBandForManifestPackages; + 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-{bandVersion}", Version: version,