Porting changeset 1209571 to build preview branch:

Sorting project items. (changeset 1211485)

Src/Compilers/CSharp/Source/CSharpCodeAnalysis.csproj

@@ -245,7 +245,6 @@
     <Compile Include="Compilation\SyntaxTreeSemanticModel.cs" />
     <Compile Include="Compilation\SyntaxTreeSemanticModel_RegionAnalysisContext.cs" />
     <Compile Include="Compilation\TypeInfo.cs" />
-    <Compile Include="CSharpCompilationOptions.cs" />
     <Compile Include="Compiler\AnonymousTypeMethodBodySynthesizer.cs" />
     <Compile Include="Compiler\ClsComplianceChecker.cs" />
     <Compile Include="Compiler\Compiler.cs" />
@@ -260,7 +259,9 @@
     <Compile Include="Compiler\SynthesizedMethodMetadataCompiler.cs" />
     <Compile Include="Compiler\TypeCompilationState.cs" />
     <Compile Include="Compiler\UnprocessedDocumentationCommentFinder.cs" />
+    <Compile Include="CSharpCompilationOptions.cs" />
     <Compile Include="CSharpExtensions.cs" />
+    <Compile Include="CSharpParseOptions.cs" />
     <Compile Include="CSharpResources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -330,8 +331,8 @@
     <Compile Include="Emitter\NoPia\EmbeddedTypesManager.cs" />
     <Compile Include="Errors\CSDiagnostic.cs" />
     <Compile Include="Errors\CSDiagnosticInfo.cs" />
-    <Compile Include="Errors\DiagnosticBagExtensions.cs" />
     <Compile Include="Errors\CSharpDiagnosticFormatter.cs" />
+    <Compile Include="Errors\DiagnosticBagExtensions.cs" />
     <Compile Include="Errors\DiagnosticInfoWithSymbols.cs" />
     <Compile Include="Errors\ErrorFacts.cs" />
     <Compile Include="Errors\LazyObsoleteDiagnosticInfo.cs" />
@@ -447,7 +448,6 @@
     <Compile Include="Lowering\SynthesizedSubmissionFields.cs" />
     <Compile Include="Lowering\SyntheticBoundNodeFactory.cs" />
     <Compile Include="Lowering\UnmatchedGotoFinder.cs" />
-    <Compile Include="CSharpParseOptions.cs" />
     <Compile Include="Parser\AbstractLexer.cs" />
     <Compile Include="Parser\BlendedNode.cs" />
     <Compile Include="Parser\Blender.cs" />
@@ -774,10 +774,9 @@
     <Compile Include="Syntax\SyntaxEquivalence.cs" />
     <Compile Include="Syntax\SyntaxExtensions.cs" />
     <Compile Include="Syntax\SyntaxFactory.cs" />
-    <Compile Include="Syntax\SyntaxNodeFacts.cs" />
-    <Compile Include="Syntax\SyntaxKindFacts.cs" />
     <Compile Include="Syntax\SyntaxFormatter.cs" />
     <Compile Include="Syntax\SyntaxKind.cs" />
+    <Compile Include="Syntax\SyntaxKindFacts.cs" />
     <Compile Include="Syntax\SyntaxList.cs" />
     <Compile Include="Syntax\SyntaxList.SeparatedWithManyChildren.cs" />
     <Compile Include="Syntax\SyntaxList.WithManyChildren.cs" />
@@ -789,6 +788,7 @@
     <Compile Include="Syntax\SyntaxListBuilderExtensions.cs" />
     <Compile Include="Syntax\SyntaxNavigator.cs" />
     <Compile Include="Syntax\SyntaxNodeExtensions.cs" />
+    <Compile Include="Syntax\SyntaxNodeFacts.cs" />
     <Compile Include="Syntax\SyntaxNodeOrTokenListBuilder.cs" />
     <Compile Include="Syntax\SyntaxNodeRemover.cs" />
     <Compile Include="Syntax\SyntaxReplacer.cs" />
@@ -811,6 +811,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Syntax\CSharpSyntaxTree.Dummy.cs" />
+    <Content Include="UseSiteDiagnosticsCheckEnforcer\BaseLine.txt" />
     <Content Include="UseSiteDiagnosticsCheckEnforcer\Run.bat" />
     <None Include="FlowAnalysis\Flow Analysis Design.docx" />
     <None Include="Symbols\PublicSymbolTable.cd" />
@@ -818,9 +819,9 @@
   <ItemGroup>
     <BoundTreeDefinition Include="BoundTree\BoundNodes.xml" />
     <Compile Include="$(IntermediateOutputPath)BoundNodes.xml.Generated.cs" />
-    <Compile Include="Errors\ErrorCode.cs" />
     <Compile Include="$(IntermediateOutputPath)ErrorFacts.Generated.cs" />
     <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.cs" />
+    <Compile Include="Errors\ErrorCode.cs" />
     <EmbeddedResource Include="CSharpResources.resx">
       <SubType>Designer</SubType>
       <Generator>ResXFileCodeGenerator</Generator>
@@ -847,9 +848,6 @@
     <InternalsVisibleToTest Include="Roslyn.Scripting.CSharp.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="UseSiteDiagnosticsCheckEnforcer\BaseLine.txt" />
-  </ItemGroup>
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

Src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj

