@@ -706,20 +706,20 @@ line_endings:
706706
707707 prevention :
708708 before_editing :
709- - " Check original line endings: git show master :{file} | python -c \" import sys; d=sys.stdin.buffer.read(); print(f'CRLF:{d.count(chr(13).encode()+chr(10).encode())} LF:{d.count(chr(10).encode())}')\" "
709+ - " Check original line endings: git show main :{file} | python -c \" import sys; d=sys.stdin.buffer.read(); print(f'CRLF:{d.count(chr(13).encode()+chr(10).encode())} LF:{d.count(chr(10).encode())}')\" "
710710
711711 after_editing :
712- - " Verify no whitespace-only changes: git diff master --ignore-all-space -- {file}"
713- - " If whitespace diff appears, restore from master and re-apply only intentional changes"
712+ - " Verify no whitespace-only changes: git diff main --ignore-all-space -- {file}"
713+ - " If whitespace diff appears, restore from main and re-apply only intentional changes"
714714
715715 restore_pattern : |
716716 # If you accidentally introduced whitespace changes:
717- git checkout master -- {file} # Restore original
717+ git checkout main -- {file} # Restore original
718718 # Then re-apply only your intentional additions using edit tool
719719
720720 diff_verification :
721- always_run : " git diff master --ignore-cr-at-eol -- {file}"
722- if_spurious_changes : " git checkout master -- {file} and re-apply edits"
721+ always_run : " git diff main --ignore-cr-at-eol -- {file}"
722+ if_spurious_changes : " git checkout main -- {file} and re-apply edits"
723723` ` `
724724
725725---
@@ -844,7 +844,7 @@ mandatory_checkpoints:
844844 - " If before/after evidence is not possible (environment-specific issue), document why and provide unit test evidence instead"
845845 - " PR MUST be created as DRAFT: `gh pr create --draft`"
846846 - " PR title MUST follow format: `[Internal] Category: (Adds|Fixes|Refactors|Removes) Description` (enforced by PR Lint bot)"
847- - " Verify no spurious whitespace changes: `git diff master --ignore-all-space`"
847+ - " Verify no spurious whitespace changes: `git diff main --ignore-all-space`"
848848
849849 before_marking_pr_ready :
850850 - " ALL CI gates MUST show green (passed) status — not just completed"
@@ -1313,7 +1313,7 @@ I've analyzed issue #{number} and gathered the following initial context:
13131313**Proposed Investigation Plan:**
131413141. Historical search: GitHub issues, PRs, StackOverflow, changelog
131513152. Code analysis: {specific areas to investigate}
1316- 3. Reproduction: Test against {reported version}, {latest SDK}, {master branch}
1316+ 3. Reproduction: Test against {reported version}, {latest SDK}, {main branch}
13171317
13181318**Estimated Time:** {X minutes}
13191319
@@ -1685,19 +1685,19 @@ reproduction_versions:
16851685 source: "NuGet package (latest)"
16861686
16871687 3_master_branch:
1688- description: "Current master /main branch"
1688+ description: "Current main /main branch"
16891689 purpose: "Check if fix exists but not released"
1690- source: "Local build from master "
1690+ source: "Local build from main "
16911691` ` `
16921692
16931693**Version Matrix Test Results:**
16941694
16951695| Version | Result | Implication |
16961696|---------|--------|-------------|
1697- | Reported ✅ / Latest ✅ / Master ✅ | Issue persists | Needs fix |
1698- | Reported ✅ / Latest ❌ / Master ❌ | Fixed in release | Recommend upgrade |
1699- | Reported ✅ / Latest ✅ / Master ❌ | Fixed, not released | Mention upcoming fix |
1700- | Reported ❌ / Latest ❌ / Master ❌ | Cannot reproduce | Request more info |
1697+ | Reported ✅ / Latest ✅ / Main ✅ | Issue persists | Needs fix |
1698+ | Reported ✅ / Latest ❌ / Main ❌ | Fixed in release | Recommend upgrade |
1699+ | Reported ✅ / Latest ✅ / Main ❌ | Fixed, not released | Mention upcoming fix |
1700+ | Reported ❌ / Latest ❌ / Main ❌ | Cannot reproduce | Request more info |
17011701
17021702# ## 4.2 Environment Setup
17031703
@@ -1725,11 +1725,11 @@ version_setup:
17251725 cd IssueRepro_{number}_latest
17261726 dotnet add package Microsoft.Azure.Cosmos # Gets latest
17271727
1728- master_branch :
1728+ main_branch :
17291729 command: |
1730- # Build from local master
1731- git checkout master
1732- git pull origin master
1730+ # Build from local main
1731+ git checkout main
1732+ git pull origin main
17331733 dotnet build Microsoft.Azure.Cosmos.sln -c Release
17341734 # Reference local build in test project
17351735` ` `
@@ -1751,7 +1751,7 @@ version_setup:
17511751
17521752/// <summary>
17531753/// Reproduction tests for GitHub Issue #{number}
1754- /// Run against: Reported version, Latest stable, Master branch
1754+ /// Run against: Reported version, Latest stable, Main branch
17551755/// </summary>
17561756[TestClass]
17571757public class Issue_{number}_Tests
@@ -1829,15 +1829,15 @@ test_execution:
18291829 command: dotnet test --filter "Issue_{number}" -- CosmosDB:ConnectionMode=Direct
18301830 record: "version=latest, gateway={pass/fail}, direct={pass/fail}"
18311831
1832- master_branch :
1832+ main_branch :
18331833 setup: |
1834- # Ensure master is built
1834+ # Ensure main is built
18351835 dotnet build Microsoft.Azure.Cosmos.sln -c Release
18361836 gateway:
18371837 command: dotnet test --filter "Issue_{number}" -- CosmosDB:ConnectionMode=Gateway
18381838 direct:
18391839 command: dotnet test --filter "Issue_{number}" -- CosmosDB:ConnectionMode=Direct
1840- record: "version=master , gateway={pass/fail}, direct={pass/fail}"
1840+ record: "version=main , gateway={pass/fail}, direct={pass/fail}"
18411841
18421842capture:
18431843 - CosmosDiagnostics output
@@ -1856,12 +1856,12 @@ capture:
18561856|---------|--------------|-------------|-------|
18571857| {reported_version} | ✅ Reproduced / ❌ Not Reproduced | ✅ / ❌ | {notes} |
18581858| {latest_version} | ✅ / ❌ | ✅ / ❌ | {notes} |
1859- | master ({commit_sha}) | ✅ / ❌ | ✅ / ❌ | {notes} |
1859+ | main ({commit_sha}) | ✅ / ❌ | ✅ / ❌ | {notes} |
18601860
18611861**Conclusion:**
18621862- [ ] Issue persists in all versions → Needs fix
18631863- [ ] Fixed in latest release → Recommend upgrade to {version}
1864- - [ ] Fixed in master , not released → Will be available in next release
1864+ - [ ] Fixed in main , not released → Will be available in next release
18651865- [ ] Cannot reproduce → Need more information
18661866` ` `
18671867
@@ -1898,7 +1898,7 @@ public class Issue_{number}_Benchmark
18981898 [Params("Gateway", "Direct")]
18991899 public string ConnectionMode { get; set; }
19001900
1901- [Params("3.35.0", "Latest", "Master ")] // Versions to compare
1901+ [Params("3.35.0", "Latest", "Main ")] // Versions to compare
19021902 public string SdkVersion { get; set; }
19031903
19041904 [GlobalSetup]
@@ -1977,8 +1977,8 @@ benchmark_workflow:
19771977 command: dotnet run -c Release -- --filter "*" --artifacts ./results/v{reported}
19781978 latest_version:
19791979 command: dotnet run -c Release -- --filter "*" --artifacts ./results/latest
1980- master_branch :
1981- command: dotnet run -c Release -- --filter "*" --artifacts ./results/master
1980+ main_branch :
1981+ command: dotnet run -c Release -- --filter "*" --artifacts ./results/main
19821982` ` `
19831983
19841984# ### Benchmark Metrics to Capture
@@ -2022,8 +2022,8 @@ metrics:
20222022| {reported} | Direct | {ms} | {ms} | {ms} | {ms} | {KB} |
20232023| {latest} | Gateway | {ms} | {ms} | {ms} | {ms} | {KB} |
20242024| {latest} | Direct | {ms} | {ms} | {ms} | {ms} | {KB} |
2025- | master | Gateway | {ms} | {ms} | {ms} | {ms} | {KB} |
2026- | master | Direct | {ms} | {ms} | {ms} | {ms} | {KB} |
2025+ | main | Gateway | {ms} | {ms} | {ms} | {ms} | {KB} |
2026+ | main | Direct | {ms} | {ms} | {ms} | {ms} | {KB} |
20272027
20282028### Throughput Comparison
20292029
@@ -2385,7 +2385,7 @@ Created: {date}
23852385## Reproduction Status
23862386- [ ] Reproduced with reported SDK version ({version})
23872387- [ ] Reproduced with latest SDK version ({version})
2388- - [ ] Reproduced with master branch ({commit_sha})
2388+ - [ ] Reproduced with main branch ({commit_sha})
23892389- [ ] Reproduced in Gateway mode
23902390- [ ] Reproduced in Direct mode
23912391- [ ] Unable to reproduce
@@ -2397,7 +2397,7 @@ Created: {date}
23972397|---------|---------|--------|-------|-------|
23982398| {reported_version} | ✅/❌ | ✅/❌ | ✅ | {notes} |
23992399| {latest_version} | ✅/❌ | ✅/❌ | ✅ | {notes} |
2400- | master ({short_sha}) | ✅/❌ | ✅/❌ | ✅ | {notes} |
2400+ | main ({short_sha}) | ✅/❌ | ✅/❌ | ✅ | {notes} |
24012401
24022402### Reproduction Steps Attempted
24032403~~~
@@ -2947,8 +2947,8 @@ reviewer_feedback_workflow:
29472947 naming_feedback :
29482948 action : " Rename as requested, update all references, reply with new name"
29492949 whitespace_noise :
2950- action : " Restore original file from master , re-apply only intentional changes"
2951- command : " git checkout master -- {file} && re-apply edits"
2950+ action : " Restore original file from main , re-apply only intentional changes"
2951+ command : " git checkout main -- {file} && re-apply edits"
29522952 missing_tests :
29532953 action : " Add requested tests, show pass evidence in reply"
29542954 style_issues :
@@ -4362,14 +4362,14 @@ flaky_tests:
43624362 action: "Retry failed stage via ADO API"
43634363
43644364pre_existing_failures:
4365- description: "Tests that consistently fail in master (not flaky)"
4365+ description: "Tests that consistently fail in main (not flaky)"
43664366 note: "These are baseline issues, not caused by your PR changes"
43674367 tests:
43684368 - name: "TestQueryExecutionInfo_FromString"
43694369 location: "OptimisticDirectExecutionQueryBaselineTests.cs"
43704370 - name: "TestTextDistributionPlanParsingFromStream"
43714371 location: "OptimisticDirectExecutionQueryBaselineTests.cs"
4372- handling: "Ignore if they fail - verify by running on master branch"
4372+ handling: "Ignore if they fail - verify by running on main branch"
43734373
43744374handling_flaky_failures:
43754375 step_1: "Check if failed test is in flaky registry"
@@ -4448,7 +4448,7 @@ ci_monitoring_loop:
44484448 code_related: "Your changes broke something"
44494449 flaky_test: "Known intermittent failure (see Section 16.7)"
44504450 infrastructure: "Emulator/network/timeout issues"
4451- unrelated: "Pre-existing failure in master "
4451+ unrelated: "Pre-existing failure in main "
44524452
44534453 respond:
44544454 code_related:
@@ -4464,7 +4464,7 @@ ci_monitoring_loop:
44644464 action: "Wait 5 min, then retry failed stage via MCP"
44654465
44664466 unrelated:
4467- action: "Document that failure exists in master , proceed"
4467+ action: "Document that failure exists in main , proceed"
44684468
44694469 step_4_iterate:
44704470 loop: "Repeat step_2 and step_3 until all gates GREEN"
@@ -4473,10 +4473,10 @@ ci_monitoring_loop:
44734473 step_5_pre_ready_checks:
44744474 description: "Verify branch is ready before marking for review"
44754475 checks:
4476- - name: "Ensure branch is up-to-date with master "
4476+ - name: "Ensure branch is up-to-date with main "
44774477 commands: |
4478- git fetch origin master
4479- git rebase origin/master
4478+ git fetch origin main
4479+ git rebase origin/main
44804480 # If conflicts, resolve and push
44814481 git push origin {branch_name} --force-with-lease
44824482 note: "Rebase ensures clean merge, re-triggers CI if needed"
@@ -4495,7 +4495,7 @@ ci_monitoring_loop:
44954495 auto_ready_behavior:
44964496 principle: "Mark PR ready for review immediately when conditions met"
44974497 required_conditions:
4498- - "Branch is up-to-date with master (rebased)"
4498+ - "Branch is up-to-date with main (rebased)"
44994499 - "dotnet-v3-ci check is SUCCESS (main CI gate)"
45004500 do_not_wait_for:
45014501 - "User confirmation"
@@ -4505,7 +4505,7 @@ ci_monitoring_loop:
45054505
45064506 success_criteria:
45074507 required:
4508- - "Branch rebased on latest master "
4508+ - "Branch rebased on latest main "
45094509 - "**dotnet-v3-ci check is SUCCESS** (primary gate)"
45104510 - "PR lint passed"
45114511 - "CLA signed"
@@ -4850,7 +4850,7 @@ pre_existing_failures:
48504850 purpose : " Distinguish regressions from known issues"
48514851
48524852 approach :
4853- step_1 : " Run tests on clean master before making changes"
4853+ step_1 : " Run tests on clean main before making changes"
48544854 step_2 : " Document any failures as 'pre-existing'"
48554855 step_3 : " After fix, compare failure list - new failures = regression"
48564856
@@ -4861,7 +4861,7 @@ pre_existing_failures:
48614861 ci_implications :
48624862 - " Pre-existing failures may cause CI to fail"
48634863 - " Check if same tests fail in recent passing PRs"
4864- - " If test passes in master but fails in PR, it's a regression"
4864+ - " If test passes in main but fails in PR, it's a regression"
48654865` ` `
48664866
48674867### 17.3 Check for Existing PRs First
@@ -5510,7 +5510,7 @@ performance:
55105510
55115511 benchmarking:
55125512 location: "Microsoft.Azure.Cosmos.Samples/Tools/Benchmark"
5513- url: "https://github.com/Azure/azure-cosmos-dotnet-v3/tree/master /Microsoft.Azure.Cosmos.Samples/Tools/Benchmark"
5513+ url: "https://github.com/Azure/azure-cosmos-dotnet-v3/tree/main /Microsoft.Azure.Cosmos.Samples/Tools/Benchmark"
55145514 important: "ALL benchmarks go here ONLY - do not add benchmarks elsewhere"
55155515
55165516 adding_benchmarks:
0 commit comments