More project/files simplification for PlatformServices (#1221)

* Move files from PS.Shared to either PS or PS.Portable * Rename files to match class name
microsoft · Sep 6, 2022 · 67c7e45 · 67c7e45
1 parent 2c665f9
commit 67c7e45
Show file tree

Hide file tree

Showing 35 changed files with 92 additions and 329 deletions.
diff --git a/TestFx.sln b/TestFx.sln
@@ -19,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestFramework", "TestFramew
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest.Core", "src\TestFramework\MSTest.Core\MSTest.Core.csproj", "{7252D9E3-267D-442C-96BC-C73AEF3241D6}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformServices.Shared", "src\Adapter\PlatformServices.Shared\PlatformServices.Shared.shproj", "{2177C273-AE07-43B3-B87A-443E47A23C5A}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A9596292-7E67-4566-9096-143DDAA4E8D8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AdapterTests", "AdapterTests", "{F2D0BF2C-38F2-4244-80E3-4AAD1C3F4C89}"
@@ -1195,7 +1193,6 @@ Global
 		{5D153CAA-80C2-4551-9549-6C406FCEEFB1} = {24088844-2107-4DB2-8F3F-CBCA94FC4B28}
 		{E48AC786-E150-4F41-9A16-32F02E4493D8} = {FF8B1B72-55A1-4FFE-809E-7B79323ED8D0}
 		{7252D9E3-267D-442C-96BC-C73AEF3241D6} = {E48AC786-E150-4F41-9A16-32F02E4493D8}
-		{2177C273-AE07-43B3-B87A-443E47A23C5A} = {24088844-2107-4DB2-8F3F-CBCA94FC4B28}
 		{F2D0BF2C-38F2-4244-80E3-4AAD1C3F4C89} = {A9596292-7E67-4566-9096-143DDAA4E8D8}
 		{DF131865-84EE-4540-8112-E88ACEBDEA09} = {E48AC786-E150-4F41-9A16-32F02E4493D8}
 		{F1A27537-78D1-4BBD-8E76-ADB31BC0C2B4} = {A9596292-7E67-4566-9096-143DDAA4E8D8}
@@ -1252,7 +1249,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9}
 	EndGlobalSection
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\Adapter\PlatformServices.Shared\PlatformServices.Shared.projitems*{2177c273-ae07-43b3-b87a-443e47a23c5a}*SharedItemsImports = 13
-	EndGlobalSection
 EndGlobal
diff --git a/...rvices.Shared/netstandard1.0/Constants.cs → ...er/PlatformServices.Portable/Constants.cs b/...rvices.Shared/netstandard1.0/Constants.cs → ...er/PlatformServices.Portable/Constants.cs
diff --git a/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj b/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
@@ -39,23 +39,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Constants.cs" Link="Constants.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\MarshalByRefObject.cs" Link="MarshalByRefObject.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\SerializableAttribute.cs" Link="SerializableAttribute.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10DiaSessionOperations.cs" Link="Services\ns10DiaSessionOperations.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10FileOperations.cs" Link="Services\ns10FileOperations.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10ReflectionOperations.cs" Link="Services\ns10ReflectionOperations.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10SettingsProvider.cs" Link="Services\ns10SettingsProvider.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestContextImplementation.cs" Link="Services\ns10TestContextImplementation.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestDataSource.cs" Link="Services\ns10TestDataSource.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestDeployment.cs" Link="Services\ns10TestDeployment.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestSource.cs" Link="Services\ns10TestSource.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestSourceHost.cs" Link="Services\ns10TestSourceHost.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10ThreadOperations.cs" Link="Services\ns10ThreadOperations.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10ThreadSafeStringWriter.cs" Link="Services\ns10ThreadSafeStringWriter.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TraceListener.cs" Link="Services\ns10TraceListener.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TraceListenerManager.cs" Link="Services\ns10TraceListenerManager.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TraceLogger.cs" Link="Services\ns10TraceLogger.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\MarshalByRefObject.cs" Link="MarshalByRefObject.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\SerializableAttribute.cs" Link="SerializableAttribute.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\DiaSessionOperations.cs" Link="Services\DiaSessionOperations.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\FileOperations.cs" Link="Services\FileOperations.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\ReflectionOperations.cs" Link="Services\ReflectionOperations.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\SettingsProvider.cs" Link="Services\SettingsProvider.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\TestContextImplementation.cs" Link="Services\TestContextImplementation.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\TestDataSource.cs" Link="Services\TestDataSource.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\TestDeployment.cs" Link="Services\TestDeployment.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\TestSource.cs" Link="Services\TestSource.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\TestSourceHost.cs" Link="Services\TestSourceHost.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\ThreadOperations.cs" Link="Services\ThreadOperations.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\TraceListener.cs" Link="Services\TraceListener.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\TraceListenerManager.cs" Link="Services\TraceListenerManager.cs" />
+    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices\Services\TraceLogger.cs" Link="Services\TraceLogger.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/....0/Services/ns10ThreadSafeStringWriter.cs → ...rtable/Services/ThreadSafeStringWriter.cs b/....0/Services/ns10ThreadSafeStringWriter.cs → ...rtable/Services/ThreadSafeStringWriter.cs
diff --git a/src/Adapter/PlatformServices.Shared/PlatformServices.Shared.projitems b/src/Adapter/PlatformServices.Shared/PlatformServices.Shared.projitems
diff --git a/src/Adapter/PlatformServices.Shared/PlatformServices.Shared.shproj b/src/Adapter/PlatformServices.Shared/PlatformServices.Shared.shproj
diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestDeployment.cs b/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TestDeployment.cs
diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TraceListenerManager.cs b/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TraceListenerManager.cs
diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListener.cs b/src/Adapter/PlatformServices.Shared/netstandard1.3/Services/ns13TraceListener.cs
diff --git a/...ared/netstandard1.3/ns13DeploymentItem.cs → ...dapter/PlatformServices/DeploymentItem.cs b/...ared/netstandard1.3/ns13DeploymentItem.cs → ...dapter/PlatformServices/DeploymentItem.cs
diff --git a/...1.3/Extensions/ns13ExceptionExtensions.cs → ...ervices/Extensions/ExceptionExtensions.cs b/...1.3/Extensions/ns13ExceptionExtensions.cs → ...ervices/Extensions/ExceptionExtensions.cs
diff --git a/...ared/netstandard1.0/MarshalByRefObject.cs → ...er/PlatformServices/MarshalByRefObject.cs b/...ared/netstandard1.0/MarshalByRefObject.cs → ...er/PlatformServices/MarshalByRefObject.cs
diff --git a/src/Adapter/PlatformServices/PlatformServices.csproj b/src/Adapter/PlatformServices/PlatformServices.csproj
@@ -61,38 +61,6 @@
     <PackageReference Include="System.Diagnostics.TextWriterTraceListener" Condition=" '$(TargetFramework)' == '$(WinUiMinimum)' " Version="$(SystemDiagnosticsTextWriterTraceListenerVersion)" />
   </ItemGroup>
 