@@ -81,16 +81,16 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.configuration" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyAttributes.cs" />
-    <Compile Include="CommandLineTests.cs" />
     <Compile Include="CommandLineDiagnosticFormatterTests.cs" />
+    <Compile Include="CommandLineTests.cs" />
     <Compile Include="TouchedFileLoggingTests.cs" />
   </ItemGroup>
   <ItemGroup />

Src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj

@@ -148,6 +148,7 @@
     <Compile Include="CodeGen\WinMdEventTests.cs" />
     <Compile Include="CodeGen\WinRTCollectionTests.cs" />
     <Compile Include="Emit\CompilationEmitTests.cs" />
+    <Compile Include="Emit\EditAndContinueTests.AssemblyReferences.cs" />
     <Compile Include="Emit\EditAndContinueTests.cs" />
     <Compile Include="Emit\EmitCustomModifiers.cs" />
     <Compile Include="Emit\EmitErrorTests.cs" />
@@ -178,9 +179,9 @@
     <Reference Include="System.Collections" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -191,9 +192,6 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Emit\EditAndContinueTests.AssemblyReferences.cs" />
-  </ItemGroup>
   <ItemGroup />
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

Src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj

@@ -145,9 +145,9 @@
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />

Src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj

@@ -206,9 +206,9 @@
     <Reference Include="System.Collections" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />

Src/Compilers/CSharp/Test/Syntax/CSharpCompilerSyntaxTest.csproj

@@ -89,6 +89,9 @@
     <PlatformTarget>ARM</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(IntermediateOutputPath)\Syntax.xml.Generated.cs">
+      <Link>Syntax\Syntax.xml.Generated.cs</Link>
+    </Compile>
     <Compile Include="Diagnostics\DiagnosticTest.cs" />
     <Compile Include="Diagnostics\DiagnosticTest.MockSyntaxTree.cs" />
     <Compile Include="Diagnostics\LocationsTests.cs" />
@@ -172,11 +175,6 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(IntermediateOutputPath)\Syntax.xml.Generated.cs">
-      <Link>Syntax\Syntax.xml.Generated.cs</Link>
-    </Compile>
-  </ItemGroup>
   <ItemGroup />
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

Src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj

@@ -89,9 +89,9 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Collections" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -172,14 +172,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="MetadataReader\CPPClassLibrary2.h" />
     <None Include="Resources\default.win32manifest" />
     <None Include="Resources\nativeWithStringIDsAndTypesAndIntTypes.res" />
     <None Include="Resources\Roslyn.ico.blah" />
     <None Include="Resources\VerResourceBuiltByRC.RES" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="MetadataReader\CPPClassLibrary2.h" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>

Src/Compilers/Core/MSBuildTasks/MSBuildTasks.csproj

@@ -62,7 +62,6 @@
   <ItemGroup>
     <Compile Include="BuildClient.cs" />
     <Compile Include="CommandLineSplitter.cs" />
-    <Compile Include="TaskUtilities.cs" />
     <Compile Include="Csc.cs" />
     <Compile Include="CscTaskFactory.cs" />
     <Compile Include="MSBuildTasksResources.Designer.cs">
@@ -72,6 +71,7 @@
     </Compile>
     <Compile Include="NativeMethods.cs" />
     <Compile Include="RoslynTaskFactory_T.cs" />
+    <Compile Include="TaskUtilities.cs" />
     <Compile Include="Vbc.cs" />
     <Compile Include="VbcTaskFactory.cs" />
   </ItemGroup>

Src/Compilers/Test/Resources/Core/CompilerTestResources.vbproj

@@ -316,8 +316,8 @@
     <Content Include="SymbolsTests\RetargetingCycle\V2\ClassB.dll" />
     <Content Include="SymbolsTests\RetargetingCycle\V2\ClassB.vb" />
     <Content Include="SymbolsTests\snKey.snk" />
-    <Content Include="SymbolsTests\snPublicKey.snk" />
     <Content Include="SymbolsTests\snKey2.snk" />
+    <Content Include="SymbolsTests\snPublicKey.snk" />
     <Content Include="SymbolsTests\snPublicKey2.snk" />
     <Content Include="SymbolsTests\TypeForwarders\Forwarded.netmodule" />
     <Content Include="SymbolsTests\TypeForwarders\TypeForwarder.dll" />
@@ -741,7 +741,6 @@
     </Compile>
     <Content Include="PerfTests\VBPerfTest.vb" />
   </ItemGroup>
-  <ItemGroup />
   <ImportGroup Label="Targets">
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
     <Import Project="..\..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />

Src/Compilers/Test/Utilities/Core2/CompilerTestUtilities2.csproj

@@ -88,6 +88,9 @@
   <ItemGroup>
     <Compile Include="CSReflectionBasedKindProvider.cs" />
     <Compile Include="Diagnostics\DiagnosticsHelper.cs" />
+    <Compile Include="Diagnostics\TestDiagnosticAnalyzer.cs" />
+    <Compile Include="Diagnostics\ThrowingDiagnosticAnalyzer.cs" />
+    <Compile Include="Diagnostics\TrackingDiagnosticAnalyzer.cs" />
     <Compile Include="DirectoryHelper.cs" />
     <Compile Include="EqualityTesting.cs" />
     <Compile Include="ErrorHelpers.cs" />
@@ -109,12 +112,9 @@
     </Compile>
     <Compile Include="SourceCodeValidator.cs" />
     <Compile Include="SpeculativeSemanticModelTestsBase.cs" />
