Skip to content

Commit 15f88dc

Browse files
$(AndroidPackVersionSuffix)=preview.6 (#10149)
Context: https://github.com/dotnet/android/tree/release/10.0.1xx-preview5 We branched for .NET 10 Preview 5 from 7486928 into `release/10.0.1xx-preview5`; the main branch is now .NET 10 Preview 6. I also updated `HowToBranch.md`.
1 parent 7486928 commit 15f88dc

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
3737
-->
3838
<AndroidPackVersion>36.0.0</AndroidPackVersion>
39-
<AndroidPackVersionSuffix>preview.5</AndroidPackVersionSuffix>
39+
<AndroidPackVersionSuffix>preview.6</AndroidPackVersionSuffix>
4040
<!-- Final value set by GetXAVersionInfo target -->
4141
<IsStableBuild>false</IsStableBuild>
4242
</PropertyGroup>

Documentation/guides/HowToBranch.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,25 @@
22

33
Context: [dotnet/maui#589][0]
44

5+
Microsoft employees can review the [.NET schedule][4] for upcoming
6+
releases. We normally branch on during the "Code complete, release
7+
branch snap and build" window. Sometimes we also wait until a newly
8+
branded .NET version appears in Maestro updates to `main`.
9+
510
Let's say that it's time for a hypothetical ".NET 10 Preview 42". The
611
sequence of events would be:
712

8-
1. [dotnet/installer][1] branches `release/10.0.1xx-preview42`
13+
1. [dotnet/dotnet][1] branches `release/10.0.1xx-preview42`
914

1015
2. Builds are available on Maestro for `dotnet/android` to consume.
1116

1217
3. `dotnet/android` branches `release/10.0.1xx-preview42`. GitHub Web
1318
UI is fine for this.
1419

15-
4. Subscribe to Maestro updates for [dotnet/installer][1] `release/10.0.1xx-preview42`:
20+
4. Subscribe to Maestro updates for [dotnet/dotnet][1] `release/10.0.1xx-preview42`:
1621

1722
```bash
18-
darc add-subscription --channel ".NET 10.0.1xx SDK Preview 42" --target-branch "release/10.0.1xx-preview42" --source-repo https://github.com/dotnet/sdk --target-repo https://github.com/dotnet/android
23+
darc add-subscription --channel ".NET 10.0.1xx SDK Preview 42" --target-branch "release/10.0.1xx-preview42" --source-repo https://github.com/dotnet/dotnet --target-repo https://github.com/dotnet/android
1924
```
2025

2126
5. Publish Maestro updates for `dotnet/android/release/10.0.1xx-preview42`:
@@ -35,10 +40,16 @@ See [eng/README.md][2] for details on `darc` commands.
3540
Note that release candidates will use values such as `rc.1`, `rc.2`, etc.
3641

3742
7. Update the [Xamarin.Android Nightly job][3], so the schedule only
38-
runs on desired branches. We likely only need a single .NET 6+
43+
runs on desired branches. We likely only need a single .NET 10+
3944
branch to be on this schedule at a time.
4045

46+
8. When the build is complete, verify the version number is as
47+
expected (36.0.0-preview.42.x) and that builds show up on
48+
https://maestro.dot.net/ in the appropriate "channel" for
49+
dotnet/maui to consume.
50+
4151
[0]: https://github.com/dotnet/maui/issues/598
42-
[1]: https://github.com/dotnet/installer
52+
[1]: https://github.com/dotnet/dotnet
4353
[2]: ../../eng/README.md
4454
[3]: https://devdiv.visualstudio.com/DevDiv/_apps/hub/ms.vss-ciworkflow.build-ci-hub?_a=edit-build-definition&id=14072&view=Tab_Triggers
55+
[4]: https://aka.ms/net10-schedule

0 commit comments

Comments
 (0)