Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
834 commits
Select commit Hold shift + click to select a range
868de17
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 3, 2025
8ce75a2
Restore fix for VS2022 rejecting preview SDKs in tools.ps1
DonnaChen888 Dec 3, 2025
170e736
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Dec 3, 2025
ec3c360
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#51910)
DonnaChen888 Dec 3, 2025
b508cf9
[release/8.0.1xx] Update dependencies from dotnet/templating (#51980)
DonnaChen888 Dec 3, 2025
35bb069
[release/8.0.4xx] Update dependencies from dotnet/templating (#51983)
DonnaChen888 Dec 3, 2025
aa6d3fe
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-9d52760f-f44…
DonnaChen888 Dec 3, 2025
906b7f0
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into …
DonnaChen888 Dec 3, 2025
4de0fc7
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
DonnaChen888 Dec 3, 2025
23a9ba9
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#51987)
DonnaChen888 Dec 3, 2025
3ebd507
[release/9.0.1xx] Support shared .NET installation - baseline update,…
ellahathaway Dec 3, 2025
1986331
[release/9.0.1xx] Update dependencies from dotnet/templating (#51985)
MiYanni Dec 3, 2025
8b9b7e5
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#51986)
MiYanni Dec 3, 2025
52c3e5e
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 4, 2025
5b9f61a
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-9cfaa61f-a…
DonnaChen888 Dec 4, 2025
5f289c6
Merge branch 'release/8.0.4xx' into merge/release/8.0.3xx-to-release/…
DonnaChen888 Dec 4, 2025
72c77c3
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Dec 4, 2025
5d56e41
Update dependencies from https://github.com/dotnet/arcade build 20251…
dotnet-maestro[bot] Dec 4, 2025
7e02450
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 4, 2025
cf5d2e8
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 4, 2025
d6e91b8
[release/8.0.4xx] Update dependencies from dotnet/templating (#52004)
DonnaChen888 Dec 4, 2025
d76697e
Merge branch 'release/8.0.4xx' into merge/release/8.0.3xx-to-release/…
DonnaChen888 Dec 4, 2025
99a108e
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Dec 4, 2025
04b04ad
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
DonnaChen888 Dec 4, 2025
53f83c3
Revert change to tools.ps1
DonnaChen888 Dec 4, 2025
ef1e9fa
[release/9.0.3xx] Update dependencies from dotnet/templating (#52009)
DonnaChen888 Dec 4, 2025
31b8ca9
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Dec 4, 2025
1db4d46
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#51998)
DonnaChen888 Dec 4, 2025
32d88bc
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 4, 2025
89d1f28
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-9cfaa61f-a…
DonnaChen888 Dec 4, 2025
3d5be23
[release/9.0.1xx] Update dependencies from dotnet/arcade (#52006)
DonnaChen888 Dec 4, 2025
1ba1e73
[release/9.0.3xx] Update dependencies from dotnet/templating (#52010)
DonnaChen888 Dec 4, 2025
7a24958
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/…
DonnaChen888 Dec 4, 2025
97a8ba4
Seeing if these are the missing version properties
MiYanni Dec 4, 2025
c7bf539
Skipping linux and mac for RunTestProjectWithCodeCoverage_ShouldRetur…
MiYanni Dec 5, 2025
3934553
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#52008)
MiYanni Dec 5, 2025
96cfc3d
Merge branch 'release/9.0.3xx' into merge/release/9.0.1xx-to-release/…
MiYanni Dec 5, 2025
e366038
Update incorrect versions.
MiYanni Dec 5, 2025
58bbf02
Using known working versions
MiYanni Dec 5, 2025
ed2bf61
Skipping ManagedWinRTComponentCanBeReferenced due to test failure.
MiYanni Dec 5, 2025
9c95827
Merge release/10.0.1xx into darc-release/10.0.1xx-b81a41bc-7d36-4f64-…
dotnet-maestro[bot] Dec 5, 2025
ea650b0
Update dependencies from https://github.com/dotnet/dotnet build 293404
dotnet-maestro[bot] Dec 5, 2025
4515680
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 5, 2025
5ac9be7
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Dec 5, 2025
070ee98
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 5, 2025
346177f
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 5, 2025
e90cc74
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#52013)
DonnaChen888 Dec 5, 2025
ed32819
Merge branch 'release/9.0.3xx' into darc-release/9.0.3xx-8f84149b-e34…
DonnaChen888 Dec 5, 2025
11b2f7d
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-9cfaa61f-a…
DonnaChen888 Dec 5, 2025
67e8d5b
Merge branch 'release/10.0.1xx' of https://github.com/dotnet/sdk into…
DonnaChen888 Dec 5, 2025
ff3dbdb
[release/9.0.3xx] Update dependencies from dotnet/msbuild (#52037)
DonnaChen888 Dec 5, 2025
ca3d898
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Dec 5, 2025
884397f
[release/10.0.1xx] Update dependencies from microsoft/testfx (#51935)
MiYanni Dec 6, 2025
d61ca6c
[release/9.0.3xx] Update dependencies from dotnet/templating (#52043)
MiYanni Dec 6, 2025
6565e3f
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Dec 6, 2025
5349b6f
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 6, 2025
2a3c1d2
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 6, 2025
e09ceb2
Merge release/10.0.1xx into darc-release/10.0.1xx-b81a41bc-7d36-4f64-…
dotnet-maestro[bot] Dec 7, 2025
0b2cd58
Update dependencies from https://github.com/dotnet/dotnet build 293627
dotnet-maestro[bot] Dec 7, 2025
b19a0e2
[release/8.0.4xx] Update dependencies from dotnet/templating (#52052)
DonnaChen888 Dec 8, 2025
92bdc01
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Dec 8, 2025
f6b256b
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
DonnaChen888 Dec 8, 2025
87dec3d
[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx' (#52…
DonnaChen888 Dec 8, 2025
26c2299
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Dec 8, 2025
7dd8681
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52033)
DonnaChen888 Dec 8, 2025
4a13708
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#52060)
DonnaChen888 Dec 8, 2025
70fb1c7
Merge branch 'release/9.0.3xx' into merge/release/9.0.1xx-to-release/…
DonnaChen888 Dec 8, 2025
fee84a3
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Dec 8, 2025
e05c1ca
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' (#52061)
DonnaChen888 Dec 9, 2025
73f0909
Merge branch 'release/10.0.1xx' of https://github.com/dotnet/sdk into…
DonnaChen888 Dec 9, 2025
f23ddb3
revert change to tools.ps1
DonnaChen888 Dec 9, 2025
a03456a
Update dependencies from https://github.com/dotnet/dotnet build 293783
dotnet-maestro[bot] Dec 9, 2025
8099b19
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 9, 2025
da8cad2
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52077)
DonnaChen888 Dec 9, 2025
972ebe5
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Dec 9, 2025
dde3fc7
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Dec 9, 2025
cbb0e6b
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
SimonZhao888 Dec 10, 2025
9254168
Merge release/10.0.1xx into darc-release/10.0.1xx-391285f5-ce92-4c65-…
dotnet-maestro[bot] Dec 10, 2025
59ae1e9
Update dependencies from https://github.com/dotnet/dotnet build 294071
dotnet-maestro[bot] Dec 10, 2025
2983998
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 10, 2025
841486f
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 10, 2025
d63fc0e
manually add back missing dependencies incorrectly removed by arcade
nagilson Dec 10, 2025
baa9cbb
add back hot reload pinned version
nagilson Dec 11, 2025
353c368
Update dependencies from https://github.com/dotnet/dotnet build 294121
dotnet-maestro[bot] Dec 11, 2025
471155d
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 11, 2025
fe3ff80
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 11, 2025
d64de0c
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52096)
DonnaChen888 Dec 11, 2025
19ed89f
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Dec 11, 2025
b964b26
Add back missing dependencies incorrectly removed by arcade and updat…
DonnaChen888 Dec 11, 2025
2666eb4
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 12, 2025
5c2e6d9
Backflow from https://github.com/dotnet/dotnet / 11af6ee build 294323
dotnet-maestro[bot] Dec 12, 2025
d3399a5
Merge release/10.0.1xx into darc-release/10.0.1xx-2ad2e62f-c7f6-4c32-…
dotnet-maestro[bot] Dec 12, 2025
fa42365
Update dependencies from https://github.com/dotnet/dotnet build 294323
dotnet-maestro[bot] Dec 12, 2025
8e3151f
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 12, 2025
165521f
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 12, 2025
88645a7
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 12, 2025
2911887
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52143)
DonnaChen888 Dec 12, 2025
f3c8492
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
nagilson Dec 12, 2025
fa0e935
Update dependencies from https://github.com/dotnet/dotnet build 294428
dotnet-maestro[bot] Dec 13, 2025
d842781
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 13, 2025
f9b9015
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 13, 2025
3e5b171
Update dependencies from https://github.com/dotnet/dotnet build 294580
dotnet-maestro[bot] Dec 14, 2025
aa0543f
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 14, 2025
751beb2
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 14, 2025
4206e40
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52152)
DonnaChen888 Dec 15, 2025
4dd5cfd
Merge branch 'release/10.0.1xx' of https://github.com/dotnet/sdk into…
DonnaChen888 Dec 15, 2025
e8f3293
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Dec 15, 2025
3869023
Initial plan
Copilot Dec 15, 2025
730fda2
Switch onelocbuild to target release/10.0.2xx branch
Copilot Dec 15, 2025
26be18a
Fix workload restore --version conflict with skip-manifest-update
Copilot Dec 6, 2025
eaf204d
Fix code formatting issues
Copilot Dec 6, 2025
755ad64
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 16, 2025
e136531
Backflow from https://github.com/dotnet/dotnet / 5bc36fd build 294703
dotnet-maestro[bot] Dec 16, 2025
2030d17
Merge release/10.0.1xx into darc-release/10.0.1xx-5181c12e-acfc-4280-…
dotnet-maestro[bot] Dec 16, 2025
c68139e
Update dependencies from https://github.com/dotnet/dotnet build 294703
dotnet-maestro[bot] Dec 16, 2025
d7f68d6
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 16, 2025
c0f3450
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 16, 2025
f66e86a
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
marcpopMSFT Dec 17, 2025
385884d
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 17, 2025
5ff60ef
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 17, 2025
edc6104
Update dependencies from https://github.com/dotnet/dotnet build 295016
dotnet-maestro[bot] Dec 18, 2025
7115630
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 18, 2025
599606d
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Dec 18, 2025
1fc4822
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52176)
DonnaChen888 Dec 18, 2025
1331d06
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Dec 18, 2025
4ce2e7c
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 18, 2025
00b3720
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Dec 18, 2025
9c98589
Update dependencies from https://github.com/dotnet/dotnet build 295183
dotnet-maestro[bot] Dec 19, 2025
3e5b955
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52246)
DonnaChen888 Dec 19, 2025
29c8df0
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
dotnet-bot Dec 19, 2025
976b11b
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
dotnet-bot Dec 19, 2025
a93c707
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Dec 19, 2025
34061b5
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Dec 19, 2025
758b3cb
Update dependencies from https://github.com/dotnet/dotnet build 295233
dotnet-maestro[bot] Dec 20, 2025
a0dfebe
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 22, 2025
accdd9d
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52259)
DonnaChen888 Dec 22, 2025
f208120
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Dec 22, 2025
afe8665
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Dec 22, 2025
17a7549
[release/10.0.1xx] Avoid discarding file-like arguments in `dotnet fi…
github-actions[bot] Dec 22, 2025
cf9af8e
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Dec 23, 2025
c8644d9
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Dec 23, 2025
8661c85
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Dec 24, 2025
1cbfde7
Merge branch 'release/10.0.1xx' into locfiles/4f827b81-3218-4b32-b895…
DonnaChen888 Dec 30, 2025
dde80f2
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
marcpopMSFT Jan 6, 2026
c9bba23
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-49056a71-0…
DonnaChen888 Jan 6, 2026
17efa74
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Jan 6, 2026
73d79ba
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Jan 6, 2026
4053d4c
Update dependencies
dotnet-maestro[bot] Jan 7, 2026
15ecb5a
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Jan 7, 2026
ac5c56a
Update osx arm64 helix images
jjonescz Jan 6, 2026
a6beb45
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Jan 8, 2026
e3d036c
[release/10.0.1xx] Update osx arm64 helix images (#52354)
dsplaisted Jan 8, 2026
8ddc5b8
Merge branch 'release/10.0.1xx' into merge/release/9.0.3xx-to-release…
DonnaChen888 Jan 8, 2026
dc26e67
Fix test
Youssef1313 Jan 8, 2026
8dca5c6
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-a7d71f11-c…
DonnaChen888 Jan 8, 2026
103fc84
[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx' (#52…
dsplaisted Jan 8, 2026
b52fdc1
[release/10.0.1xx] Update dependencies from microsoft/testfx (#52053)
dsplaisted Jan 8, 2026
400e46e
Switch onelocbuild to target release/10.0.2xx branch (#52164)
marcpopMSFT Jan 8, 2026
cb38dd8
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52339)
DonnaChen888 Jan 9, 2026
87f7302
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Jan 9, 2026
80d4001
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 9, 2026
dcd1abd
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 9, 2026
1b1a7a2
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52372)
dotnet-maestro[bot] Jan 9, 2026
0bb8ac7
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Jan 9, 2026
375cd9d
[release/10.0.1xx] Update dependencies from microsoft/testfx (#52371)
DonnaChen888 Jan 9, 2026
2e31831
Reset files to release/10.0.2xx
github-actions[bot] Jan 9, 2026
9009d85
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
DonnaChen888 Jan 9, 2026
5f80649
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 10, 2026
b654dc5
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 10, 2026
49803a7
[release/10.0.1xx] Update dependencies from microsoft/testfx (#52392)
SimonZhao888 Jan 12, 2026
e4185dc
Merge branch 'release/10.0.2xx' of https://github.com/dotnet/sdk into…
Jan 12, 2026
1f9d3f7
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
SimonZhao888 Jan 12, 2026
8ad3b9e
Fix duplicate solution folder when adding multiple projects from same…
Copilot Dec 9, 2025
37d9724
Address code review feedback: use SingleOrDefault instead of FirstOrD…
Copilot Dec 9, 2025
62c89f8
Fix test
Youssef1313 Jan 12, 2026
616f503
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
SimonZhao888 Jan 13, 2026
ea01688
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 13, 2026
d5f0e05
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 13, 2026
54edf1d
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-releas…
SimonZhao888 Jan 13, 2026
44e1273
Backflow from https://github.com/dotnet/dotnet / 976695d build 297004
dotnet-maestro[bot] Jan 13, 2026
62263a2
Update dependencies
dotnet-maestro[bot] Jan 13, 2026
70b5d0a
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
SimonZhao888 Jan 14, 2026
c9ea09f
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-releas…
SimonZhao888 Jan 14, 2026
9f332f8
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 14, 2026
df42cd5
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 14, 2026
fe4a345
Update dependencies
dotnet-maestro[bot] Jan 14, 2026
dcf7903
[release/10.0.1xx] Fix a file-based app package test (#52450)
jjonescz Jan 14, 2026
3c2bf03
Merge release/10.0.1xx into darc-release/10.0.1xx-94614c9e-7bd7-4e50-…
dotnet-maestro[bot] Jan 14, 2026
d0fd329
Update dependencies
dotnet-maestro[bot] Jan 14, 2026
8b4d765
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52421)
SimonZhao888 Jan 15, 2026
7731534
Merge branch 'release/10.0.2xx' into darc-release/10.0.2xx-8c90e841-1…
SimonZhao888 Jan 15, 2026
4bd353c
Merge branch 'release/10.0.1xx' into darc-release/10.0.1xx-b24ead53-2…
SimonZhao888 Jan 15, 2026
f7b4311
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-releas…
SimonZhao888 Jan 15, 2026
7fa6e04
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 15, 2026
2bce72e
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 15, 2026
cdaf9a7
[release/10.0.2xx] Update dependencies from microsoft/testfx (#51895)
nagilson Jan 15, 2026
043eaf5
[release/10.0.1xx] Update dependencies from microsoft/testfx (#52415)
SimonZhao888 Jan 15, 2026
22a1f1c
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-releas…
SimonZhao888 Jan 15, 2026
6fecb9f
Update dependencies
dotnet-maestro[bot] Jan 15, 2026
4591cec
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' (#5…
SimonZhao888 Jan 15, 2026
371e906
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
dotnet-bot Jan 15, 2026
d58f3b3
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
dotnet-bot Jan 15, 2026
180ea1d
Update dependencies
dotnet-maestro[bot] Jan 15, 2026
79091aa
[release/10.0.1xx] Source code updates from dotnet/dotnet (#52476)
marcpopMSFT Jan 15, 2026
8179f80
Reset files to release/10.0.2xx
github-actions[bot] Jan 15, 2026
bf343f0
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' (#5…
marcpopMSFT Jan 16, 2026
3585328
Localized file check-in by OneLocBuild Task: Build definition ID 140:…
marcpopMSFT Jan 16, 2026
9c3ae96
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 16, 2026
e73cf35
Update dependencies from https://github.com/microsoft/testfx build 20…
dotnet-maestro[bot] Jan 16, 2026
7218b01
[release/10.0.1xx] Update dependencies from microsoft/testfx (#52500)
SimonZhao888 Jan 16, 2026
dcaebf1
[release/10.0.2xx] Update dependencies from microsoft/testfx (#52501)
SimonZhao888 Jan 16, 2026
6404a34
[release/10.0.1xx] Bump analysislevel constants for .NET 10 release (…
github-actions[bot] Jan 19, 2026
e3b054f
Reset files to release/10.0.2xx
github-actions[bot] Jan 19, 2026
8b8f4c6
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-releas…
DonnaChen888 Jan 19, 2026
27bc76b
[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' (#5…
DonnaChen888 Jan 19, 2026
9f346ad
Reset files to release/10.0.3xx
github-actions[bot] Jan 19, 2026
060c1a9
[automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx' (#5…
MiYanni Jan 21, 2026
df0b540
[do not merge] Unify code paths processing static asset and scoped cs…
tmat Jan 21, 2026
6cadd91
Separate command definitions to a new project (#52382)
tmat Jan 21, 2026
585b3fa
[dotnet-run] implement "device" selection logic (#51914)
jonathanpeppers Dec 4, 2025
fa90f70
[dotnet-run] fix logging and `Restore` for device selection (#52113)
jonathanpeppers Dec 11, 2025
3eae966
[dotnet-run] Implement `DeployToDevice` target invocation (#52046)
jonathanpeppers Dec 16, 2025
a2bbad7
[HotReloadAgent] Handle unsupported platform for `PosixSignalRegistra…
jonathanpeppers Jan 22, 2026
679f4d5
Move New command definitions to CommandDefinitions project (#52526)
tmat Jan 22, 2026
bd9a008
Include more DLLs in redist fast path target (#52551)
jjonescz Jan 22, 2026
198b2c4
Revert "Include more DLLs in redist fast path target" (#52637)
jjonescz Jan 22, 2026
c98e9fc
Merge branch 'release/10.0.3xx' into dev/peppers/dotnet-run-backport
jonathanpeppers Jan 22, 2026
dd7c083
[release/10.0.3xx] backport mobile changes for `dotnet run` (#52608)
jonathanpeppers Jan 23, 2026
d0e8e8c
Add csc.rsp test (#52510)
jjonescz Jan 23, 2026
6b14721
Fix duplicate solution folder creation when adding multiple projects …
marcpopMSFT Jan 24, 2026
f11caaa
Fix: Allow --version option with workload restore (#52048)
marcpopMSFT Jan 24, 2026
0346e09
dotnet root command and dotnet watch (#52583)
tmat Jan 28, 2026
1e2385d
Reset files to main
github-actions[bot] Jan 28, 2026
a7361b8
Merge remote-tracking branch 'origin/main' into merge/release/10.0.3x…
marcpopMSFT Jan 29, 2026
d002012
Merge branch 'main' into merge/release/10.0.3xx-to-main
DonnaChen888 Jan 30, 2026
5e69acb
Fix build breaks from release/10.0.3xx merge to main
marcpopMSFT Jan 30, 2026
98d46d2
Update XLF translation files - 2026-01-30
github-actions[bot] Jan 30, 2026
3315aae
Merge branch 'main' into merge/release/10.0.3xx-to-main
DonnaChen888 Feb 2, 2026
26371c3
Revert the change on DotnetCliSnapshotTests.cs
DonnaChen888 Feb 2, 2026
a22981d
Merge branch 'main' into merge/release/10.0.3xx-to-main
DonnaChen888 Feb 2, 2026
82e2df8
Merge branch 'main' into merge/release/10.0.3xx-to-main
DonnaChen888 Feb 3, 2026
a836d3d
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
DonnaChen888 Feb 4, 2026
f53b2b4
Fix build breaks: restore license header format, correct CoreUtils TF…
DonnaChen888 Feb 4, 2026
413fd40
Merge remote-tracking branch 'origin/main' into merge/release/10.0.3x…
marcpopMSFT Feb 5, 2026
f45ec8c
Merge branch 'main' of https://github.com/dotnet/sdk into merge/relea…
DonnaChen888 Feb 6, 2026
22c4f2f
PR feedback
marcpopMSFT Feb 6, 2026
bac5929
Merge remote-tracking branch 'origin/main' into merge/release/10.0.3x…
marcpopMSFT Feb 10, 2026
686569c
Update CSC arguments: add analysislevel_11_default.globalconfig
jjonescz Feb 10, 2026
c99b9a7
Merge remote-tracking branch 'origin/main' into merge/release/10.0.3x…
marcpopMSFT Feb 10, 2026
3cc90b0
Apply copilot recommended test fixes
marcpopMSFT Feb 11, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,20 @@
<GenerateProgramFile>false</GenerateProgramFile>
</PropertyGroup>

<!-- TODO: Re-enable NuGet Audit and fix alerts: https://github.com/dotnet/sdk/issues/51465 -->
<PropertyGroup>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup>

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<!-- TODO: Re-enable NuGet Audit and fix alerts: https://github.com/dotnet/sdk/issues/51466 -->
<PropertyGroup>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup>

<!-- Global usings -->
<!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
<ItemGroup>
Expand Down
145 changes: 145 additions & 0 deletions build-duty-report-2026-01-26.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
# SDK Build Duty Triage Report

**Generated:** January 26, 2026
**Repos Monitored:** dotnet/sdk, dotnet/templating, dotnet/dotnet (VMR - SDK-owned only)

---

## Summary

| Category | Count |
|----------|-------|
| 🟢 Ready to Merge | 1 |
| ⏳ Waiting/On Hold | 1 |
| 🔴 Failing/Blocked | 13 |
| 🟡 Branch Lockdown | 10 |
| 🟠 New/Pending Validation | 2 |

---

## 🟢 Ready to Merge PRs (1)

These PRs have all checks passing and are ready for merge.

### dotnet/dotnet VMR

| PR | Title | Target Branch | Age |
|----|-------|---------------|-----|
| [#4419](https://github.com/dotnet/dotnet/pull/4419) | [release/10.0.1xx] Source code updates from dotnet/source-build-reference-packages | release/10.0.1xx | 0d |

---

## 🟠 New/Pending Validation PRs (2)

These PRs were just created and are awaiting initial CI validation.

### dotnet/sdk

| PR | Title | Target Branch | Age |
|----|-------|---------------|-----|
| [#52673](https://github.com/dotnet/sdk/pull/52673) | [release/10.0.1xx] Source code updates from dotnet/dotnet | release/10.0.1xx | 0d |

### dotnet/templating

| PR | Title | Target Branch | Age |
|----|-------|---------------|-----|
| [#9757](https://github.com/dotnet/templating/pull/9757) | [release/10.0.1xx] Source code updates from dotnet/dotnet | release/10.0.1xx | 3d |

---

## ⏳ Waiting/On Hold PRs (1)

These PRs have passing checks but have comments indicating they should wait before merging.

### dotnet/templating

| PR | Title | Target Branch | Age | Reason |
|----|-------|-----------------|-----|--------|
| [#9754](https://github.com/dotnet/templating/pull/9754) | [release/10.0.3xx] Source code updates from dotnet/dotnet | release/10.0.3xx | 4d | **Will break build** - Arcade version flow issue. Waiting for Arcade 10 to flow through VMR. CC @MichaelSimons. Also linked to [Issue #51574](https://github.com/dotnet/sdk/issues/51574). |

---

## 🟡 Branch Lockdown PRs (10)

These PRs are in branches with lockdown labels and require approval to merge.

### dotnet/sdk (8)

| PR | Title | Target Branch | Age |
|----|-------|---------------|-----|
| [#52667](https://github.com/dotnet/sdk/pull/52667) | [release/9.0.1xx] Update dependencies from dotnet/roslyn-analyzers | release/9.0.1xx | 1d |
| [#52624](https://github.com/dotnet/sdk/pull/52624) | [release/9.0.3xx] Update dependencies from dotnet/scenario-tests | release/9.0.3xx | 4d |
| [#52606](https://github.com/dotnet/sdk/pull/52606) | [release/9.0.1xx] Update dependencies from dotnet/scenario-tests | release/9.0.1xx | 5d |
| [#52594](https://github.com/dotnet/sdk/pull/52594) | [release/9.0.3xx] Update dependencies from dotnet/msbuild | release/9.0.3xx | 5d |
| [#52592](https://github.com/dotnet/sdk/pull/52592) | [release/9.0.3xx] Update dependencies from dotnet/arcade | release/9.0.3xx | 5d |
| [#52591](https://github.com/dotnet/sdk/pull/52591) | [release/9.0.1xx] Update dependencies from dotnet/source-build-reference-packages | release/9.0.1xx | 5d |
| [#52590](https://github.com/dotnet/sdk/pull/52590) | [release/9.0.1xx] Update dependencies from dotnet/arcade | release/9.0.1xx | 5d |
| [#52530](https://github.com/dotnet/sdk/pull/52530) | Merge branch 'release/8.0.1xx' => 'release/8.0.4xx' | release/8.0.4xx | 8d |

### dotnet/templating (2)

| PR | Title | Target Branch | Age |
|----|-------|---------------|-----|
| [#9746](https://github.com/dotnet/templating/pull/9746) | [release/9.0.1xx] Update dependencies from dotnet/arcade | release/9.0.1xx | 5d |
| [#9744](https://github.com/dotnet/templating/pull/9744) | [release/9.0.3xx] Update dependencies from dotnet/arcade | release/9.0.3xx | 5d |

---

## 🔴 Failing/Blocked PRs (13)

PRs with pending or failing status checks.

### dotnet/sdk (11)

| PR | Title | Target Branch | Age | Issue |
|----|-------|---------------|-----|-------|
| [#52662](https://github.com/dotnet/sdk/pull/52662) | [release/10.0.2xx] Source code updates from dotnet/dotnet | release/10.0.2xx | 3d | ⚠️ Opposite codeflow merged - needs decision (merge/close/force) |
| [#52657](https://github.com/dotnet/sdk/pull/52657) | Merge branch 'release/10.0.1xx' => 'release/10.0.2xx' | release/10.0.2xx | 3d | ⏳ Checks pending |
| [#52653](https://github.com/dotnet/sdk/pull/52653) | [release/10.0.2xx] Update dependencies from microsoft/testfx | release/10.0.2xx | 3d | ⏳ Checks pending |
| [#52652](https://github.com/dotnet/sdk/pull/52652) | [release/10.0.1xx] Update dependencies from microsoft/testfx | release/10.0.1xx | 3d | ⏳ Checks pending |
| [#52651](https://github.com/dotnet/sdk/pull/52651) | [main] Update dependencies from microsoft/testfx | main | 3d | ⏳ Checks pending |
| [#52596](https://github.com/dotnet/sdk/pull/52596) | [main] Source code updates from dotnet/dotnet | main | 5d | ❌ ILLink analyzer error: `System.MissingMethodException` - [Issue #52599](https://github.com/dotnet/sdk/issues/52599) |
| [#52588](https://github.com/dotnet/sdk/pull/52588) | Merge branch 'release/10.0.2xx' => 'release/10.0.3xx' | release/10.0.3xx | 5d | ❌ Build error: `TagHelperCollection` not found in RazorSdk - @dotnet/razor-tooling investigating |
| [#52585](https://github.com/dotnet/sdk/pull/52585) | [release/10.0.3xx] Source code updates from dotnet/dotnet | release/10.0.3xx | 5d | ⏳ Checks pending |
| [#52523](https://github.com/dotnet/sdk/pull/52523) | [release/10.0.2xx] Source code updates from dotnet/dotnet | release/10.0.2xx | 9d | ❌ Restore error NU1603: `Microsoft.Deployment.DotNet.Releases` version mismatch |
| [#52519](https://github.com/dotnet/sdk/pull/52519) | Merge branch 'release/10.0.3xx' => 'main' | main | 9d | ❌ Test failures: `XunitMultiTFM`, `RunWithSolutionFilterAsFirstUnmatchedToken` - fix pushed, awaiting green |

### github-actions[bot] Merge PRs (2)

*Note: These are cross-branch merge PRs that require manual attention.*

| Repo | PR | Title | Target Branch | Age | Issue |
|------|-----|-------|---------------|-----|-------|
| dotnet/sdk | [#52530](https://github.com/dotnet/sdk/pull/52530) | Merge 'release/8.0.1xx' => 'release/8.0.4xx' | release/8.0.4xx | 8d | Branch Lockdown |
| dotnet/sdk | [#52529](https://github.com/dotnet/sdk/pull/52529) | Merge 'release/8.0.4xx' => 'release/9.0.1xx' | release/9.0.1xx | 8d | Branch Lockdown |

---

## Notes

- **Status API shows pending for all PRs** - These repos use Azure Pipelines/GitHub Checks API which doesn't populate the Status API. Actual check status determined from comments and PR state.
- All PRs checked against authors: `dotnet-maestro[bot]`, `github-actions[bot]` (Merge PRs only)
- dotnet/dotnet VMR PRs filtered to SDK-owned: `dotnet/sdk`, `dotnet/templating`, `dotnet/deployment-tools`, `dotnet/source-build-reference-packages`

### Total PR Count by Repo

| Repo | Count |
|------|-------|
| dotnet/sdk | 19 |
| dotnet/templating | 4 |
| dotnet/dotnet (VMR) | 1 |
| **Total** | **24** |

### Key Issues Blocking Multiple PRs

| Issue | Affected PRs | Status |
|-------|--------------|--------|
| [#52599](https://github.com/dotnet/sdk/issues/52599) - ILLink analyzer MissingMethodException | #52596 | Open, @MiYanni investigating |
| [#51574](https://github.com/dotnet/sdk/issues/51574) - Arcade version flow | templating #9754 | On hold |
| RazorSdk TagHelperCollection missing | #52588 | @dotnet/razor-tooling investigating |
| Opposite codeflow merged | #52662, #52596, #52523 | Needs decision: merge/close/force |
| Branch Lockdown (9.0.x branches) | 8 SDK PRs, 2 templating PRs | Requires approval |

---

*Report generated by SDK Build Duty skill*
2 changes: 2 additions & 0 deletions sdk.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
<Folder Name="/src/Cli/">
<Project Path="src/Cli/dotnet/dotnet.csproj" />
<Project Path="src/Cli/Microsoft.DotNet.Cli.CommandLine/Microsoft.DotNet.Cli.CommandLine.csproj" />
<Project Path="src/Cli/Microsoft.DotNet.Cli.CoreUtils/Microsoft.DotNet.Cli.CoreUtils.csproj" />
<Project Path="src/Cli/Microsoft.DotNet.Cli.Definitions/Microsoft.DotNet.Cli.Definitions.csproj" />
<Project Path="src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj" />
<Project Path="src/Cli/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj" />
<Project Path="src/Cli/Microsoft.DotNet.FileBasedPrograms/Microsoft.DotNet.FileBasedPrograms.Package.csproj" />
Expand Down
3 changes: 2 additions & 1 deletion src/BuiltInTools/HotReloadAgent.Host/StartupHook.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ internal sealed class StartupHook
&& !OperatingSystem.IsIOS()
&& !OperatingSystem.IsTvOS()
&& !OperatingSystem.IsBrowser();
private static readonly bool s_supportsPosixSignals = s_supportsConsoleColor;

#if NET10_0_OR_GREATER
private static PosixSignalRegistration? s_signalRegistration;
Expand Down Expand Up @@ -125,7 +126,7 @@ private static void RegisterSignalHandlers()
[DllImport("kernel32.dll", SetLastError = true)]
static extern bool SetConsoleCtrlHandler(Delegate? handler, bool add);
}
else
else if (s_supportsPosixSignals)
{
#if NET10_0_OR_GREATER
// Register a handler for SIGTERM to allow graceful shutdown of the application on Unix.
Expand Down
23 changes: 6 additions & 17 deletions src/BuiltInTools/HotReloadClient/HotReloadClients.cs
Original file line number Diff line number Diff line change
Expand Up @@ -187,39 +187,28 @@ public async ValueTask InitialUpdatesAppliedAsync(CancellationToken cancellation
}

/// <param name="cancellationToken">Cancellation token. The cancellation should trigger on process terminatation.</param>
public async Task ApplyStaticAssetUpdatesAsync(IEnumerable<(string filePath, string relativeUrl, string assemblyName, bool isApplicationProject)> assets, CancellationToken cancellationToken)
public async Task ApplyStaticAssetUpdatesAsync(IEnumerable<StaticWebAsset> assets, CancellationToken cancellationToken)
{
if (browserRefreshServer != null)
{
await browserRefreshServer.UpdateStaticAssetsAsync(assets.Select(static a => a.relativeUrl), cancellationToken);
await browserRefreshServer.UpdateStaticAssetsAsync(assets.Select(static a => a.RelativeUrl), cancellationToken);
}
else
{
var updates = new List<HotReloadStaticAssetUpdate>();

foreach (var (filePath, relativeUrl, assemblyName, isApplicationProject) in assets)
foreach (var asset in assets)
{
ImmutableArray<byte> content;
try
{
#if NET
var blob = await File.ReadAllBytesAsync(filePath, cancellationToken);
#else
var blob = File.ReadAllBytes(filePath);
#endif
content = ImmutableCollectionsMarshal.AsImmutableArray(blob);
ClientLogger.LogDebug("Loading asset '{Url}' from '{Path}'.", asset.RelativeUrl, asset.FilePath);
updates.Add(await HotReloadStaticAssetUpdate.CreateAsync(asset, cancellationToken));
}
catch (Exception e) when (e is not OperationCanceledException)
{
ClientLogger.LogError("Failed to read file {FilePath}: {Message}", filePath, e.Message);
ClientLogger.LogError("Failed to read file {FilePath}: {Message}", asset.FilePath, e.Message);
continue;
}

updates.Add(new HotReloadStaticAssetUpdate(
assemblyName: assemblyName,
relativePath: relativeUrl,
content: content,
isApplicationProject));
}

await ApplyStaticAssetUpdatesAsync([.. updates], isProcessSuspended: false, cancellationToken);
Expand Down
18 changes: 18 additions & 0 deletions src/BuiltInTools/HotReloadClient/HotReloadStaticAssetUpdate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#nullable enable

using System.Collections.Immutable;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;

namespace Microsoft.DotNet.HotReload;

Expand All @@ -13,4 +17,18 @@ internal readonly struct HotReloadStaticAssetUpdate(string assemblyName, string
public string AssemblyName { get; } = assemblyName;
public ImmutableArray<byte> Content { get; } = content;
public bool IsApplicationProject { get; } = isApplicationProject;

public static async ValueTask<HotReloadStaticAssetUpdate> CreateAsync(StaticWebAsset asset, CancellationToken cancellationToken)
{
#if NET
var blob = await File.ReadAllBytesAsync(asset.FilePath, cancellationToken);
#else
var blob = File.ReadAllBytes(asset.FilePath);
#endif
return new HotReloadStaticAssetUpdate(
assemblyName: asset.AssemblyName,
relativePath: asset.RelativeUrl,
content: ImmutableCollectionsMarshal.AsImmutableArray(blob),
asset.IsApplicationProject);
}
}
114 changes: 114 additions & 0 deletions src/BuiltInTools/HotReloadClient/Utilities/PathExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
#nullable enable

using System.Diagnostics;
using System.Runtime.CompilerServices;
using System.Text;

namespace System.IO;

internal static partial class PathExtensions
{
#if NET // binary compatibility
public static bool IsPathFullyQualified(string path)
=> Path.IsPathFullyQualified(path);

public static string Join(string? path1, string? path2)
=> Path.Join(path1, path2);
#else
extension(Path)
{
public static bool IsPathFullyQualified(string path)
=> Path.DirectorySeparatorChar == '\\'
? !IsPartiallyQualified(path.AsSpan())
: Path.IsPathRooted(path);
}

// Copied from https://github.com/dotnet/runtime/blob/a6c5ba30aab998555e36aec7c04311935e1797ab/src/libraries/Common/src/System/IO/PathInternal.Windows.cs#L250

/// <summary>
/// Returns true if the path specified is relative to the current drive or working directory.
/// Returns false if the path is fixed to a specific drive or UNC path. This method does no
/// validation of the path (URIs will be returned as relative as a result).
/// </summary>
/// <remarks>
/// Handles paths that use the alternate directory separator. It is a frequent mistake to
/// assume that rooted paths (Path.IsPathRooted) are not relative. This isn't the case.
/// "C:a" is drive relative- meaning that it will be resolved against the current directory
/// for C: (rooted, but relative). "C:\a" is rooted and not relative (the current directory
/// will not be used to modify the path).
/// </remarks>
private static bool IsPartiallyQualified(ReadOnlySpan<char> path)
{
if (path.Length < 2)
{
// It isn't fixed, it must be relative. There is no way to specify a fixed
// path with one character (or less).
return true;
}

if (IsDirectorySeparator(path[0]))
{
// There is no valid way to specify a relative path with two initial slashes or
// \? as ? isn't valid for drive relative paths and \??\ is equivalent to \\?\
return !(path[1] == '?' || IsDirectorySeparator(path[1]));
}

// The only way to specify a fixed path that doesn't begin with two slashes
// is the drive, colon, slash format- i.e. C:\
return !((path.Length >= 3)
&& (path[1] == Path.VolumeSeparatorChar)
&& IsDirectorySeparator(path[2])
// To match old behavior we'll check the drive character for validity as the path is technically
// not qualified if you don't have a valid drive. "=:\" is the "=" file's default data stream.
&& IsValidDriveChar(path[0]));
}

/// <summary>
/// True if the given character is a directory separator.
/// </summary>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal static bool IsDirectorySeparator(char c)
{
return c == Path.DirectorySeparatorChar || c == Path.AltDirectorySeparatorChar;
}

/// <summary>
/// Returns true if the given character is a valid drive letter
/// </summary>
internal static bool IsValidDriveChar(char value)
{
return (uint)((value | 0x20) - 'a') <= (uint)('z' - 'a');
}

// Copied from https://github.com/dotnet/runtime/blob/main/src/libraries/System.Private.CoreLib/src/System/IO/Path.cs

private static readonly string s_directorySeparatorCharAsString = Path.DirectorySeparatorChar.ToString();

extension(Path)
{
public static string Join(string? path1, string? path2)
{
if (string.IsNullOrEmpty(path1))
return path2 ?? string.Empty;

if (string.IsNullOrEmpty(path2))
return path1;

return JoinInternal(path1, path2);
}
}

private static string JoinInternal(string first, string second)
{
Debug.Assert(first.Length > 0 && second.Length > 0, "should have dealt with empty paths");

bool hasSeparator = IsDirectorySeparator(first[^1]) || IsDirectorySeparator(second[0]);

return hasSeparator ?
string.Concat(first, second) :
string.Concat(first, s_directorySeparatorCharAsString, second);
}
#endif
}
Loading
Loading