-    <Compile Include="Diagnostics\TestDiagnosticAnalyzer.cs" />
     <Compile Include="TestExceptionUtilities.cs" />
     <Compile Include="TestReferences.cs" />
     <Compile Include="TokenRuleAttribute.cs" />
-    <Compile Include="Diagnostics\ThrowingDiagnosticAnalyzer.cs" />
-    <Compile Include="Diagnostics\TrackingDiagnosticAnalyzer.cs" />
     <Compile Include="TreeRuleAttribute.cs" />
     <Compile Include="TreeRules.cs" />
     <Compile Include="TreeValidator.cs" />

Src/Compilers/VisualBasic/Source/BasicCodeAnalysis.vbproj

@@ -90,6 +90,7 @@
     <RootNamespace></RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(IntermediateOutputPath)BoundNodes.xml.Generated.vb" />
     <Compile Include="Analysis\Analyzer.vb" />
     <Compile Include="Analysis\FlowAnalysis\AbstractFlowPass.AbstractLocalState.vb" />
     <Compile Include="Analysis\FlowAnalysis\AbstractFlowPass.NestedTypes.vb" />
@@ -126,7 +127,6 @@
     <Compile Include="Binding\BackstopBinder.vb" />
     <Compile Include="Binding\BasesBeingResolvedBinder.vb" />
     <Compile Include="Binding\Binder.vb" />
-    <Compile Include="Binding\BinderFactory.BinderFactoryVisitor.vb" />
     <Compile Include="Binding\Binder_AnonymousTypes.vb" />
     <Compile Include="Binding\Binder_Attributes.vb" />
     <Compile Include="Binding\Binder_Constraints.vb" />
@@ -151,6 +151,7 @@
     <Compile Include="Binding\Binder_WithBlock.vb" />
     <Compile Include="Binding\Binder_XmlLiterals.vb" />
     <Compile Include="Binding\BinderBuilder.vb" />
+    <Compile Include="Binding\BinderFactory.BinderFactoryVisitor.vb" />
     <Compile Include="Binding\BinderFactory.NodeUsage.vb" />
     <Compile Include="Binding\BinderFactory.vb" />
     <Compile Include="Binding\Binders\AliasAndImportsClause.vb" />
@@ -254,7 +255,6 @@
     <Compile Include="BoundTree\BoundNode.vb" />
     <Compile Include="BoundTree\BoundNodeExtensions.vb" />
     <Compile Include="BoundTree\BoundNodeFinder.vb" />
-    <Compile Include="$(IntermediateOutputPath)BoundNodes.xml.Generated.vb" />
     <Compile Include="BoundTree\BoundNoOpStatement.vb" />
     <Compile Include="BoundTree\BoundNullableIsTrueOperator.vb" />
     <Compile Include="BoundTree\BoundObjectCreationExpression.vb" />
@@ -349,11 +349,11 @@
     <Compile Include="Compilation\SyntaxTreeSemanticModel.vb" />
     <Compile Include="Compilation\TypeCompilationState.vb" />
     <Compile Include="Compilation\TypeInfo.vb" />
+    <Compile Include="Compilation\VisualBasicCompilation.DefinitionMap.vb" />
     <Compile Include="Compilation\VisualBasicCompilation.MethodCompiler.vb" />
     <Compile Include="Compilation\VisualBasicCompilation.SynthesizedMetadataCompiler.vb" />
     <Compile Include="Compilation\VisualBasicCompilation.vb" />
     <Compile Include="Compilation\VisualBasicCompilationReference.vb" />
-    <Compile Include="VisualBasicCompilationOptions.vb" />
     <Compile Include="Declarations\Declaration.vb" />
     <Compile Include="Declarations\DeclarationKind.vb" />
     <Compile Include="Declarations\DeclarationModifiers.vb" />
@@ -524,7 +524,6 @@
     <Compile Include="Lowering\WithExpressionRewriter.vb" />
     <Compile Include="OptionStrict.vb" />
     <Compile Include="OptionsValidator.vb" />
-    <Compile Include="VisualBasicParseOptions.vb" />
     <Compile Include="Parser\BlockContexts\BlockContext.vb" />
     <Compile Include="Parser\BlockContexts\BlockContextExtensions.vb" />
     <Compile Include="Parser\BlockContexts\CaseBlockContext.vb" />
@@ -904,7 +903,9 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>VBResources.resx</DependentUpon>
     </Compile>
+    <Compile Include="VisualBasicCompilationOptions.vb" />
     <Compile Include="VisualBasicExtensions.vb" />
+    <Compile Include="VisualBasicParseOptions.vb" />
     <EmbeddedResource Include="Symbols\EmbeddedSymbols\Embedded.vb" />
     <EmbeddedResource Include="Symbols\EmbeddedSymbols\InternalXmlHelper.vb" />
     <EmbeddedResource Include="Symbols\EmbeddedSymbols\VbCoreSourceText.vb" />
@@ -920,13 +921,14 @@
     <BoundTreeDefinition Include="BoundTree\BoundNodes.xml">
       <SubType>Designer</SubType>
     </BoundTreeDefinition>
+    <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
     <Compile Include="Symbols\SymbolVisitor.vb" />
     <Compile Include="Symbols\SymbolVisitor`1.vb" />
     <Compile Include="Syntax\InternalSyntax\ChildSyntaxList.Enumerator.vb" />
     <Compile Include="Syntax\InternalSyntax\ChildSyntaxList.vb" />
