Moved some files

src/EditorFeatures/Test/EditorServicesTest.csproj

@@ -214,6 +214,7 @@
     <Compile Include="TextEditor\TryGetDocumentTests.cs" />
     <Compile Include="Threading\AsynchronousWorkerTests.cs" />
     <Compile Include="Threading\ForegroundNotificationServiceTests.cs" />
+    <Compile Include="Utilities\EditorServicesUtil.cs" />
     <Compile Include="Utilities\AsynchronousOperationListenerTests.cs" />
     <Compile Include="Utilities\AsyncLazyTests.cs" />
     <Compile Include="Utilities\BloomFilterTests.cs" />

src/EditorFeatures/Test2/NavigationBar/NavigationBarPresenterTests.vb

@@ -9,8 +9,7 @@ Imports Microsoft.VisualStudio.Composition
 
 Namespace Microsoft.CodeAnalysis.Editor.UnitTests.NavigationBar
     Public Class NavigationBarControllerTests
-        Friend ReadOnly ExportProvider As ExportProvider = MinimalTestExportProvider.CreateExportProvider(
-            TestExportProvider.EntireAssemblyCatalogWithCSharpAndVisualBasic.WithPart(GetType(NavigationBarWaiter)))
+        Friend ReadOnly ExportProvider As ExportProvider = MinimalTestExportProvider.CreateExportProvider(TestExportProvider.EntireAssemblyCatalogWithCSharpAndVisualBasic.WithPart(GetType(NavigationBarWaiter)).WithPart(GetType(WorkspaceWaiter)))
 
         <[Shared]>
         <Export(GetType(IAsynchronousOperationListener))>
@@ -21,6 +20,15 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.NavigationBar
             Inherits AsynchronousOperationListener
         End Class
 
