Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to runtime async branch #77700

Merged
merged 194 commits into from
Mar 20, 2025
Merged
Changes from 1 commit
Commits
Show all changes
194 commits
Select commit Hold shift + click to select a range
b6b952a
wip
akhera99 Nov 26, 2024
5ed5ee7
wip
akhera99 Nov 27, 2024
f416e98
wip
akhera99 Nov 27, 2024
38fa91a
wip
akhera99 Nov 27, 2024
1f6a30f
wip
akhera99 Nov 29, 2024
6de1307
wip
akhera99 Nov 29, 2024
ed36e8f
wip
akhera99 Nov 29, 2024
9fd8f89
remove some commented out code
akhera99 Dec 3, 2024
36a8305
Merge branch 'main' into dev/ankitakhera/aai_doc_comments
akhera99 Jan 6, 2025
9c33d32
still cleaning up
akhera99 Jan 7, 2025
f2ec7f1
revert file
akhera99 Jan 7, 2025
0f8e4f3
clean up + option
akhera99 Jan 9, 2025
c096031
wip
akhera99 Jan 21, 2025
f46e751
dispose of disable of intellicode line completions
akhera99 Jan 27, 2025
0676f73
comments
akhera99 Jan 27, 2025
c028cc9
Merge branch 'main' into dev/ankitakhera/aai_doc_comments
akhera99 Jan 27, 2025
5ffb800
comments
akhera99 Jan 27, 2025
30c4aaf
add quota exceeded checks
akhera99 Jan 27, 2025
1f93a1f
fix tests
akhera99 Jan 28, 2025
8f64473
revert file
akhera99 Jan 28, 2025
2e2f6f0
remove unused optional params
akhera99 Jan 28, 2025
77a3f0c
last few fixes
akhera99 Jan 30, 2025
ae0ffe6
feedback
akhera99 Feb 4, 2025
ce330fe
fix tests
akhera99 Feb 4, 2025
ed65b3b
small fix
akhera99 Feb 4, 2025
73e3e8e
Merge branch 'main' into dev/ankitakhera/aai_doc_comments
akhera99 Feb 7, 2025
c756a4a
fix
akhera99 Feb 7, 2025
5fef68f
feedback
akhera99 Feb 7, 2025
dde66ab
feedback
akhera99 Feb 7, 2025
4e8f752
removed per comments
akhera99 Feb 11, 2025
b6688d6
remove unused usings
akhera99 Feb 11, 2025
ab35eeb
Fixer/Analyzer for implementing method
maryamariyan Feb 11, 2025
5decd9b
feedback
akhera99 Feb 12, 2025
daff7a1
feedback
akhera99 Feb 12, 2025
4dc63b8
move stuff around with new EA structure in roslyn
akhera99 Feb 13, 2025
96bd8e2
wip
akhera99 Feb 13, 2025
906aed9
feedback
akhera99 Feb 13, 2025
61acead
feedbacl
akhera99 Feb 15, 2025
ae609fa
fix
akhera99 Feb 15, 2025
423a6df
feedback
akhera99 Feb 15, 2025
7683098
feedback
akhera99 Feb 18, 2025
ec34831
feedback
akhera99 Feb 18, 2025
b6b8e8c
revert
akhera99 Feb 18, 2025
dbff122
remove null check
akhera99 Feb 18, 2025
41be07f
clean up
akhera99 Feb 18, 2025
a63b731
fix
akhera99 Feb 19, 2025
835c7ec
Merge remote-tracking branch 'origin/main' into dev/maryamariyan/dev1…
maryamariyan Feb 19, 2025
faea3a8
fix tests
akhera99 Feb 19, 2025
3851626
Merge remote-tracking branch 'origin/main' into dev/ankitakhera/aai_d…
maryamariyan Feb 19, 2025
b98a886
local ad ons
maryamariyan Feb 20, 2025
7b6d468
local ad ons
maryamariyan Feb 20, 2025
6d46c43
Merge branch 'dev/maryamariyan/dev17-implement-method-fixer' into dev…
maryamariyan Feb 20, 2025
2c62d7b
Add main bits for generating method implementation
maryamariyan Feb 20, 2025
c49fdcc
todo next
maryamariyan Feb 20, 2025
ee3b104
update APIs
maryamariyan Feb 20, 2025
bdcfbf4
trial 1
maryamariyan Feb 21, 2025
9db6634
Merge remote-tracking branch 'origin/main' into dev/maryamariyan/repl…
maryamariyan Feb 21, 2025
7431087
Fix compile after merge
maryamariyan Feb 21, 2025
e6153f0
temp1
maryamariyan Feb 22, 2025
b2c0584
temp2
maryamariyan Feb 22, 2025
e1e6fd3
Implement method, end-to-end for one-off code action
maryamariyan Feb 22, 2025
ba32b2b
corrections
maryamariyan Feb 22, 2025
e6c9ef2
cleanup
maryamariyan Feb 24, 2025
d595c6a
cleanup preliminary check
maryamariyan Feb 24, 2025
86e8bf9
Fix bug
maryamariyan Feb 24, 2025
d993617
cleanup and fixes
maryamariyan Feb 25, 2025
3360777
remove local changes for pr
maryamariyan Feb 25, 2025
de14ec1
correct spacing
maryamariyan Feb 25, 2025
56b16f9
cleanup
maryamariyan Feb 25, 2025
8c89fee
Add unit test - takes code block suggestion to replace with method body
maryamariyan Feb 25, 2025
5150992
Add test, support expression body clause later
maryamariyan Feb 25, 2025
47c913c
Change the FAR API call
maryamariyan Feb 25, 2025
b8f70c6
using `.Parent.FirstAncestorOrSelf`
maryamariyan Feb 25, 2025
b02349f
Improve wrapper implementation
maryamariyan Feb 25, 2025
ba4b470
Apply first round code review
maryamariyan Feb 26, 2025
688b3ea
Merge DualChangeAction into DocumentChangeAction
sharwell Feb 28, 2025
42b8763
Make IDE3000 not configurable
sharwell Feb 28, 2025
998a3d8
Simplify analyzer code and improve robustness
sharwell Feb 28, 2025
0aa9356
Simplifies fixer and applies most remaining feedback
maryamariyan Mar 1, 2025
f5116f2
Merge remote-tracking branch 'maryam/dev/maryamariyan/replicate-for-f…
maryamariyan Mar 1, 2025
1c9ba44
Fix compile related to DocumentChangeAction
maryamariyan Mar 1, 2025
2ed4649
Cleanup messaging
maryamariyan Mar 1, 2025
24f76b2
Add resources for messaging
maryamariyan Mar 1, 2025
744eb42
Adds a few basic tests
maryamariyan Mar 1, 2025
b077c3f
Merge remote-tracking branch 'origin/main' into dev/maryamariyan/repl…
maryamariyan Mar 2, 2025
70209d7
Undo most recent analyzer changes,
maryamariyan Mar 2, 2025
ffd9bce
Apply PR feedback
maryamariyan Mar 2, 2025
e8596bc
Tests renamed
maryamariyan Mar 2, 2025
1923930
Correct test setup
maryamariyan Mar 2, 2025
0cc13f3
Improves readability and removes unreachable code
maryamariyan Mar 3, 2025
fbcd111
Correct mistakes in tests
maryamariyan Mar 3, 2025
41a421f
Adds more unit tests
maryamariyan Mar 3, 2025
9222c16
Fix formatting (https://learn.microsoft.com/dotnet/fundamentals/code-…
maryamariyan Mar 3, 2025
1452aa0
Fixes Analyzer tests
maryamariyan Mar 3, 2025
6fb4938
Makes sure original and replacement text are properly aligned
maryamariyan Mar 3, 2025
c270a76
Apply partial PR feedback
maryamariyan Mar 3, 2025
061d448
cleanup
maryamariyan Mar 3, 2025
faa4722
Applies feedback to change API surface
maryamariyan Mar 4, 2025
f48bf92
All tests pass
maryamariyan Mar 4, 2025
af8ca36
tests are actually failing
maryamariyan Mar 4, 2025
770fc86
Fix Quota bug and show failing tests
maryamariyan Mar 4, 2025
6d20484
Update tests for error conditions where diagnostics are not corrected
sharwell Mar 4, 2025
2b7487a
undo IsImplementNotImplementedExceptionEnabledAsync change
maryamariyan Mar 5, 2025
8b53fe0
Fixes remaining tests
maryamariyan Mar 5, 2025
dbc3919
cleanup
maryamariyan Mar 5, 2025
3e3bd88
Add back referencedSymbols to API call to help with perf
maryamariyan Mar 5, 2025
16d2481
Gracefully comment when result is unexpected
maryamariyan Mar 5, 2025
3b0ba9a
Remove unused resource
maryamariyan Mar 5, 2025
b20b2cb
Simplify error messages
maryamariyan Mar 5, 2025
384ce72
Cleanup tests
maryamariyan Mar 5, 2025
79bebb1
Add missing entry for IDE3000
maryamariyan Mar 5, 2025
517d977
Add Missing Help Link
maryamariyan Mar 5, 2025
8aaa595
mid stage
maryamariyan Mar 6, 2025
9eb2e7c
Removes QuotaExceeds property, received as message
maryamariyan Mar 6, 2025
d088c36
Update signature
maryamariyan Mar 6, 2025
7127ff7
Merge remote-tracking branch 'origin/main' into dev/maryamariyan/repl…
maryamariyan Mar 6, 2025
2f934a6
Fix missed out warning
maryamariyan Mar 6, 2025
4eecdc6
Fix test correctness issue picked up by CI
maryamariyan Mar 6, 2025
44a65e1
Add logging
maryamariyan Mar 6, 2025
960a9cd
Apply PR feedback
maryamariyan Mar 7, 2025
f86f371
Fix run code analysis on solution not reporting results
sharwell Mar 10, 2025
fb0debe
Use HangMitigatingTimeout for cases where operations do not complete …
sharwell Mar 11, 2025
e809937
some PR feedback
maryamariyan Mar 11, 2025
03c8917
spacing
maryamariyan Mar 11, 2025
cab1e65
Move test
maryamariyan Mar 11, 2025
3af16d7
Apply most remaining feedback
maryamariyan Mar 11, 2025
141c83d
Applies feedback
maryamariyan Mar 11, 2025
6f0dc5e
Add runtime async to official build (#77537)
333fred Mar 11, 2025
8012d9c
Signature now strictly uses MemberDeclarationSyntax
maryamariyan Mar 11, 2025
6a6e924
Update message for analyzer referencing newer compiler than host (#77…
RikkiGibson Mar 12, 2025
27405d2
Updates tests
maryamariyan Mar 12, 2025
37efb07
field implementation is not supported as method or property
maryamariyan Mar 12, 2025
336b591
Fix NFW due to invoking Workspace.RaiseEventForHandlers in the CA pro…
ToddGrun Mar 12, 2025
0c41f80
Implement field null resilience analysis (#77127)
RikkiGibson Mar 12, 2025
6acccaf
Fix incremental generator in deterministic key file (#77553)
jaredpar Mar 12, 2025
4e68dca
Apply PR feedback
maryamariyan Mar 12, 2025
1a2fa42
Disable downloading the runtime packages during restore and instead e…
ToddGrun Mar 12, 2025
e65c6c8
Fix run code analysis on solution not reporting results (#77501)
sharwell Mar 12, 2025
276ad7f
Simplifies assumptions - Only trigger fixer when service available
maryamariyan Mar 12, 2025
b59cffa
nit spacing
maryamariyan Mar 12, 2025
9d3c56e
Fix preview window for 'implement NotImplementedException'
CyrusNajmabadi Mar 13, 2025
6dd05a7
Simmplify
CyrusNajmabadi Mar 13, 2025
15d1c1c
Remove uneeded helper
CyrusNajmabadi Mar 13, 2025
5b20ad7
Fix Stack Trace Explorer for additional documents (#77517)
ryzngard Mar 13, 2025
2c39ea7
Adds :bulb: `Implement Using Copilot` for `NotImplementedException` (…
CyrusNajmabadi Mar 13, 2025
557fa80
Merge branch 'main' into implementPreview
CyrusNajmabadi Mar 13, 2025
adc21be
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 13, 2025
9ad37db
Update PublishData.json (#77589)
jjonescz Mar 13, 2025
d0ecb50
Fix preview window for 'implement NotImplementedException' (#77579)
CyrusNajmabadi Mar 13, 2025
07d5af7
Update main-merge.yml to not run on forks
arunchndr Mar 13, 2025
debe306
Fix typo (#77595)
kauwai Mar 13, 2025
bc377e0
Update main-merge.yml to not run on forks (#77594)
arunchndr Mar 13, 2025
c02ed62
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Mar 14, 2025
3ed7fbf
Filter down the list of files we need to examing when looking for a :…
CyrusNajmabadi Mar 14, 2025
a0ff8bd
Move feature-oriented helpers to appropriate location
CyrusNajmabadi Mar 14, 2025
9a120ba
Filter down the list of files we need to examing when looking for a `…
CyrusNajmabadi Mar 14, 2025
3e2d972
Move feature-oriented helpers to appropriate location (#77611)
CyrusNajmabadi Mar 14, 2025
be7fcea
Ensure we don't touch Solution.Workspace if we don't have to
jasonmalinowski Mar 13, 2025
64137a0
Ensure we don't touch Solution.Workspace if we don't have to (#77581)
jasonmalinowski Mar 15, 2025
2e44cf2
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Mar 17, 2025
878db64
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Mar 17, 2025
3e4345f
Correct how we pick up options for `ICopilotOptionsService` (#77620)
maryamariyan Mar 17, 2025
4fb855f
Update BuildActionTelemetryTable tool
maryamariyan Mar 17, 2025
85d110d
Add feature flag controlling Copilot prompt in Semantic Search (#77562)
tmat Mar 17, 2025
806cb27
Fix BuildActionTelemetryTable project
JoeRobich Mar 17, 2025
3eceae1
Update CodeActionDescriptionsMap.
JoeRobich Mar 17, 2025
ee84187
Fix typo
JoeRobich Mar 17, 2025
1529f23
Remove dead code, use generated regex, use filescoped namespace.
JoeRobich Mar 17, 2025
f296737
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Mar 18, 2025
8d9e041
On-the-fly-docs Pass along additional context (#77510)
akhera99 Mar 18, 2025
a969b14
Change vs deps flow (#77651)
jjonescz Mar 18, 2025
d5fe6f0
Fix generation of attribute with array constant
dibarbet Jan 22, 2025
6f384ca
Make ISemanticSearchCopilotUIProvider import lazy to avoid loading VS…
tmat Mar 18, 2025
2de5624
Fix watch window completion window upon manual completion invocation …
ToddGrun Mar 18, 2025
423e3da
Fix generation of attribute with array constant (#77661)
dibarbet Mar 18, 2025
76de433
Generate Documentation - Bug Fixes (#77641)
akhera99 Mar 18, 2025
06a1104
Ensure we get telemetry signal for `Implement with Copilot` Code Fix …
JoeRobich Mar 18, 2025
29d0a35
Fix reflection
davidwengier Mar 19, 2025
121ba61
Fix reflection use in integration tests (#77669)
davidwengier Mar 19, 2025
8f92e67
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Mar 19, 2025
447d6d1
Fix typo (#77678)
BillWagner Mar 19, 2025
b19eb22
Fix SkipApplyOptimizationData parameter (#77677)
jjonescz Mar 19, 2025
b07f304
Support textDocument/semanticTokens/full
PaddiM8 Mar 18, 2025
259b4d0
Support textDocument/semanticTokens/full (#77665)
dibarbet Mar 19, 2025
b1c7ddd
Cleanup and make semantic token processing and testing code more cons…
CyrusNajmabadi Mar 19, 2025
0d48864
Fix test
CyrusNajmabadi Mar 19, 2025
a4179e0
Add CI validation of Semantic Search API lists (#77535)
tmat Mar 19, 2025
77a9c20
raw strings
CyrusNajmabadi Mar 19, 2025
17368bc
Cleanup and make semantic token processing and testing code more cons…
CyrusNajmabadi Mar 19, 2025
38cced1
Fix bug where exact path match would throw for additional files (#77583)
ryzngard Mar 19, 2025
6a92c2e
Update CSharpCopilotCodeAnalysisService.cs (#77691)
akhera99 Mar 20, 2025
57b748d
Update dependencies from https://github.com/dotnet/source-build-refer…
dotnet-maestro[bot] Mar 20, 2025
84a299c
Merge remote-tracking branch 'upstream/main' into merge-main
333fred Mar 20, 2025
f35162b
Semantic search info
333fred Mar 20, 2025
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
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Merge branch 'main' into dev/ankitakhera/aai_doc_comments
akhera99 committed Feb 7, 2025
commit 73e3e8ef8e6b8be0f9f30bcec657b2403e5c63e3
29 changes: 23 additions & 6 deletions Roslyn.sln
Original file line number Diff line number Diff line change
@@ -535,7 +535,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Exte
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost", "src\Workspaces\MSBuild\BuildHost\Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj", "{B1481D94-682E-46EC-ADBE-A16EB46FEEE9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Copilot", "src\EditorFeatures\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj", "{5E8FB6D6-6C5C-42E6-9220-1EAA7ED9BCAD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Copilot", "src\Features\ExternalAccess\Copilot\Microsoft.CodeAnalysis.ExternalAccess.Copilot.csproj", "{5D60CF30-28A9-9F0F-7610-D90E4A69AE73}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator", "src\VisualStudio\ExternalAccess\EditorConfigGenerator\Microsoft.CodeAnalysis.ExternalAccess.EditorConfigGenerator.csproj", "{09AEDEE4-6358-47C9-8022-3BD37A518070}"
EndProject
@@ -569,6 +569,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExternalAccess", "ExternalA
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.LanguageServer.Protocol.Test.Utilities", "src\LanguageServer\Protocol.TestUtilities\Microsoft.CodeAnalysis.LanguageServer.Protocol.Test.Utilities.csproj", "{7465CE63-A7B7-475F-8C57-48D2F8BC665A}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.CodeAnalysis.Threading", "src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.shproj", "{967723E8-4FDD-447B-99F6-4F8C47CB5433}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Threading.Package", "src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.Package.csproj", "{2559DAF9-784E-4C29-E0E1-70204B1FD56E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -1355,10 +1359,6 @@ Global
{B1481D94-682E-46EC-ADBE-A16EB46FEEE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B1481D94-682E-46EC-ADBE-A16EB46FEEE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B1481D94-682E-46EC-ADBE-A16EB46FEEE9}.Release|Any CPU.Build.0 = Release|Any CPU
{5E8FB6D6-6C5C-42E6-9220-1EAA7ED9BCAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E8FB6D6-6C5C-42E6-9220-1EAA7ED9BCAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E8FB6D6-6C5C-42E6-9220-1EAA7ED9BCAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E8FB6D6-6C5C-42E6-9220-1EAA7ED9BCAD}.Release|Any CPU.Build.0 = Release|Any CPU
{09AEDEE4-6358-47C9-8022-3BD37A518070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{09AEDEE4-6358-47C9-8022-3BD37A518070}.Debug|Any CPU.Build.0 = Debug|Any CPU
{09AEDEE4-6358-47C9-8022-3BD37A518070}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1399,6 +1399,14 @@ Global
{7465CE63-A7B7-475F-8C57-48D2F8BC665A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7465CE63-A7B7-475F-8C57-48D2F8BC665A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7465CE63-A7B7-475F-8C57-48D2F8BC665A}.Release|Any CPU.Build.0 = Release|Any CPU
{5D60CF30-28A9-9F0F-7610-D90E4A69AE73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D60CF30-28A9-9F0F-7610-D90E4A69AE73}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D60CF30-28A9-9F0F-7610-D90E4A69AE73}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D60CF30-28A9-9F0F-7610-D90E4A69AE73}.Release|Any CPU.Build.0 = Release|Any CPU
{2559DAF9-784E-4C29-E0E1-70204B1FD56E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2559DAF9-784E-4C29-E0E1-70204B1FD56E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2559DAF9-784E-4C29-E0E1-70204B1FD56E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2559DAF9-784E-4C29-E0E1-70204B1FD56E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1644,7 +1652,6 @@ Global
{A833B11C-5072-4A1F-A32B-2700433B0D3D} = {806F0C6F-3640-4C92-8D55-6767B1535467}
{8988270E-393A-4B92-AC1A-534F903CFD34} = {8977A560-45C2-4EC2-A849-97335B382C74}
{B1481D94-682E-46EC-ADBE-A16EB46FEEE9} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
{5E8FB6D6-6C5C-42E6-9220-1EAA7ED9BCAD} = {1AE9182D-B03E-4B00-B32E-37AE01715F57}
{09AEDEE4-6358-47C9-8022-3BD37A518070} = {5880FECB-91F1-4AB8-8726-75EAFA8A918E}
{5BABC440-4F1B-46E8-9068-DD7F02ED25D3} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6}
{5762E483-75CE-4328-A410-511F30737712} = {3E5FE3DB-45F7-4D83-9097-8F05D3B3AEC6}
@@ -1661,6 +1668,9 @@ Global
{1AE9182D-B03E-4B00-B32E-37AE01715F57} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
{806F0C6F-3640-4C92-8D55-6767B1535467} = {D449D505-CC6A-4E0B-AF1B-976E2D0AE67A}
{7465CE63-A7B7-475F-8C57-48D2F8BC665A} = {D449D505-CC6A-4E0B-AF1B-976E2D0AE67A}
{5D60CF30-28A9-9F0F-7610-D90E4A69AE73} = {58A2876A-618D-4AE6-A136-E44B42BBDE11}
{967723E8-4FDD-447B-99F6-4F8C47CB5433} = {C2D1346B-9665-4150-B644-075CF1636BAA}
{2559DAF9-784E-4C29-E0E1-70204B1FD56E} = {C2D1346B-9665-4150-B644-075CF1636BAA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}
@@ -1679,9 +1689,12 @@ Global
src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 5
src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{2531a8c4-97dd-47bc-a79c-b7846051e137}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\VisualBasic\VisualBasicCompilerExtensions.projitems*{2531a8c4-97dd-47bc-a79c-b7846051e137}*SharedItemsImports = 5
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{2559daf9-784e-4c29-e0e1-70204b1fd56e}*SharedItemsImports = 5
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{2559daf9-784e-4c29-e0e1-70204b1fd56e}*SharedItemsImports = 5
src\Analyzers\Core\Analyzers\Analyzers.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e35}*SharedItemsImports = 13
src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e36}*SharedItemsImports = 13
@@ -1697,6 +1710,7 @@ Global
src\Analyzers\CSharp\Tests\CSharpAnalyzers.UnitTests.projitems*{58969243-7f59-4236-93d0-c93b81f569b3}*SharedItemsImports = 13
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
@@ -1709,8 +1723,11 @@ Global
src\Analyzers\Core\Analyzers\Analyzers.projitems*{76e96966-4780-4040-8197-bde2879516f4}*SharedItemsImports = 13
src\Analyzers\VisualBasic\Tests\VisualBasicAnalyzers.UnitTests.projitems*{7b7f4153-ae93-4908-b8f0-430871589f83}*SharedItemsImports = 13
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{810b02ad-2ea5-4422-88ac-b71b8ab0df0b}*SharedItemsImports = 13
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{8e2a252e-a140-45a6-a81a-2652996ea589}*SharedItemsImports = 5
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{8e2a252e-a140-45a6-a81a-2652996ea589}*SharedItemsImports = 5
src\Analyzers\VisualBasic\Analyzers\VisualBasicAnalyzers.projitems*{94faf461-2e74-4dbb-9813-6b2cde6f1880}*SharedItemsImports = 13
src\Compilers\Server\VBCSCompiler\VBCSCompilerCommandLine.projitems*{9508f118-f62e-4c16-a6f4-7c3b56e166ad}*SharedItemsImports = 5
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{967723e8-4fdd-447b-99f6-4f8c47cb5433}*SharedItemsImports = 13
src\Compilers\VisualBasic\vbc\VbcCommandLine.projitems*{975cd834-45f4-4ea0-a395-cb60dbd0e214}*SharedItemsImports = 5
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{99f594b1-3916-471d-a761-a6731fc50e9a}*SharedItemsImports = 13
src\Analyzers\VisualBasic\CodeFixes\VisualBasicCodeFixes.projitems*{9f9ccc78-7487-4127-9d46-db23e501f001}*SharedItemsImports = 13
11 changes: 0 additions & 11 deletions azure-pipelines-official.yml
Original file line number Diff line number Diff line change
@@ -266,16 +266,6 @@ extends:
useGlobalJson: true
workingDirectory: '$(Build.SourcesDirectory)'

# Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package
- task: NuGetCommand@2
displayName: Restore internal tools
inputs:
command: restore
feedsToUse: config
restoreSolution: 'eng\common\internal\Tools.csproj'
nugetConfigPath: 'NuGet.config'
restoreDirectory: '$(Build.SourcesDirectory)\.packages'

- task: MicroBuildSigningPlugin@4
inputs:
signType: $(SignType)
@@ -308,7 +298,6 @@ extends:
/p:DotnetPublishUsingPipelines=true
/p:IgnoreIbcMergeErrors=true
/p:GenerateSbom=true
/p:ForceAzureComSources=true
condition: succeeded()

- template: /eng/common/templates-official/steps/generate-sbom.yml@self
10 changes: 0 additions & 10 deletions azure-pipelines-pr-validation.yml
Original file line number Diff line number Diff line change
@@ -215,16 +215,6 @@ extends:
useGlobalJson: true
workingDirectory: '$(Build.SourcesDirectory)'

# Needed to restore the Microsoft.DevDiv.Optimization.Data.PowerShell package
- task: NuGetCommand@2
displayName: Restore internal tools
inputs:
command: restore
feedsToUse: config
restoreSolution: 'eng\common\internal\Tools.csproj'
nugetConfigPath: 'NuGet.config'
restoreDirectory: '$(Build.SourcesDirectory)\.packages'

- task: MicroBuildSigningPlugin@4
inputs:
signType: $(SignType)
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.