-    <Compile Include="$(IntermediateOutputPath)Syntax.xml.Generated.vb" />
     <Content Include="Symbols\SymbolsAndNoPia.docx" />
     <Content Include="UseSiteDiagnosticsCheckEnforcer\BaseLine.txt" />
+    <Content Include="UseSiteDiagnosticsCheckEnforcer\Run.bat" />
     <SyntaxDefinition Include="Syntax\Syntax.xml">
       <SubType>Designer</SubType>
     </SyntaxDefinition>
@@ -959,15 +961,9 @@
     <InternalsVisibleToTest Include="Roslyn.Scripting.VisualBasic.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.VisualBasic.UnitTests" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="UseSiteDiagnosticsCheckEnforcer\Run.bat" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="My Project\" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Compilation\VisualBasicCompilation.DefinitionMap.vb" />
-  </ItemGroup>
   <ItemGroup />
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />

Src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj

@@ -117,6 +117,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="TouchedFileLoggingTests.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="My Project\Resources.resx">
@@ -137,9 +138,6 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TouchedFileLoggingTests.vb" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>

Src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj

@@ -97,9 +97,9 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
@@ -188,6 +188,7 @@
     </Compile>
     <Compile Include="Semantics\StaticLocalsSemanticTests.vb" />
     <Compile Include="XmlLiteralTests.vb" />
+    <Content Include="CodeGen\ConversionsILGenTestBaseline.txt" />
     <Content Include="CodeGen\ConversionsILGenTestBaseline1.txt" />
     <Content Include="CodeGen\ConversionsILGenTestSource.vb" />
     <Content Include="CodeGen\ConversionsILGenTestSource1.vb" />
@@ -260,9 +261,6 @@
       <LastGenOutput>Resource.Designer.vb</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="CodeGen\ConversionsILGenTestBaseline.txt" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="My Project\" />
   </ItemGroup>

Src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj

@@ -93,8 +93,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -126,13 +126,13 @@
     <Compile Include="Binding\SyncLockTests.vb" />
     <Compile Include="Binding\UsingTests.vb" />
     <Compile Include="Compilation\CompilationAPITests.vb" />
-    <Compile Include="Compilation\VisualBasicCompilationOptionsTests.vb" />
     <Compile Include="Compilation\GetSemanticInfoBrokenCodeTests.vb" />
     <Compile Include="Compilation\MyTemplateTests.vb" />
     <Compile Include="Compilation\ReferenceManagerTests.vb" />
     <Compile Include="Compilation\SemanticModelAPITests.vb" />
     <Compile Include="Compilation\SemanticModelGetDeclaredSymbolAPITests.vb" />
     <Compile Include="Compilation\SemanticModelLookupSymbolsAPITests.vb" />
+    <Compile Include="Compilation\VisualBasicCompilationOptionsTests.vb" />
     <Compile Include="DeclaringSyntaxNodeTests.vb" />
     <Compile Include="Diagnostics\DiagnosticAnalyzerTests.AllInOne.vb" />
     <Compile Include="Diagnostics\DiagnosticAnalyzerTests.vb" />
@@ -214,6 +214,12 @@
     <Compile Include="Semantics\WithBlockErrorTests.vb" />
     <Compile Include="Semantics\WithBlockSemanticModelTests.vb" />
     <Compile Include="Semantics\XmlLiteralSemanticModelTests.vb" />
+    <Content Include="Semantics\Async_Overload_Change_3.vb.txt" />
+    <Content Include="Semantics\BinaryOperatorsTestBaseline1.txt" />
+    <Content Include="Semantics\BinaryOperatorsTestBaseline2.txt" />
+    <Content Include="Semantics\BinaryOperatorsTestBaseline3.txt" />
+    <Content Include="Semantics\BinaryOperatorsTestBaseline4.txt" />
+    <Content Include="Semantics\BinaryOperatorsTestBaseline5.txt" />
     <Content Include="Semantics\BinaryOperatorsTestSource1.vb" />
     <Content Include="Semantics\BinaryOperatorsTestSource2.vb" />
     <Content Include="Semantics\BinaryOperatorsTestSource3.vb" />
@@ -224,23 +230,13 @@
     <EmbeddedResource Include="Binding\T_1247520.cs" />
     <EmbeddedResource Include="Binding\T_1556342.cs" />
     <EmbeddedResource Include="Binding\T_68086.vb" />
-    <EmbeddedResource Include="Semantics\LongTypeName.vb.txt" />
-    <EmbeddedResource Include="Semantics\LongTypeNameNative.vb.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Semantics\Async_Overload_Change_3.vb.txt" />
-    <Content Include="Semantics\BinaryOperatorsTestBaseline1.txt" />
-    <Content Include="Semantics\BinaryOperatorsTestBaseline2.txt" />
-    <Content Include="Semantics\BinaryOperatorsTestBaseline3.txt" />
-    <Content Include="Semantics\BinaryOperatorsTestBaseline4.txt" />
-    <Content Include="Semantics\BinaryOperatorsTestBaseline5.txt" />
-  </ItemGroup>
-  <ItemGroup>
     <EmbeddedResource Include="Resource.resx">
       <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic.UnitTests.My.Resources</CustomToolNamespace>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resource.Designer.vb</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="Semantics\LongTypeName.vb.txt" />
