Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
-->
<AndroidPackVersion>35.0.0</AndroidPackVersion>
<AndroidPackVersionSuffix>preview.7</AndroidPackVersionSuffix>
<IsStableBuild>false</IsStableBuild>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was comparing what we have on the release/8.0.2xx branch:

<!-- NuGet package version numbers. See Documentation/guides/OneDotNet.md.
Rules:
* 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>34.0.1</AndroidPackVersion>
<AndroidPackVersionPatchIndex>$(AndroidPackVersion.LastIndexOf("."))</AndroidPackVersionPatchIndex>
<AndroidPackVersionMajorMinor>$(AndroidPackVersion.Substring(0,$(AndroidPackVersionPatchIndex)))</AndroidPackVersionMajorMinor>
<AndroidPackVersionPatch>$(AndroidPackVersion.Substring($([MSBuild]::Add($(AndroidPackVersionPatchIndex), 1))))</AndroidPackVersionPatch>
<AndroidPackVersionSuffix>rtm</AndroidPackVersionSuffix>

Could this check $(AndroidPackVersionSuffix) == 'rtm' to determine true or false?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sounds reasonable to me, I think it would be best to not introduce more properties that need to be manually tweaked when stablizing.

I was looking at AndroidPackVersionSuffix and I think it's not used anywhere when moving to stable package versions? I don't think that's an issue, we'll just have to make sure to still update it to rtm each time even though it won't be referenced by anything?

</PropertyGroup>

<!-- Common <PackageReference/> versions -->
Expand Down
1 change: 1 addition & 0 deletions build-tools/create-packs/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@

<PushToAzureDevOpsArtifacts
ItemsToPush="@(ItemsToPush)"
IsStableBuild="$(IsStableBuild)"
ManifestBuildData="@(ManifestBuildData)"
ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
ManifestBranch="$(BUILD_SOURCEBRANCH)"
Expand Down