Skip to content

Commit b23782a

Browse files
authored
Update implementation plan from last source-build champs meeting (#1714)
* Update implementation plan base on recent source-build champs meeting * Update implementation plan graph * Updates based on PR review comments
1 parent 66fd23b commit b23782a

File tree

3 files changed

+41
-56
lines changed

3 files changed

+41
-56
lines changed

Documentation/planning/arcade-powered-source-build/img/implementation-plan-graph.dgml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<DirectedGraph Layout="Sugiyama" ZoomLevel="-1" xmlns="http://schemas.microsoft.com/vs/2009/dgml">
33
<Nodes>
4-
<Node Id="application-insights" Category="Stage2" Label="application-insights" />
4+
<Node Id="source-build-reference-packages" Category="Stage5" Label="source-build-reference-packages" />
5+
<Node Id="application-insights" Category="Stage1" Label="application-insights" />
56
<Node Id="arcade" Category="Stage1" Label="arcade" />
67
<Node Id="aspnet-extensions" Category="Stage1" Label="extensions" />
78
<Node Id="aspnet-xdt" Category="Stage1" Label="aspnet-xdt" />
@@ -12,9 +13,9 @@
1213
<Node Id="fsharp" Category="Stage1" Label="fsharp" />
1314
<Node Id="linker" Category="Stage1" Label="linker" />
1415
<Node Id="msbuild" Category="Stage1" Label="msbuild" />
15-
<Node Id="netcorecli-fsc" Category="Stage2" Label="netcorecli-fsc" />
16-
<Node Id="newtonsoft-json" Category="Stage2" Label="newtonsoft-json" />
17-
<Node Id="newtonsoft-json901" Category="Stage2" Label="newtonsoft-json901" />
16+
<Node Id="netcorecli-fsc" Category="Stage1" Label="netcorecli-fsc" />
17+
<Node Id="newtonsoft-json" Category="Stage1" Label="newtonsoft-json" />
18+
<Node Id="newtonsoft-json901" Category="Stage1" Label="newtonsoft-json901" />
1819
<Node Id="nuget-client" Category="Stage1" Label="nuget-client" />
1920
<Node Id="roslyn" Category="Stage1" Label="roslyn" />
2021
<Node Id="runtime" Category="Stage1" Label="runtime" />
@@ -24,7 +25,7 @@
2425
<Node Id="templating" Category="Stage1" Label="templating" />
2526
<Node Id="vstest" Category="Stage1" Label="vstest" />
2627
<Node Id="websdk" Category="Stage1" Label="websdk" />
27-
<Node Id="xliff-tasks" Category="Stage2" Label="xliff-tasks" />
28+
<Node Id="xliff-tasks" Category="Stage1" Label="xliff-tasks" />
2829
</Nodes>
2930
<Links>
3031
<Link Source="application-insights" Target="sdk" />
@@ -117,29 +118,25 @@
117118
<Condition Expression="HasCategory('Stage1')" />
118119
<Setter Property="Background" Value="#FFD0CECE" />
119120
</Style>
120-
<Style TargetType="Node" GroupLabel="Stage2 - Patch Removal" ValueLabel="True">
121+
<Style TargetType="Node" GroupLabel="Stage2 - Input intermediate pkgs" ValueLabel="True">
121122
<Condition Expression="HasCategory('Stage2')" />
122123
<Setter Property="Background" Value="#FFF7CAAC" />
123124
</Style>
124-
<Style TargetType="Node" GroupLabel="Stage3 - Build params to Eng dir" ValueLabel="True">
125+
<Style TargetType="Node" GroupLabel="Stage3 - Merge to dev branch" ValueLabel="True">
125126
<Condition Expression="HasCategory('Stage3')" />
126127
<Setter Property="Background" Value="#FFFFE599" />
127128
</Style>
128-
<Style TargetType="Node" GroupLabel="Stage4 - Input intermediate pkgs" ValueLabel="True">
129+
<Style TargetType="Node" GroupLabel="Stage4 - Setup CI / Mock official build" ValueLabel="True">
129130
<Condition Expression="HasCategory('Stage4')" />
130131
<Setter Property="Background" Value="#FFF0FE86" />
131132
</Style>
132-
<Style TargetType="Node" GroupLabel="Stage5 - Official build" ValueLabel="True">
133+
<Style TargetType="Node" GroupLabel="Stage5 - Validate / Merge to 5.0" ValueLabel="True">
133134
<Condition Expression="HasCategory('Stage5')" />
134135
<Setter Property="Background" Value="#FFB4C6E7" />
135136
</Style>
136-
<Style TargetType="Node" GroupLabel="Stage6 - Source-build PR validation" ValueLabel="True">
137+
<Style TargetType="Node" GroupLabel="Stage6 - Prebuilt baseline enforcment" ValueLabel="True">
137138
<Condition Expression="HasCategory('Stage6')" />
138139
<Setter Property="Background" Value="#FFCFAFE7" />
139140
</Style>
140-
<Style TargetType="Node" GroupLabel="Stage7 - Prebuilt check / enforcement" ValueLabel="True">
141-
<Condition Expression="HasCategory('Stage7')" />
142-
<Setter Property="Background" Value="#FFA8D08D" />
143-
</Style>
144141
</Styles>
145142
</DirectedGraph>
-27.6 KB
Loading

Documentation/planning/arcade-powered-source-build/implementation-plan.md

Lines changed: 30 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ To get each repo building with the new source-build 5.0 plan, [Arcade-Powered So
55
> ![](img/implementation-plan-graph.png)
66
> [source (img/implementation-plan-graph.dgml)](img/implementation-plan-graph.dgml)
77
8-
| Tier | Repo | Owner | (Stage 1)<br>Build from source - 5.0 | (Stage 2)<br>Patch Removal | (Stage 3)<br>Move build params to eng dir | (Stage 4)<br>Input Intermediate Packages Available | (Stage 5)<br>Official build | (Stage 6)<br>Source-build PR validation | (Stage 7)<br>Prebuilt check / enforcement |
9-
| --- | --- | --- | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
10-
| sbrp | Source-build-reference-packages | [Dan Seefeldt](https://github.com/dseefeld) | ✔️ | ✔️ | | | | | |
11-
| Tools | sourcelink | [Tomas Matousek](https://github.com/tmat) | ✔️ | 4 | | | | | |
12-
| Tools | arcade | [Mark Wilkie](https://github.com/markwilkie) | ✔️ | ⏱ 11 | | | | | |
13-
| 1 | application-insights | [Reiley Yang](https://github.com/reyang) | ✔️ | ✔️ | | | | | |
14-
| 1 | aspnet-xdt | [Vijay Ramakrishnan](https://github.com/vijayrkn) | ✔️ | 2 | | | | | |
15-
| 1 | newtonsoft-json | [Chris Rummel](https://github.com/crummel) | ✔️ | ✔️ | | | | | |
16-
| 1 | netcorecli-fsc | [Chris Rummel](https://github.com/crummel) | ✔️ | ✔️ | | | | | |
17-
| 1 | newtonsoft-json901 | [Chris Rummel](https://github.com/crummel) | ✔️ | ✔️ | | | | | |
18-
| 1 | xliff-tasks | [William Li](https://github.com/wli3) | ✔️ | 1 | | | | | |
19-
| 1 | clicommandlineparser | [Sarah Oslund](https://github.com/sfoslund) | ✔️ | 1 | | | | | |
20-
| 1 | roslyn | [Fred Silberberg](https://github.com/333fred) | ✔️ | 5 | | | | | |
21-
| 2 | linker | [Dan Seefeldt](https://github.com/dseefeld) | ✔️ | 3 | | | | | |
22-
| 2 | runtime | [Jared Parsons](https://github.com/jaredpar) | ✔️ | 15 | | | | | |
23-
| 2 | msbuild | [Ben Villalobos](https://github.com/BenVillalobos) | ✔️ | 4 | | | | | |
24-
| 2 | NuGet.Client | [Fernando Aguilar Reyes](https://github.com/dominoFire) | ✔️ | ⏱ 10 | | | | | |
25-
| 2 | templating | [Jose Aguilar](https://github.com/donJoseLuis) | ✔️ | ✔️ | | | | | |
26-
| 3 | aspnetcore | [John Luo](https://github.com/JunTaoLuo) | ✔️ | 13 | | | | | |
27-
| 3 | websdk | [Vijay Ramakrishnan](https://github.com/vijayrkn) | ✔️ | 1 | | | | | |
28-
| 4 | sdk | [Sarah Oslund](https://github.com/sfoslund) | ✔️ | 9 | | | | | |
29-
| 4 | vstest | [Jakub Jares](https://github.com/nohwnd) | ✔️ | 7 | | | | | |
30-
| 4 | fsharp | [Brett Forsgren](https://github.com/brettfo) | ✔️ | 4 | | | | | |
31-
| 5 | installer | [Sarah Oslund](https://github.com/sfoslund) | ✔️ | 3 | | | | | |
8+
| Tier | Repo | Owner | (Stage 1)<br>Build from source - 5.0 | (Stage 2)<br>Input intermediate packages available | (Stage 3)<br>Merge patches & local build infra into dev branch | (Stage 4)<br>Merge CI, generate mock official build | (Stage 5)<br>Validate & merge dev branch into 5.0 | (Stage 6)<br>Prebuilt baseline enforcement |
9+
| --- | --- | --- | :---: | :---: | :---: | :---: | :---: | :---: |
10+
| sbrp | Source-build-reference-packages | [Dan Seefeldt](https://github.com/dseefeld) | ✔️ | ✔️ | [#1715](https://github.com/dotnet/source-build/issues/1715) | ✔️ | ✔️ | |
11+
| Tools | sourcelink | [Tomas Matousek](https://github.com/tmat) | ✔️ | | | | | |
12+
| Tools | arcade | [Mark Wilkie](https://github.com/markwilkie) | ✔️ | | | | | |
13+
| 1 | application-insights | [Reiley Yang](https://github.com/reyang) | ✔️ | | | | | |
14+
| 1 | aspnet-xdt | [Vijay Ramakrishnan](https://github.com/vijayrkn) | ✔️ | | | | | |
15+
| 1 | newtonsoft-json | [Chris Rummel](https://github.com/crummel) | ✔️ | | | | | |
16+
| 1 | netcorecli-fsc | [Chris Rummel](https://github.com/crummel) | ✔️ | | | | | |
17+
| 1 | newtonsoft-json901 | [Chris Rummel](https://github.com/crummel) | ✔️ | | | | | |
18+
| 1 | xliff-tasks | [William Li](https://github.com/wli3) | ✔️ | | | | | |
19+
| 1 | clicommandlineparser | [Sarah Oslund](https://github.com/sfoslund) | ✔️ | | | | | |
20+
| 1 | roslyn | [Fred Silberberg](https://github.com/333fred) | ✔️ | | | | | |
21+
| 2 | linker | [Dan Seefeldt](https://github.com/dseefeld) | ✔️ | | | | | |
22+
| 2 | runtime | [Jared Parsons](https://github.com/jaredpar) | ✔️ | | | | | |
23+
| 2 | msbuild | [Ben Villalobos](https://github.com/BenVillalobos) | ✔️ | | | | | |
24+
| 2 | NuGet.Client | [Fernando Aguilar Reyes](https://github.com/dominoFire) | ✔️ | | | | | |
25+
| 2 | templating | [Jose Aguilar](https://github.com/donJoseLuis) | ✔️ | | | | | |
26+
| 3 | aspnetcore | [John Luo](https://github.com/JunTaoLuo) | ✔️ | | | | | |
27+
| 3 | websdk | [Vijay Ramakrishnan](https://github.com/vijayrkn) | ✔️ | | | | | |
28+
| 4 | sdk | [Sarah Oslund](https://github.com/sfoslund) | ✔️ | | | | | |
29+
| 4 | vstest | [Jakub Jares](https://github.com/nohwnd) | ✔️ | | | | | |
30+
| 4 | fsharp | [Brett Forsgren](https://github.com/brettfo) | ✔️ | | | | | |
31+
| 5 | installer | [Sarah Oslund](https://github.com/sfoslund) | ✔️ | | | | | |
3232

3333
| Status | Description |
3434
| --- | --- |
@@ -37,21 +37,9 @@ To get each repo building with the new source-build 5.0 plan, [Arcade-Powered So
3737
|| At Risk |
3838

3939
## Stage descriptions:
40-
- **(1) Build from Source 5.0** – Get repo building from source with 5.0 source in dotnet/source-build.
41-
- **(2) Patch Removal** – Incorporate patches required to build from source into the repo code base.
42-
- **(3) Move Build Params to Eng Dir** – Move all source-build specific build parameter from `/repos/<reponame>.proj` in source-build repo to repo `/eng` directory.
43-
- **(4) Input Intermediate Packages Available** – Indicates upstream intermediate packages are available, and work on this repo can begin.
44-
- **(5) Official build** – Build source-built intermediate packages in official build.
45-
- **(6) Source-build PR validation** – Add AzDO build jobs to PR validation to ensure build-from-source continues running without avoidable regressions.
46-
- **(7) Prebuilt check / enforcement** – Add a check to PR validation to ensure that no prebuilts are included when building repo.
47-
48-
## Key Milestone Dates:
49-
50-
| Stage(s) | Start | End |
51-
| --- | :---: | :---: |
52-
| Stage 1 - Build from Source 5.0 | 2020-05-28 | 2020-06-29 |
53-
| Stage 2 - Patch Removal | 2020-06-16 | 2020-07-23 |
54-
| Stages 3-5 - Get into Official Build | 2020-06-25 | 2020-09-16 |
55-
| Stages 6-7 - PR Validation / Prebuilt check | 2020-07-28 | 2020-10-05 |
56-
57-
40+
- **(1) Build from source 5.0** – Get repo building from source with 5.0 source in dotnet/source-build.
41+
- **(2) Input intermediate packages available** – Indicates upstream intermediate packages are available, and work on this repo can begin.
42+
- **(3) Merge patches & local build infra into dev branch** – Repo owner has created source-build dev branch. Move all source-build specific build parameters from `/repos/<reponame>.proj` in source-build repo to repo `/eng` directory and add repo-specific patches into source-build dev branch.
43+
- **(4) Merge CI, generate mock official build** – PR validation and Official Build CI jobs added to source-build dev branch and run to generate intermediate package for repo.
44+
- **(5) Validate & merge dev branch into 5.0** – Build logs and intermediate package reviewed and validated by source-build team. Source-build changes are live for repo in 5.0 branch. Build source-built intermediate packages in official build.
45+
- **(6) Prebuilt baseline enforcement** – Prebuilt checks enforcment enabled in PR validation builds. Builds fail if new prebuilts are introduced.

0 commit comments

Comments
 (0)