+    <EmbeddedResource Include="Semantics\LongTypeNameNative.vb.txt" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

Src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj

@@ -93,9 +93,9 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>

Src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj

@@ -112,6 +112,9 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="$(IntermediateOutputPath)\Syntax.xml.Generated.vb">
+      <Link>Syntax\Syntax.xml.Generated.vb</Link>
+    </Compile>
     <Compile Include="IncrementalParser\IncrementalParser.vb" />
     <Compile Include="IncrementalParser\IPEndBlockStatements.vb" />
     <Compile Include="IncrementalParser\SyntaxDifferences.vb" />
@@ -170,11 +173,6 @@
   <ItemGroup>
     <Folder Include="My Project\" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(IntermediateOutputPath)\Syntax.xml.Generated.vb">
-      <Link>Syntax\Syntax.xml.Generated.vb</Link>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resource.resx">
       <CustomToolNamespace>My.Resources</CustomToolNamespace>

Src/Compilers/VisualBasic/rvbc/rvbc.vbproj

@@ -94,11 +94,6 @@
       <CustomToolNamespace>My</CustomToolNamespace>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
-  </ItemGroup>
-  <ItemGroup>
-    <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.CommandLine.UnitTests" />
-  </ItemGroup>
-  <ItemGroup>
     <None Include="rvbc.exe.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -106,6 +101,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.CommandLine.UnitTests" />
+  </ItemGroup>
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

Src/Diagnostics/Core/FxCopRulesDiagnosticAnalyzers.csproj

@@ -74,8 +74,8 @@
     <InternalsVisibleTo Include="Roslyn.InteractiveFeatures" />
     <InternalsVisibleTo Include="Roslyn.VisualBasic.InteractiveEditorFeatures" />
     <InternalsVisibleTo Include="Roslyn.VisualStudio.Setup" />
-    <InternalsVisibleToTest Include="Roslyn.DiagnosticFixers.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.DiagnosticAnalyzers.UnitTests" />
+    <InternalsVisibleToTest Include="Roslyn.DiagnosticFixers.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Hosting.Diagnostics" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveWindow.UnitTests" />

Src/Diagnostics/Test/FxCopRulesDiagnosticAnalyzersTest.csproj

@@ -139,7 +139,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup />
   <ImportGroup Label="Targets">
     <Import Project="..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

Src/Diagnostics/VisualBasic/BasicFxCopRulesDiagnosticAnalyzers.vbproj

@@ -138,8 +138,6 @@
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup />
-  <ItemGroup />
   <ImportGroup Label="Targets">
     <Import Project="..\..\Tools\Microsoft.CodeAnalysis.Toolset.Open\Targets\VSL.Imports.targets" />
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

Src/Test/PdbUtilities/PdbUtilities.csproj

@@ -82,9 +82,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="System.Reflection.Primitives" />
     <Reference Include="System.IO" />
+    <Reference Include="System.Reflection.Primitives" />
+    <Reference Include="System.Runtime" />
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>

Src/Workspaces/CSharp/CSharpWorkspace.csproj

@@ -190,8 +190,6 @@
     <Compile Include="Formatting\Rules\WrappingFormattingRule.cs" />
     <Compile Include="LanguageServices\CSharpCommandLineArgumentsFactoryService.cs" />
     <Compile Include="LanguageServices\CSharpCompilationFactoryService.cs" />
-    <Compile Include="MSBuild\CSharpProjectFileLoader.cs" />
-    <Compile Include="MSBuild\CSharpProjectFileLoader.CSharpProjectFile.cs" />
     <Compile Include="LanguageServices\CSharpSemanticFactsService.cs" />
     <Compile Include="LanguageServices\CSharpSymbolDeclarationService.cs" />
     <Compile Include="LanguageServices\CSharpSyntaxFactsService.cs" />
@@ -203,6 +201,8 @@
     <Compile Include="LanguageServices\CSharpSyntaxVersionService.cs" />
     <Compile Include="LanguageServices\CSharpTypeInferenceService.cs" />
     <Compile Include="LanguageServices\CSharpTypeInferenceService.TypeInferrer.cs" />
+    <Compile Include="MSBuild\CSharpProjectFileLoader.cs" />
+    <Compile Include="MSBuild\CSharpProjectFileLoader.CSharpProjectFile.cs" />
     <Compile Include="Recommendations\CSharpRecommendationService.cs" />
     <Compile Include="Rename\CSharpRenameRewriterLanguageService.cs" />
     <Compile Include="Rename\LabelConflictVisitor.cs" />

Src/Workspaces/Core/Workspaces.csproj

@@ -781,6 +781,7 @@
     <Compile Include="Workspace\DocumentationComments\DocumentationCommentId.cs" />
     <Compile Include="Workspace\DocumentationComments\XmlDocumentationProvider.cs" />
     <Compile Include="Workspace\DocumentEventArgs.cs" />
+    <Compile Include="Workspace\FileTextLoader.cs" />
     <Compile Include="Workspace\Host\BackgroundCompilation\BackgroundCompiler.cs" />
     <Compile Include="Workspace\Host\BackgroundParsing\BackgroundParser.cs" />
     <Compile Include="Workspace\Host\Caching\CachedObjectSource.cs" />
