Adjust the unit test projects (#3161)

* Adjust the unit test projects * Fix build warning for TestCommon
OData · Jan 7, 2025 · c1c9b84 · c1c9b84
1 parent f6c064a
commit c1c9b84
Show file tree

Hide file tree

Showing 601 changed files with 52 additions and 36 deletions.
diff --git a/OData.E2E.sln b/OData.E2E.sln
@@ -17,13 +17,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5D4916FD-F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unitTests", "unitTests", "{F2A816DD-1537-4D00-B3BF-535F4FA8D724}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{B9F65944-971A-4665-B0F1-5FD413C0DAD8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{B9F65944-971A-4665-B0F1-5FD413C0DAD8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{6FEFB52A-B175-466C-92C3-58A5DF513440}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{6FEFB52A-B175-466C-92C3-58A5DF513440}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{17E925D3-8840-41BD-B0DF-884334FB9812}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{17E925D3-8840-41BD-B0DF-884334FB9812}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "e2eTests", "e2eTests", "{57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}"
 EndProject

diff --git a/build.ps1 b/build.ps1
@@ -137,10 +137,10 @@ $NightlyTestDlls = "microsoft.test.data.services.ddbasics.dll",
        "astoriaclientunittests.dll"
 
 # .NET Core tests are different and require the dotnet tool. The tool references the .csproj (VS2017) files instead of dlls
-$NetCoreXUnitTestProjs = "\test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj",
-    "\test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj",
-    "\test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj",
-    "\test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj"
+$NetCoreXUnitTestProjs = "\test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj",
+    "\test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj",
+    "\test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj",
+    "\test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj"
 
 $NetCoreE2ETestProjs = "\test\FunctionalTests\Tests\DataServices\ddbasics\Microsoft.Test.Data.Services.DDBasics.csproj",
      "\test\FunctionalTests\Tests\DataServices\UnitTests\TDDUnitTests\Microsoft.OData.Service.TDDUnitTests.csproj",

diff --git a/sln/OData.E2E.sln b/sln/OData.E2E.sln
@@ -17,21 +17,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5D4916FD-F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unitTests", "unitTests", "{F2A816DD-1537-4D00-B3BF-535F4FA8D724}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{B9F65944-971A-4665-B0F1-5FD413C0DAD8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{B9F65944-971A-4665-B0F1-5FD413C0DAD8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{6FEFB52A-B175-466C-92C3-58A5DF513440}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{6FEFB52A-B175-466C-92C3-58A5DF513440}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{17E925D3-8840-41BD-B0DF-884334FB9812}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{17E925D3-8840-41BD-B0DF-884334FB9812}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "e2eTests", "e2eTests", "{57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.E2E.TestCommon", "..\test\EndToEndTests\Common\Microsoft.OData.Client.E2E.TestCommon\Microsoft.OData.Client.E2E.TestCommon.csproj", "{70A2EB6E-8B18-49A5-A1C7-2863A535BC9D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helper", "helper", "{C2ADD565-E633-42A9-9956-9FF9FAF5E4B5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\FunctionalTests\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{F9BF7E61-402B-4492-A4FE-F9549921741B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{F9BF7E61-402B-4492-A4FE-F9549921741B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.DependencyInjection", "..\test\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj", "{AB1B80D6-EAE2-41C0-A089-7CD492E85FE9}"
 EndProject

diff --git a/sln/OData.Pipeline.sln b/sln/OData.Pipeline.sln
@@ -17,17 +17,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{403A5A8E-A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unitTests", "unitTests", "{13B04FEF-695B-4DAD-92EE-E1AB841617CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{D79B6243-EF18-4656-B18E-C577BCFAA7F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{D79B6243-EF18-4656-B18E-C577BCFAA7F1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{C43FE103-6CCA-4B0D-865C-7EBA627752C9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{C43FE103-6CCA-4B0D-865C-7EBA627752C9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{27E133C3-BDA1-45FF-B631-3BD446D1443D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{27E133C3-BDA1-45FF-B631-3BD446D1443D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{59FC6BEB-B8E9-47E1-A3CA-B36572F2BE9B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{59FC6BEB-B8E9-47E1-A3CA-B36572F2BE9B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helper", "helper", "{69A333F6-82AC-4B53-951C-300A8340DE8B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\FunctionalTests\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{A9CC879D-AF23-4505-B263-23BAC2B096C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{A9CC879D-AF23-4505-B263-23BAC2B096C7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.DependencyInjection", "..\test\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj", "{91526796-57BB-44C0-B9EB-905F47F902AF}"
 EndProject

diff --git a/sln/OData.sln b/sln/OData.sln
@@ -8,23 +8,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial", "..\src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client", "..\src\Microsoft.OData.Client\Microsoft.OData.Client.csproj", "{D1567C63-4A0D-4E18-A14E-79699B9BFFFF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\FunctionalTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{9F0AB290-8164-4885-BFCA-A6F87AB81740}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.Tests", "..\test\UnitTests\Microsoft.OData.Client.Tests\Microsoft.OData.Client.Tests.csproj", "{9F0AB290-8164-4885-BFCA-A6F87AB81740}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FDC11FD3-7DCD-4B75-8CC8-3BDC88107F01}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6D9CCEF3-6509-4381-B104-1A3FA576297F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\FunctionalTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{933B0254-BE0B-459E-8B1A-97CC4A6A2CC6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "..\test\UnitTests\Microsoft.Spatial.Tests\Microsoft.Spatial.Tests.csproj", "{933B0254-BE0B-459E-8B1A-97CC4A6A2CC6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\FunctionalTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{9760E330-020D-498C-ADBE-1FCE38D74125}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Edm.Tests", "..\test\UnitTests\Microsoft.OData.Edm.Tests\Microsoft.OData.Edm.Tests.csproj", "{9760E330-020D-498C-ADBE-1FCE38D74125}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.DependencyInjection", "..\test\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj", "{9349A28B-90CE-4596-8A5B-333FCE08A51D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\FunctionalTests\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{42A09462-804F-4A05-8585-EA61ADC28B31}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{42A09462-804F-4A05-8585-EA61ADC28B31}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core", "..\src\Microsoft.OData.Core\Microsoft.OData.Core.csproj", "{05F1DE17-BD58-4745-9263-6667809AB9FD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\FunctionalTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{E67E13D2-92D7-4AA9-AF2C-502AD0C76F1D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Core.Tests", "..\test\UnitTests\Microsoft.OData.Core.Tests\Microsoft.OData.Core.Tests.csproj", "{E67E13D2-92D7-4AA9-AF2C-502AD0C76F1D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/test/Build.Debug.props b/test/Build.Debug.props
@@ -38,19 +38,19 @@
 
   <!--import Microsoft.OData.TestCommon because it contains the definition of the DebugAssertTraceListener that is referenced in the App.config transforms-->
   <ItemGroup>
-    <ProjectReference Include="$(EnlistmentRoot)\test\FunctionalTests\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
+    <ProjectReference Include="$(EnlistmentRoot)\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
   </ItemGroup>
 
   <!--we need to import a "fake" usage of the Microsoft.OData.TestCommon project so that the test frameworks will automatically copy the binary to the test run folder-->
   <Choose>
     <When Condition="'$(MSBuildProjectExtension)' == '.csproj'">
       <ItemGroup>
-        <Compile Include="$(EnlistmentRoot)\test\FunctionalTests\Microsoft.OData.TestCommon\Fake.cs" Link="App_Config\Fake.cs" />
+        <Compile Include="$(EnlistmentRoot)\test\Common\Microsoft.OData.TestCommon\Fake.cs" Link="App_Config\Fake.cs" />
       </ItemGroup>
     </When>
     <When Condition="'$(MSBuildProjectExtension)' == '.vbproj'">
       <ItemGroup>
-        <Compile Include="$(EnlistmentRoot)\test\FunctionalTests\Microsoft.OData.TestCommon\Fake.vb" Link="App_Config\Fake.vb" />
+        <Compile Include="$(EnlistmentRoot)\test\Common\Microsoft.OData.TestCommon\Fake.vb" Link="App_Config\Fake.vb" />
       </ItemGroup>
     </When>
     <Otherwise>

diff --git a/...ta.TestCommon/DebugAssertTraceListener.cs → ...ta.TestCommon/DebugAssertTraceListener.cs b/...ta.TestCommon/DebugAssertTraceListener.cs → ...ta.TestCommon/DebugAssertTraceListener.cs
@@ -61,6 +61,7 @@ public DebugAssertException(string message, Exception innerException) : base(mes
             {
             }
 
+#if false  // Exception.Exception is obsolete. So, let's templately scope this constrct out and delete it in the next major.
             /// <summary>
             /// Initializes a new instance of the <see cref="DebugAssertException"/> class.
             /// </summary>
@@ -77,6 +78,7 @@ public DebugAssertException(string message, Exception innerException) : base(mes
             public DebugAssertException(SerializationInfo info, StreamingContext context) : base(info, context)
             {
             }
+#endif
         }
     }
 }
diff --git a/...lTests/Microsoft.OData.TestCommon/Fake.cs → ...Common/Microsoft.OData.TestCommon/Fake.cs b/...lTests/Microsoft.OData.TestCommon/Fake.cs → ...Common/Microsoft.OData.TestCommon/Fake.cs
diff --git a/...lTests/Microsoft.OData.TestCommon/Fake.vb → ...Common/Microsoft.OData.TestCommon/Fake.vb b/...lTests/Microsoft.OData.TestCommon/Fake.vb → ...Common/Microsoft.OData.TestCommon/Fake.vb
diff --git a/...tCommon/Microsoft.OData.TestCommon.csproj → ...tCommon/Microsoft.OData.TestCommon.csproj b/...tCommon/Microsoft.OData.TestCommon.csproj → ...tCommon/Microsoft.OData.TestCommon.csproj
diff --git a/...ata.TestCommon/Properties/AssemblyInfo.cs → ...ata.TestCommon/Properties/AssemblyInfo.cs b/...ata.TestCommon/Properties/AssemblyInfo.cs → ...ata.TestCommon/Properties/AssemblyInfo.cs
diff --git a/...OData.TestCommon/TestHttpClientFactory.cs → ...OData.TestCommon/TestHttpClientFactory.cs b/...OData.TestCommon/TestHttpClientFactory.cs → ...OData.TestCommon/TestHttpClientFactory.cs
diff --git a/.../Microsoft.Test.OData.DependencyInjection/Microsoft.Test.OData.DependencyInjection.csproj b/.../Microsoft.Test.OData.DependencyInjection/Microsoft.Test.OData.DependencyInjection.csproj
@@ -19,7 +19,7 @@
   <Choose>
     <When Condition=" '$(TestType)'=='Private' ">
       <ItemGroup>
-        <ProjectReference Include="$(EnlistmentRoot)\src\Microsoft.OData.Core\Microsoft.OData.Core.csproj" />                  
+        <ProjectReference Include="$(EnlistmentRoot)\src\Microsoft.OData.Core\Microsoft.OData.Core.csproj" />
       </ItemGroup>
     </When>
   </Choose>

diff --git a/test/UnitTests/Build.props b/test/UnitTests/Build.props
@@ -0,0 +1,14 @@
+<Project >
+
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <!-- 
+    This is where you place settings that should apply to all projects under this folder.  See 
+    $(EnlistmentRoot)\Build.props for examples. 
+  -->
+
+  <Import Project="..\Build.props" />
+
+</Project>
diff --git a/...ts/ALinq/AddNewEndingTokenVisitorTests.cs → ...ts/ALinq/AddNewEndingTokenVisitorTests.cs b/...ts/ALinq/AddNewEndingTokenVisitorTests.cs → ...ts/ALinq/AddNewEndingTokenVisitorTests.cs
diff --git a/....Client.Tests/ALinq/CountDistinctTests.cs → ....Client.Tests/ALinq/CountDistinctTests.cs b/....Client.Tests/ALinq/CountDistinctTests.cs → ....Client.Tests/ALinq/CountDistinctTests.cs
diff --git a/....Tests/ALinq/DollarApplyAggregateTests.cs → ....Tests/ALinq/DollarApplyAggregateTests.cs b/....Tests/ALinq/DollarApplyAggregateTests.cs → ....Tests/ALinq/DollarApplyAggregateTests.cs
diff --git a/...nt.Tests/ALinq/DollarApplyGroupByTests.cs → ...nt.Tests/ALinq/DollarApplyGroupByTests.cs b/...nt.Tests/ALinq/DollarApplyGroupByTests.cs → ...nt.Tests/ALinq/DollarApplyGroupByTests.cs
diff --git a/...lient.Tests/ALinq/DollarApplyTestsBase.cs → ...lient.Tests/ALinq/DollarApplyTestsBase.cs b/...lient.Tests/ALinq/DollarApplyTestsBase.cs → ...lient.Tests/ALinq/DollarApplyTestsBase.cs
diff --git a/....Tests/ALinq/DollarFilterWithCastTests.cs → ....Tests/ALinq/DollarFilterWithCastTests.cs b/....Tests/ALinq/DollarFilterWithCastTests.cs → ....Tests/ALinq/DollarFilterWithCastTests.cs
diff --git a/.../ALinq/PreserveTypesAndAttributesTests.cs → .../ALinq/PreserveTypesAndAttributesTests.cs b/.../ALinq/PreserveTypesAndAttributesTests.cs → .../ALinq/PreserveTypesAndAttributesTests.cs
diff --git a/...ata.Client.Tests/ALinq/ProjectionTests.cs → ...ata.Client.Tests/ALinq/ProjectionTests.cs b/...ata.Client.Tests/ALinq/ProjectionTests.cs → ...ata.Client.Tests/ALinq/ProjectionTests.cs
diff --git a/...Tests/ALinq/RemoveWildcardVisitorTests.cs → ...Tests/ALinq/RemoveWildcardVisitorTests.cs b/...Tests/ALinq/RemoveWildcardVisitorTests.cs → ...Tests/ALinq/RemoveWildcardVisitorTests.cs
diff --git a/...sts/ALinq/SelectExpandPathBuilderTests.cs → ...sts/ALinq/SelectExpandPathBuilderTests.cs b/...sts/ALinq/SelectExpandPathBuilderTests.cs → ...sts/ALinq/SelectExpandPathBuilderTests.cs
diff --git a/...q/SelectExpandPathToStringVisitorTests.cs → ...q/SelectExpandPathToStringVisitorTests.cs b/...q/SelectExpandPathToStringVisitorTests.cs → ...q/SelectExpandPathToStringVisitorTests.cs
diff --git a/...lient.Tests/ALinq/SequenceMethodsTests.cs → ...lient.Tests/ALinq/SequenceMethodsTests.cs b/...lient.Tests/ALinq/SequenceMethodsTests.cs → ...lient.Tests/ALinq/SequenceMethodsTests.cs
diff --git a/...OData.Client.Tests/ClientEdmModelTests.cs → ...OData.Client.Tests/ClientEdmModelTests.cs b/...OData.Client.Tests/ClientEdmModelTests.cs → ...OData.Client.Tests/ClientEdmModelTests.cs
diff --git a/...plexNavigations/ComplexNavigationTests.cs → ...plexNavigations/ComplexNavigationTests.cs b/...plexNavigations/ComplexNavigationTests.cs → ...plexNavigations/ComplexNavigationTests.cs
diff --git a/...tion/DirectoryInternalSchema_Version27.cs → ...tion/DirectoryInternalSchema_Version27.cs b/...tion/DirectoryInternalSchema_Version27.cs → ...tion/DirectoryInternalSchema_Version27.cs
diff --git a/...ata/UntypedCollection/failedresponse.json → ...ata/UntypedCollection/failedresponse.json b/...ata/UntypedCollection/failedresponse.json → ...ata/UntypedCollection/failedresponse.json
diff --git a/...ests/Data/UntypedCollection/version27.xml → ...ests/Data/UntypedCollection/version27.xml b/...ests/Data/UntypedCollection/version27.xml → ...ests/Data/UntypedCollection/version27.xml
diff --git a/...eContextHttpClientHandlerProviderTests.cs → ...eContextHttpClientHandlerProviderTests.cs b/...eContextHttpClientHandlerProviderTests.cs → ...eContextHttpClientHandlerProviderTests.cs
diff --git a/...a.Client.Tests/DataServiceContextTests.cs → ...a.Client.Tests/DataServiceContextTests.cs b/...a.Client.Tests/DataServiceContextTests.cs → ...a.Client.Tests/DataServiceContextTests.cs
diff --git a/...nt.Tests/DataServiceQueryProviderTests.cs → ...nt.Tests/DataServiceQueryProviderTests.cs b/...nt.Tests/DataServiceQueryProviderTests.cs → ...nt.Tests/DataServiceQueryProviderTests.cs
diff --git a/...ent.Tests/Metadata/ClientTypeUtilTests.cs → ...ent.Tests/Metadata/ClientTypeUtilTests.cs b/...ent.Tests/Metadata/ClientTypeUtilTests.cs → ...ent.Tests/Metadata/ClientTypeUtilTests.cs
diff --git a/...crosoft.OData.Client.Tests.Netcore.csproj → ...crosoft.OData.Client.Tests.Netcore.csproj b/...crosoft.OData.Client.Tests.Netcore.csproj → ...crosoft.OData.Client.Tests.Netcore.csproj
diff --git a/...Tests/Microsoft.OData.Client.Tests.csproj → ...Tests/Microsoft.OData.Client.Tests.csproj b/...Tests/Microsoft.OData.Client.Tests.csproj → ...Tests/Microsoft.OData.Client.Tests.csproj
diff --git a/...taMessageConcreteTypePreferHeaderTests.cs → ...taMessageConcreteTypePreferHeaderTests.cs b/...taMessageConcreteTypePreferHeaderTests.cs → ...taMessageConcreteTypePreferHeaderTests.cs
diff --git a/...soft.OData.Client.Tests/ODataPathTests.cs → ...soft.OData.Client.Tests/ODataPathTests.cs b/...soft.OData.Client.Tests/ODataPathTests.cs → ...soft.OData.Client.Tests/ODataPathTests.cs
diff --git a/...a.Client.Tests/Properties/AssemblyInfo.cs → ...a.Client.Tests/Properties/AssemblyInfo.cs b/...a.Client.Tests/Properties/AssemblyInfo.cs → ...a.Client.Tests/Properties/AssemblyInfo.cs
diff --git a/...lization/HttpClientRequestMessageTests.cs → ...lization/HttpClientRequestMessageTests.cs b/...lization/HttpClientRequestMessageTests.cs → ...lization/HttpClientRequestMessageTests.cs
diff --git a/...alization/MockDelayedHttpClientHandler.cs → ...alization/MockDelayedHttpClientHandler.cs b/...alization/MockDelayedHttpClientHandler.cs → ...alization/MockDelayedHttpClientHandler.cs
diff --git a/...ts/Serialization/MockHttpClientFactory.cs → ...ts/Serialization/MockHttpClientFactory.cs b/...ts/Serialization/MockHttpClientFactory.cs → ...ts/Serialization/MockHttpClientFactory.cs
diff --git a/...ts/Serialization/MockHttpClientHandler.cs → ...ts/Serialization/MockHttpClientHandler.cs b/...ts/Serialization/MockHttpClientHandler.cs → ...ts/Serialization/MockHttpClientHandler.cs
diff --git a/...tion/MockUnresponsiveHttpClientHandler.cs → ...tion/MockUnresponsiveHttpClientHandler.cs b/...tion/MockUnresponsiveHttpClientHandler.cs → ...tion/MockUnresponsiveHttpClientHandler.cs
diff --git a/...Client.Tests/TestHttpWebRequestMessage.cs → ...Client.Tests/TestHttpWebRequestMessage.cs b/...Client.Tests/TestHttpWebRequestMessage.cs → ...Client.Tests/TestHttpWebRequestMessage.cs
diff --git a/...ests/Tracking/ClientEntityTrackerTests.cs → ...ests/Tracking/ClientEntityTrackerTests.cs b/...ests/Tracking/ClientEntityTrackerTests.cs → ...ests/Tracking/ClientEntityTrackerTests.cs
diff --git a/...taServiceContextNoTrackingStreamsTests.cs → ...taServiceContextNoTrackingStreamsTests.cs b/...taServiceContextNoTrackingStreamsTests.cs → ...taServiceContextNoTrackingStreamsTests.cs
diff --git a/.../Tracking/DataServiceContextQueryTests.cs → .../Tracking/DataServiceContextQueryTests.cs b/.../Tracking/DataServiceContextQueryTests.cs → .../Tracking/DataServiceContextQueryTests.cs
diff --git a/...ore.Tests/AnnotationFilterPatternTests.cs → ...ore.Tests/AnnotationFilterPatternTests.cs b/...ore.Tests/AnnotationFilterPatternTests.cs → ...ore.Tests/AnnotationFilterPatternTests.cs
diff --git a/...OData.Core.Tests/AnnotationFilterTests.cs → ...OData.Core.Tests/AnnotationFilterTests.cs b/...OData.Core.Tests/AnnotationFilterTests.cs → ...OData.Core.Tests/AnnotationFilterTests.cs
diff --git a/...ata.Core.Tests/ArgumentValidationUtils.cs → ...ata.Core.Tests/ArgumentValidationUtils.cs b/...ata.Core.Tests/ArgumentValidationUtils.cs → ...ata.Core.Tests/ArgumentValidationUtils.cs
diff --git a/...soft.OData.Core.Tests/AssertExtensions.cs → ...soft.OData.Core.Tests/AssertExtensions.cs b/...soft.OData.Core.Tests/AssertExtensions.cs → ...soft.OData.Core.Tests/AssertExtensions.cs
diff --git a/...Microsoft.OData.Core.Tests/AsyncStream.cs → ...Microsoft.OData.Core.Tests/AsyncStream.cs b/...Microsoft.OData.Core.Tests/AsyncStream.cs → ...Microsoft.OData.Core.Tests/AsyncStream.cs
diff --git a/...soft.OData.Core.Tests/AsyncYieldStream.cs → ...soft.OData.Core.Tests/AsyncYieldStream.cs b/...soft.OData.Core.Tests/AsyncYieldStream.cs → ...soft.OData.Core.Tests/AsyncYieldStream.cs
diff --git a/...soft.OData.Core.Tests/BufferUtilsTests.cs → ...soft.OData.Core.Tests/BufferUtilsTests.cs b/...soft.OData.Core.Tests/BufferUtilsTests.cs → ...soft.OData.Core.Tests/BufferUtilsTests.cs
diff --git a/...t.OData.Core.Tests/DummyRequestMessage.cs → ...t.OData.Core.Tests/DummyRequestMessage.cs b/...t.OData.Core.Tests/DummyRequestMessage.cs → ...t.OData.Core.Tests/DummyRequestMessage.cs
diff --git a/...sts/DuplicatePropertyNamesCheckerTests.cs → ...sts/DuplicatePropertyNamesCheckerTests.cs b/...sts/DuplicatePropertyNamesCheckerTests.cs → ...sts/DuplicatePropertyNamesCheckerTests.cs
diff --git a/...Evaluation/EdmStructuredValueSimulator.cs → ...Evaluation/EdmStructuredValueSimulator.cs b/...Evaluation/EdmStructuredValueSimulator.cs → ...Evaluation/EdmStructuredValueSimulator.cs
diff --git a/...ation/NoOpResourceMetadataBuilderTests.cs → ...ation/NoOpResourceMetadataBuilderTests.cs b/...ation/NoOpResourceMetadataBuilderTests.cs → ...ation/NoOpResourceMetadataBuilderTests.cs
diff --git a/...luation/NullEntityMetadataBuilderTests.cs → ...luation/NullEntityMetadataBuilderTests.cs b/...luation/NullEntityMetadataBuilderTests.cs → ...luation/NullEntityMetadataBuilderTests.cs
diff --git a/...ConventionalEntityMetadataBuilderTests.cs → ...ConventionalEntityMetadataBuilderTests.cs b/...ConventionalEntityMetadataBuilderTests.cs → ...ConventionalEntityMetadataBuilderTests.cs
diff --git a/...ation/ODataConventionalUriBuilderTests.cs → ...ation/ODataConventionalUriBuilderTests.cs b/...ation/ODataConventionalUriBuilderTests.cs → ...ation/ODataConventionalUriBuilderTests.cs
diff --git a/...uation/ODataEntityMetadataBuilderTests.cs → ...uation/ODataEntityMetadataBuilderTests.cs b/...uation/ODataEntityMetadataBuilderTests.cs → ...uation/ODataEntityMetadataBuilderTests.cs
diff --git a/...n/ODataEntityMetadataBuilderTestsUtils.cs → ...n/ODataEntityMetadataBuilderTestsUtils.cs b/...n/ODataEntityMetadataBuilderTestsUtils.cs → ...n/ODataEntityMetadataBuilderTestsUtils.cs
diff --git a/...aluation/ODataEntryMetadataContextTest.cs → ...aluation/ODataEntryMetadataContextTest.cs b/...aluation/ODataEntryMetadataContextTest.cs → ...aluation/ODataEntryMetadataContextTest.cs
diff --git a/...s/Evaluation/ODataMetadataContextTests.cs → ...s/Evaluation/ODataMetadataContextTests.cs b/...s/Evaluation/ODataMetadataContextTests.cs → ...s/Evaluation/ODataMetadataContextTests.cs
diff --git a/.../Evaluation/ODataMetadataSelectorTests.cs → .../Evaluation/ODataMetadataSelectorTests.cs b/.../Evaluation/ODataMetadataSelectorTests.cs → .../Evaluation/ODataMetadataSelectorTests.cs
diff --git a/...on/ODataMissingOperationGeneratorTests.cs → ...on/ODataMissingOperationGeneratorTests.cs b/...on/ODataMissingOperationGeneratorTests.cs → ...on/ODataMissingOperationGeneratorTests.cs
diff --git a/....Tests/Evaluation/ODataUriBuilderTests.cs → ....Tests/Evaluation/ODataUriBuilderTests.cs b/....Tests/Evaluation/ODataUriBuilderTests.cs → ....Tests/Evaluation/ODataUriBuilderTests.cs
diff --git a/...ts/Evaluation/ODataUriBuilderTestsBase.cs → ...ts/Evaluation/ODataUriBuilderTestsBase.cs b/...ts/Evaluation/ODataUriBuilderTestsBase.cs → ...ts/Evaluation/ODataUriBuilderTestsBase.cs
diff --git a/....Tests/Evaluation/TestMetadataSelector.cs → ....Tests/Evaluation/TestMetadataSelector.cs b/....Tests/Evaluation/TestMetadataSelector.cs → ....Tests/Evaluation/TestMetadataSelector.cs
diff --git a/....OData.Core.Tests/Evaluation/TestModel.cs → ....OData.Core.Tests/Evaluation/TestModel.cs b/....OData.Core.Tests/Evaluation/TestModel.cs → ....OData.Core.Tests/Evaluation/TestModel.cs
diff --git a/...Core.Tests/GeographyTypeConverterTests.cs → ...Core.Tests/GeographyTypeConverterTests.cs b/...Core.Tests/GeographyTypeConverterTests.cs → ...Core.Tests/GeographyTypeConverterTests.cs
diff --git a/...Core.Tests/HttpHeaderValueElementTests.cs → ...Core.Tests/HttpHeaderValueElementTests.cs b/...Core.Tests/HttpHeaderValueElementTests.cs → ...Core.Tests/HttpHeaderValueElementTests.cs
diff --git a/...a.Core.Tests/HttpHeaderValueLexerTests.cs → ...a.Core.Tests/HttpHeaderValueLexerTests.cs b/...a.Core.Tests/HttpHeaderValueLexerTests.cs → ...a.Core.Tests/HttpHeaderValueLexerTests.cs
diff --git a/....OData.Core.Tests/HttpHeaderValueTests.cs → ....OData.Core.Tests/HttpHeaderValueTests.cs b/....OData.Core.Tests/HttpHeaderValueTests.cs → ....OData.Core.Tests/HttpHeaderValueTests.cs
diff --git a/...rosoft.OData.Core.Tests/HttpUtilsTests.cs → ...rosoft.OData.Core.Tests/HttpUtilsTests.cs b/...rosoft.OData.Core.Tests/HttpUtilsTests.cs → ...rosoft.OData.Core.Tests/HttpUtilsTests.cs
diff --git a/...osoft.OData.Core.Tests/InMemoryMessage.cs → ...osoft.OData.Core.Tests/InMemoryMessage.cs b/...osoft.OData.Core.Tests/InMemoryMessage.cs → ...osoft.OData.Core.Tests/InMemoryMessage.cs
diff --git a/...ts/InstanceAnnotationWriteTrackerTests.cs → ...ts/InstanceAnnotationWriteTrackerTests.cs b/...ts/InstanceAnnotationWriteTrackerTests.cs → ...ts/InstanceAnnotationWriteTrackerTests.cs
diff --git a/.../AutoComputeETagInJsonIntegrationTests.cs → .../AutoComputeETagInJsonIntegrationTests.cs b/.../AutoComputeETagInJsonIntegrationTests.cs → .../AutoComputeETagInJsonIntegrationTests.cs
diff --git a/...ePayloadMetadataInJsonIntegrationTests.cs → ...ePayloadMetadataInJsonIntegrationTests.cs b/...ePayloadMetadataInJsonIntegrationTests.cs → ...ePayloadMetadataInJsonIntegrationTests.cs
diff --git a/...n/KeyAsSegmentTemplateIntegrationTests.cs → ...n/KeyAsSegmentTemplateIntegrationTests.cs b/...n/KeyAsSegmentTemplateIntegrationTests.cs → ...n/KeyAsSegmentTemplateIntegrationTests.cs
diff --git a/...er/Json/FeedAnnotationIntegrationTests.cs → ...er/Json/FeedAnnotationIntegrationTests.cs b/...er/Json/FeedAnnotationIntegrationTests.cs → ...er/Json/FeedAnnotationIntegrationTests.cs
diff --git a/...tanceAnnotationsReaderIntegrationTests.cs → ...tanceAnnotationsReaderIntegrationTests.cs b/...tanceAnnotationsReaderIntegrationTests.cs → ...tanceAnnotationsReaderIntegrationTests.cs
diff --git a/...on/ODataJsonReaderEnumIntegrationTests.cs → ...on/ODataJsonReaderEnumIntegrationTests.cs b/...on/ODataJsonReaderEnumIntegrationTests.cs → ...on/ODataJsonReaderEnumIntegrationTests.cs
diff --git a/...r/Json/ODataJsonReaderIntegrationTests.cs → ...r/Json/ODataJsonReaderIntegrationTests.cs b/...r/Json/ODataJsonReaderIntegrationTests.cs → ...r/Json/ODataJsonReaderIntegrationTests.cs
diff --git a/...ertyAndValueJsonReaderIntegrationTests.cs → ...ertyAndValueJsonReaderIntegrationTests.cs b/...ertyAndValueJsonReaderIntegrationTests.cs → ...ertyAndValueJsonReaderIntegrationTests.cs
diff --git a/...son/UriParameterReaderIntegrationTests.cs → ...son/UriParameterReaderIntegrationTests.cs b/...son/UriParameterReaderIntegrationTests.cs → ...son/UriParameterReaderIntegrationTests.cs
diff --git a/...Writer/DeltaLinkWriterIntegrationTests.cs → ...Writer/DeltaLinkWriterIntegrationTests.cs b/...Writer/DeltaLinkWriterIntegrationTests.cs → ...Writer/DeltaLinkWriterIntegrationTests.cs
diff --git a/...stanceAnnotationWriterIntegrationTests.cs → ...stanceAnnotationWriterIntegrationTests.cs b/...stanceAnnotationWriterIntegrationTests.cs → ...stanceAnnotationWriterIntegrationTests.cs
diff --git a/...on/DeltaLinkJsonWriterIntegrationTests.cs → ...on/DeltaLinkJsonWriterIntegrationTests.cs b/...on/DeltaLinkJsonWriterIntegrationTests.cs → ...on/DeltaLinkJsonWriterIntegrationTests.cs
diff --git a/...ODataJsonWriterComplexIntegrationTests.cs → ...ODataJsonWriterComplexIntegrationTests.cs b/...ODataJsonWriterComplexIntegrationTests.cs → ...ODataJsonWriterComplexIntegrationTests.cs
diff --git a/...on/ODataJsonWriterEnumIntegrationTests.cs → ...on/ODataJsonWriterEnumIntegrationTests.cs b/...on/ODataJsonWriterEnumIntegrationTests.cs → ...on/ODataJsonWriterEnumIntegrationTests.cs
diff --git a/...r/Json/ODataJsonWriterIntegrationTests.cs → ...r/Json/ODataJsonWriterIntegrationTests.cs b/...r/Json/ODataJsonWriterIntegrationTests.cs → ...r/Json/ODataJsonWriterIntegrationTests.cs
diff --git a/...ataJsonWriterShortSpanIntegrationTests.cs → ...ataJsonWriterShortSpanIntegrationTests.cs b/...ataJsonWriterShortSpanIntegrationTests.cs → ...ataJsonWriterShortSpanIntegrationTests.cs
diff --git a/...ertyAndValueJsonWriterIntegrationTests.cs → ...ertyAndValueJsonWriterIntegrationTests.cs b/...ertyAndValueJsonWriterIntegrationTests.cs → ...ertyAndValueJsonWriterIntegrationTests.cs
diff --git a/...son/UriParameterWriterIntegrationTests.cs → ...son/UriParameterWriterIntegrationTests.cs b/...son/UriParameterWriterIntegrationTests.cs → ...son/UriParameterWriterIntegrationTests.cs
diff --git a/...ft.OData.Core.Tests/Json/BitStackTests.cs → ...ft.OData.Core.Tests/Json/BitStackTests.cs b/...ft.OData.Core.Tests/Json/BitStackTests.cs → ...ft.OData.Core.Tests/Json/BitStackTests.cs
diff --git a/...re.Tests/Json/BufferingJsonReaderTests.cs → ...re.Tests/Json/BufferingJsonReaderTests.cs b/...re.Tests/Json/BufferingJsonReaderTests.cs → ...re.Tests/Json/BufferingJsonReaderTests.cs
diff --git a/...imUriWithDerivedTypeCastAndKeySegment.xml → ...imUriWithDerivedTypeCastAndKeySegment.xml b/...imUriWithDerivedTypeCastAndKeySegment.xml → ...imUriWithDerivedTypeCastAndKeySegment.xml
diff --git a/....Tests/Json/JsonFullMetadataLevelTests.cs → ....Tests/Json/JsonFullMetadataLevelTests.cs b/....Tests/Json/JsonFullMetadataLevelTests.cs → ....Tests/Json/JsonFullMetadataLevelTests.cs
diff --git a/...on/JsonFullMetadataTypeNameOracleTests.cs → ...on/JsonFullMetadataTypeNameOracleTests.cs b/...on/JsonFullMetadataTypeNameOracleTests.cs → ...on/JsonFullMetadataTypeNameOracleTests.cs
diff --git a/...JsonInstanceAnnotationWriterAsyncTests.cs → ...JsonInstanceAnnotationWriterAsyncTests.cs b/...JsonInstanceAnnotationWriterAsyncTests.cs → ...JsonInstanceAnnotationWriterAsyncTests.cs
diff --git a/...Json/JsonInstanceAnnotationWriterTests.cs → ...Json/JsonInstanceAnnotationWriterTests.cs b/...Json/JsonInstanceAnnotationWriterTests.cs → ...Json/JsonInstanceAnnotationWriterTests.cs
diff --git a/...Core.Tests/Json/JsonMetadataLevelTests.cs → ...Core.Tests/Json/JsonMetadataLevelTests.cs b/...Core.Tests/Json/JsonMetadataLevelTests.cs → ...Core.Tests/Json/JsonMetadataLevelTests.cs
diff --git a/...sts/Json/JsonMinimalMetadataLevelTests.cs → ...sts/Json/JsonMinimalMetadataLevelTests.cs b/...sts/Json/JsonMinimalMetadataLevelTests.cs → ...sts/Json/JsonMinimalMetadataLevelTests.cs
diff --git a/...JsonMinimalMetadataTypeNameOracleTests.cs → ...JsonMinimalMetadataTypeNameOracleTests.cs b/...JsonMinimalMetadataTypeNameOracleTests.cs → ...JsonMinimalMetadataTypeNameOracleTests.cs
diff --git a/...re.Tests/Json/JsonNoMetadataLevelTests.cs → ...re.Tests/Json/JsonNoMetadataLevelTests.cs b/...re.Tests/Json/JsonNoMetadataLevelTests.cs → ...re.Tests/Json/JsonNoMetadataLevelTests.cs
diff --git a/...Json/JsonNoMetadataTypeNameOracleTests.cs → ...Json/JsonNoMetadataTypeNameOracleTests.cs b/...Json/JsonNoMetadataTypeNameOracleTests.cs → ...Json/JsonNoMetadataTypeNameOracleTests.cs
diff --git a/...ts/Json/JsonODataAnnotationWriterTests.cs → ...ts/Json/JsonODataAnnotationWriterTests.cs b/...ts/Json/JsonODataAnnotationWriterTests.cs → ...ts/Json/JsonODataAnnotationWriterTests.cs
diff --git a/...a.Core.Tests/Json/JsonReaderAssertions.cs → ...a.Core.Tests/Json/JsonReaderAssertions.cs b/...a.Core.Tests/Json/JsonReaderAssertions.cs → ...a.Core.Tests/Json/JsonReaderAssertions.cs
diff --git a/....OData.Core.Tests/Json/JsonReaderTests.cs → ....OData.Core.Tests/Json/JsonReaderTests.cs b/....OData.Core.Tests/Json/JsonReaderTests.cs → ....OData.Core.Tests/Json/JsonReaderTests.cs
diff --git a/....OData.Core.Tests/Json/JsonReaderUtils.cs → ....OData.Core.Tests/Json/JsonReaderUtils.cs b/....OData.Core.Tests/Json/JsonReaderUtils.cs → ....OData.Core.Tests/Json/JsonReaderUtils.cs
diff --git a/...rosoft.OData.Core.Tests/Json/JsonUtils.cs → ...rosoft.OData.Core.Tests/Json/JsonUtils.cs b/...rosoft.OData.Core.Tests/Json/JsonUtils.cs → ...rosoft.OData.Core.Tests/Json/JsonUtils.cs
diff --git a/...re.Tests/Json/JsonValueUtilsAsyncTests.cs → ...re.Tests/Json/JsonValueUtilsAsyncTests.cs b/...re.Tests/Json/JsonValueUtilsAsyncTests.cs → ...re.Tests/Json/JsonValueUtilsAsyncTests.cs
diff --git a/...ta.Core.Tests/Json/JsonValueUtilsTests.cs → ...ta.Core.Tests/Json/JsonValueUtilsTests.cs b/...ta.Core.Tests/Json/JsonValueUtilsTests.cs → ...ta.Core.Tests/Json/JsonValueUtilsTests.cs
diff --git a/...re.Tests/Json/JsonWriterAsyncBaseTests.cs → ...re.Tests/Json/JsonWriterAsyncBaseTests.cs b/...re.Tests/Json/JsonWriterAsyncBaseTests.cs → ...re.Tests/Json/JsonWriterAsyncBaseTests.cs
diff --git a/...a.Core.Tests/Json/JsonWriterAsyncTests.cs → ...a.Core.Tests/Json/JsonWriterAsyncTests.cs b/...a.Core.Tests/Json/JsonWriterAsyncTests.cs → ...a.Core.Tests/Json/JsonWriterAsyncTests.cs
diff --git a/...ta.Core.Tests/Json/JsonWriterBaseTests.cs → ...ta.Core.Tests/Json/JsonWriterBaseTests.cs b/...ta.Core.Tests/Json/JsonWriterBaseTests.cs → ...ta.Core.Tests/Json/JsonWriterBaseTests.cs
diff --git a/....OData.Core.Tests/Json/JsonWriterTests.cs → ....OData.Core.Tests/Json/JsonWriterTests.cs b/....OData.Core.Tests/Json/JsonWriterTests.cs → ....OData.Core.Tests/Json/JsonWriterTests.cs
diff --git a/...Data.Core.Tests/Json/MockCharArrayPool.cs → ...Data.Core.Tests/Json/MockCharArrayPool.cs b/...Data.Core.Tests/Json/MockCharArrayPool.cs → ...Data.Core.Tests/Json/MockCharArrayPool.cs
diff --git a/...ore.Tests/Json/MockJsonValueSerializer.cs → ...ore.Tests/Json/MockJsonValueSerializer.cs b/...ore.Tests/Json/MockJsonValueSerializer.cs → ...ore.Tests/Json/MockJsonValueSerializer.cs
diff --git a/...t.OData.Core.Tests/Json/MockJsonWriter.cs → ...t.OData.Core.Tests/Json/MockJsonWriter.cs b/...t.OData.Core.Tests/Json/MockJsonWriter.cs → ...t.OData.Core.Tests/Json/MockJsonWriter.cs
diff --git a/....Core.Tests/Json/MockJsonWriterFactory.cs → ....Core.Tests/Json/MockJsonWriterFactory.cs b/....Core.Tests/Json/MockJsonWriterFactory.cs → ....Core.Tests/Json/MockJsonWriterFactory.cs
diff --git a/...ests/Json/MockJsonWriterFactoryWrapper.cs → ...ests/Json/MockJsonWriterFactoryWrapper.cs b/...ests/Json/MockJsonWriterFactoryWrapper.cs → ...ests/Json/MockJsonWriterFactoryWrapper.cs
diff --git a/...s/Json/NonIndentedTextWriterAsyncTests.cs → ...s/Json/NonIndentedTextWriterAsyncTests.cs b/...s/Json/NonIndentedTextWriterAsyncTests.cs → ...s/Json/NonIndentedTextWriterAsyncTests.cs
diff --git a/....Tests/Json/NonIndentedTextWriterTests.cs → ....Tests/Json/NonIndentedTextWriterTests.cs b/....Tests/Json/NonIndentedTextWriterTests.cs → ....Tests/Json/NonIndentedTextWriterTests.cs
diff --git a/...e.Tests/Json/ODataAnnotationNamesTests.cs → ...e.Tests/Json/ODataAnnotationNamesTests.cs b/...e.Tests/Json/ODataAnnotationNamesTests.cs → ...e.Tests/Json/ODataAnnotationNamesTests.cs
diff --git a/...ests/Json/ODataBinaryStreamWriterTests.cs → ...ests/Json/ODataBinaryStreamWriterTests.cs b/...ests/Json/ODataBinaryStreamWriterTests.cs → ...ests/Json/ODataBinaryStreamWriterTests.cs
diff --git a/...e.Tests/Json/ODataJsonBatchReaderTests.cs → ...e.Tests/Json/ODataJsonBatchReaderTests.cs b/...e.Tests/Json/ODataJsonBatchReaderTests.cs → ...e.Tests/Json/ODataJsonBatchReaderTests.cs
diff --git a/...e.Tests/Json/ODataJsonBatchWriterTests.cs → ...e.Tests/Json/ODataJsonBatchWriterTests.cs b/...e.Tests/Json/ODataJsonBatchWriterTests.cs → ...e.Tests/Json/ODataJsonBatchWriterTests.cs
diff --git a/...n/ODataJsonCollectionDeserializerTests.cs → ...n/ODataJsonCollectionDeserializerTests.cs b/...n/ODataJsonCollectionDeserializerTests.cs → ...n/ODataJsonCollectionDeserializerTests.cs
diff --git a/...ts/Json/ODataJsonCollectionReaderTests.cs → ...ts/Json/ODataJsonCollectionReaderTests.cs b/...ts/Json/ODataJsonCollectionReaderTests.cs → ...ts/Json/ODataJsonCollectionReaderTests.cs
diff --git a/...son/ODataJsonCollectionSerializerTests.cs → ...son/ODataJsonCollectionSerializerTests.cs b/...son/ODataJsonCollectionSerializerTests.cs → ...son/ODataJsonCollectionSerializerTests.cs
diff --git a/...ts/Json/ODataJsonCollectionWriterTests.cs → ...ts/Json/ODataJsonCollectionWriterTests.cs b/...ts/Json/ODataJsonCollectionWriterTests.cs → ...ts/Json/ODataJsonCollectionWriterTests.cs
diff --git a/...ts/Json/ODataJsonContextUriParserTests.cs → ...ts/Json/ODataJsonContextUriParserTests.cs b/...ts/Json/ODataJsonContextUriParserTests.cs → ...ts/Json/ODataJsonContextUriParserTests.cs
diff --git a/...e.Tests/Json/ODataJsonDeltaReaderTests.cs → ...e.Tests/Json/ODataJsonDeltaReaderTests.cs b/...e.Tests/Json/ODataJsonDeltaReaderTests.cs → ...e.Tests/Json/ODataJsonDeltaReaderTests.cs
diff --git a/...e.Tests/Json/ODataJsonDeltaWriterTests.cs → ...e.Tests/Json/ODataJsonDeltaWriterTests.cs b/...e.Tests/Json/ODataJsonDeltaWriterTests.cs → ...e.Tests/Json/ODataJsonDeltaWriterTests.cs
diff --git a/....Tests/Json/ODataJsonDeserializerTests.cs → ....Tests/Json/ODataJsonDeserializerTests.cs b/....Tests/Json/ODataJsonDeserializerTests.cs → ....Tests/Json/ODataJsonDeserializerTests.cs
diff --git a/...JsonEntityReferenceLinkSerializerTests.cs → ...JsonEntityReferenceLinkSerializerTests.cs b/...JsonEntityReferenceLinkSerializerTests.cs → ...JsonEntityReferenceLinkSerializerTests.cs
diff --git a/...ODataJsonEntryAndFeedDeserializerTests.cs → ...ODataJsonEntryAndFeedDeserializerTests.cs b/...ODataJsonEntryAndFeedDeserializerTests.cs → ...ODataJsonEntryAndFeedDeserializerTests.cs
diff --git a/...dDeserializerUndeclaredAnnotationTests.cs → ...dDeserializerUndeclaredAnnotationTests.cs b/...dDeserializerUndeclaredAnnotationTests.cs → ...dDeserializerUndeclaredAnnotationTests.cs
diff --git a/...ntryAndFeedDeserializerUndeclaredTests.cs → ...ntryAndFeedDeserializerUndeclaredTests.cs b/...ntryAndFeedDeserializerUndeclaredTests.cs → ...ntryAndFeedDeserializerUndeclaredTests.cs
diff --git a/...n/ODataJsonEntryAndFeedSerializerTests.cs → ...n/ODataJsonEntryAndFeedSerializerTests.cs b/...n/ODataJsonEntryAndFeedSerializerTests.cs → ...n/ODataJsonEntryAndFeedSerializerTests.cs
diff --git a/...nEntryAndFeedSerializerUndecalredTests.cs → ...nEntryAndFeedSerializerUndecalredTests.cs b/...nEntryAndFeedSerializerUndecalredTests.cs → ...nEntryAndFeedSerializerUndecalredTests.cs
diff --git a/...s/Json/ODataJsonErrorDeserializerTests.cs → ...s/Json/ODataJsonErrorDeserializerTests.cs b/...s/Json/ODataJsonErrorDeserializerTests.cs → ...s/Json/ODataJsonErrorDeserializerTests.cs
diff --git a/...ts/Json/ODataJsonOutputContextApiTests.cs → ...ts/Json/ODataJsonOutputContextApiTests.cs b/...ts/Json/ODataJsonOutputContextApiTests.cs → ...ts/Json/ODataJsonOutputContextApiTests.cs
diff --git a/...Tests/Json/ODataJsonOutputContextTests.cs → ...Tests/Json/ODataJsonOutputContextTests.cs b/...Tests/Json/ODataJsonOutputContextTests.cs → ...Tests/Json/ODataJsonOutputContextTests.cs
diff --git a/...on/ODataJsonParameterDeserializerTests.cs → ...on/ODataJsonParameterDeserializerTests.cs b/...on/ODataJsonParameterDeserializerTests.cs → ...on/ODataJsonParameterDeserializerTests.cs
diff --git a/...sts/Json/ODataJsonParameterReaderTests.cs → ...sts/Json/ODataJsonParameterReaderTests.cs b/...sts/Json/ODataJsonParameterReaderTests.cs → ...sts/Json/ODataJsonParameterReaderTests.cs
diff --git a/...sts/Json/ODataJsonParameterWriterTests.cs → ...sts/Json/ODataJsonParameterWriterTests.cs b/...sts/Json/ODataJsonParameterWriterTests.cs → ...sts/Json/ODataJsonParameterWriterTests.cs
diff --git a/...nPayloadKindDetectionDeserializerTests.cs → ...nPayloadKindDetectionDeserializerTests.cs b/...nPayloadKindDetectionDeserializerTests.cs → ...nPayloadKindDetectionDeserializerTests.cs
diff --git a/.../ODataJsonPropertySerializerAsyncTests.cs → .../ODataJsonPropertySerializerAsyncTests.cs b/.../ODataJsonPropertySerializerAsyncTests.cs → .../ODataJsonPropertySerializerAsyncTests.cs
diff --git a/.../Json/ODataJsonPropertySerializerTests.cs → .../Json/ODataJsonPropertySerializerTests.cs b/.../Json/ODataJsonPropertySerializerTests.cs → .../Json/ODataJsonPropertySerializerTests.cs
diff --git a/...sts/Json/ODataJsonReaderCoreUtilsTests.cs → ...sts/Json/ODataJsonReaderCoreUtilsTests.cs b/...sts/Json/ODataJsonReaderCoreUtilsTests.cs → ...sts/Json/ODataJsonReaderCoreUtilsTests.cs
diff --git a/...a.Core.Tests/Json/ODataJsonReaderTests.cs → ...a.Core.Tests/Json/ODataJsonReaderTests.cs b/...a.Core.Tests/Json/ODataJsonReaderTests.cs → ...a.Core.Tests/Json/ODataJsonReaderTests.cs
diff --git a/...e.Tests/Json/ODataJsonReaderUtilsTests.cs → ...e.Tests/Json/ODataJsonReaderUtilsTests.cs b/...e.Tests/Json/ODataJsonReaderUtilsTests.cs → ...e.Tests/Json/ODataJsonReaderUtilsTests.cs
diff --git a/...son/ODataJsonResourceDeserializerTests.cs → ...son/ODataJsonResourceDeserializerTests.cs b/...son/ODataJsonResourceDeserializerTests.cs → ...son/ODataJsonResourceDeserializerTests.cs
diff --git a/.../Json/ODataJsonResourceSerializerTests.cs → .../Json/ODataJsonResourceSerializerTests.cs b/.../Json/ODataJsonResourceSerializerTests.cs → .../Json/ODataJsonResourceSerializerTests.cs
diff --git a/...re.Tests/Json/ODataJsonSerializerTests.cs → ...re.Tests/Json/ODataJsonSerializerTests.cs b/...re.Tests/Json/ODataJsonSerializerTests.cs → ...re.Tests/Json/ODataJsonSerializerTests.cs
diff --git a/...taJsonServiceDocumentDeserializerTests.cs → ...taJsonServiceDocumentDeserializerTests.cs b/...taJsonServiceDocumentDeserializerTests.cs → ...taJsonServiceDocumentDeserializerTests.cs
diff --git a/...DataJsonServiceDocumentSerializerTests.cs → ...DataJsonServiceDocumentSerializerTests.cs b/...DataJsonServiceDocumentSerializerTests.cs → ...DataJsonServiceDocumentSerializerTests.cs
diff --git a/...sts/Json/ODataJsonTextWriterAsyncTests.cs → ...sts/Json/ODataJsonTextWriterAsyncTests.cs b/...sts/Json/ODataJsonTextWriterAsyncTests.cs → ...sts/Json/ODataJsonTextWriterAsyncTests.cs
diff --git a/...ta.Core.Tests/Json/ODataJsonUtilsTests.cs → ...ta.Core.Tests/Json/ODataJsonUtilsTests.cs b/...ta.Core.Tests/Json/ODataJsonUtilsTests.cs → ...ta.Core.Tests/Json/ODataJsonUtilsTests.cs
diff --git a/...sts/Json/ODataJsonValidationUtilsTests.cs → ...sts/Json/ODataJsonValidationUtilsTests.cs b/...sts/Json/ODataJsonValidationUtilsTests.cs → ...sts/Json/ODataJsonValidationUtilsTests.cs
diff --git a/...son/ODataJsonValueSerializerAsyncTests.cs → ...son/ODataJsonValueSerializerAsyncTests.cs b/...son/ODataJsonValueSerializerAsyncTests.cs → ...son/ODataJsonValueSerializerAsyncTests.cs
diff --git a/...sts/Json/ODataJsonValueSerializerTests.cs → ...sts/Json/ODataJsonValueSerializerTests.cs b/...sts/Json/ODataJsonValueSerializerTests.cs → ...sts/Json/ODataJsonValueSerializerTests.cs
diff --git a/...sts/Json/ODataJsonWriterCoreUtilsTests.cs → ...sts/Json/ODataJsonWriterCoreUtilsTests.cs b/...sts/Json/ODataJsonWriterCoreUtilsTests.cs → ...sts/Json/ODataJsonWriterCoreUtilsTests.cs
diff --git a/...a.Core.Tests/Json/ODataJsonWriterTests.cs → ...a.Core.Tests/Json/ODataJsonWriterTests.cs b/...a.Core.Tests/Json/ODataJsonWriterTests.cs → ...a.Core.Tests/Json/ODataJsonWriterTests.cs
diff --git a/...ts/Json/ODataJsonWriterUtilsAsyncTests.cs → ...ts/Json/ODataJsonWriterUtilsAsyncTests.cs b/...ts/Json/ODataJsonWriterUtilsAsyncTests.cs → ...ts/Json/ODataJsonWriterUtilsAsyncTests.cs
diff --git a/...e.Tests/Json/ODataJsonWriterUtilsTests.cs → ...e.Tests/Json/ODataJsonWriterUtilsTests.cs b/...e.Tests/Json/ODataJsonWriterUtilsTests.cs → ...e.Tests/Json/ODataJsonWriterUtilsTests.cs
diff --git a/...ests/Json/ODataUtf8JsonTextWriterTests.cs → ...ests/Json/ODataUtf8JsonTextWriterTests.cs b/...ests/Json/ODataUtf8JsonTextWriterTests.cs → ...ests/Json/ODataUtf8JsonTextWriterTests.cs
diff --git a/...sts/Json/ODataUtf8JsonWriterAsyncTests.cs → ...sts/Json/ODataUtf8JsonWriterAsyncTests.cs b/...sts/Json/ODataUtf8JsonWriterAsyncTests.cs → ...sts/Json/ODataUtf8JsonWriterAsyncTests.cs
diff --git a/...n/ODataUtf8JsonWriterFactoryAsyncTests.cs → ...n/ODataUtf8JsonWriterFactoryAsyncTests.cs b/...n/ODataUtf8JsonWriterFactoryAsyncTests.cs → ...n/ODataUtf8JsonWriterFactoryAsyncTests.cs
diff --git a/...s/Json/ODataUtf8JsonWriterFactoryTests.cs → ...s/Json/ODataUtf8JsonWriterFactoryTests.cs b/...s/Json/ODataUtf8JsonWriterFactoryTests.cs → ...s/Json/ODataUtf8JsonWriterFactoryTests.cs
diff --git a/...ts/Json/ODataUtf8JsonWriterStreamTests.cs → ...ts/Json/ODataUtf8JsonWriterStreamTests.cs b/...ts/Json/ODataUtf8JsonWriterStreamTests.cs → ...ts/Json/ODataUtf8JsonWriterStreamTests.cs
diff --git a/...re.Tests/Json/ODataUtf8JsonWriterTests.cs → ...re.Tests/Json/ODataUtf8JsonWriterTests.cs b/...re.Tests/Json/ODataUtf8JsonWriterTests.cs → ...re.Tests/Json/ODataUtf8JsonWriterTests.cs
diff --git a/...Core.Tests/Json/PayloadValueConverters.cs → ...Core.Tests/Json/PayloadValueConverters.cs b/...Core.Tests/Json/PayloadValueConverters.cs → ...Core.Tests/Json/PayloadValueConverters.cs
diff --git a/...Tests/Json/PooledByteBufferWriterTests.cs → ...Tests/Json/PooledByteBufferWriterTests.cs b/...Tests/Json/PooledByteBufferWriterTests.cs → ...Tests/Json/PooledByteBufferWriterTests.cs
diff --git a/...e.Tests/Json/ReorderingJsonReaderTests.cs → ...e.Tests/Json/ReorderingJsonReaderTests.cs b/...e.Tests/Json/ReorderingJsonReaderTests.cs → ...e.Tests/Json/ReorderingJsonReaderTests.cs
diff --git a/...e.Tests/Json/TestEntityMetadataBuilder.cs → ...e.Tests/Json/TestEntityMetadataBuilder.cs b/...e.Tests/Json/TestEntityMetadataBuilder.cs → ...e.Tests/Json/TestEntityMetadataBuilder.cs
diff --git a/.../Json/TestODataJsonWriterResourceState.cs → .../Json/TestODataJsonWriterResourceState.cs b/.../Json/TestODataJsonWriterResourceState.cs → .../Json/TestODataJsonWriterResourceState.cs
diff --git a/.../Json/TestODataResourceMetadataBuilder.cs → .../Json/TestODataResourceMetadataBuilder.cs b/.../Json/TestODataResourceMetadataBuilder.cs → .../Json/TestODataResourceMetadataBuilder.cs
diff --git a/...Tests/Json/TranscodingWriteStreamTests.cs → ...Tests/Json/TranscodingWriteStreamTests.cs b/...Tests/Json/TranscodingWriteStreamTests.cs → ...Tests/Json/TranscodingWriteStreamTests.cs
diff --git a/...WithDerivedTypeCastAndKeySegmentAsync.xml → ...WithDerivedTypeCastAndKeySegmentAsync.xml b/...WithDerivedTypeCastAndKeySegmentAsync.xml → ...WithDerivedTypeCastAndKeySegmentAsync.xml
diff --git a/...t.OData.Core.Tests/MediaTypeUtilsTests.cs → ...t.OData.Core.Tests/MediaTypeUtilsTests.cs b/...t.OData.Core.Tests/MediaTypeUtilsTests.cs → ...t.OData.Core.Tests/MediaTypeUtilsTests.cs
diff --git a/...re.Tests/MessageWriterConcurrencyTests.cs → ...re.Tests/MessageWriterConcurrencyTests.cs b/...re.Tests/MessageWriterConcurrencyTests.cs → ...re.Tests/MessageWriterConcurrencyTests.cs
diff --git a/...sts/Metadata/EdmLibraryExtensionsTests.cs → ...sts/Metadata/EdmLibraryExtensionsTests.cs b/...sts/Metadata/EdmLibraryExtensionsTests.cs → ...sts/Metadata/EdmLibraryExtensionsTests.cs
diff --git a/...ests/Metadata/MetadataUtilsCommonTests.cs → ...ests/Metadata/MetadataUtilsCommonTests.cs b/...ests/Metadata/MetadataUtilsCommonTests.cs → ...ests/Metadata/MetadataUtilsCommonTests.cs
diff --git a/...Core.Tests/Metadata/MetadataUtilsTests.cs → ...Core.Tests/Metadata/MetadataUtilsTests.cs b/...Core.Tests/Metadata/MetadataUtilsTests.cs → ...Core.Tests/Metadata/MetadataUtilsTests.cs
diff --git a/...Microsoft.OData.Core.Tests.NetCore.csproj → ...Microsoft.OData.Core.Tests.NetCore.csproj b/...Microsoft.OData.Core.Tests.NetCore.csproj → ...Microsoft.OData.Core.Tests.NetCore.csproj
diff --git a/...e.Tests/Microsoft.OData.Core.Tests.csproj → ...e.Tests/Microsoft.OData.Core.Tests.csproj b/...e.Tests/Microsoft.OData.Core.Tests.csproj → ...e.Tests/Microsoft.OData.Core.Tests.csproj
@@ -51,13 +51,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Common\ExceptionUtilities.cs" Link="ExceptionUtilities.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\EdmConstants.cs" Link="EdmConstants.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\EdmToStockModelConverter.cs" Link="EdmToStockModelConverter.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\MetadataExtensionMethods.cs" Link="MetadataExtensionMethods.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\MetadataUtils.cs" Link="MetadataUtils.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\TestModels.cs" Link="TestModels.cs" />
-    <Compile Include="..\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\ODataLibTest\ModelBuilder.cs" Link="ModelBuilder.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Common\ExceptionUtilities.cs" Link="ExceptionUtilities.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\EdmConstants.cs" Link="EdmConstants.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\EdmToStockModelConverter.cs" Link="EdmToStockModelConverter.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\MetadataExtensionMethods.cs" Link="MetadataExtensionMethods.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\MetadataUtils.cs" Link="MetadataUtils.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\Metadata\TestModels.cs" Link="TestModels.cs" />
+    <Compile Include="..\..\FunctionalTests\Tests\TestUtils\Common\Microsoft.Test.OData.Utils\ODataLibTest\ModelBuilder.cs" Link="ModelBuilder.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -70,7 +70,7 @@
     <ProjectReference Include="..\..\..\src\Microsoft.OData.Edm\Microsoft.OData.Edm.csproj" />
     <ProjectReference Include="..\..\..\src\Microsoft.Spatial\Microsoft.Spatial.csproj" />
     <ProjectReference Include="..\..\Common\Microsoft.Test.OData.DependencyInjection\Microsoft.Test.OData.DependencyInjection.csproj" />
-    <ProjectReference Include="..\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
+    <ProjectReference Include="..\..\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(TargetFramework)' == 'net48'">

diff --git a/...oft.OData.Core.Tests/MultiBindingTests.cs → ...oft.OData.Core.Tests/MultiBindingTests.cs b/...oft.OData.Core.Tests/MultiBindingTests.cs → ...oft.OData.Core.Tests/MultiBindingTests.cs
diff --git a/...Tests/NavigationPropertyOnComplexTests.cs → ...Tests/NavigationPropertyOnComplexTests.cs b/...Tests/NavigationPropertyOnComplexTests.cs → ...Tests/NavigationPropertyOnComplexTests.cs
diff --git a/...OData.Core.Tests/ODataAnnotatableTests.cs → ...OData.Core.Tests/ODataAnnotatableTests.cs b/...OData.Core.Tests/ODataAnnotatableTests.cs → ...OData.Core.Tests/ODataAnnotatableTests.cs
diff --git a/...ore.Tests/ODataAsynchronousReaderTests.cs → ...ore.Tests/ODataAsynchronousReaderTests.cs b/...ore.Tests/ODataAsynchronousReaderTests.cs → ...ore.Tests/ODataAsynchronousReaderTests.cs
diff --git a/...ore.Tests/ODataAsynchronousWriterTests.cs → ...ore.Tests/ODataAsynchronousWriterTests.cs b/...ore.Tests/ODataAsynchronousWriterTests.cs → ...ore.Tests/ODataAsynchronousWriterTests.cs
diff --git a/...Core.Tests/ODataBatchReaderStreamTests.cs → ...Core.Tests/ODataBatchReaderStreamTests.cs b/...Core.Tests/ODataBatchReaderStreamTests.cs → ...Core.Tests/ODataBatchReaderStreamTests.cs
diff --git a/...ore.Tests/ODataBinaryStreamReaderTests.cs → ...ore.Tests/ODataBinaryStreamReaderTests.cs b/...ore.Tests/ODataBinaryStreamReaderTests.cs → ...ore.Tests/ODataBinaryStreamReaderTests.cs
diff --git a/...aCollectionStartSerializationInfoTests.cs → ...aCollectionStartSerializationInfoTests.cs b/...aCollectionStartSerializationInfoTests.cs → ...aCollectionStartSerializationInfoTests.cs
diff --git a/...a.Core.Tests/ODataCollectionStartTests.cs → ...a.Core.Tests/ODataCollectionStartTests.cs b/...a.Core.Tests/ODataCollectionStartTests.cs → ...a.Core.Tests/ODataCollectionStartTests.cs
diff --git a/...Core.Tests/ODataContextUriBuilderTests.cs → ...Core.Tests/ODataContextUriBuilderTests.cs b/...Core.Tests/ODataContextUriBuilderTests.cs → ...Core.Tests/ODataContextUriBuilderTests.cs
diff --git a/...re.Tests/ODataEntityReferenceLinkTests.cs → ...re.Tests/ODataEntityReferenceLinkTests.cs b/...re.Tests/ODataEntityReferenceLinkTests.cs → ...re.Tests/ODataEntityReferenceLinkTests.cs
diff --git a/...e.Tests/ODataEntityReferenceLinksTests.cs → ...e.Tests/ODataEntityReferenceLinksTests.cs b/...e.Tests/ODataEntityReferenceLinksTests.cs → ...e.Tests/ODataEntityReferenceLinksTests.cs
diff --git a/...osoft.OData.Core.Tests/ODataErrorTests.cs → ...osoft.OData.Core.Tests/ODataErrorTests.cs b/...osoft.OData.Core.Tests/ODataErrorTests.cs → ...osoft.OData.Core.Tests/ODataErrorTests.cs
diff --git a/...rosoft.OData.Core.Tests/ODataFeedTests.cs → ...rosoft.OData.Core.Tests/ODataFeedTests.cs b/...rosoft.OData.Core.Tests/ODataFeedTests.cs → ...rosoft.OData.Core.Tests/ODataFeedTests.cs
diff --git a/...soft.OData.Core.Tests/ODataFormatTests.cs → ...soft.OData.Core.Tests/ODataFormatTests.cs b/...soft.OData.Core.Tests/ODataFormatTests.cs → ...soft.OData.Core.Tests/ODataFormatTests.cs
diff --git a/...ore.Tests/ODataInstanceAnnotationTests.cs → ...ore.Tests/ODataInstanceAnnotationTests.cs b/...ore.Tests/ODataInstanceAnnotationTests.cs → ...ore.Tests/ODataInstanceAnnotationTests.cs
diff --git a/...Core.Tests/ODataMediaTypeResolverTests.cs → ...Core.Tests/ODataMediaTypeResolverTests.cs b/...Core.Tests/ODataMediaTypeResolverTests.cs → ...Core.Tests/ODataMediaTypeResolverTests.cs
diff --git a/...Core.Tests/ODataMessageExtensionsTests.cs → ...Core.Tests/ODataMessageExtensionsTests.cs b/...Core.Tests/ODataMessageExtensionsTests.cs → ...Core.Tests/ODataMessageExtensionsTests.cs
diff --git a/....Tests/ODataMessageReaderSettingsTests.cs → ....Tests/ODataMessageReaderSettingsTests.cs b/....Tests/ODataMessageReaderSettingsTests.cs → ....Tests/ODataMessageReaderSettingsTests.cs
diff --git a/...ata.Core.Tests/ODataMessageReaderTests.cs → ...ata.Core.Tests/ODataMessageReaderTests.cs b/...ata.Core.Tests/ODataMessageReaderTests.cs → ...ata.Core.Tests/ODataMessageReaderTests.cs
diff --git a/....Tests/ODataMessageWriterSettingsTests.cs → ....Tests/ODataMessageWriterSettingsTests.cs b/....Tests/ODataMessageWriterSettingsTests.cs → ....Tests/ODataMessageWriterSettingsTests.cs
diff --git a/...ata.Core.Tests/ODataMessageWriterTests.cs → ...ata.Core.Tests/ODataMessageWriterTests.cs b/...ata.Core.Tests/ODataMessageWriterTests.cs → ...ata.Core.Tests/ODataMessageWriterTests.cs
diff --git a/...ltipartMixedBatchOutputContextApiTests.cs → ...ltipartMixedBatchOutputContextApiTests.cs b/...ltipartMixedBatchOutputContextApiTests.cs → ...ltipartMixedBatchOutputContextApiTests.cs
diff --git a/...ts/ODataMultipartMixedBatchReaderTests.cs → ...ts/ODataMultipartMixedBatchReaderTests.cs b/...ts/ODataMultipartMixedBatchReaderTests.cs → ...ts/ODataMultipartMixedBatchReaderTests.cs
diff --git a/...ts/ODataMultipartMixedBatchWriterTests.cs → ...ts/ODataMultipartMixedBatchWriterTests.cs b/...ts/ODataMultipartMixedBatchWriterTests.cs → ...ts/ODataMultipartMixedBatchWriterTests.cs
diff --git a/...ta.Core.Tests/ODataNavigationLinkTests.cs → ...ta.Core.Tests/ODataNavigationLinkTests.cs b/...ta.Core.Tests/ODataNavigationLinkTests.cs → ...ta.Core.Tests/ODataNavigationLinkTests.cs
diff --git a/...ore.Tests/ODataNotificationReaderTests.cs → ...ore.Tests/ODataNotificationReaderTests.cs b/...ore.Tests/ODataNotificationReaderTests.cs → ...ore.Tests/ODataNotificationReaderTests.cs
diff --git a/...ore.Tests/ODataNotificationStreamTests.cs → ...ore.Tests/ODataNotificationStreamTests.cs b/...ore.Tests/ODataNotificationStreamTests.cs → ...ore.Tests/ODataNotificationStreamTests.cs
diff --git a/...ore.Tests/ODataNotificationWriterTests.cs → ...ore.Tests/ODataNotificationWriterTests.cs b/...ore.Tests/ODataNotificationWriterTests.cs → ...ore.Tests/ODataNotificationWriterTests.cs
diff --git a/...t.OData.Core.Tests/ODataNullValueTests.cs → ...t.OData.Core.Tests/ODataNullValueTests.cs b/...t.OData.Core.Tests/ODataNullValueTests.cs → ...t.OData.Core.Tests/ODataNullValueTests.cs
diff --git a/...e.Tests/ODataObjectModelExtensionTests.cs → ...e.Tests/ODataObjectModelExtensionTests.cs b/...e.Tests/ODataObjectModelExtensionTests.cs → ...e.Tests/ODataObjectModelExtensionTests.cs
diff --git a/...t.OData.Core.Tests/ODataOperationTests.cs → ...t.OData.Core.Tests/ODataOperationTests.cs b/...t.OData.Core.Tests/ODataOperationTests.cs → ...t.OData.Core.Tests/ODataOperationTests.cs
diff --git a/....Core.Tests/ODataPreferenceHeaderTests.cs → ....Core.Tests/ODataPreferenceHeaderTests.cs b/....Core.Tests/ODataPreferenceHeaderTests.cs → ....Core.Tests/ODataPreferenceHeaderTests.cs
diff --git a/...ta.Core.Tests/ODataPrimitiveValueTests.cs → ...ta.Core.Tests/ODataPrimitiveValueTests.cs b/...ta.Core.Tests/ODataPrimitiveValueTests.cs → ...ta.Core.Tests/ODataPrimitiveValueTests.cs
diff --git a/...opertySerializationInfoAnnotationTests.cs → ...opertySerializationInfoAnnotationTests.cs b/...opertySerializationInfoAnnotationTests.cs → ...opertySerializationInfoAnnotationTests.cs
diff --git a/...ft.OData.Core.Tests/ODataPropertyTests.cs → ...ft.OData.Core.Tests/ODataPropertyTests.cs b/...ft.OData.Core.Tests/ODataPropertyTests.cs → ...ft.OData.Core.Tests/ODataPropertyTests.cs
diff --git a/...a.Core.Tests/ODataRawInputContextTests.cs → ...a.Core.Tests/ODataRawInputContextTests.cs b/...a.Core.Tests/ODataRawInputContextTests.cs → ...a.Core.Tests/ODataRawInputContextTests.cs
diff --git a/...re.Tests/ODataRawOutputContextApiTests.cs → ...re.Tests/ODataRawOutputContextApiTests.cs b/...re.Tests/ODataRawOutputContextApiTests.cs → ...re.Tests/ODataRawOutputContextApiTests.cs
diff --git a/....Core.Tests/ODataRawOutputContextTests.cs → ....Core.Tests/ODataRawOutputContextTests.cs b/....Core.Tests/ODataRawOutputContextTests.cs → ....Core.Tests/ODataRawOutputContextTests.cs
diff --git a/.../ODataReaderDerivedTypeConstraintTests.cs → .../ODataReaderDerivedTypeConstraintTests.cs b/.../ODataReaderDerivedTypeConstraintTests.cs → .../ODataReaderDerivedTypeConstraintTests.cs
diff --git a/...ta.Core.Tests/ODataRequestMessageTests.cs → ...ta.Core.Tests/ODataRequestMessageTests.cs b/...ta.Core.Tests/ODataRequestMessageTests.cs → ...ta.Core.Tests/ODataRequestMessageTests.cs
diff --git a/...ts/ODataResourceSerializationInfoTests.cs → ...ts/ODataResourceSerializationInfoTests.cs b/...ts/ODataResourceSerializationInfoTests.cs → ...ts/ODataResourceSerializationInfoTests.cs
diff --git a/...ft.OData.Core.Tests/ODataResourceTests.cs → ...ft.OData.Core.Tests/ODataResourceTests.cs b/...ft.OData.Core.Tests/ODataResourceTests.cs → ...ft.OData.Core.Tests/ODataResourceTests.cs
diff --git a/...re.Tests/ODataResourceTypeContextTests.cs → ...re.Tests/ODataResourceTypeContextTests.cs b/...re.Tests/ODataResourceTypeContextTests.cs → ...re.Tests/ODataResourceTypeContextTests.cs
diff --git a/...s/ODataServiceCollectionExtensionTests.cs → ...s/ODataServiceCollectionExtensionTests.cs b/...s/ODataServiceCollectionExtensionTests.cs → ...s/ODataServiceCollectionExtensionTests.cs
diff --git a/...e.Tests/ODataStreamReferenceValueTests.cs → ...e.Tests/ODataStreamReferenceValueTests.cs b/...e.Tests/ODataStreamReferenceValueTests.cs → ...e.Tests/ODataStreamReferenceValueTests.cs
diff --git a/....Core.Tests/ODataTextStreamReaderTests.cs → ....Core.Tests/ODataTextStreamReaderTests.cs b/....Core.Tests/ODataTextStreamReaderTests.cs → ....Core.Tests/ODataTextStreamReaderTests.cs
diff --git a/...ata.Core.Tests/ODataUtilsInternalTests.cs → ...ata.Core.Tests/ODataUtilsInternalTests.cs b/...ata.Core.Tests/ODataUtilsInternalTests.cs → ...ata.Core.Tests/ODataUtilsInternalTests.cs
diff --git a/...osoft.OData.Core.Tests/ODataUtilsTests.cs → ...osoft.OData.Core.Tests/ODataUtilsTests.cs b/...osoft.OData.Core.Tests/ODataUtilsTests.cs → ...osoft.OData.Core.Tests/ODataUtilsTests.cs
diff --git a/....OData.Core.Tests/ODataValueUtilsTests.cs → ....OData.Core.Tests/ODataValueUtilsTests.cs b/....OData.Core.Tests/ODataValueUtilsTests.cs → ....OData.Core.Tests/ODataValueUtilsTests.cs
diff --git a/...Data.Core.Tests/ODataVersionCacheTests.cs → ...Data.Core.Tests/ODataVersionCacheTests.cs b/...Data.Core.Tests/ODataVersionCacheTests.cs → ...Data.Core.Tests/ODataVersionCacheTests.cs
diff --git a/...OData.Core.Tests/ODataWriteStreamTests.cs → ...OData.Core.Tests/ODataWriteStreamTests.cs b/...OData.Core.Tests/ODataWriteStreamTests.cs → ...OData.Core.Tests/ODataWriteStreamTests.cs
diff --git a/....OData.Core.Tests/ODataWriterCoreTests.cs → ....OData.Core.Tests/ODataWriterCoreTests.cs b/....OData.Core.Tests/ODataWriterCoreTests.cs → ....OData.Core.Tests/ODataWriterCoreTests.cs
diff --git a/.../ODataWriterDerivedTypeConstraintTests.cs → .../ODataWriterDerivedTypeConstraintTests.cs b/.../ODataWriterDerivedTypeConstraintTests.cs → .../ODataWriterDerivedTypeConstraintTests.cs
diff --git a/....Core.Tests/ODataWriterValidationTests.cs → ....Core.Tests/ODataWriterValidationTests.cs b/....Core.Tests/ODataWriterValidationTests.cs → ....Core.Tests/ODataWriterValidationTests.cs
diff --git a/...ata.Core.Tests/Properties/AssemblyInfo.cs → ...ata.Core.Tests/Properties/AssemblyInfo.cs b/...ata.Core.Tests/Properties/AssemblyInfo.cs → ...ata.Core.Tests/Properties/AssemblyInfo.cs
diff --git a/...a.Core.Tests/PropertyCacheHandlerTests.cs → ...a.Core.Tests/PropertyCacheHandlerTests.cs b/...a.Core.Tests/PropertyCacheHandlerTests.cs → ...a.Core.Tests/PropertyCacheHandlerTests.cs
diff --git a/...sts/Query/ODataUriConversionUtilsTests.cs → ...sts/Query/ODataUriConversionUtilsTests.cs b/...sts/Query/ODataUriConversionUtilsTests.cs → ...sts/Query/ODataUriConversionUtilsTests.cs
diff --git a/...ta.Core.Tests/Query/ODataUriUtilsTests.cs → ...ta.Core.Tests/Query/ODataUriUtilsTests.cs b/...ta.Core.Tests/Query/ODataUriUtilsTests.cs → ...ta.Core.Tests/Query/ODataUriUtilsTests.cs
diff --git a/...t.OData.Core.Tests/RawValueWriterTests.cs → ...t.OData.Core.Tests/RawValueWriterTests.cs b/...t.OData.Core.Tests/RawValueWriterTests.cs → ...t.OData.Core.Tests/RawValueWriterTests.cs
diff --git a/...ata.Core.Tests/ReadOnlyEnumerableTests.cs → ...ata.Core.Tests/ReadOnlyEnumerableTests.cs b/...ata.Core.Tests/ReadOnlyEnumerableTests.cs → ...ata.Core.Tests/ReadOnlyEnumerableTests.cs
diff --git a/...ts/Evaluation/KeyGenerationPinningTest.cs → ...ts/Evaluation/KeyGenerationPinningTest.cs b/...ts/Evaluation/KeyGenerationPinningTest.cs → ...ts/Evaluation/KeyGenerationPinningTest.cs
diff --git a/...ustomInstanceAnnotationAcceptanceTests.cs → ...ustomInstanceAnnotationAcceptanceTests.cs b/...ustomInstanceAnnotationAcceptanceTests.cs → ...ustomInstanceAnnotationAcceptanceTests.cs
diff --git a/...er/DisablePrimitiveTypeConversionTests.cs → ...er/DisablePrimitiveTypeConversionTests.cs b/...er/DisablePrimitiveTypeConversionTests.cs → ...er/DisablePrimitiveTypeConversionTests.cs
diff --git a/...oTests/Reader/Json/DateReaderJsonTests.cs → ...oTests/Reader/Json/DateReaderJsonTests.cs b/...oTests/Reader/Json/DateReaderJsonTests.cs → ...oTests/Reader/Json/DateReaderJsonTests.cs
diff --git a/...ts/Reader/Json/DateTimeReaderJsonTests.cs → ...ts/Reader/Json/DateTimeReaderJsonTests.cs b/...ts/Reader/Json/DateTimeReaderJsonTests.cs → ...ts/Reader/Json/DateTimeReaderJsonTests.cs
diff --git a/...der/Json/ODataJsonSingletonReaderTests.cs → ...der/Json/ODataJsonSingletonReaderTests.cs b/...der/Json/ODataJsonSingletonReaderTests.cs → ...der/Json/ODataJsonSingletonReaderTests.cs
diff --git a/...s/Reader/Json/TimeOfDayReaderJsonTests.cs → ...s/Reader/Json/TimeOfDayReaderJsonTests.cs b/...s/Reader/Json/TimeOfDayReaderJsonTests.cs → ...s/Reader/Json/TimeOfDayReaderJsonTests.cs
diff --git a/...enarioTests/Reader/MetadataReaderTests.cs → ...enarioTests/Reader/MetadataReaderTests.cs b/...enarioTests/Reader/MetadataReaderTests.cs → ...enarioTests/Reader/MetadataReaderTests.cs
diff --git a/...trip/ContextUrlWriterReaderTests.Async.cs → ...trip/ContextUrlWriterReaderTests.Async.cs b/...trip/ContextUrlWriterReaderTests.Async.cs → ...trip/ContextUrlWriterReaderTests.Async.cs
diff --git a/.../Roundtrip/ContextUrlWriterReaderTests.cs → .../Roundtrip/ContextUrlWriterReaderTests.cs b/.../Roundtrip/ContextUrlWriterReaderTests.cs → .../Roundtrip/ContextUrlWriterReaderTests.cs
diff --git a/...trip/Json/AsyncBatchRoundtripJsonTests.cs → ...trip/Json/AsyncBatchRoundtripJsonTests.cs b/...trip/Json/AsyncBatchRoundtripJsonTests.cs → ...trip/Json/AsyncBatchRoundtripJsonTests.cs
diff --git a/...Roundtrip/Json/AsyncRoundtripJsonTests.cs → ...Roundtrip/Json/AsyncRoundtripJsonTests.cs b/...Roundtrip/Json/AsyncRoundtripJsonTests.cs → ...Roundtrip/Json/AsyncRoundtripJsonTests.cs
diff --git a/...oundtrip/Json/BinaryValueEncodingTests.cs → ...oundtrip/Json/BinaryValueEncodingTests.cs b/...oundtrip/Json/BinaryValueEncodingTests.cs → ...oundtrip/Json/BinaryValueEncodingTests.cs
diff --git a/...omInstanceAnnotationRoundtripJsonTests.cs → ...omInstanceAnnotationRoundtripJsonTests.cs b/...omInstanceAnnotationRoundtripJsonTests.cs → ...omInstanceAnnotationRoundtripJsonTests.cs
diff --git a/...hBodyContentTextualAndBinaryValueTests.cs → ...hBodyContentTextualAndBinaryValueTests.cs b/...hBodyContentTextualAndBinaryValueTests.cs → ...hBodyContentTextualAndBinaryValueTests.cs
diff --git a/...Roundtrip/Json/JsonBatchRoundTripTests.cs → ...Roundtrip/Json/JsonBatchRoundTripTests.cs b/...Roundtrip/Json/JsonBatchRoundTripTests.cs → ...Roundtrip/Json/JsonBatchRoundTripTests.cs
diff --git a/...ndtrip/Json/JsonBigBatchRoundTripTests.cs → ...ndtrip/Json/JsonBigBatchRoundTripTests.cs b/...ndtrip/Json/JsonBigBatchRoundTripTests.cs → ...ndtrip/Json/JsonBigBatchRoundTripTests.cs
diff --git a/...undtrip/Json/MetadataUriRoundTripTests.cs → ...undtrip/Json/MetadataUriRoundTripTests.cs b/...undtrip/Json/MetadataUriRoundTripTests.cs → ...undtrip/Json/MetadataUriRoundTripTests.cs
diff --git a/...n/MultipartMixedBatchDependsOnIdsTests.cs → ...n/MultipartMixedBatchDependsOnIdsTests.cs b/...n/MultipartMixedBatchDependsOnIdsTests.cs → ...n/MultipartMixedBatchDependsOnIdsTests.cs
diff --git a/...son/NonPrimitiveTypeRoundtripJsonTests.cs → ...son/NonPrimitiveTypeRoundtripJsonTests.cs b/...son/NonPrimitiveTypeRoundtripJsonTests.cs → ...son/NonPrimitiveTypeRoundtripJsonTests.cs
diff --git a/...ts/Roundtrip/Json/ODataEntryExtensions.cs → ...ts/Roundtrip/Json/ODataEntryExtensions.cs b/...ts/Roundtrip/Json/ODataEntryExtensions.cs → ...ts/Roundtrip/Json/ODataEntryExtensions.cs
diff --git a/...Json/ODataJsonBatchAtomicityGroupTests.cs → ...Json/ODataJsonBatchAtomicityGroupTests.cs b/...Json/ODataJsonBatchAtomicityGroupTests.cs → ...Json/ODataJsonBatchAtomicityGroupTests.cs
diff --git a/...rip/Json/ODataJsonBatchPayloadTestCase.cs → ...rip/Json/ODataJsonBatchPayloadTestCase.cs b/...rip/Json/ODataJsonBatchPayloadTestCase.cs → ...rip/Json/ODataJsonBatchPayloadTestCase.cs
diff --git a/...Json/PrimitiveValuesRoundtripJsonTests.cs → ...Json/PrimitiveValuesRoundtripJsonTests.cs b/...Json/PrimitiveValuesRoundtripJsonTests.cs → ...Json/PrimitiveValuesRoundtripJsonTests.cs
diff --git a/.../Json/SingletonBatchRoundtripJsonTests.cs → .../Json/SingletonBatchRoundtripJsonTests.cs b/.../Json/SingletonBatchRoundtripJsonTests.cs → .../Json/SingletonBatchRoundtripJsonTests.cs
diff --git a/...sts/ScenarioTests/Roundtrip/Json/Utils.cs → ...sts/ScenarioTests/Roundtrip/Json/Utils.cs b/...sts/ScenarioTests/Roundtrip/Json/Utils.cs → ...sts/ScenarioTests/Roundtrip/Json/Utils.cs
diff --git a/...undtrip/JsonReaderWriterInjectionTests.cs → ...undtrip/JsonReaderWriterInjectionTests.cs b/...undtrip/JsonReaderWriterInjectionTests.cs → ...undtrip/JsonReaderWriterInjectionTests.cs
diff --git a/.../Streaming/ODataJsonStreamReadingTests.cs → .../Streaming/ODataJsonStreamReadingTests.cs b/.../Streaming/ODataJsonStreamReadingTests.cs → .../Streaming/ODataJsonStreamReadingTests.cs
diff --git a/.../Streaming/ODataJsonStreamWritingTests.cs → .../Streaming/ODataJsonStreamWritingTests.cs b/.../Streaming/ODataJsonStreamWritingTests.cs → .../Streaming/ODataJsonStreamWritingTests.cs
diff --git a/...narioTests/UriBuilder/ApplyBuilderTest.cs → ...narioTests/UriBuilder/ApplyBuilderTest.cs b/...narioTests/UriBuilder/ApplyBuilderTest.cs → ...narioTests/UriBuilder/ApplyBuilderTest.cs
diff --git a/...s/UriBuilder/ContextUrlPathStringTests.cs → ...s/UriBuilder/ContextUrlPathStringTests.cs b/...s/UriBuilder/ContextUrlPathStringTests.cs → ...s/UriBuilder/ContextUrlPathStringTests.cs
diff --git a/...arioTests/UriBuilder/CountBuilderTests.cs → ...arioTests/UriBuilder/CountBuilderTests.cs b/...arioTests/UriBuilder/CountBuilderTests.cs → ...arioTests/UriBuilder/CountBuilderTests.cs
diff --git a/...riBuilder/FilterAndOrderByBuilderTests.cs → ...riBuilder/FilterAndOrderByBuilderTests.cs b/...riBuilder/FilterAndOrderByBuilderTests.cs → ...riBuilder/FilterAndOrderByBuilderTests.cs
diff --git a/...ts/UriBuilder/PathBuilderCreationTests.cs → ...ts/UriBuilder/PathBuilderCreationTests.cs b/...ts/UriBuilder/PathBuilderCreationTests.cs → ...ts/UriBuilder/PathBuilderCreationTests.cs
diff --git a/...narioTests/UriBuilder/PathBuilderTests.cs → ...narioTests/UriBuilder/PathBuilderTests.cs b/...narioTests/UriBuilder/PathBuilderTests.cs → ...narioTests/UriBuilder/PathBuilderTests.cs
diff --git a/...rioTests/UriBuilder/SearchBuilderTests.cs → ...rioTests/UriBuilder/SearchBuilderTests.cs b/...rioTests/UriBuilder/SearchBuilderTests.cs → ...rioTests/UriBuilder/SearchBuilderTests.cs
diff --git a/...ts/UriBuilder/SelectExpandBuilderTests.cs → ...ts/UriBuilder/SelectExpandBuilderTests.cs b/...ts/UriBuilder/SelectExpandBuilderTests.cs → ...ts/UriBuilder/SelectExpandBuilderTests.cs
diff --git a/...cenarioTests/UriBuilder/SpatialHelpers.cs → ...cenarioTests/UriBuilder/SpatialHelpers.cs b/...cenarioTests/UriBuilder/SpatialHelpers.cs → ...cenarioTests/UriBuilder/SpatialHelpers.cs
diff --git a/...ests/UriBuilder/TopAndSkipBuilderTests.cs → ...ests/UriBuilder/TopAndSkipBuilderTests.cs b/...ests/UriBuilder/TopAndSkipBuilderTests.cs → ...ests/UriBuilder/TopAndSkipBuilderTests.cs
diff --git a/...rioTests/UriBuilder/UriBuilderTestBase.cs → ...rioTests/UriBuilder/UriBuilderTestBase.cs b/...rioTests/UriBuilder/UriBuilderTestBase.cs → ...rioTests/UriBuilder/UriBuilderTestBase.cs
diff --git a/...lder/UrlBuilderWithParameterAliasTests.cs → ...lder/UrlBuilderWithParameterAliasTests.cs b/...lder/UrlBuilderWithParameterAliasTests.cs → ...lder/UrlBuilderWithParameterAliasTests.cs
diff --git a/...sts/UriParser/BuiltInUriFunctionsTests.cs → ...sts/UriParser/BuiltInUriFunctionsTests.cs b/...sts/UriParser/BuiltInUriFunctionsTests.cs → ...sts/UriParser/BuiltInUriFunctionsTests.cs
diff --git a/...ioTests/UriParser/CountFunctionalTests.cs → ...ioTests/UriParser/CountFunctionalTests.cs b/...ioTests/UriParser/CountFunctionalTests.cs → ...ioTests/UriParser/CountFunctionalTests.cs
diff --git a/...ests/UriParser/CustomUriFunctionsTests.cs → ...ests/UriParser/CustomUriFunctionsTests.cs b/...ests/UriParser/CustomUriFunctionsTests.cs → ...ests/UriParser/CustomUriFunctionsTests.cs
diff --git a/...ests/UriParser/EntityIdFunctionalTests.cs → ...ests/UriParser/EntityIdFunctionalTests.cs b/...ests/UriParser/EntityIdFunctionalTests.cs → ...ests/UriParser/EntityIdFunctionalTests.cs
diff --git a/...iParser/EntityReferenceFunctionalTests.cs → ...iParser/EntityReferenceFunctionalTests.cs b/...iParser/EntityReferenceFunctionalTests.cs → ...iParser/EntityReferenceFunctionalTests.cs