[main] Update dependencies from dotnet/icu dotnet/emsdk (#89147)

* 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 * Compute the package name from the version * Use a generated regex * Use VersionBandForManifestPackages for CI/dev versions * 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 * Fix band calculation --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Larry Ewing <lewing@microsoft.com>
dotnet · Jul 19, 2023 · 0678ea2 · 0678ea2
1 parent 90900f7
commit 0678ea2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-preview.7.23367.1">
+    <Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-rc.1.23368.2">
       <Uri>https://github.com/dotnet/icu</Uri>
-      <Sha>d5c6ceec99d8ed785f0243895a761ca13b6b19cb</Sha>
+      <Sha>8ba6d649968752d87aec0689083c82317dee92f8</Sha>
     </Dependency>
     <Dependency Name="System.Net.MsQuic.Transport" Version="8.0.0-alpha.1.23166.1">
       <Uri>https://github.com/dotnet/msquic</Uri>
@@ -90,9 +90,9 @@
       <Sha>1a6a83a8f50e1119f1007b1e3c211d3289ba6901</Sha>
       <SourceBuild RepoName="cecil" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23367.1">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23368.3">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>f69a540dc6c1539f6df09893d41c94d832cd4b28</Sha>
+      <Sha>1f68fcee45ca75a2cb780edaff1e695af4d4f787</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23266.3">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -213,7 +213,7 @@
     <!-- Mono Cecil -->
     <MicrosoftDotNetCecilVersion>0.11.4-alpha.23360.2</MicrosoftDotNetCecilVersion>
     <!-- ICU -->
-    <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-preview.7.23367.1</MicrosoftNETCoreRuntimeICUTransportVersion>
+    <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23368.2</MicrosoftNETCoreRuntimeICUTransportVersion>
     <!-- MsQuic -->
     <MicrosoftNativeQuicMsQuicVersion>2.1.7</MicrosoftNativeQuicMsQuicVersion>
     <SystemNetMsQuicTransportVersion>8.0.0-alpha.1.23180.2</SystemNetMsQuicTransportVersion>
@@ -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
     -->
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23367.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23368.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
     <MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
     <!-- workloads -->
     <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

diff --git 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<ITaskItem>();
@@ -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");