Skip to content

Commit 9c9e77e

Browse files
authored
[release/9.0] Treat -rtm as stable sdk version band (#107997)
* Treat -rtm versions as stable workload sdk bands * Handle rtm specially here too * Update to the latest net 9 emsdk
1 parent a95d038 commit 9c9e77e

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@
6464
<Sha>526b22d829bc9b420dff6ef70877a67053b66e0f</Sha>
6565
<SourceBuild RepoName="cecil" ManagedOnly="true" />
6666
</Dependency>
67-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.2.24464.3">
67+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rtm.24469.1">
6868
<Uri>https://github.com/dotnet/emsdk</Uri>
69-
<Sha>c3d83d0ea894e5ee537bfc591fd48e06af8d9166</Sha>
69+
<Sha>8e660ff41e91879977e3a9d837e068bd72234c26</Sha>
7070
</Dependency>
7171
<!-- Intermediate is necessary for source build. -->
72-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.0-rc.2.24464.3">
72+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.0-rtm.24469.1">
7373
<Uri>https://github.com/dotnet/emsdk</Uri>
74-
<Sha>c3d83d0ea894e5ee537bfc591fd48e06af8d9166</Sha>
74+
<Sha>8e660ff41e91879977e3a9d837e068bd72234c26</Sha>
7575
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7676
</Dependency>
7777
<!-- Intermediate is necessary for source build. -->

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<!-- Enable to remove prerelease label. -->
1717
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1818
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
19-
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PreReleaseVersionIteration)' == ''">-$(PreReleaseVersionLabel)</WorkloadVersionSuffix>
20-
<WorkloadVersionSuffix Condition="'$(WorkloadVersionSuffix)' == '' and '$(DotNetFinalVersionKind)' != 'release'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
19+
<WorkloadVersionSuffix Condition="'$(DotNetFinalVersionKind)' != 'release' and '$(PreReleaseVersionIteration)' == '' and '$(PreReleaseVersionLabel)' != 'rtm'">-$(PreReleaseVersionLabel)</WorkloadVersionSuffix>
20+
<WorkloadVersionSuffix Condition="'$(WorkloadVersionSuffix)' == '' and '$(DotNetFinalVersionKind)' != 'release' and '$(PreReleaseVersionLabel)' != 'rtm'">-$(PreReleaseVersionLabel).$(PreReleaseVersionIteration)</WorkloadVersionSuffix>
2121
<SdkBandVersionForWorkload_FromRuntimeVersions>$(SdkBandVersion)$(WorkloadVersionSuffix)</SdkBandVersionForWorkload_FromRuntimeVersions>
2222
<!-- Set assembly version to align with major and minor version,
2323
as for the patches and revisions should be manually updated per assembly if it is serviced. -->
@@ -239,7 +239,7 @@
239239
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
240240
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport
241241
-->
242-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rc.2.24464.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
242+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rtm.24469.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
243243
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
244244
<!-- workloads -->
245245
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

src/mono/nuget/Microsoft.NET.Runtime.WorkloadTesting.Internal/Sdk/WorkloadTesting.Core.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<Exec Condition="$(_DotNetVersionExitCode) != '0'" Command="$(_DotNetVersionCommand)" CustomErrorRegularExpression=".*" />
111111

112112
<PropertyGroup>
113-
<SdkBandVersionForWorkload_ComputedFromInstaller>$(SdkBandVersion)$([System.Text.RegularExpressions.Regex]::Match($(_DotNetVersionOutput), `-[A-z]*[\.]*\d*`))</SdkBandVersionForWorkload_ComputedFromInstaller>
113+
<SdkBandVersionForWorkload_ComputedFromInstaller>$(SdkBandVersion)$([System.Text.RegularExpressions.Regex]::Match($(_DotNetVersionOutput), `-(?!rtm)[A-z]*[\.]*\d*`))</SdkBandVersionForWorkload_ComputedFromInstaller>
114114
<VersionBandForSdkManifestsDir Condition="'$(VersionBandForSdkManifestsDir)' == ''">$(SdkBandVersionForWorkload_ComputedFromInstaller)</VersionBandForSdkManifestsDir>
115115
<VersionBandForManifestPackages Condition="'$(VersionBandForManifestPackages)' == ''">$(VersionBandForSdkManifestsDir)</VersionBandForManifestPackages>
116116
</PropertyGroup>

src/tasks/WorkloadBuildTasks/InstallWorkloadFromArtifacts.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public partial class InstallWorkloadFromArtifacts : PatchNuGetConfig
5656
ReadCommentHandling = JsonCommentHandling.Skip
5757
};
5858

59-
[GeneratedRegex(@"^\d+\.\d+\.\d+(-[A-z]*\.*\d*)?")]
59+
[GeneratedRegex(@"^\d+\.\d+\.\d+(-(?!rtm)[A-z]*\.*\d*)?")]
6060
private static partial Regex bandVersionRegex();
6161

6262
public override bool Execute()
@@ -301,7 +301,8 @@ private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string v
301301
if (!string.IsNullOrEmpty(bandPreleaseVersion) &&
302302
packagePreleaseVersion != bandPreleaseVersion &&
303303
packagePreleaseVersion != "-dev" &&
304-
packagePreleaseVersion != "-ci")
304+
packagePreleaseVersion != "-ci" &&
305+
packagePreleaseVersion != "-rtm")
305306
{
306307
bandVersion = bandVersion.Replace (bandPreleaseVersion, packagePreleaseVersion);
307308
}

0 commit comments

Comments
 (0)