Skip to content

Commit c562b17

Browse files
committed
Change the ordering of scenarios
The diff makes this look more complicated than it is. All I did was swap the order so that bootstrap was positioned after servicing.
1 parent 5e25107 commit c562b17

File tree

1 file changed

+89
-89
lines changed

1 file changed

+89
-89
lines changed

Documentation/feature-band-source-building.md

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ multiple SDK feature bands.
2020
- [1xx Band Bootstrap](#1xx-band-bootstrap)
2121
- [1xx Band Servicing](#1xx-band-servicing)
2222
- [2xx Band Initial Release (N.0.200)](#2xx-band-initial-release-n0200)
23-
- [2xx Band Bootstrap (N.0.200+)](#2xx-band-bootstrap-n0200)
2423
- [2xx Band Servicing (N.0.201+)](#2xx-band-servicing-n0201)
24+
- [2xx Band Bootstrap (N.0.200+)](#2xx-band-bootstrap-n0200)
2525
- [3xx Band Initial Release (N.0.300)](#3xx-band-initial-release-n0300)
26-
- [3xx Band Bootstrap (N.0.300+)](#3xx-band-bootstrap-n0300)
2726
- [3xx Band Servicing (N.0.301+)](#3xx-band-servicing-n0301)
27+
- [3xx Band Bootstrap (N.0.300+)](#3xx-band-bootstrap-n0300)
2828
- [Troubleshooting](#troubleshooting)
2929
- [Poison and Prebuilt Detection](#poison-and-prebuilt-detection)
3030
- [Additional Resources](#additional-resources)
@@ -524,6 +524,59 @@ flowchart LR
524524
class SBCurrent2xx curr2xx
525525
```
526526

527+
### 2xx Band Servicing (N.0.201+)
528+
529+
For ongoing 2xx servicing builds.
530+
531+
Required inputs:
532+
533+
- source-built artifacts of the current 1xx release
534+
- source-built SDK and artifacts from the previous 2xx release
535+
536+
```bash
537+
git clone -b <2xx-release-branch> https://github.com/dotnet/dotnet.git
538+
cd dotnet
539+
540+
# Build the SDK
541+
./build.sh --source-only \
542+
--with-sdk /path/to/previous-source-built-2xx/sdk \
543+
--with-packages /path/to/previous-source-built-2xx/artifacts \
544+
--with-shared-components /path/to/current-source-built-1xx/artifacts
545+
546+
# Final source-built outputs available in artifacts/x64/Release/
547+
```
548+
549+
```mermaid
550+
flowchart LR
551+
subgraph SBPrev2xx["Previous 2xx SB Release"]
552+
Prev_1xx_SDK[Source-built<br/>2xx SDK]
553+
Prev_2xx_Art[Source-built<br/>2xx Artifacts]
554+
end
555+
556+
subgraph SBCurrent1xx["Current 1xx SB Release"]
557+
Curr_1xx_Art[Current source-built <br/>1xx Artifacts]
558+
end
559+
560+
subgraph SBCurrent2xx["Current 2xx SB Release"]
561+
Build((Build Process))
562+
SDK_2xx[New 2xx SDK]
563+
Art_2xx[New 2xx Artifacts]
564+
end
565+
566+
Prev_1xx_SDK -.->|with-sdk| Build
567+
Prev_2xx_Art -.->|with-packages| Build
568+
Curr_1xx_Art -.->|with-shared-components| Build
569+
Build --> SDK_2xx
570+
Build --> Art_2xx
571+
572+
classDef prev2xx fill:#c98989,stroke:#666,stroke-width:2px,color:#000
573+
classDef curr1xx fill:#5bb75b,stroke:#666,stroke-width:2px,color:#000
574+
classDef curr2xx fill:#3da53d,stroke:#666,stroke-width:2px,color:#000
575+
class SBPrev2xx prev2xx
576+
class SBCurrent1xx curr1xx
577+
class SBCurrent2xx curr2xx
578+
```
579+
527580
### 2xx Band Bootstrap (N.0.200+)
528581

529582
For 2xx releases that require bootstrap (two-stage process).
@@ -608,17 +661,18 @@ flowchart LR
608661
class SB curr2xx
609662
```
610663

611-
### 2xx Band Servicing (N.0.201+)
664+
### 3xx Band Initial Release (N.0.300)
612665

613-
For ongoing 2xx servicing builds.
666+
For the initial 3xx release. The same pattern applies to 4xx band initial
667+
release (N.0.400), which would depend on the latest 3xx release instead of 2xx.
614668

615669
Required inputs:
616670

617-
- source-built artifacts of the current 1xx release
671+
- source-built artifacts from the current 1xx release
618672
- source-built SDK and artifacts from the previous 2xx release
619673

620674
```bash
621-
git clone -b <2xx-release-branch> https://github.com/dotnet/dotnet.git
675+
git clone -b <3xx-release-branch> https://github.com/dotnet/dotnet.git
622676
cd dotnet
623677

624678
# Build the SDK
@@ -633,62 +687,62 @@ cd dotnet
633687
```mermaid
634688
flowchart LR
635689
subgraph SBPrev2xx["Previous 2xx SB Release"]
636-
Prev_1xx_SDK[Source-built<br/>2xx SDK]
637-
Prev_2xx_Art[Source-built<br/>2xx Artifacts]
690+
Prev_2xx_SDK[Source-built 2xx SDK]
691+
Prev_2xx_Art[Source-built 2xx Artifacts]
638692
end
639693
640-
subgraph SBCurrent1xx["Current 1xx SB Release"]
641-
Curr_1xx_Art[Current source-built <br/>1xx Artifacts]
694+
subgraph SBCurr1xx["Current 1xx SB Release"]
695+
Curr_1xx_Art[Source-built 1xx artifacts]
642696
end
643697
644-
subgraph SBCurrent2xx["Current 2xx SB Release"]
698+
subgraph SBCurr3xx["Current 3xx SB Release"]
645699
Build((Build Process))
646-
SDK_2xx[New 2xx SDK]
647-
Art_2xx[New 2xx Artifacts]
700+
SDK_3xx[New 3xx SDK]
701+
Art_3xx[New 3xx Artifacts]
648702
end
649703
650-
Prev_1xx_SDK -.->|with-sdk| Build
651-
Prev_2xx_Art -.->|with-packages| Build
652-
Curr_1xx_Art -.->|with-shared-components| Build
653-
Build --> SDK_2xx
654-
Build --> Art_2xx
704+
Prev_2xx_SDK -.-> Build
705+
Prev_2xx_Art -.->|PSB| Build
706+
Curr_1xx_Art -.->|shared components| Build
707+
Build --> SDK_3xx
708+
Build --> Art_3xx
655709
656710
classDef prev2xx fill:#c98989,stroke:#666,stroke-width:2px,color:#000
657711
classDef curr1xx fill:#5bb75b,stroke:#666,stroke-width:2px,color:#000
658-
classDef curr2xx fill:#3da53d,stroke:#666,stroke-width:2px,color:#000
712+
classDef curr3xx fill:#2d8b2d,stroke:#666,stroke-width:2px,color:#000
659713
class SBPrev2xx prev2xx
660-
class SBCurrent1xx curr1xx
661-
class SBCurrent2xx curr2xx
714+
class SBCurr1xx curr1xx
715+
class SBCurr3xx curr3xx
662716
```
663717

664-
### 3xx Band Initial Release (N.0.300)
718+
### 3xx Band Servicing (N.0.301+)
665719

666-
For the initial 3xx release. The same pattern applies to 4xx band initial
667-
release (N.0.400), which would depend on the latest 3xx release instead of 2xx.
720+
For ongoing 3xx servicing builds. The same pattern applies to 4xx band
721+
servicing (N.0.401+).
668722

669723
Required inputs:
670724

671725
- source-built artifacts from the current 1xx release
672-
- source-built SDK and artifacts from the previous 2xx release
726+
- source-built SDK and artifacts from the previous 3xx release
673727

674728
```bash
675729
git clone -b <3xx-release-branch> https://github.com/dotnet/dotnet.git
676730
cd dotnet
677731

678732
# Build the SDK
679733
./build.sh --source-only \
680-
--with-sdk /path/to/previous-source-built-2xx/sdk \
681-
--with-packages /path/to/previous-source-built-2xx/artifacts \
734+
--with-sdk /path/to/previous-source-built-3xx/sdk \
735+
--with-packages /path/to/previous-source-built-3xx/artifacts \
682736
--with-shared-components /path/to/current-source-built-1xx/artifacts
683737

684738
# Final source-built outputs available in artifacts/x64/Release/
685739
```
686740

687741
```mermaid
688742
flowchart LR
689-
subgraph SBPrev2xx["Previous 2xx SB Release"]
690-
Prev_2xx_SDK[Source-built 2xx SDK]
691-
Prev_2xx_Art[Source-built 2xx Artifacts]
743+
subgraph SBPrev3xx["Previous 3xx SB Release"]
744+
Prev_3xx_SDK[Source-built 3xx SDK]
745+
Prev_3xx_Art[Source-built 3xx artifacts]
692746
end
693747
694748
subgraph SBCurr1xx["Current 1xx SB Release"]
@@ -701,16 +755,16 @@ flowchart LR
701755
Art_3xx[New 3xx Artifacts]
702756
end
703757
704-
Prev_2xx_SDK -.-> Build
705-
Prev_2xx_Art -.->|PSB| Build
706-
Curr_1xx_Art -.->|shared components| Build
758+
Prev_3xx_SDK -.->|with-sdk| Build
759+
Prev_3xx_Art -.->|with-packages| Build
760+
Curr_1xx_Art -.->|with-shared-components| Build
707761
Build --> SDK_3xx
708762
Build --> Art_3xx
709763
710-
classDef prev2xx fill:#c98989,stroke:#666,stroke-width:2px,color:#000
764+
classDef prev3xx fill:#c98989,stroke:#666,stroke-width:2px,color:#000
711765
classDef curr1xx fill:#5bb75b,stroke:#666,stroke-width:2px,color:#000
712766
classDef curr3xx fill:#2d8b2d,stroke:#666,stroke-width:2px,color:#000
713-
class SBPrev2xx prev2xx
767+
class SBPrev3xx prev3xx
714768
class SBCurr1xx curr1xx
715769
class SBCurr3xx curr3xx
716770
```
@@ -800,60 +854,6 @@ flowchart LR
800854
class SBCurr3xx curr3xx
801855
```
802856

803-
### 3xx Band Servicing (N.0.301+)
804-
805-
For ongoing 3xx servicing builds. The same pattern applies to 4xx band
806-
servicing (N.0.401+).
807-
808-
Required inputs:
809-
810-
- source-built artifacts from the current 1xx release
811-
- source-built SDK and artifacts from the previous 3xx release
812-
813-
```bash
814-
git clone -b <3xx-release-branch> https://github.com/dotnet/dotnet.git
815-
cd dotnet
816-
817-
# Build the SDK
818-
./build.sh --source-only \
819-
--with-sdk /path/to/previous-source-built-3xx/sdk \
820-
--with-packages /path/to/previous-source-built-3xx/artifacts \
821-
--with-shared-components /path/to/current-source-built-1xx/artifacts
822-
823-
# Final source-built outputs available in artifacts/x64/Release/
824-
```
825-
826-
```mermaid
827-
flowchart LR
828-
subgraph SBPrev3xx["Previous 3xx SB Release"]
829-
Prev_3xx_SDK[Source-built 3xx SDK]
830-
Prev_3xx_Art[Source-built 3xx artifacts]
831-
end
832-
833-
subgraph SBCurr1xx["Current 1xx SB Release"]
834-
Curr_1xx_Art[Source-built 1xx artifacts]
835-
end
836-
837-
subgraph SBCurr3xx["Current 3xx SB Release"]
838-
Build((Build Process))
839-
SDK_3xx[New 3xx SDK]
840-
Art_3xx[New 3xx Artifacts]
841-
end
842-
843-
Prev_3xx_SDK -.->|with-sdk| Build
844-
Prev_3xx_Art -.->|with-packages| Build
845-
Curr_1xx_Art -.->|with-shared-components| Build
846-
Build --> SDK_3xx
847-
Build --> Art_3xx
848-
849-
classDef prev3xx fill:#c98989,stroke:#666,stroke-width:2px,color:#000
850-
classDef curr1xx fill:#5bb75b,stroke:#666,stroke-width:2px,color:#000
851-
classDef curr3xx fill:#2d8b2d,stroke:#666,stroke-width:2px,color:#000
852-
class SBPrev3xx prev3xx
853-
class SBCurr1xx curr1xx
854-
class SBCurr3xx curr3xx
855-
```
856-
857857
## Troubleshooting
858858

859859
**Error**: `Shared components cannot be provided as input to a build which

0 commit comments

Comments
 (0)