diff --git a/eng/Versions.props b/eng/Versions.props
index 9e725235601d7..fa06fb7f0b199 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -15,7 +15,8 @@
false
release
- -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)
+ -$(PreReleaseVersionLabel)
+ -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)
$(SdkBandVersion)$(WorkloadVersionSuffix)
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);
}