-  <!-- Common Items -->
-  <ItemGroup>
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\MarshalByRefObject.cs" Link="MarshalByRefObject.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\ns10RecursiveDirectoryPath.cs" Link="ns10RecursiveDirectoryPath.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\SerializableAttribute.cs" Link="SerializableAttribute.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10DiaSessionOperations.cs" Link="Services\ns10DiaSessionOperations.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10FileOperations.cs" Link="Services\ns10FileOperations.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10ReflectionOperations.cs" Link="Services\ns10ReflectionOperations.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10SettingsProvider.cs" Link="Services\ns10SettingsProvider.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestContextImplementation.cs" Link="Services\ns10TestContextImplementation.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestContextPropertyStrings.cs" Link="Services\ns10TestContextPropertyStrings.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestDataSource.cs" Link="Services\ns10TestDataSource.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestDeployment.cs" Link="Services\ns10TestDeployment.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestSource.cs" Link="Services\ns10TestSource.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TestSourceHost.cs" Link="Services\ns10TestSourceHost.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10ThreadOperations.cs" Link="Services\ns10ThreadOperations.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TraceListener.cs" Link="Services\ns10TraceListener.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TraceListenerManager.cs" Link="Services\ns10TraceListenerManager.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Services\ns10TraceLogger.cs" Link="Services\ns10TraceLogger.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.0\Utilities\ns10Validate.cs" Link="Utilities\ns10Validate.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Extensions\ns13ExceptionExtensions.cs" Link="Extensions\ns13ExceptionExtensions.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\ns13DeploymentItem.cs" Link="Deployment\ns13DeploymentItem.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Services\ns13MSTestAdapterSettings.cs" Link="Services\ns13MSTestAdapterSettings.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Services\ns13TestDeployment.cs" Link="Services\ns13TestDeployment.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Services\ns13ThreadSafeStringWriter.cs" Link="Services\ns13ThreadSafeStringWriter.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Services\ns13TraceListener.cs" Link="Services\ns13TraceListener.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Services\ns13TraceListenerManager.cs" Link="Services\ns13TraceListenerManager.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Utilities\ns13DeploymentItemUtility.cs" Link="Utilities\ns13DeploymentItemUtility.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Utilities\ns13DeploymentUtilityBase.cs" Link="Utilities\ns13DeploymentUtilityBase.cs" />
-    <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Utilities\ns13FileUtility.cs" Link="Utilities\ns13FileUtility.cs" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' != '$(UwpMinimum)' ">
     <Compile Include="$(RepoRoot)src\Adapter\PlatformServices.Shared\netstandard1.3\Resources\Resource.Designer.cs">
       <Link>Resources\Resource.Designer.cs</Link>

diff --git a/...standard1.0/ns10RecursiveDirectoryPath.cs → ...latformServices/RecursiveDirectoryPath.cs b/...standard1.0/ns10RecursiveDirectoryPath.cs → ...latformServices/RecursiveDirectoryPath.cs
@@ -22,7 +22,6 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
 /// </summary>
 [Serializable]
 [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1603:DocumentationMustContainValidXml", Justification = "Reviewed. Suppression is ok here.")]
-#pragma warning disable SA1649 // File name must match first type name
 public class RecursiveDirectoryPath : MarshalByRefObject
 {
     /// <summary>

diff --git a/...d/netstandard1.0/SerializableAttribute.cs → ...PlatformServices/SerializableAttribute.cs b/...d/netstandard1.0/SerializableAttribute.cs → ...PlatformServices/SerializableAttribute.cs