Rename MSTest.CoreAdapter into MSTest.TestAdapter (#1181)

Localize/LocProject.json

@@ -4,11 +4,11 @@
             "LanguageSet": "VS_Main_Languages",
             "LocItems": [
                 {
-                    "SourceFile": "src\\Adapter\\MSTest.CoreAdapter\\Resources\\xlf\\Resource.xlf",
+                    "SourceFile": "src\\Adapter\\MSTest.TestAdapter\\Resources\\xlf\\Resource.xlf",
                     "Languages": "",
                     "CopyOption": "LangIDOnName",
-                    "OutputPath": "src\\Adapter\\MSTest.CoreAdapter\\Resources\\xlf\\",
-                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Adapter\\MSTest.CoreAdapter\\Resources\\xlf\\Resource.xlf.lcl"
+                    "OutputPath": "src\\Adapter\\MSTest.TestAdapter\\Resources\\xlf\\",
+                    "LclFile": "Localize\\lcl\\{Lang}\\src\\Adapter\\MSTest.TestAdapter\\Resources\\xlf\\Resource.xlf.lcl"
                 }
             ]
         },

TestFx.sln

@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FF8B1B72-55A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Adapter", "Adapter", "{24088844-2107-4DB2-8F3F-CBCA94FC4B28}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest.CoreAdapter", "src\Adapter\MSTest.CoreAdapter\MSTest.CoreAdapter.csproj", "{98BA6D2C-1F3D-4636-8E1D-D4932B7A253D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTest.TestAdapter", "src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj", "{98BA6D2C-1F3D-4636-8E1D-D4932B7A253D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatformServices.Interface", "src\Adapter\PlatformServices.Interface\PlatformServices.Interface.csproj", "{BBC99A6B-4490-49DD-9C12-AF2C1E95576E}"
 EndProject
@@ -153,7 +153,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BCF5
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{92F8E9A2-903E-4025-99BC-7DC478D5466D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FxExtensibility", "samples\FxExtensibility\FxExtensibility.csproj", "{A82770C0-1FF5-43C7-8790-471D5E4F8D6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FxExtensibility", "samples\FxExtensibility\FxExtensibility.csproj", "{A82770C0-1FF5-43C7-8790-471D5E4F8D6E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FxExtensibilityTestProject", "test\E2ETests\TestAssets\FxExtensibilityTestProject\FxExtensibilityTestProject.csproj", "{4004757A-0080-4410-B90A-6169B20F151B}"
 EndProject

src/Package/MSTest.TestAdapter.nuspec

@@ -54,7 +54,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="MSTest.CoreAdapter\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\_common\" />
+    <file src="MSTest.TestAdapter\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\_common\" />
     <file src="PlatformServices.Interface\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" target="build\_common\" />
     <file src="PlatformServices.Desktop\net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\_common\" />
     <file src="MSTest.Core\netstandard1.4\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\_common\" />
@@ -96,7 +96,7 @@
     <file src="Microsoft.TestPlatform.AdapterUtilities\net462\" target="build\net462\" />
 
     <!-- Localization -->
-    <file src="MSTest.CoreAdapter\**\*.resources.dll" target="\build\_common\" />
+    <file src="MSTest.TestAdapter\**\*.resources.dll" target="\build\_common\" />
     <file src="PlatformServices.Desktop\net462\**\*.resources.dll" target="\build\_common\" />
     <file src="MSTest.Core\**\*.resources.dll" target="build\_common\" />
 

src/Package/MSTest.TestAdapter.symbols.nuspec

@@ -54,7 +54,7 @@
     </dependencies>
   </metadata>
   <files>
-    <file src="MSTest.CoreAdapter\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\_common\" />
+    <file src="MSTest.TestAdapter\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\_common\" />
     <file src="PlatformServices.Interface\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" target="build\_common\" />
     <file src="PlatformServices.Desktop\net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\_common\" />
     <file src="MSTest.Core\netstandard1.4\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\_common\" />
@@ -96,12 +96,12 @@
     <file src="Microsoft.TestPlatform.AdapterUtilities\net462\" target="build\net462\" />
 
     <!-- Localization -->
-    <file src="MSTest.CoreAdapter\**\*.resources.dll" target="\build\_common\" />
+    <file src="MSTest.TestAdapter\**\*.resources.dll" target="\build\_common\" />
     <file src="PlatformServices.Desktop\net462\**\*.resources.dll" target="\build\_common\" />
     <file src="MSTest.Core\**\*.resources.dll" target="build\_common\" />
 
     <!-- Symbols -->
-    <file src="MSTest.CoreAdapter\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" target="build\_common\" />
+    <file src="MSTest.TestAdapter\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" target="build\_common\" />
     <file src="PlatformServices.Interface\netstandard1.4\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.pdb" target="build\_common\" />
     <file src="PlatformServices.Desktop\net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" target="build\_common\" />
     <file src="MSTest.Core\netstandard1.4\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" target="build\_common\" />

test/E2ETests/Automation.CLI/Automation.CLI.csproj

@@ -73,12 +73,12 @@
       <FileToCopy Include="$(SourcePath)MSTest.Core\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" KeepDuplicates="True" />
       <FileToCopy Include="$(SourcePath)Extension.Desktop\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" KeepDuplicates="True" />
       <FileToCopy Include="$(SourcePath)Extension.Desktop\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)MSTest.CoreAdapter\net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)MSTest.CoreAdapter\net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" KeepDuplicates="True" />
+      <FileToCopy Include="$(SourcePath)MSTest.TestAdapter\net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" KeepDuplicates="True" />
+      <FileToCopy Include="$(SourcePath)MSTest.TestAdapter\net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" KeepDuplicates="True" />
 
       <FileToCopy Include="$(NuGetPackageRoot)\microsoft.testplatform.adapterutilities\$(MicrosoftNETTestSdkVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" KeepDuplicates="true" Folder="netcoreapp3.1" />
-      <FileToCopy Include="$(SourcePath)MSTest.CoreAdapter\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" KeepDuplicates="True" Folder="netcoreapp3.1" />
-      <FileToCopy Include="$(SourcePath)MSTest.CoreAdapter\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" KeepDuplicates="True" Folder="netcoreapp3.1" />
+      <FileToCopy Include="$(SourcePath)MSTest.TestAdapter\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" KeepDuplicates="True" Folder="netcoreapp3.1" />
+      <FileToCopy Include="$(SourcePath)MSTest.TestAdapter\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" KeepDuplicates="True" Folder="netcoreapp3.1" />
       <FileToCopy Include="$(SourcePath)PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" KeepDuplicates="True" Folder="netcoreapp3.1" />
       <FileToCopy Include="$(SourcePath)PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" KeepDuplicates="True" Folder="netcoreapp3.1" />
       <FileToCopy Include="$(SourcePath)PlatformServices.NetCore\netstandard1.5\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll" KeepDuplicates="True" Folder="netcoreapp3.1" />

test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj

@@ -21,10 +21,10 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter">
-      <HintPath>$(ArtifactsBinDir)MSTest.CoreAdapter\$(TargetFramework)\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</HintPath>
+      <HintPath>$(ArtifactsBinDir)MSTest.TestAdapter\$(TargetFramework)\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Concurrent">
-      <HintPath>$(ArtifactsBinDir)MSTest.CoreAdapter\$(TargetFramework)\System.Collections.Concurrent.dll</HintPath>
+      <HintPath>$(ArtifactsBinDir)MSTest.TestAdapter\$(TargetFramework)\System.Collections.Concurrent.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices">
       <HintPath>$(ArtifactsBinDir)PlatformServices.Desktop\$(TargetFramework)\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll</HintPath>
@@ -40,4 +40,4 @@
     </Reference>
   </ItemGroup>
 
-</Project>
+</Project>

test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj

@@ -49,9 +49,9 @@
       <Name>PlatformServices.Portable</Name>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.CoreAdapter\MSTest.CoreAdapter.csproj">
+    <ProjectReference Include="..\..\..\src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj">
       <Project>{98ba6d2c-1f3d-4636-8e1d-d4932b7a253d}</Project>
-      <Name>MSTest.CoreAdapter</Name>
+      <Name>MSTest.TestAdapter</Name>
       <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="$(RepoRoot)src\TestFramework\MSTest.Core\MSTest.Core.csproj">

test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj

@@ -13,7 +13,7 @@
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\TestFramework\MSTest.Core\MSTest.Core.csproj" />
     <ProjectReference Include="$(RepoRoot)src\TestFramework\Extension.Core\Extension.Core.csproj" Aliases="FrameworkV2Extension" />
-    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.CoreAdapter\MSTest.CoreAdapter.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Adapter\PlatformServices.Interface\PlatformServices.Interface.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Adapter\PlatformServices.NetCore\PlatformServices.NetCore.csproj" />
   </ItemGroup>