@@ -808,15 +809,6 @@
     <Compile Include="Workspace\Host\PersistentStorage\NoOpPersistentStorage.cs" />
     <Compile Include="Workspace\Host\PersistentStorage\PersistentStorageOptions.cs" />
     <Compile Include="Workspace\Host\PersistentStorage\PersistentStorageServiceFactory.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\ProjectFile.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\ProjectFileLoader.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\BuildTargets.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\DocumentFileInfo.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\IProjectFile.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\IProjectFileLoader.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\MetadataInfo.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\ProjectFileInfo.cs" />
-    <Compile Include="Workspace\MSBuild\ProjectFile\ProjectFileReference.cs" />
     <Compile Include="Workspace\Host\TaskScheduler\IWorkspaceTaskScheduler.cs" />
     <Compile Include="Workspace\Host\TaskScheduler\IWorkspaceTaskSchedulerFactory.cs" />
     <Compile Include="Workspace\Host\TaskScheduler\WorkspaceTaskSchedulerFactory.cs" />
@@ -831,13 +823,20 @@
     <Compile Include="Workspace\Host\TextFactory\TextFactoryServiceFactory.cs" />
     <Compile Include="Workspace\Host\TextFactory\TextFactoryServiceFactory.TextFactoryService.cs" />
     <Compile Include="Workspace\InternalsVisibleTo.cs" />
-    <Compile Include="Workspace\FileTextLoader.cs" />
     <Compile Include="Workspace\MSBuild\MSBuildWorkspace.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\BuildTargets.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\DocumentFileInfo.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\IProjectFile.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\IProjectFileLoader.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\MetadataInfo.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\ProjectFile.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\ProjectFileInfo.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\ProjectFileLoader.cs" />
+    <Compile Include="Workspace\MSBuild\ProjectFile\ProjectFileReference.cs" />
     <Compile Include="Workspace\MSBuild\SolutionFile\LineScanner.cs" />
     <Compile Include="Workspace\MSBuild\SolutionFile\ProjectBlock.cs" />
     <Compile Include="Workspace\MSBuild\SolutionFile\SectionBlock.cs" />
     <Compile Include="Workspace\MSBuild\SolutionFile\SolutionFile.cs" />
-    <Compile Include="Workspace\WellKnownFeatures.cs" />
     <Compile Include="Workspace\Solution\BranchId.cs" />
     <Compile Include="Workspace\Solution\Document.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
@@ -880,6 +879,7 @@
     <Compile Include="Workspace\Solution\TreeAndVersion.cs" />
     <Compile Include="Workspace\Solution\VersionStamp.cs" />
     <Compile Include="Workspace\TextExtensions.cs" />
+    <Compile Include="Workspace\WellKnownFeatures.cs" />
     <Compile Include="Workspace\Workspace.cs" />
     <Compile Include="Workspace\Workspace.TextTracker.cs" />
     <Compile Include="Workspace\Workspace_Editor.cs" />

Src/Workspaces/Test/ServicesTest.csproj

@@ -145,15 +145,39 @@
     <Compile Include="WorkspaceServices\ProjectDependencyServiceTests.cs" />
     <Compile Include="WorkspaceServices\TestPersistenceService.cs" />
     <Compile Include="WorkspaceServices\TestWorkspaceServiceProvider.cs" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_App.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="TestFiles\CSharpProject_App.xaml.cs" />
     <EmbeddedResource Include="TestFiles\CSharpProject_AssemblyInfo.cs" />
     <EmbeddedResource Include="TestFiles\CSharpProject_CSharpClass.cs" />
     <EmbeddedResource Include="TestFiles\CSharpProject_CSharpClass_WithConditionalAttributes.cs" />
     <EmbeddedResource Include="TestFiles\CSharpProject_CSharpConsole.cs" />
     <EmbeddedResource Include="TestFiles\CSharpProject_CSharpExternAlias.cs" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AssemblyNameIsPath.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AssemblyNameIsPath2.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_BadHintPath.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_DuplicateFile.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ExternAlias.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ForEmittedOutput.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ProjectReference.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithoutPrefer32Bit.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithPrefer32Bit.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithXaml.csproj" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_MainWindow.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="TestFiles\CSharpProject_MainWindow.xaml.cs" />
     <EmbeddedResource Include="TestFiles\OtherStuff_Foo.cs" />
+    <EmbeddedResource Include="TestFiles\TestLoad_SolutionFileWithEmptyLineBetweenProjectBlock.sln" />
+    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_EmptyLines.sln" />
+    <EmbeddedResource Include="TestFiles\TestSolution_CSharpProjectReference.sln" />
     <EmbeddedResource Include="TestFiles\VisualBasicProject_Resources.resx_" />
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicClass_WithConditionalAttributes.vb" />
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_3_5.vbproj" />
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_Embed.vbproj" />
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_WithoutPrefer32Bit.vbproj" />
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_WithPrefer32Bit.vbproj" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
@@ -199,60 +223,6 @@
     <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicClass.vb" />
     <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject.vbproj" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AssemblyNameIsPath.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AssemblyNameIsPath2.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_BadHintPath.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_DuplicateFile.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_3_5.vbproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithoutPrefer32Bit.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithPrefer32Bit.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_MainWindow.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithXaml.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_App.xaml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_Embed.vbproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_WithoutPrefer32Bit.vbproj" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_WithPrefer32Bit.vbproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ProjectReference.csproj" />
