diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dac31c111a971..b0bb52b3c87ad 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -64,14 +64,14 @@
526b22d829bc9b420dff6ef70877a67053b66e0f
-
+
https://github.com/dotnet/emsdk
- c3d83d0ea894e5ee537bfc591fd48e06af8d9166
+ 8e660ff41e91879977e3a9d837e068bd72234c26
-
+
https://github.com/dotnet/emsdk
- c3d83d0ea894e5ee537bfc591fd48e06af8d9166
+ 8e660ff41e91879977e3a9d837e068bd72234c26
diff --git a/eng/Versions.props b/eng/Versions.props
index 40cb2b4f142b6..f24d3a0bc3f50 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -16,8 +16,8 @@
false
release
- -$(PreReleaseVersionLabel)
- -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)
+ -$(PreReleaseVersionLabel)
+ -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)
$(SdkBandVersion)$(WorkloadVersionSuffix)
@@ -239,7 +239,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-9_0_100_Transport
-->
- 9.0.0-rc.2.24464.3
+ 9.0.0-rtm.24469.1
$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)
1.1.87-gba258badda
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets b/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets
index d853cb881eb84..93fdb93172af4 100755
--- a/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets
+++ b/src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets
@@ -110,7 +110,7 @@
- $(SdkBandVersion)$([System.Text.RegularExpressions.Regex]::Match($(_DotNetVersionOutput), `-[A-z]*[\.]*\d*`))
+ $(SdkBandVersion)$([System.Text.RegularExpressions.Regex]::Match($(_DotNetVersionOutput), `-(?!rtm)[A-z]*[\.]*\d*`))
$(SdkBandVersionForWorkload_ComputedFromInstaller)
$(VersionBandForSdkManifestsDir)
diff --git a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
index d5b163168d8f7..0427f1ba436dd 100644
--- a/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
+++ b/src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs
@@ -56,7 +56,7 @@ public partial class InstallWorkloadFromArtifacts : PatchNuGetConfig
ReadCommentHandling = JsonCommentHandling.Skip
};
- [GeneratedRegex(@"^\d+\.\d+\.\d+(-[A-z]*\.*\d*)?")]
+ [GeneratedRegex(@"^\d+\.\d+\.\d+(-(?!rtm)[A-z]*\.*\d*)?")]
private static partial Regex bandVersionRegex();
public override bool Execute()
@@ -301,7 +301,8 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v
if (!string.IsNullOrEmpty(bandPreleaseVersion) &&
packagePreleaseVersion != bandPreleaseVersion &&
packagePreleaseVersion != "-dev" &&
- packagePreleaseVersion != "-ci")
+ packagePreleaseVersion != "-ci" &&
+ packagePreleaseVersion != "-rtm")
{
bandVersion = bandVersion.Replace (bandPreleaseVersion, packagePreleaseVersion);
}