Skip to content

Commit f4e6964

Browse files
authored
Add Microsoft.CodeAnalysis.Extensions package (#78388)
1 parent 7e19b0f commit f4e6964

File tree

47 files changed

+227
-165
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+227
-165
lines changed

Roslyn.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestReferenceAssembly", "sr
725725
EndProject
726726
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.ExternalAccess.Extensions", "src\Tools\ExternalAccess\Extensions\Microsoft.CodeAnalysis.ExternalAccess.Extensions.csproj", "{6C816C16-D563-884A-D65B-5E68C6FB6659}"
727727
EndProject
728+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.CodeAnalysis.Extensions", "src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Extensions\Microsoft.CodeAnalysis.Extensions.shproj", "{02BCC112-0A29-43AA-84FA-C71C18A9486C}"
729+
EndProject
730+
Project("{9a19103f-16f7-4668-be54-9a1e7a4f7556}") = "Microsoft.CodeAnalysis.Extensions.Package", "src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Extensions\Microsoft.CodeAnalysis.Extensions.Package.csproj", "{EEFAB994-3778-9C0D-1E88-C0ABB1D3DE43}"
731+
EndProject
728732
Global
729733
GlobalSection(SolutionConfigurationPlatforms) = preSolution
730734
Debug|Any CPU = Debug|Any CPU
@@ -1787,6 +1791,10 @@ Global
17871791
{6C816C16-D563-884A-D65B-5E68C6FB6659}.Debug|Any CPU.Build.0 = Debug|Any CPU
17881792
{6C816C16-D563-884A-D65B-5E68C6FB6659}.Release|Any CPU.ActiveCfg = Release|Any CPU
17891793
{6C816C16-D563-884A-D65B-5E68C6FB6659}.Release|Any CPU.Build.0 = Release|Any CPU
1794+
{EEFAB994-3778-9C0D-1E88-C0ABB1D3DE43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1795+
{EEFAB994-3778-9C0D-1E88-C0ABB1D3DE43}.Debug|Any CPU.Build.0 = Debug|Any CPU
1796+
{EEFAB994-3778-9C0D-1E88-C0ABB1D3DE43}.Release|Any CPU.ActiveCfg = Release|Any CPU
1797+
{EEFAB994-3778-9C0D-1E88-C0ABB1D3DE43}.Release|Any CPU.Build.0 = Release|Any CPU
17901798
EndGlobalSection
17911799
GlobalSection(SolutionProperties) = preSolution
17921800
HideSolutionNode = FALSE
@@ -2126,6 +2134,8 @@ Global
21262134
{29080628-23A6-1DCB-F15E-93F1D1682CC1} = {482C1FC7-4FD6-4381-8078-73BEBFAF4349}
21272135
{31EB654C-B562-73B4-2456-78FA875515D2} = {0DDCFE67-7D4E-4709-9882-EC032A031789}
21282136
{6C816C16-D563-884A-D65B-5E68C6FB6659} = {8977A560-45C2-4EC2-A849-97335B382C74}
2137+
{02BCC112-0A29-43AA-84FA-C71C18A9486C} = {7A69EA65-4411-4CD0-B439-035E720C1BD3}
2138+
{EEFAB994-3778-9C0D-1E88-C0ABB1D3DE43} = {7A69EA65-4411-4CD0-B439-035E720C1BD3}
21292139
EndGlobalSection
21302140
GlobalSection(ExtensibilityGlobals) = postSolution
21312141
SolutionGuid = {604E6B91-7BC0-4126-AE07-D4D2FEFC3D29}
@@ -2160,6 +2170,7 @@ Global
21602170
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
21612171
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
21622172
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
2173+
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Extensions\Microsoft.CodeAnalysis.Extensions.projitems*{275812ee-dedb-4232-9439-91c9757d2ae4}*SharedItemsImports = 5
21632174
src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{2801f82b-78ce-4bae-b06f-537574751e2e}*SharedItemsImports = 5
21642175
src\RoslynAnalyzers\Utilities\Refactoring.CSharp\Refactoring.CSharp.Utilities.projitems*{3055f932-0d1e-4823-a03a-7b62c7639bda}*SharedItemsImports = 13
21652176
src\ExpressionEvaluator\VisualBasic\Source\ResultProvider\BasicResultProvider.projitems*{3140fe61-0856-4367-9aa3-8081b9a80e35}*SharedItemsImports = 13
@@ -2184,6 +2195,7 @@ Global
21842195
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
21852196
src\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
21862197
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
2198+
src\Workspaces\SharedUtilitiesAndExtensions\Compiler\Extensions\Microsoft.CodeAnalysis.Extensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
21872199
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5f8d2414-064a-4b3a-9b42-8e2a04246be5}*SharedItemsImports = 5
21882200
src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
21892201
src\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems*{5ff1e493-69cc-4d0b-83f2-039f469a04e1}*SharedItemsImports = 5
@@ -2267,6 +2279,9 @@ Global
22672279
src\Analyzers\Core\CodeFixes\CodeFixes.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
22682280
src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
22692281
src\Dependencies\CodeAnalysis.Debugging\Microsoft.CodeAnalysis.Debugging.projitems*{edc68a0e-c68d-4a74-91b7-bf38ec909888}*SharedItemsImports = 5
2282+
src\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems*{eefab994-3778-9c0d-1e88-c0abb1d3de43}*SharedItemsImports = 5
2283+
src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{eefab994-3778-9c0d-1e88-c0abb1d3de43}*SharedItemsImports = 5
2284+
src\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems*{eefab994-3778-9c0d-1e88-c0abb1d3de43}*SharedItemsImports = 5
22702285
src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*SharedItemsImports = 5
22712286
src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*SharedItemsImports = 5
22722287
src\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems*{fc2ae90b-2e4b-4045-9fdd-73d4f5ed6c89}*SharedItemsImports = 5

eng/config/PublishData.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"Microsoft.CodeAnalysis.PooledObjects": "arcade",
3737
"Microsoft.CodeAnalysis.Collections": "arcade",
3838
"Microsoft.CodeAnalysis.Threading": "arcade",
39+
"Microsoft.CodeAnalysis.Extensions": "vs-impl",
3940
"Microsoft.CodeAnalysis.Features": "arcade",
4041
"Microsoft.CodeAnalysis.EditorFeatures": "vssdk",
4142
"Microsoft.CodeAnalysis.EditorFeatures.Common": "vssdk",

eng/test-rebuild.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ try {
6565
" --exclude netstandard2.0\Microsoft.CodeAnalysis.Debugging.Package.dll" +
6666
" --exclude netstandard2.0\Microsoft.CodeAnalysis.PooledObjects.Package.dll" +
6767
" --exclude netstandard2.0\Microsoft.CodeAnalysis.Threading.Package.dll" +
68+
" --exclude netstandard2.0\Microsoft.CodeAnalysis.Extensions.Package.dll" +
6869
" --exclude netcoreapp3.1\Microsoft.CodeAnalysis.Workspaces.UnitTests.dll" +
6970
" --exclude net472\Zip\tools\vsixexpinstaller\System.ValueTuple.dll" +
7071
" --exclude net472\Zip\tools\vsixexpinstaller\VSIXExpInstaller.exe" +

src/CodeStyle/Core/Analyzers/Microsoft.CodeAnalysis.CodeStyle.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@
5151
<Import Project="..\..\..\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems" Label="Shared" />
5252
<Import Project="..\..\..\Dependencies\Threading\Microsoft.CodeAnalysis.Threading.projitems" Label="Shared" />
5353
<Import Project="..\..\..\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems" Label="Shared" />
54+
<Import Project="..\..\..\Workspaces\SharedUtilitiesAndExtensions\Compiler\Extensions\Microsoft.CodeAnalysis.Extensions.projitems" Label="Shared" />
5455
<Import Project="..\..\..\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems" Label="Shared" />
5556
</Project>

src/Compilers/Core/Portable/SpecialTypeExtensions.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,6 @@ public static int VBForToShiftBits(this SpecialType specialType)
273273

274274
public static SpecialType FromRuntimeTypeOfLiteralValue(object value)
275275
{
276-
RoslynDebug.Assert(value != null);
277-
278276
// Perf: Note that JIT optimizes each expression val.GetType() == typeof(T) to a single register comparison.
279277
// Also the checks are sorted by commonality of the checked types.
280278

@@ -371,7 +369,6 @@ public static bool CanOptimizeBehavior(this SpecialType specialType)
371369
/// </summary>
372370
internal static ulong ConvertUnderlyingValueToUInt64(this SpecialType enumUnderlyingType, object value)
373371
{
374-
RoslynDebug.Assert(value != null);
375372
Debug.Assert(value.GetType().IsPrimitive);
376373

377374
unchecked

src/VisualStudio/CSharp/Test/DesignerAttribute/DesignerAttributeServiceTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Linq;
66
using System.Threading;
77
using System.Threading.Tasks;
8+
using Microsoft.CodeAnalysis;
89
using Microsoft.CodeAnalysis.DesignerAttribute;
910
using Microsoft.CodeAnalysis.Shared.Extensions;
1011
using Microsoft.CodeAnalysis.Test.Utilities;

src/Workspaces/Core/Portable/Microsoft.CodeAnalysis.Workspaces.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@
167167
</ItemGroup>
168168
<Import Project="..\..\..\Dependencies\PooledObjects\Microsoft.CodeAnalysis.PooledObjects.projitems" Label="Shared" />
169169
<Import Project="..\..\..\Workspaces\SharedUtilitiesAndExtensions\Compiler\Core\CompilerExtensions.projitems" Label="Shared" />
170+
<Import Project="..\..\..\Workspaces\SharedUtilitiesAndExtensions\Compiler\Extensions\Microsoft.CodeAnalysis.Extensions.projitems" Label="Shared" />
170171
<Import Project="..\..\..\Workspaces\SharedUtilitiesAndExtensions\Workspace\Core\WorkspaceExtensions.projitems" Label="Shared" />
171172
<Import Project="..\..\..\Dependencies\Contracts\Microsoft.CodeAnalysis.Contracts.projitems" Label="Shared" />
172173
<Import Project="..\..\..\Dependencies\Collections\Microsoft.CodeAnalysis.Collections.projitems" Label="Shared" />

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/CompilerExtensions.projitems

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,10 @@
208208
<Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\VirtualCharSequence.cs" />
209209
<Compile Include="$(MSBuildThisFileDirectory)EmbeddedLanguages\VirtualChars\VirtualCharSequence.Enumerator.cs" />
210210
<Compile Include="$(MSBuildThisFileDirectory)Extensions\AnalysisContextExtensions.cs" />
211-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\CompilationExtensions.cs" />
212211
<Compile Include="$(MSBuildThisFileDirectory)Extensions\DiagnosticAnalyzerExtensions.cs" />
213212
<Compile Include="$(MSBuildThisFileDirectory)Extensions\DiagnosticDescriptorExtensions.cs" />
214213
<Compile Include="$(MSBuildThisFileDirectory)Extensions\DiagnosticSeverityExtensions_Shared.cs" />
215214
<Compile Include="$(MSBuildThisFileDirectory)Extensions\DirectiveInfo.cs" />
216-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\IPropertySymbolExtensions.cs" />
217-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeGenerator.cs" />
218-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeParameterSymbolExtensions.cs" />
219-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeSymbolExtensions.AnonymousTypeRemover.cs" />
220-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeSymbolExtensions.CollectTypeParameterSymbolsVisitor.cs" />
221-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeSymbolExtensions.CompilationTypeGenerator.cs" />
222-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeSymbolExtensions.SubstituteTypesVisitor.cs" />
223-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeSymbolExtensions.UnavailableTypeParameterRemover.cs" />
224-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeSymbolExtensions.UnnamedErrorTypeRemover.cs" />
225215
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ListExtensions.cs" />
226216
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ObjectWriterExtensions.cs" />
227217
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ReadOnlySpanExtensions.cs" />
@@ -495,12 +485,8 @@
495485
<Compile Include="$(MSBuildThisFileDirectory)Utilities\Matcher`1.cs" />
496486
<Compile Include="$(MSBuildThisFileDirectory)Utilities\NonReentrantLock.cs" />
497487
<Compile Include="$(MSBuildThisFileDirectory)Utilities\PooledBuilderExtensions.cs" />
498-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\PredefinedOperator.cs" />
499-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\PredefinedType.cs" />
500-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\PredefinedTypeExtensions.cs" />
501488
<Compile Include="$(MSBuildThisFileDirectory)Extensions\SemanticModelExtensions.cs" />
502489
<Compile Include="$(MSBuildThisFileDirectory)Extensions\SourceTextExtensions_SharedWithCodeStyle.cs" />
503-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\SpecialTypeExtensions.cs" />
504490
<Compile Include="$(MSBuildThisFileDirectory)Extensions\StringExtensions.cs" />
505491
<Compile Include="$(MSBuildThisFileDirectory)Extensions\SymbolDisplayPartExtensions.cs" />
506492
<Compile Include="$(MSBuildThisFileDirectory)Extensions\SyntaxNodeExtensions.cs" />
@@ -522,7 +508,6 @@
522508
<Compile Include="$(MSBuildThisFileDirectory)Utilities\RoslynParallel.NetFramework.cs" />
523509
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SemaphoreSlimFactory.cs" />
524510
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SerializableBytes.cs" />
525-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SignatureComparer.cs" />
526511
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SoftCrashException.cs" />
527512
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SpecializedTasks.cs" />
528513
<Compile Include="$(MSBuildThisFileDirectory)Utilities\StringBreaker.cs" />
@@ -537,22 +522,9 @@
537522
<Compile Include="$(MSBuildThisFileDirectory)Utilities\EventHandlerFactory.cs" />
538523
</ItemGroup>
539524
<ItemGroup>
540-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\AccessibilityUtilities.cs" />
541525
<Compile Include="$(MSBuildThisFileDirectory)Extensions\BasicBlockExtensions.cs" />
542526
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ControlFlowGraphExtensions.cs" />
543527
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ControlFlowRegionExtensions.cs" />
544-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\IAssemblySymbolExtensions.cs" />
545-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ICompilationExtensions.cs" />
546-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\IMethodSymbolExtensions.cs" />
547-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\INamedTypeSymbolExtensions.cs" />
548-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\INamespaceOrTypeSymbolExtensions.cs" />
549-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\IParameterSymbolExtensions.cs" />
550-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ISymbolExtensions.cs" />
551-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ISymbolExtensions.RequiresUnsafeModifierVisitor.cs" />
552-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ISymbolExtensions_Accessibility.cs" />
553-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeSymbolExtensions.cs" />
554-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\ITypeSymbolExtensions.MinimalAccessibilityVisitor.cs" />
555-
<Compile Include="$(MSBuildThisFileDirectory)Extensions\MethodKindExtensions.cs" />
556528
<Compile Include="$(MSBuildThisFileDirectory)Extensions\OperationExtensions.cs" />
557529
<Compile Include="$(MSBuildThisFileDirectory)Extensions\StackExtensions.cs" />
558530
<Compile Include="$(MSBuildThisFileDirectory)Extensions\SymbolInfoExtensions.cs" />
@@ -563,14 +535,6 @@
563535
<Compile Include="$(MSBuildThisFileDirectory)ObjectPools\PooledDisposer.cs" />
564536
<Compile Include="$(MSBuildThisFileDirectory)ObjectPools\PooledObject.cs" />
565537
<Compile Include="$(MSBuildThisFileDirectory)ObjectPools\SharedPools.cs" />
566-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SymbolDisplayFormats.cs" />
567-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SymbolVisibility.cs" />
568-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SymbolEquivalenceComparer.AssemblyComparers.cs" />
569-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SymbolEquivalenceComparer.cs" />
570-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SymbolEquivalenceComparer.EquivalenceVisitor.cs" />
571-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SymbolEquivalenceComparer.GetHashCodeVisitor.cs" />
572-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SymbolEquivalenceComparer.ParameterSymbolEqualityComparer.cs" />
573-
<Compile Include="$(MSBuildThisFileDirectory)Utilities\SymbolEquivalenceComparer.SignatureTypeSymbolEquivalenceComparer.cs" />
574538
<Compile Include="$(MSBuildThisFileDirectory)Diagnostics\DiagnosticAnalyzerCategory.cs" />
575539
<Compile Include="$(MSBuildThisFileDirectory)Diagnostics\DiagnosticCategory.cs" />
576540
<Compile Include="$(MSBuildThisFileDirectory)Diagnostics\IBuiltInAnalyzer.cs" />

src/Workspaces/SharedUtilitiesAndExtensions/Compiler/Core/Extensions/CompilationExtensions.cs

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)