$(AndroidPackVersionSuffix)=rtm; Stable 35.0.x branding (#9337)

Context: 4ea5dbb9 We branched for .NET 9 RC 2 from 118e894 into `release/9.0.1xx-rc2`; the main branch is now .NET 9 "GA" or "rtm". Update dotnet/android/main's version number to 35.0.1-ci.main.x, which should auto-increment for each commit. Eventually, when we branch for `release/9.0.1xx`, the version number will automatically become 35.0.1 without the prerelease suffix. Co-authored-by: Peter Collins <[email protected]>
dotnet · Sep 26, 2024 · 0f2a323 · 0f2a323
1 parent 118e894
commit 0f2a323
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -35,10 +35,10 @@
          * Major/Minor match Android stable API level, such as 30.0 for API 30.
          * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
     -->
-    <AndroidPackVersion>35.0.0</AndroidPackVersion>
-    <AndroidPackVersionSuffix>rc.2</AndroidPackVersionSuffix>
+    <AndroidPackVersion>35.0.1</AndroidPackVersion>
+    <AndroidPackVersionSuffix>rtm</AndroidPackVersionSuffix>
+    <!-- Final value set by GetXAVersionInfo target -->
     <IsStableBuild>false</IsStableBuild>
-    <IsStableBuild Condition=" '$(AndroidPackVersionSuffix)' == 'rtm' ">true</IsStableBuild>
   </PropertyGroup>
 
   <!-- Common <PackageReference/> versions -->

diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets
@@ -79,10 +79,11 @@
       <!-- See Azure Pipelines predefined variables. -->
       <_AndroidPackLabel Condition=" '$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)' != '' ">ci.pr.gh$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER).$(PackVersionCommitCount)</_AndroidPackLabel>
       <_AndroidPackBranch>$([System.Text.RegularExpressions.Regex]::Replace('$(XAVersionBranch)', '[^a-zA-Z0-9-]', '-'))</_AndroidPackBranch>
-      <_AndroidPackLabel Condition=" '$(_AndroidPackLabel)' == '' and ('$(XAVersionBranch)' == 'main' or $(XAVersionBranch.StartsWith('release/')))">$(AndroidPackVersionSuffix).$(PackVersionCommitCount)</_AndroidPackLabel>
+      <_AndroidPackLabel Condition=" '$(_AndroidPackLabel)' == '' and $(XAVersionBranch.StartsWith('release/'))">$(AndroidPackVersionSuffix).$(PackVersionCommitCount)</_AndroidPackLabel>
       <_AndroidPackLabel Condition=" '$(_AndroidPackLabel)' == '' ">ci.$(_AndroidPackBranch).$(PackVersionCommitCount)</_AndroidPackLabel>
       <AndroidPackVersionLong>$(AndroidPackVersion)-$(_AndroidPackLabel)</AndroidPackVersionLong>
       <AndroidMSIVersion>$(AndroidPackVersion).$(PackVersionCommitCount)</AndroidMSIVersion>
+      <IsStableBuild Condition=" '$(AndroidPackVersionSuffix)' == 'rtm' and $(XAVersionBranch.StartsWith('release/')) ">true</IsStableBuild>
     </PropertyGroup>
   </Target>
 </Project>