Merge pull request #194 from AArnott/moveTests

Move test projects into top-level test folder
microsoft · Jan 22, 2021 · b0e892a · b0e892a
2 parents ba8395f + cca91c0
commit b0e892a
Show file tree

Hide file tree

Showing 176 changed files with 78 additions and 52 deletions.
diff --git a/src/Directory.Build.props → Directory.Build.props b/src/Directory.Build.props → Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <RepoBinPath>$(MSBuildThisFileDirectory)..\bin\</RepoBinPath>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <RepoBinPath>$(MSBuildThisFileDirectory)bin\</RepoBinPath>
+    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(RepoBinPath)$(MSBuildProjectName)\</BaseOutputPath>
     <PackageOutputPath>$(RepoBinPath)$(Configuration)\Packages\</PackageOutputPath>
 
@@ -35,7 +35,7 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)PackageIcon.png" Pack="true" PackagePath="" />
+    <None Include="$(MSBuildThisFileDirectory)src\PackageIcon.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json">

diff --git a/src/Microsoft.VisualStudio.Composition.sln → Microsoft.VisualStudio.Composition.sln b/src/Microsoft.VisualStudio.Composition.sln → Microsoft.VisualStudio.Composition.sln
@@ -3,47 +3,57 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28606.126
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition", "Microsoft.VisualStudio.Composition\Microsoft.VisualStudio.Composition.csproj", "{1CA6A92C-5DD9-4BE5-B5B7-EE4A1318B4C2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition", "src\Microsoft.VisualStudio.Composition\Microsoft.VisualStudio.Composition.csproj", "{1CA6A92C-5DD9-4BE5-B5B7-EE4A1318B4C2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.Tests", "tests\Microsoft.VisualStudio.Composition.Tests\Microsoft.VisualStudio.Composition.Tests.csproj", "{C92F90BA-CD5B-4847-832A-EE738F0FDB13}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.Tests", "test\Microsoft.VisualStudio.Composition.Tests\Microsoft.VisualStudio.Composition.Tests.csproj", "{C92F90BA-CD5B-4847-832A-EE738F0FDB13}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AppDomainTests", "tests\Microsoft.VisualStudio.Composition.AppDomainTests\Microsoft.VisualStudio.Composition.AppDomainTests.csproj", "{15FC5B0E-AE82-4437-8916-B59E646C41E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AppDomainTests", "test\Microsoft.VisualStudio.Composition.AppDomainTests\Microsoft.VisualStudio.Composition.AppDomainTests.csproj", "{15FC5B0E-AE82-4437-8916-B59E646C41E7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AppDomainTests2", "tests\Microsoft.VisualStudio.Composition.AppDomainTests2\Microsoft.VisualStudio.Composition.AppDomainTests2.csproj", "{8FEA4ED5-0504-43A6-92C0-E9DACB20F1C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AppDomainTests2", "test\Microsoft.VisualStudio.Composition.AppDomainTests2\Microsoft.VisualStudio.Composition.AppDomainTests2.csproj", "{8FEA4ED5-0504-43A6-92C0-E9DACB20F1C8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests", "tests\Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests\Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests.csproj", "{37E36AEC-3319-4219-974F-D258FBE8D143}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests", "test\Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests\Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests.csproj", "{37E36AEC-3319-4219-974F-D258FBE8D143}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.Configuration", "Microsoft.VisualStudio.Composition.Configuration\Microsoft.VisualStudio.Composition.Configuration.csproj", "{2285F0B1-0B9E-43C5-9BA5-0CB293C9BC63}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.Configuration", "src\Microsoft.VisualStudio.Composition.Configuration\Microsoft.VisualStudio.Composition.Configuration.csproj", "{2285F0B1-0B9E-43C5-9BA5-0CB293C9BC63}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.EmbeddedTypeReceiver", "tests\Microsoft.VisualStudio.Composition.EmbeddedTypeReceiver\Microsoft.VisualStudio.Composition.EmbeddedTypeReceiver.csproj", "{843DB118-C15B-48B5-A9DC-B815CC788CEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.EmbeddedTypeReceiver", "test\Microsoft.VisualStudio.Composition.EmbeddedTypeReceiver\Microsoft.VisualStudio.Composition.EmbeddedTypeReceiver.csproj", "{843DB118-C15B-48B5-A9DC-B815CC788CEF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.NonEmbeddingTypeReceiver", "tests\Microsoft.VisualStudio.Composition.NonEmbeddingTypeReceiver\Microsoft.VisualStudio.Composition.NonEmbeddingTypeReceiver.csproj", "{3E996534-55E8-428D-8668-2C49E8770F32}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.NonEmbeddingTypeReceiver", "test\Microsoft.VisualStudio.Composition.NonEmbeddingTypeReceiver\Microsoft.VisualStudio.Composition.NonEmbeddingTypeReceiver.csproj", "{3E996534-55E8-428D-8668-2C49E8770F32}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.MissingAssemblyTests", "tests\Microsoft.VisualStudio.Composition.MissingAssemblyTests\Microsoft.VisualStudio.Composition.MissingAssemblyTests.csproj", "{635A4876-52BA-47C7-874C-8DFB125C020A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.MissingAssemblyTests", "test\Microsoft.VisualStudio.Composition.MissingAssemblyTests\Microsoft.VisualStudio.Composition.MissingAssemblyTests.csproj", "{635A4876-52BA-47C7-874C-8DFB125C020A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.BrokenAssemblyTests", "tests\Microsoft.VisualStudio.Composition.BrokenAssemblyTests\Microsoft.VisualStudio.Composition.BrokenAssemblyTests.csproj", "{0FD27327-EBFD-459A-887D-349BC3835C20}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.BrokenAssemblyTests", "test\Microsoft.VisualStudio.Composition.BrokenAssemblyTests\Microsoft.VisualStudio.Composition.BrokenAssemblyTests.csproj", "{0FD27327-EBFD-459A-887D-349BC3835C20}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{28B65BDB-4470-4946-BAC3-4EE840F40B37}"
 	ProjectSection(SolutionItems) = preProject
-		..\azure-pipelines\build.yml = ..\azure-pipelines\build.yml
 		Directory.Build.props = Directory.Build.props
-		..\global.json = ..\global.json
-		..\nuget.config = ..\nuget.config
-		..\azure-pipelines\testfx.yml = ..\azure-pipelines\testfx.yml
+		global.json = global.json
+		nuget.config = nuget.config
+		README.md = README.md
+		stylecop.json = stylecop.json
 		version.json = version.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests2", "tests\Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests2\Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests2.csproj", "{A424CBE4-248E-477C-88BD-575FA240EACB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests2", "test\Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests2\Microsoft.VisualStudio.Composition.AssemblyDiscoveryTests2.csproj", "{A424CBE4-248E-477C-88BD-575FA240EACB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AppHost", "Microsoft.VisualStudio.Composition.AppHost\Microsoft.VisualStudio.Composition.AppHost.csproj", "{93C14982-BB95-4554-BE09-2D0A4C9ADA09}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.AppHost", "src\Microsoft.VisualStudio.Composition.AppHost\Microsoft.VisualStudio.Composition.AppHost.csproj", "{93C14982-BB95-4554-BE09-2D0A4C9ADA09}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.TestEmbeddableTypes", "tests\Microsoft.VisualStudio.Composition.TestEmbeddableTypes\Microsoft.VisualStudio.Composition.TestEmbeddableTypes.csproj", "{E4BB6F4B-EAB5-4DF2-9FFA-08981105DF90}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.TestEmbeddableTypes", "test\Microsoft.VisualStudio.Composition.TestEmbeddableTypes\Microsoft.VisualStudio.Composition.TestEmbeddableTypes.csproj", "{E4BB6F4B-EAB5-4DF2-9FFA-08981105DF90}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.NetFxAttributes", "Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj", "{DFD69876-E482-4F1A-A772-7B5DA5D75724}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.NetFxAttributes", "src\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj", "{DFD69876-E482-4F1A-A772-7B5DA5D75724}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.Composition.Analyzers", "Microsoft.VisualStudio.Composition.Analyzers\Microsoft.VisualStudio.Composition.Analyzers.csproj", "{E05AF240-2D20-4037-97DD-7163B3BAA7F4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.Analyzers", "src\Microsoft.VisualStudio.Composition.Analyzers\Microsoft.VisualStudio.Composition.Analyzers.csproj", "{E05AF240-2D20-4037-97DD-7163B3BAA7F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.Composition.Analyzers.Tests", "tests\Microsoft.VisualStudio.Composition.Analyzers.Tests\Microsoft.VisualStudio.Composition.Analyzers.Tests.csproj", "{A469088A-DCA0-4968-B472-F9D6C7D6DF38}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Composition.Analyzers.Tests", "test\Microsoft.VisualStudio.Composition.Analyzers.Tests\Microsoft.VisualStudio.Composition.Analyzers.Tests.csproj", "{A469088A-DCA0-4968-B472-F9D6C7D6DF38}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C1E69228-5ECA-4B33-A08C-F60908B1A31A}"
+	ProjectSection(SolutionItems) = preProject
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{34FA3DAA-1CE6-4D26-9802-681043203006}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+		test\Directory.Build.targets = test\Directory.Build.targets
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -119,6 +129,24 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{1CA6A92C-5DD9-4BE5-B5B7-EE4A1318B4C2} = {C1E69228-5ECA-4B33-A08C-F60908B1A31A}
+		{C92F90BA-CD5B-4847-832A-EE738F0FDB13} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{15FC5B0E-AE82-4437-8916-B59E646C41E7} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{8FEA4ED5-0504-43A6-92C0-E9DACB20F1C8} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{37E36AEC-3319-4219-974F-D258FBE8D143} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{2285F0B1-0B9E-43C5-9BA5-0CB293C9BC63} = {C1E69228-5ECA-4B33-A08C-F60908B1A31A}
+		{843DB118-C15B-48B5-A9DC-B815CC788CEF} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{3E996534-55E8-428D-8668-2C49E8770F32} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{635A4876-52BA-47C7-874C-8DFB125C020A} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{0FD27327-EBFD-459A-887D-349BC3835C20} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{A424CBE4-248E-477C-88BD-575FA240EACB} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{93C14982-BB95-4554-BE09-2D0A4C9ADA09} = {C1E69228-5ECA-4B33-A08C-F60908B1A31A}
+		{E4BB6F4B-EAB5-4DF2-9FFA-08981105DF90} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+		{DFD69876-E482-4F1A-A772-7B5DA5D75724} = {C1E69228-5ECA-4B33-A08C-F60908B1A31A}
+		{E05AF240-2D20-4037-97DD-7163B3BAA7F4} = {C1E69228-5ECA-4B33-A08C-F60908B1A31A}
+		{A469088A-DCA0-4968-B472-F9D6C7D6DF38} = {34FA3DAA-1CE6-4D26-9802-681043203006}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {595F7089-18B6-4D24-8F38-7FFCCE2F5F0E}
 	EndGlobalSection

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -25,7 +25,7 @@ jobs:
   steps:
   - template: azure-pipelines/testfx.yml
     parameters:
-      projectdirectory: src/tests/Microsoft.VisualStudio.Composition.Tests
+      projectdirectory: test/Microsoft.VisualStudio.Composition.Tests
       testlogartifactname: linux_testlogs
 
 - job: macOS
@@ -34,5 +34,5 @@ jobs:
   steps:
   - template: azure-pipelines/testfx.yml
     parameters:
-      projectdirectory: src/tests/Microsoft.VisualStudio.Composition.Tests
+      projectdirectory: test/Microsoft.VisualStudio.Composition.Tests
       testlogartifactname: macOS_testlogs
diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
@@ -15,9 +15,8 @@ steps:
     version: 2.1.x
 
 - script: |
-    dotnet tool install --tool-path .. nbgv
-    ..\nbgv cloud
-  workingDirectory: src
+    dotnet tool install --tool-path . nbgv
+    .\nbgv cloud
   displayName: Set build number
 
 - task: PowerShell@2
@@ -50,7 +49,6 @@ steps:
   inputs:
     command: restore
     verbosityRestore: normal # detailed, normal, minimal
-    projects: src/**/*.sln
     feedsToUse: config
     nugetConfigPath: nuget.config
 
@@ -66,7 +64,7 @@ steps:
   displayName: Run tests
   inputs:
     command: test
-    projects: src/**/*.Tests.csproj
+    projects: test/**/*.Tests.csproj
     arguments: --configuration $(BuildConfiguration) --no-build --filter "TestCategory!=FailsInCloudTest" -v n
   condition: and(succeeded(), ne(variables['SignType'], 'real'))
 

diff --git a/src/stylecop.json → stylecop.json b/src/stylecop.json → stylecop.json
diff --git a/src/tests/Directory.Build.props → test/Directory.Build.props b/src/tests/Directory.Build.props → test/Directory.Build.props
diff --git a/src/tests/Directory.Build.targets → test/Directory.Build.targets b/src/tests/Directory.Build.targets → test/Directory.Build.targets
diff --git a/...s/Helpers/CSharpCodeFixVerifier`2+Test.cs → ...s/Helpers/CSharpCodeFixVerifier`2+Test.cs b/...s/Helpers/CSharpCodeFixVerifier`2+Test.cs → ...s/Helpers/CSharpCodeFixVerifier`2+Test.cs
diff --git a/....Tests/Helpers/CSharpCodeFixVerifier`2.cs → ....Tests/Helpers/CSharpCodeFixVerifier`2.cs b/....Tests/Helpers/CSharpCodeFixVerifier`2.cs → ....Tests/Helpers/CSharpCodeFixVerifier`2.cs
diff --git a/...alyzers.Tests/Helpers/ReferencesHelper.cs → ...alyzers.Tests/Helpers/ReferencesHelper.cs b/...alyzers.Tests/Helpers/ReferencesHelper.cs → ...alyzers.Tests/Helpers/ReferencesHelper.cs
diff --git a/...pers/VisualBasicCodeFixVerifier`2+Test.cs → ...pers/VisualBasicCodeFixVerifier`2+Test.cs b/...pers/VisualBasicCodeFixVerifier`2+Test.cs → ...pers/VisualBasicCodeFixVerifier`2+Test.cs
diff --git a/...s/Helpers/VisualBasicCodeFixVerifier`2.cs → ...s/Helpers/VisualBasicCodeFixVerifier`2.cs b/...s/Helpers/VisualBasicCodeFixVerifier`2.cs → ...s/Helpers/VisualBasicCodeFixVerifier`2.cs
diff --git a/...Studio.Composition.Analyzers.Tests.csproj → ...Studio.Composition.Analyzers.Tests.csproj b/...Studio.Composition.Analyzers.Tests.csproj → ...Studio.Composition.Analyzers.Tests.csproj
@@ -4,7 +4,7 @@
     <!-- Do not contribute to the one test directory that all the others do, because we're unrelated
          and most importantly our analyzer test dependencies bring their own copy of vs-mef, leading to a 'last one wins' file overwrite
          issue if we were to share a directory with vs-mef tests that makes testing unstable. -->
-    <BaseOutputPath>$(MSBuildThisFileDirectory)..\..\..\bin\Tests\Microsoft.VisualStudio.Composition.Analyzers.Tests</BaseOutputPath>
+    <BaseOutputPath>$(MSBuildThisFileDirectory)..\..\bin\Tests\Microsoft.VisualStudio.Composition.Analyzers.Tests</BaseOutputPath>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.VisualStudio.Composition.Analyzers\Microsoft.VisualStudio.Composition.Analyzers.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.Analyzers\Microsoft.VisualStudio.Composition.Analyzers.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ts/VSMEF001PropertyMustHaveSetterTests.cs → ...ts/VSMEF001PropertyMustHaveSetterTests.cs b/...ts/VSMEF001PropertyMustHaveSetterTests.cs → ...ts/VSMEF001PropertyMustHaveSetterTests.cs
diff --git a/...position.AppDomainTests/ExternalExport.cs → ...position.AppDomainTests/ExternalExport.cs b/...position.AppDomainTests/ExternalExport.cs → ...position.AppDomainTests/ExternalExport.cs
diff --git a/....AppDomainTests/ExternalExportOnMember.cs → ....AppDomainTests/ExternalExportOnMember.cs b/....AppDomainTests/ExternalExportOnMember.cs → ....AppDomainTests/ExternalExportOnMember.cs
diff --git a/...ExternalExportWithExternalMetadataType.cs → ...ExternalExportWithExternalMetadataType.cs b/...ExternalExportWithExternalMetadataType.cs → ...ExternalExportWithExternalMetadataType.cs
diff --git a/....AppDomainTests/ExternalExportWithLazy.cs → ....AppDomainTests/ExternalExportWithLazy.cs b/....AppDomainTests/ExternalExportWithLazy.cs → ....AppDomainTests/ExternalExportWithLazy.cs
diff --git a/...lStudio.Composition.AppDomainTests.csproj → ...lStudio.Composition.AppDomainTests.csproj b/...lStudio.Composition.AppDomainTests.csproj → ...lStudio.Composition.AppDomainTests.csproj
@@ -4,6 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.VisualStudio.Composition.AppDomainTests2\Microsoft.VisualStudio.Composition.AppDomainTests2.csproj" />
-    <ProjectReference Include="..\..\Microsoft.VisualStudio.Composition\Microsoft.VisualStudio.Composition.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition\Microsoft.VisualStudio.Composition.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...ion.AppDomainTests/OpenGenericExport`1.cs → ...ion.AppDomainTests/OpenGenericExport`1.cs b/...ion.AppDomainTests/OpenGenericExport`1.cs → ...ion.AppDomainTests/OpenGenericExport`1.cs
diff --git a/...ainTests/PartThatImportsExportedMember.cs → ...ainTests/PartThatImportsExportedMember.cs b/...ainTests/PartThatImportsExportedMember.cs → ...ainTests/PartThatImportsExportedMember.cs
diff --git a/...yImportsExportWithMetadataOfCustomType.cs → ...yImportsExportWithMetadataOfCustomType.cs b/...yImportsExportWithMetadataOfCustomType.cs → ...yImportsExportWithMetadataOfCustomType.cs
diff --git a/...rtsExportWithTypeMetadataViaDictionary.cs → ...rtsExportWithTypeMetadataViaDictionary.cs b/...rtsExportWithTypeMetadataViaDictionary.cs → ...rtsExportWithTypeMetadataViaDictionary.cs
diff --git a/...ortsExportWithTypeMetadataViaTMetadata.cs → ...ortsExportWithTypeMetadataViaTMetadata.cs b/...ortsExportWithTypeMetadataViaTMetadata.cs → ...ortsExportWithTypeMetadataViaTMetadata.cs
diff --git a/...inTests2/AnExportWithMetadataTypeValue.cs → ...inTests2/AnExportWithMetadataTypeValue.cs b/...inTests2/AnExportWithMetadataTypeValue.cs → ...inTests2/AnExportWithMetadataTypeValue.cs
diff --git a/...ppDomainTests2/CustomMetadataAttribute.cs → ...ppDomainTests2/CustomMetadataAttribute.cs b/...ppDomainTests2/CustomMetadataAttribute.cs → ...ppDomainTests2/CustomMetadataAttribute.cs
diff --git a/...pDomainTests2/ExportWithCustomMetadata.cs → ...pDomainTests2/ExportWithCustomMetadata.cs b/...pDomainTests2/ExportWithCustomMetadata.cs → ...pDomainTests2/ExportWithCustomMetadata.cs
diff --git a/...osition.AppDomainTests2/ExportedMember.cs → ...osition.AppDomainTests2/ExportedMember.cs b/...osition.AppDomainTests2/ExportedMember.cs → ...osition.AppDomainTests2/ExportedMember.cs
diff --git a/...Studio.Composition.AppDomainTests2.csproj → ...Studio.Composition.AppDomainTests2.csproj b/...Studio.Composition.AppDomainTests2.csproj → ...Studio.Composition.AppDomainTests2.csproj
diff --git a/...ition.AppDomainTests2/YetAnotherExport.cs → ...ition.AppDomainTests2/YetAnotherExport.cs b/...ition.AppDomainTests2/YetAnotherExport.cs → ...ition.AppDomainTests2/YetAnotherExport.cs
diff --git a/...semblyDiscoveryTests/AConditionalClass.cs → ...semblyDiscoveryTests/AConditionalClass.cs b/...semblyDiscoveryTests/AConditionalClass.cs → ...semblyDiscoveryTests/AConditionalClass.cs
diff --git a/...on.AssemblyDiscoveryTests/AssemblyInfo.cs → ...on.AssemblyDiscoveryTests/AssemblyInfo.cs b/...on.AssemblyDiscoveryTests/AssemblyInfo.cs → ...on.AssemblyDiscoveryTests/AssemblyInfo.cs
diff --git a/...semblyDiscoveryTests/DiscoverablePart1.cs → ...semblyDiscoveryTests/DiscoverablePart1.cs b/...semblyDiscoveryTests/DiscoverablePart1.cs → ...semblyDiscoveryTests/DiscoverablePart1.cs
diff --git a/...semblyDiscoveryTests/DiscoverablePart2.cs → ...semblyDiscoveryTests/DiscoverablePart2.cs b/...semblyDiscoveryTests/DiscoverablePart2.cs → ...semblyDiscoveryTests/DiscoverablePart2.cs
diff --git a/...lyDiscoveryTests/IInternalMetadataView.cs → ...lyDiscoveryTests/IInternalMetadataView.cs b/...lyDiscoveryTests/IInternalMetadataView.cs → ...lyDiscoveryTests/IInternalMetadataView.cs
diff --git a/....AssemblyDiscoveryTests/ISomeInterface.cs → ....AssemblyDiscoveryTests/ISomeInterface.cs b/....AssemblyDiscoveryTests/ISomeInterface.cs → ....AssemblyDiscoveryTests/ISomeInterface.cs
diff --git a/...Composition.AssemblyDiscoveryTests.csproj → ...Composition.AssemblyDiscoveryTests.csproj b/...Composition.AssemblyDiscoveryTests.csproj → ...Composition.AssemblyDiscoveryTests.csproj
@@ -10,6 +10,6 @@
     <ProjectReference Include="..\Microsoft.VisualStudio.Composition.MissingAssemblyTests\Microsoft.VisualStudio.Composition.MissingAssemblyTests.csproj">
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...tion.AssemblyDiscoveryTests/NestedPart.cs → ...tion.AssemblyDiscoveryTests/NestedPart.cs b/...tion.AssemblyDiscoveryTests/NestedPart.cs → ...tion.AssemblyDiscoveryTests/NestedPart.cs
diff --git a/...mblyDiscoveryTests/NonDiscoverablePart.cs → ...mblyDiscoveryTests/NonDiscoverablePart.cs b/...mblyDiscoveryTests/NonDiscoverablePart.cs → ...mblyDiscoveryTests/NonDiscoverablePart.cs
diff --git a/...lyDiscoveryTests/NonDiscoverablePartV1.cs → ...lyDiscoveryTests/NonDiscoverablePartV1.cs b/...lyDiscoveryTests/NonDiscoverablePartV1.cs → ...lyDiscoveryTests/NonDiscoverablePartV1.cs
diff --git a/...lyDiscoveryTests/NonDiscoverablePartV2.cs → ...lyDiscoveryTests/NonDiscoverablePartV2.cs b/...lyDiscoveryTests/NonDiscoverablePartV2.cs → ...lyDiscoveryTests/NonDiscoverablePartV2.cs
diff --git a/...osition.AssemblyDiscoveryTests/NonPart.cs → ...osition.AssemblyDiscoveryTests/NonPart.cs b/...osition.AssemblyDiscoveryTests/NonPart.cs → ...osition.AssemblyDiscoveryTests/NonPart.cs
diff --git a/...sition.AssemblyDiscoveryTests/SomeEnum.cs → ...sition.AssemblyDiscoveryTests/SomeEnum.cs b/...sition.AssemblyDiscoveryTests/SomeEnum.cs → ...sition.AssemblyDiscoveryTests/SomeEnum.cs
diff --git a/...aAttributeFromAnotherAssemblyAttribute.cs → ...aAttributeFromAnotherAssemblyAttribute.cs b/...aAttributeFromAnotherAssemblyAttribute.cs → ...aAttributeFromAnotherAssemblyAttribute.cs
diff --git a/...iscoveryTests/TypeWithMissingAttribute.cs → ...iscoveryTests/TypeWithMissingAttribute.cs b/...iscoveryTests/TypeWithMissingAttribute.cs → ...iscoveryTests/TypeWithMissingAttribute.cs
diff --git a/...ssemblyDiscoveryTests2/IBlankInterface.cs → ...ssemblyDiscoveryTests2/IBlankInterface.cs b/...ssemblyDiscoveryTests2/IBlankInterface.cs → ...ssemblyDiscoveryTests2/IBlankInterface.cs
diff --git a/...omposition.AssemblyDiscoveryTests2.csproj → ...omposition.AssemblyDiscoveryTests2.csproj b/...omposition.AssemblyDiscoveryTests2.csproj → ...omposition.AssemblyDiscoveryTests2.csproj
diff --git a/....AssemblyDiscoveryTests2/SomeOtherEnum.cs → ....AssemblyDiscoveryTests2/SomeOtherEnum.cs b/....AssemblyDiscoveryTests2/SomeOtherEnum.cs → ....AssemblyDiscoveryTests2/SomeOtherEnum.cs
diff --git a/...mposition.BrokenAssemblyTests/GoodType.cs → ...mposition.BrokenAssemblyTests/GoodType.cs b/...mposition.BrokenAssemblyTests/GoodType.cs → ...mposition.BrokenAssemblyTests/GoodType.cs
diff --git a/...io.Composition.BrokenAssemblyTests.csproj → ...io.Composition.BrokenAssemblyTests.csproj b/...io.Composition.BrokenAssemblyTests.csproj → ...io.Composition.BrokenAssemblyTests.csproj
@@ -6,9 +6,9 @@
     <ProjectReference Include="..\Microsoft.VisualStudio.Composition.MissingAssemblyTests\Microsoft.VisualStudio.Composition.MissingAssemblyTests.csproj">
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Composition" Version="1.0.31" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...semblyTests/PartInAssemblyWithBadTypes.cs → ...semblyTests/PartInAssemblyWithBadTypes.cs b/...semblyTests/PartInAssemblyWithBadTypes.cs → ...semblyTests/PartInAssemblyWithBadTypes.cs
diff --git a/...nAssemblyTests/TypeWithMissingBaseType.cs → ...nAssemblyTests/TypeWithMissingBaseType.cs b/...nAssemblyTests/TypeWithMissingBaseType.cs → ...nAssemblyTests/TypeWithMissingBaseType.cs
diff --git a/...o.Composition.EmbeddedTypeReceiver.csproj → ...o.Composition.EmbeddedTypeReceiver.csproj b/...o.Composition.EmbeddedTypeReceiver.csproj → ...o.Composition.EmbeddedTypeReceiver.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="..\Microsoft.VisualStudio.Composition.TestEmbeddableTypes\Microsoft.VisualStudio.Composition.TestEmbeddableTypes.csproj">
       <EmbedInteropTypes>true</EmbedInteropTypes>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...iver/PartThatImportsLazyOfEmbeddedType.cs → ...iver/PartThatImportsLazyOfEmbeddedType.cs b/...iver/PartThatImportsLazyOfEmbeddedType.cs → ...iver/PartThatImportsLazyOfEmbeddedType.cs
diff --git a/...o.Composition.MissingAssemblyTests.csproj → ...o.Composition.MissingAssemblyTests.csproj b/...o.Composition.MissingAssemblyTests.csproj → ...o.Composition.MissingAssemblyTests.csproj
diff --git a/...MissingAssemblyTests/NotFoundAttribute.cs → ...MissingAssemblyTests/NotFoundAttribute.cs b/...MissingAssemblyTests/NotFoundAttribute.cs → ...MissingAssemblyTests/NotFoundAttribute.cs
diff --git a/....MissingAssemblyTests/NotFoundBaseType.cs → ....MissingAssemblyTests/NotFoundBaseType.cs b/....MissingAssemblyTests/NotFoundBaseType.cs → ....MissingAssemblyTests/NotFoundBaseType.cs
diff --git a/...mposition.NonEmbeddingTypeReceiver.csproj → ...mposition.NonEmbeddingTypeReceiver.csproj b/...mposition.NonEmbeddingTypeReceiver.csproj → ...mposition.NonEmbeddingTypeReceiver.csproj
@@ -9,6 +9,6 @@
     <ProjectReference Include="..\Microsoft.VisualStudio.Composition.TestEmbeddableTypes\Microsoft.VisualStudio.Composition.TestEmbeddableTypes.csproj">
       <EmbedInteropTypes>false</EmbedInteropTypes>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.Composition.NetFxAttributes\Microsoft.VisualStudio.Composition.NetFxAttributes.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...r/PartThatImportsLazyOfNonEmbeddedType.cs → ...r/PartThatImportsLazyOfNonEmbeddedType.cs b/...r/PartThatImportsLazyOfNonEmbeddedType.cs → ...r/PartThatImportsLazyOfNonEmbeddedType.cs
diff --git a/...ition.TestEmbeddableTypes/AssemblyInfo.cs → ...ition.TestEmbeddableTypes/AssemblyInfo.cs b/...ition.TestEmbeddableTypes/AssemblyInfo.cs → ...ition.TestEmbeddableTypes/AssemblyInfo.cs
diff --git a/...ition.TestEmbeddableTypes/IVsReference.cs → ...ition.TestEmbeddableTypes/IVsReference.cs b/...ition.TestEmbeddableTypes/IVsReference.cs → ...ition.TestEmbeddableTypes/IVsReference.cs
diff --git a/...ableTypes/ImportedFromTypeLibAttribute.cs → ...ableTypes/ImportedFromTypeLibAttribute.cs b/...ableTypes/ImportedFromTypeLibAttribute.cs → ...ableTypes/ImportedFromTypeLibAttribute.cs
diff --git a/...io.Composition.TestEmbeddableTypes.csproj → ...io.Composition.TestEmbeddableTypes.csproj b/...io.Composition.TestEmbeddableTypes.csproj → ...io.Composition.TestEmbeddableTypes.csproj
diff --git a/...position.Tests/AmbiguousPartNamesTests.cs → ...position.Tests/AmbiguousPartNamesTests.cs b/...position.Tests/AmbiguousPartNamesTests.cs → ...position.Tests/AmbiguousPartNamesTests.cs
diff --git a/...AssembliesLazyLoadedDataFileCacheTests.cs → ...AssembliesLazyLoadedDataFileCacheTests.cs b/...AssembliesLazyLoadedDataFileCacheTests.cs → ...AssembliesLazyLoadedDataFileCacheTests.cs
diff --git a/...sition.Tests/AssembliesLazyLoadedTests.cs → ...sition.Tests/AssembliesLazyLoadedTests.cs b/...sition.Tests/AssembliesLazyLoadedTests.cs → ...sition.Tests/AssembliesLazyLoadedTests.cs
diff --git a/...osition.Tests/AssemblyReferencingTests.cs → ...osition.Tests/AssemblyReferencingTests.cs b/...osition.Tests/AssemblyReferencingTests.cs → ...osition.Tests/AssemblyReferencingTests.cs
diff --git a/...s/AttributedPartDiscoveryCombinedTests.cs → ...s/AttributedPartDiscoveryCombinedTests.cs b/...s/AttributedPartDiscoveryCombinedTests.cs → ...s/AttributedPartDiscoveryCombinedTests.cs
diff --git a/....Tests/AttributedPartDiscoveryTestBase.cs → ....Tests/AttributedPartDiscoveryTestBase.cs b/....Tests/AttributedPartDiscoveryTestBase.cs → ....Tests/AttributedPartDiscoveryTestBase.cs
diff --git a/...ion.Tests/AttributedPartDiscoveryTests.cs → ...ion.Tests/AttributedPartDiscoveryTests.cs b/...ion.Tests/AttributedPartDiscoveryTests.cs → ...ion.Tests/AttributedPartDiscoveryTests.cs
diff --git a/...n.Tests/AttributedPartDiscoveryV1Tests.cs → ...n.Tests/AttributedPartDiscoveryV1Tests.cs b/...n.Tests/AttributedPartDiscoveryV1Tests.cs → ...n.Tests/AttributedPartDiscoveryV1Tests.cs
diff --git a/...Composition.Tests/BaseGenericTypeTests.cs → ...Composition.Tests/BaseGenericTypeTests.cs b/...Composition.Tests/BaseGenericTypeTests.cs → ...Composition.Tests/BaseGenericTypeTests.cs
diff --git a/...Composition.Tests/ByValueEqualityTests.cs → ...Composition.Tests/ByValueEqualityTests.cs b/...Composition.Tests/ByValueEqualityTests.cs → ...Composition.Tests/ByValueEqualityTests.cs
diff --git a/....Composition.Tests/CacheAndReloadTests.cs → ....Composition.Tests/CacheAndReloadTests.cs b/....Composition.Tests/CacheAndReloadTests.cs → ....Composition.Tests/CacheAndReloadTests.cs
diff --git a/...Composition.Tests/CacheResiliencyTests.cs → ...Composition.Tests/CacheResiliencyTests.cs b/...Composition.Tests/CacheResiliencyTests.cs → ...Composition.Tests/CacheResiliencyTests.cs
diff --git a/...osition.Tests/CardinalityMismatchTests.cs → ...osition.Tests/CardinalityMismatchTests.cs b/...osition.Tests/CardinalityMismatchTests.cs → ...osition.Tests/CardinalityMismatchTests.cs
diff --git a/...position.Tests/CircularDependencyTests.cs → ...position.Tests/CircularDependencyTests.cs b/...position.Tests/CircularDependencyTests.cs → ...position.Tests/CircularDependencyTests.cs
diff --git a/...n.Tests/ClosedGenericExportedTypeTests.cs → ...n.Tests/ClosedGenericExportedTypeTests.cs b/...n.Tests/ClosedGenericExportedTypeTests.cs → ...n.Tests/ClosedGenericExportedTypeTests.cs
diff --git a/...mposition.Tests/ComposableCatalogTests.cs → ...mposition.Tests/ComposableCatalogTests.cs b/...mposition.Tests/ComposableCatalogTests.cs → ...mposition.Tests/ComposableCatalogTests.cs
diff --git a/...position.Tests/ComposableCatalogTests2.cs → ...position.Tests/ComposableCatalogTests2.cs b/...position.Tests/ComposableCatalogTests2.cs → ...position.Tests/ComposableCatalogTests2.cs
diff --git a/...on.Tests/ComposablePartDefinitionTests.cs → ...on.Tests/ComposablePartDefinitionTests.cs b/...on.Tests/ComposablePartDefinitionTests.cs → ...on.Tests/ComposablePartDefinitionTests.cs
diff --git a/...on.Tests/CompositionConfigurationTests.cs → ...on.Tests/CompositionConfigurationTests.cs b/...on.Tests/CompositionConfigurationTests.cs → ...on.Tests/CompositionConfigurationTests.cs
diff --git a/...o.Composition.Tests/CompositionEngines.cs → ...o.Composition.Tests/CompositionEngines.cs b/...o.Composition.Tests/CompositionEngines.cs → ...o.Composition.Tests/CompositionEngines.cs
diff --git a/....Tests/CompositionFailedExceptionTests.cs → ....Tests/CompositionFailedExceptionTests.cs b/....Tests/CompositionFailedExceptionTests.cs → ....Tests/CompositionFailedExceptionTests.cs
diff --git a/...position.Tests/CompositionServiceTests.cs → ...position.Tests/CompositionServiceTests.cs b/...position.Tests/CompositionServiceTests.cs → ...position.Tests/CompositionServiceTests.cs
diff --git a/....Composition.Tests/CompressedUIntTests.cs → ....Composition.Tests/CompressedUIntTests.cs b/....Composition.Tests/CompressedUIntTests.cs → ....Composition.Tests/CompressedUIntTests.cs
diff --git a/...position.Tests/ContainerIsolationTests.cs → ...position.Tests/ContainerIsolationTests.cs b/...position.Tests/ContainerIsolationTests.cs → ...position.Tests/ContainerIsolationTests.cs
diff --git a/...ion.Tests/CustomMetadataAttributeTests.cs → ...ion.Tests/CustomMetadataAttributeTests.cs b/...ion.Tests/CustomMetadataAttributeTests.cs → ...ion.Tests/CustomMetadataAttributeTests.cs
diff --git a/...osition.Tests/CustomMetadataValueTests.cs → ...osition.Tests/CustomMetadataValueTests.cs b/...osition.Tests/CustomMetadataValueTests.cs → ...osition.Tests/CustomMetadataValueTests.cs
diff --git a/...tion.Tests/DataFileCacheAndReloadTests.cs → ...tion.Tests/DataFileCacheAndReloadTests.cs b/...tion.Tests/DataFileCacheAndReloadTests.cs → ...tion.Tests/DataFileCacheAndReloadTests.cs
diff --git a/...omposition.Tests/DelegateServicesTests.cs → ...omposition.Tests/DelegateServicesTests.cs b/...omposition.Tests/DelegateServicesTests.cs → ...omposition.Tests/DelegateServicesTests.cs
diff --git a/...on.Tests/DelegatingExportProviderTests.cs → ...on.Tests/DelegatingExportProviderTests.cs b/...on.Tests/DelegatingExportProviderTests.cs → ...on.Tests/DelegatingExportProviderTests.cs
diff --git a/....Composition.Tests/DgmlProductionTests.cs → ....Composition.Tests/DgmlProductionTests.cs b/....Composition.Tests/DgmlProductionTests.cs → ....Composition.Tests/DgmlProductionTests.cs
diff --git a/...Composition.Tests/DisposablePartsTests.cs → ...Composition.Tests/DisposablePartsTests.cs b/...Composition.Tests/DisposablePartsTests.cs → ...Composition.Tests/DisposablePartsTests.cs
diff --git a/...o.Composition.Tests/DynamicImportTests.cs → ...o.Composition.Tests/DynamicImportTests.cs b/...o.Composition.Tests/DynamicImportTests.cs → ...o.Composition.Tests/DynamicImportTests.cs
diff --git a/...Composition.Tests/EmbeddableTypesTests.cs → ...Composition.Tests/EmbeddableTypesTests.cs b/...Composition.Tests/EmbeddableTypesTests.cs → ...Composition.Tests/EmbeddableTypesTests.cs
diff --git a/...tion.Tests/EmbeddedableTypesMixedTests.cs → ...tion.Tests/EmbeddedableTypesMixedTests.cs b/...tion.Tests/EmbeddedableTypesMixedTests.cs → ...tion.Tests/EmbeddedableTypesMixedTests.cs
diff --git a/....Tests/ExplicitImportIdentityTypeTests.cs → ....Tests/ExplicitImportIdentityTypeTests.cs b/....Tests/ExplicitImportIdentityTypeTests.cs → ....Tests/ExplicitImportIdentityTypeTests.cs
diff --git a/...omposition.Tests/ExportDefinitionTests.cs → ...omposition.Tests/ExportDefinitionTests.cs b/...omposition.Tests/ExportDefinitionTests.cs → ...omposition.Tests/ExportDefinitionTests.cs
diff --git a/...NonSharedImportingSharingBoundaryTests.cs → ...NonSharedImportingSharingBoundaryTests.cs b/...NonSharedImportingSharingBoundaryTests.cs → ...NonSharedImportingSharingBoundaryTests.cs
diff --git a/...o.Composition.Tests/ExportFactoryTests.cs → ...o.Composition.Tests/ExportFactoryTests.cs b/...o.Composition.Tests/ExportFactoryTests.cs → ...o.Composition.Tests/ExportFactoryTests.cs
diff --git a/...position.Tests/ExportImportViaBaseType.cs → ...position.Tests/ExportImportViaBaseType.cs b/...position.Tests/ExportImportViaBaseType.cs → ...position.Tests/ExportImportViaBaseType.cs
diff --git a/...tion.Tests/ExportMetadataMultipleTests.cs → ...tion.Tests/ExportMetadataMultipleTests.cs b/...tion.Tests/ExportMetadataMultipleTests.cs → ...tion.Tests/ExportMetadataMultipleTests.cs
diff --git a/...Tests/ExportMetadataNameCollisionTests.cs → ...Tests/ExportMetadataNameCollisionTests.cs b/...Tests/ExportMetadataNameCollisionTests.cs → ...Tests/ExportMetadataNameCollisionTests.cs
diff --git a/...sts/ExportMetadataNonStringValuesTests.cs → ...sts/ExportMetadataNonStringValuesTests.cs b/...sts/ExportMetadataNonStringValuesTests.cs → ...sts/ExportMetadataNonStringValuesTests.cs
diff --git a/....Composition.Tests/ExportMetadataTests.cs → ....Composition.Tests/ExportMetadataTests.cs b/....Composition.Tests/ExportMetadataTests.cs → ....Composition.Tests/ExportMetadataTests.cs
diff --git a/...s/ExportMetadataViewNameCollisionTests.cs → ...s/ExportMetadataViewNameCollisionTests.cs b/...s/ExportMetadataViewNameCollisionTests.cs → ...s/ExportMetadataViewNameCollisionTests.cs
diff --git a/....Composition.Tests/ExportProviderTests.cs → ....Composition.Tests/ExportProviderTests.cs b/....Composition.Tests/ExportProviderTests.cs → ....Composition.Tests/ExportProviderTests.cs
diff --git a/...omposition.Tests/ExportingMembersTests.cs → ...omposition.Tests/ExportingMembersTests.cs b/...omposition.Tests/ExportingMembersTests.cs → ...omposition.Tests/ExportingMembersTests.cs
diff --git a/...dio.Composition.Tests/FaultyPartsTests.cs → ...dio.Composition.Tests/FaultyPartsTests.cs b/...dio.Composition.Tests/FaultyPartsTests.cs → ...dio.Composition.Tests/FaultyPartsTests.cs
diff --git a/...o.Composition.Tests/GenericImportTests.cs → ...o.Composition.Tests/GenericImportTests.cs b/...o.Composition.Tests/GenericImportTests.cs → ...o.Composition.Tests/GenericImportTests.cs
diff --git a/...io.Composition.Tests/GuidMetadataTests.cs → ...io.Composition.Tests/GuidMetadataTests.cs b/...io.Composition.Tests/GuidMetadataTests.cs → ...io.Composition.Tests/GuidMetadataTests.cs
diff --git a/...ualStudio.Composition.Tests/IContainer.cs → ...ualStudio.Composition.Tests/IContainer.cs b/...ualStudio.Composition.Tests/IContainer.cs → ...ualStudio.Composition.Tests/IContainer.cs
diff --git a/...omposition.Tests/ImportDefinitionTests.cs → ...omposition.Tests/ImportDefinitionTests.cs b/...omposition.Tests/ImportDefinitionTests.cs → ...omposition.Tests/ImportDefinitionTests.cs
diff --git a/...udio.Composition.Tests/ImportManyTests.cs → ...udio.Composition.Tests/ImportManyTests.cs b/...udio.Composition.Tests/ImportManyTests.cs → ...udio.Composition.Tests/ImportManyTests.cs
diff --git a/...on.Tests/ImportMetadataConstraintTests.cs → ...on.Tests/ImportMetadataConstraintTests.cs b/...on.Tests/ImportMetadataConstraintTests.cs → ...on.Tests/ImportMetadataConstraintTests.cs
diff --git a/...s/ImportOfTResolvedByDerivedClassTests.cs → ...s/ImportOfTResolvedByDerivedClassTests.cs b/...s/ImportOfTResolvedByDerivedClassTests.cs → ...s/ImportOfTResolvedByDerivedClassTests.cs
diff --git a/...on.Tests/ImportSiteCreationPolicyTests.cs → ...on.Tests/ImportSiteCreationPolicyTests.cs b/...on.Tests/ImportSiteCreationPolicyTests.cs → ...on.Tests/ImportSiteCreationPolicyTests.cs
diff --git a/...tion.Tests/ImportedExportProviderTests.cs → ...tion.Tests/ImportedExportProviderTests.cs b/...tion.Tests/ImportedExportProviderTests.cs → ...tion.Tests/ImportedExportProviderTests.cs
diff --git a/...sition.Tests/ImportingConstructorTests.cs → ...sition.Tests/ImportingConstructorTests.cs b/...sition.Tests/ImportingConstructorTests.cs → ...sition.Tests/ImportingConstructorTests.cs
diff --git a/...Composition.Tests/InheritedExportTests.cs → ...Composition.Tests/InheritedExportTests.cs b/...Composition.Tests/InheritedExportTests.cs → ...Composition.Tests/InheritedExportTests.cs
diff --git a/...Composition.Tests/InheritedImportTests.cs → ...Composition.Tests/InheritedImportTests.cs b/...Composition.Tests/InheritedImportTests.cs → ...Composition.Tests/InheritedImportTests.cs
diff --git a/...io.Composition.Tests/InvalidGraphTests.cs → ...io.Composition.Tests/InvalidGraphTests.cs b/...io.Composition.Tests/InvalidGraphTests.cs → ...io.Composition.Tests/InvalidGraphTests.cs
diff --git a/...udio.Composition.Tests/LazyImportTests.cs → ...udio.Composition.Tests/LazyImportTests.cs b/...udio.Composition.Tests/LazyImportTests.cs → ...udio.Composition.Tests/LazyImportTests.cs
diff --git a/...io.Composition.Tests/LazyServicesTests.cs → ...io.Composition.Tests/LazyServicesTests.cs b/...io.Composition.Tests/LazyServicesTests.cs → ...io.Composition.Tests/LazyServicesTests.cs
diff --git a/....Tests/MefV1ExportProviderAdapterTests.cs → ....Tests/MefV1ExportProviderAdapterTests.cs b/....Tests/MefV1ExportProviderAdapterTests.cs → ....Tests/MefV1ExportProviderAdapterTests.cs
diff --git a/...adataViewClassDefaultCtorProviderTests.cs → ...adataViewClassDefaultCtorProviderTests.cs b/...adataViewClassDefaultCtorProviderTests.cs → ...adataViewClassDefaultCtorProviderTests.cs
diff --git a/....Tests/MetadataViewImplementationTests.cs → ....Tests/MetadataViewImplementationTests.cs b/....Tests/MetadataViewImplementationTests.cs → ....Tests/MetadataViewImplementationTests.cs