-    <EmbeddedResource Include="TestFiles\TestSolution_CSharpProjectReference.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ExternAlias.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicClass_WithConditionalAttributes.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_EmptyLines.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestLoad_SolutionFileWithEmptyLineBetweenProjectBlock.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ForEmittedOutput.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>

Src/Workspaces/Test/TestFiles/CSharpProject_CSharpProject_WithXaml.csproj

@@ -63,16 +63,14 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Src/Workspaces/Test/TestFiles/CSharpProject_WithLink.csproj

@@ -51,7 +51,6 @@
     <Compile Include="CSharpClass.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Src/Workspaces/VisualBasic/BasicWorkspace.vbproj

@@ -80,6 +80,8 @@
     <Compile Include="Classification\Worker.XmlClassifier.vb" />
     <Compile Include="CodeCleanup\AsyncOrIteratorFunctionReturnTypeFixer.vb" />
     <Compile Include="CodeCleanup\Providers\AbstractTokensCodeCleanupProvider.vb" />
+    <Compile Include="CodeCleanup\Providers\AddMissingTokensCodeCleanupProvider.vb" />
+    <Compile Include="CodeCleanup\Providers\CaseCorrectionCodeCleanupProvider.vb" />
     <Compile Include="CodeCleanup\Providers\FixIncorrectTokensCodeCleanupProvider.vb" />
     <Compile Include="CodeCleanup\Providers\NormalizeModifiersOrOperatorsCodeCleanupProvider.vb" />
     <Compile Include="CodeCleanup\Providers\ReduceTokensCodeCleanupProvider.vb" />
@@ -123,18 +125,38 @@
     <Compile Include="Extensions\ContextQuery\SyntaxTreeExtensions.vb" />
     <Compile Include="Extensions\ContextQuery\VisualBasicSyntaxContext.vb" />
     <Compile Include="Extensions\ContextQuery\VisualBasicSyntaxContextExtensions.vb" />
+    <Compile Include="Extensions\DirectiveSyntaxExtensions.vb" />
+    <Compile Include="Extensions\ExpressionSyntaxExtensions.vb" />
+    <Compile Include="Extensions\ExpressionSyntaxGeneratorVisitor.vb" />
     <Compile Include="Extensions\IDocumentExtensions.vb" />
     <Compile Include="Extensions\IMethodSymbolExtensions.vb" />
     <Compile Include="Extensions\INamespaceOrTypeSymbolExtensions.vb" />
     <Compile Include="Extensions\InvocationExpressionSyntaxExtensions.vb" />
+    <Compile Include="Extensions\ISemanticModelExtensions.vb" />
+    <Compile Include="Extensions\ITypeSymbolExtensions.vb" />
+    <Compile Include="Extensions\LocationExtensions.vb" />
+    <Compile Include="Extensions\MemberAccessExpressionSyntaxExtensions.vb" />
     <Compile Include="Extensions\MethodBaseSyntaxExtensions.vb" />
+    <Compile Include="Extensions\NameSyntaxExtensions.vb" />
     <Compile Include="Extensions\ObjectCreationExpressionExtensions.vb" />
     <Compile Include="Extensions\OperatorPrecedence.vb" />
     <Compile Include="Extensions\ParameterSyntaxExtensions.vb" />
     <Compile Include="Extensions\ParenthesizedExpressionSyntaxExtensions.vb" />
+    <Compile Include="Extensions\SimpleNameSyntaxExtensions.vb" />
+    <Compile Include="Extensions\SingleLineRewriter.vb" />
+    <Compile Include="Extensions\StatementSyntaxExtensions.vb" />
+    <Compile Include="Extensions\StringExtensions.vb" />
     <Compile Include="Extensions\SymbolDisplayPartExtensions.vb" />
     <Compile Include="Extensions\SymbolExtensions.vb" />
+    <Compile Include="Extensions\SyntaxListExtensions.vb" />
+    <Compile Include="Extensions\SyntaxNodeExtensions.vb" />
+    <Compile Include="Extensions\SyntaxTokenExtensions.vb" />
+    <Compile Include="Extensions\SyntaxTreeExtensions.vb" />
+    <Compile Include="Extensions\SyntaxTriviaExtensions.vb" />
+    <Compile Include="Extensions\SyntaxTriviaListExtensions.vb" />
     <Compile Include="Extensions\TypeBlockSyntaxExtensions.vb" />
+    <Compile Include="Extensions\TypeSyntaxGeneratorVisitor.vb" />
+    <Compile Include="Extensions\VariableDeclaratorSyntaxExtensions.vb" />
     <Compile Include="Formatting\DefaultOperationProvider.vb" />
     <Compile Include="Formatting\Engine\AggregatedFormattingResult.vb" />
     <Compile Include="Formatting\Engine\FormattingResult.vb" />
@@ -151,6 +173,7 @@
     <Compile Include="Formatting\Engine\VisualBasicFormatEngine.vb" />
     <Compile Include="Formatting\Engine\VisualBasicStructuredTriviaFormatEngine.vb" />
     <Compile Include="Formatting\FormattingHelpers.vb" />
+    <Compile Include="Formatting\Rules\AdjustSpaceFormattingRule.vb" />
     <Compile Include="Formatting\Rules\AlignTokensFormattingRule.vb" />
     <Compile Include="Formatting\Rules\BaseFormattingRule.vb" />
     <Compile Include="Formatting\Rules\ElasticTriviaFormattingRule.vb" />
