Skip to content

Commit 0678ea2

Browse files
[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>
1 parent 90900f7 commit 0678ea2

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-preview.7.23367.1">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-rc.1.23368.2">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>d5c6ceec99d8ed785f0243895a761ca13b6b19cb</Sha>
5+
<Sha>8ba6d649968752d87aec0689083c82317dee92f8</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="8.0.0-alpha.1.23166.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>
@@ -90,9 +90,9 @@
9090
<Sha>1a6a83a8f50e1119f1007b1e3c211d3289ba6901</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23367.1">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.1.23368.3">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>f69a540dc6c1539f6df09893d41c94d832cd4b28</Sha>
95+
<Sha>1f68fcee45ca75a2cb780edaff1e695af4d4f787</Sha>
9696
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
9797
</Dependency>
9898
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23266.3">

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
<!-- Mono Cecil -->
214214
<MicrosoftDotNetCecilVersion>0.11.4-alpha.23360.2</MicrosoftDotNetCecilVersion>
215215
<!-- ICU -->
216-
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-preview.7.23367.1</MicrosoftNETCoreRuntimeICUTransportVersion>
216+
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23368.2</MicrosoftNETCoreRuntimeICUTransportVersion>
217217
<!-- MsQuic -->
218218
<MicrosoftNativeQuicMsQuicVersion>2.1.7</MicrosoftNativeQuicMsQuicVersion>
219219
<SystemNetMsQuicTransportVersion>8.0.0-alpha.1.23180.2</SystemNetMsQuicTransportVersion>
@@ -236,7 +236,7 @@
236236
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
237237
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
238238
-->
239-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23367.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
239+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-rc.1.23368.3</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
240240
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
241241
<!-- workloads -->
242242
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Linq;
1111
using System.Text.Json;
1212
using System.Text.Json.Serialization;
13+
using System.Text.RegularExpressions;
1314
using System.Xml.Linq;
1415
using Microsoft.Build.Framework;
1516
using Microsoft.Build.Utilities;
@@ -18,7 +19,7 @@
1819

1920
namespace Microsoft.Workload.Build.Tasks
2021
{
21-
public class InstallWorkloadFromArtifacts : Task
22+
public partial class InstallWorkloadFromArtifacts : Task
2223
{
2324
[Required, NotNull]
2425
public ITaskItem[] WorkloadIds { get; set; } = Array.Empty<ITaskItem>();
@@ -48,6 +49,9 @@ public class InstallWorkloadFromArtifacts : Task
4849
private string _tempDir = string.Empty;
4950
private string _nugetCachePath = string.Empty;
5051

52+
[GeneratedRegex(@"^\d+\.\d+\.\d+(-[A-z]*\.*\d*)?")]
53+
private static partial Regex bandVersionRegex();
54+
5155
public override bool Execute()
5256
{
5357
_tempDir = Path.Combine(Path.GetTempPath(), $"workload-{Path.GetRandomFileName()}");
@@ -292,8 +296,15 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v
292296
}
293297

294298
string outputDir = FindSubDirIgnoringCase(manifestVersionBandDir, name);
299+
var bandVersion = VersionBandForManifestPackages;
300+
// regex matching the version band, e.g. 6.0.100-preview.3.21202.5 => 6.0.100-preview.3
301+
string packagePreleaseVersion = bandVersionRegex().Match(version).Groups[1].Value;
302+
string bandPreleaseVersion = bandVersionRegex().Match(bandVersion).Groups[1].Value;
303+
304+
if (packagePreleaseVersion != bandPreleaseVersion && packagePreleaseVersion != "-dev" && packagePreleaseVersion != "-ci")
305+
bandVersion = bandVersion.Replace (bandPreleaseVersion, packagePreleaseVersion);
295306

296-
PackageReference pkgRef = new(Name: $"{name}.Manifest-{VersionBandForManifestPackages}",
307+
PackageReference pkgRef = new(Name: $"{name}.Manifest-{bandVersion}",
297308
Version: version,
298309
OutputDir: outputDir,
299310
relativeSourceDir: "data");

0 commit comments

Comments
 (0)