+        <[Shared]>
+        <Export(GetType(IAsynchronousOperationListener))>
+        <Export(GetType(IAsynchronousOperationWaiter))>
+        <Export(GetType(NavigationBarWaiter))>
+        <Feature(FeatureAttribute.Workspace)>
+        Private Class WorkspaceWaiter
+            Inherits AsynchronousOperationListener
+        End Class
+
         <WpfFact, Trait(Traits.Feature, Traits.Features.NavigationBar), WorkItem(544957, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/544957")>
         Public Async Function TestDoNotRecomputeAfterFullRecompute() As Task
             Using workspace = Await TestWorkspace.CreateAsync(

src/Workspaces/CoreTest/ServicesTest.csproj

@@ -118,37 +118,6 @@
     <Compile Include="WorkspaceServiceTests\OptionServiceTests.cs" />
     <Compile Include="Host\WorkspaceServices\TestPersistenceService.cs" />
     <Compile Include="Host\TestHost.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_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" />
@@ -161,127 +130,16 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject.dll" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject.csproj">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AllOptions.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidLibrary1.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidLibrary2.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidLibrary3.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidLibrary4.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidReferenceTest.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidsBecomeCircularReferential.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidsBecomeSelfReferential.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_WithLink.csproj" />
-    <EmbeddedResource Include="TestFiles\key.snk" />
-    <EmbeddedResource Include="TestFiles\TestSolution_CSharp.sln" />
-    <EmbeddedResource Include="TestFiles\TestSolution_DuplicatedGuids.sln" />
-    <EmbeddedResource Include="TestFiles\TestSolution_DuplicatedGuidsBecomeCircularReferential.sln" />
-    <EmbeddedResource Include="TestFiles\TestSolution_DuplicatedGuidsBecomeSelfReferential.sln" />
-    <EmbeddedResource Include="TestFiles\TestSolution_MissingEndProject1.sln" />
-    <EmbeddedResource Include="TestFiles\TestSolution_MissingEndProject2.sln" />
-    <EmbeddedResource Include="TestFiles\TestSolution_MissingEndProject3.sln" />
-    <EmbeddedResource Include="TestFiles\TestSolution_VB_and_CSharp.sln" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_Application.Designer.vb" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_Application.myapp" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_AssemblyInfo.vb" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_Resources.Designer.vb" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_Settings.Designer.vb" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_Settings.settings" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicClass.vb" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject.vbproj" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestSolution_AnalyzerReference.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AnalyzerReference.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_AnalyzerReference.vbproj" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Host\Utilities\" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestSolution_InvalidProjectPath.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestSolution_NonExistentProject.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AssemblyNameIsPath.csproj" />
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AssemblyNameIsPath2.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_UnknownProjectTypeGuid.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_UnknownProjectTypeGuidAndUnknownExtension.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_UnknownProjectExtension.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_InvalidProjectReference.vbproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_NonExistentProjectReference.vbproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_UnknownProjectExtension.vbproj" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="project.json" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\Encoding.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\EmptyLibrary.dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\TestSolution_SolutionFolder.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_Circular_Target.vbproj" />
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_Circular_Top.vbproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithoutCSharpTargetsImported.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_WithoutVBTargetsImported.vbproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_BadLink.csproj">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ExternAlias2.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CircularProjectReferences\CircularCSharpProject1.csproj" />
-    <EmbeddedResource Include="TestFiles\CircularProjectReferences\CircularCSharpProject2.csproj" />
-    <EmbeddedResource Include="TestFiles\CircularProjectReferences\CircularSolution.sln" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_ReferencesPortableProject.csproj">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="TestFiles\CSharpProject_PortableProject.csproj">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="..\..\..\build\Targets\Imports.targets" />
   <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
 </Project>
\ No newline at end of file

src/Workspaces/CoreTestUtilities/WorkspacesTestUtilities.csproj

@@ -58,10 +58,25 @@
     <Compile Include="FileSet.cs" />
     <Compile Include="Formatting\FormattingTestBase.cs" />
     <Compile Include="SolutionUtilities.cs" />
+    <EmbeddedResource Include="TestFiles\CSharpProject_App.xaml.cs">
+      <DependentUpon>CSharpProject_App.xaml</DependentUpon>
+    </EmbeddedResource>
+    <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_MainWindow.xaml.cs">
+      <DependentUpon>CSharpProject_MainWindow.xaml</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TestFiles\OtherStuff_Foo.cs" />
     <Compile Include="TestWorkspace.cs" />
     <Compile Include="WorkspaceExtensions.cs" />
     <Compile Include="WorkspaceTestBase.cs" />
     <None Include="project.json" />
+    <EmbeddedResource Include="TestFiles\key.snk" />
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_Resources.resx_" />
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_Settings.settings" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
@@ -77,5 +92,230 @@
   <ItemGroup>
     <InternalsVisibleToTest Include="Roslyn.Services.UnitTests" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CircularProjectReferences\CircularCSharpProject1.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CircularProjectReferences\CircularCSharpProject2.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CircularProjectReferences\CircularSolution.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_App.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject.csproj">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AllOptions.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AnalyzerReference.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AssemblyNameIsPath.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_AssemblyNameIsPath2.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_BadHintPath.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_BadLink.csproj">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_DuplicateFile.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ExternAlias.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ExternAlias2.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ForEmittedOutput.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_ProjectReference.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithoutCSharpTargetsImported.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithoutPrefer32Bit.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithPrefer32Bit.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_CSharpProject_WithXaml.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidLibrary1.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidLibrary2.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidLibrary3.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidLibrary4.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidReferenceTest.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidsBecomeCircularReferential.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_DuplicatedGuidsBecomeSelfReferential.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_MainWindow.xaml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_PortableProject.csproj">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_ReferencesPortableProject.csproj">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\CSharpProject_WithLink.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\EmptyLibrary.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\Encoding.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestLoad_SolutionFileWithEmptyLineBetweenProjectBlock.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_AnalyzerReference.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_CSharp.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_EmptyLines.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_UnknownProjectExtension.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_UnknownProjectTypeGuid.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_CSharp_UnknownProjectTypeGuidAndUnknownExtension.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_CSharpProjectReference.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_DuplicatedGuids.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_DuplicatedGuidsBecomeCircularReferential.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_DuplicatedGuidsBecomeSelfReferential.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_InvalidProjectPath.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_MissingEndProject1.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_MissingEndProject2.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_MissingEndProject3.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_NonExistentProject.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_SolutionFolder.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\TestSolution_VB_and_CSharp.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_Application.Designer.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_Application.myapp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_AssemblyInfo.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_Circular_Target.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_Circular_Top.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_Resources.Designer.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_Settings.Designer.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicClass.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicClass_WithConditionalAttributes.vb" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_3_5.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_AnalyzerReference.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_Embed.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_InvalidProjectReference.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_NonExistentProjectReference.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_UnknownProjectExtension.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_WithoutPrefer32Bit.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_WithoutVBTargetsImported.vbproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TestFiles\VisualBasicProject_VisualBasicProject_WithPrefer32Bit.vbproj" />
+  </ItemGroup>
   <Import Project="..\..\..\build\Targets\Imports.targets" />
-</Project>
+</Project>
\ No newline at end of file