@@ -158,15 +181,19 @@
     <Compile Include="Formatting\Rules\StructuredTriviaFormattingRule.vb" />
     <Compile Include="Formatting\VisualBasicSyntaxFormattingService.vb" />
     <Compile Include="LanguageServices\VisualBasicCommandLineArgumentsFactoryService.vb" />
-    <Compile Include="MSBuild\VisualBasicProjectFileLoader.vb" />
+    <Compile Include="LanguageServices\VisualBasicCompilationFactoryService.vb" />
     <Compile Include="LanguageServices\VisualBasicSemanticFactsService.vb" />
     <Compile Include="LanguageServices\VisualBasicSymbolDeclarationService.vb" />
     <Compile Include="LanguageServices\VisualBasicSyntaxFactsService.vb" />
+    <Compile Include="LanguageServices\VisualBasicSyntaxTreeFactoryService.NullSyntaxReference.vb" />
     <Compile Include="LanguageServices\VisualBasicSyntaxTreeFactoryService.PathSyntaxReference.vb" />
+    <Compile Include="LanguageServices\VisualBasicSyntaxTreeFactoryService.PositionalSyntaxReference.vb" />
     <Compile Include="LanguageServices\VisualBasicSyntaxTreeFactoryService.RecoverableSyntaxTree.vb" />
+    <Compile Include="LanguageServices\VisualBasicSyntaxTreeFactoryService.vb" />
     <Compile Include="LanguageServices\VisualBasicSyntaxVersionService.vb" />
     <Compile Include="LanguageServices\VisualBasicTypeInferenceService.TypeInferrer.vb" />
     <Compile Include="LanguageServices\VisualBasicTypeInferenceService.vb" />
+    <Compile Include="MSBuild\VisualBasicProjectFileLoader.vb" />
     <Compile Include="Recommendations\VisualBasicRecommendationService.vb" />
     <Compile Include="Rename\LabelConflictVisitor.vb" />
     <Compile Include="Rename\LocalConflictVisitor.vb" />
@@ -193,6 +220,7 @@
     <Compile Include="Simplification\VisualBasicSimplificationService.vb" />
     <Compile Include="Simplification\VisualBasicVariableDeclaratorReducer.Rewriter.vb" />
     <Compile Include="Simplification\VisualBasicVariableDeclaratorReducer.vb" />
+    <Compile Include="Utilities\DirectiveSyntaxEqualityComparer.vb" />
     <Compile Include="Utilities\DirectiveWalker.vb" />
     <Compile Include="Utilities\ImportsClauseComparer.vb" />
     <Compile Include="Utilities\ImportsOrganizer.vb" />
@@ -225,36 +253,6 @@
       <DependentUpon>VBWorkspaceResources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Extensions\DirectiveSyntaxExtensions.vb" />
-    <Compile Include="Extensions\ExpressionSyntaxExtensions.vb" />
-    <Compile Include="Extensions\ISemanticModelExtensions.vb" />
-    <Compile Include="Extensions\ITypeSymbolExtensions.vb" />
-    <Compile Include="Extensions\LocationExtensions.vb" />
-    <Compile Include="Extensions\MemberAccessExpressionSyntaxExtensions.vb" />
-    <Compile Include="Extensions\NameSyntaxExtensions.vb" />
-    <Compile Include="Extensions\SimpleNameSyntaxExtensions.vb" />
-    <Compile Include="Extensions\SingleLineRewriter.vb" />
-    <Compile Include="Extensions\StatementSyntaxExtensions.vb" />
-    <Compile Include="Extensions\StringExtensions.vb" />
-    <Compile Include="Extensions\SyntaxListExtensions.vb" />
-    <Compile Include="Extensions\SyntaxNodeExtensions.vb" />
-    <Compile Include="Extensions\SyntaxTokenExtensions.vb" />
-    <Compile Include="Extensions\SyntaxTreeExtensions.vb" />
-    <Compile Include="Extensions\SyntaxTriviaExtensions.vb" />
-    <Compile Include="Extensions\SyntaxTriviaListExtensions.vb" />
-    <Compile Include="Extensions\VariableDeclaratorSyntaxExtensions.vb" />
-    <Compile Include="Utilities\DirectiveSyntaxEqualityComparer.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Formatting\Rules\AdjustSpaceFormattingRule.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="LanguageServices\VisualBasicCompilationFactoryService.vb" />
-    <Compile Include="LanguageServices\VisualBasicSyntaxTreeFactoryService.NullSyntaxReference.vb" />
-    <Compile Include="LanguageServices\VisualBasicSyntaxTreeFactoryService.PositionalSyntaxReference.vb" />
-    <Compile Include="LanguageServices\VisualBasicSyntaxTreeFactoryService.vb" />
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <AllowNonModulatedReference>true</AllowNonModulatedReference>
@@ -277,18 +275,6 @@
     <Import Include="Roslyn.Utilities" />
     <Import Include="Roslyn.Utilities.Contract" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CodeCleanup\Providers\CaseCorrectionCodeCleanupProvider.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CodeCleanup\Providers\AddMissingTokensCodeCleanupProvider.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Extensions\ExpressionSyntaxGeneratorVisitor.vb" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Extensions\TypeSyntaxGeneratorVisitor.vb" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="VBWorkspaceResources.resx">
       <CustomToolNamespace>Microsoft.CodeAnalysis.VisualBasic</CustomToolNamespace>