Move FQN related code into a separate NuGet package (#2714)

* Removed ManagedNameUtilities from ObjectModel in order to restore compatibility with older versions. * Added `Microsoft.TestPlatform.AdapterUtilities`. * Added `net20` and `net35` support to the code.
microsoft · Jan 27, 2021 · 9bcf509 · 9bcf509
1 parent 49bee46
commit 9bcf509
Show file tree

Hide file tree

Showing 57 changed files with 945 additions and 777 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ build*.log
 build*.wrn
 build*.err
 *.binlog
+*.svclog
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

diff --git a/TestPlatform.sln b/TestPlatform.sln
@@ -65,6 +65,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console.UnitTests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests", "test\Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests\Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj", "{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4}"
+	ProjectSection(SolutionItems) = preProject
+		scripts\perf\perf.ps1 = scripts\perf\perf.ps1
+		scripts\perf\perfconfig.csv = scripts\perf\perfconfig.csv
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DED1590A-ED25-413B-8590-006A4DD5B2FD}"
+	ProjectSection(SolutionItems) = preProject
+		scripts\build\TestPlatform.Dependencies.props = scripts\build\TestPlatform.Dependencies.props
+		scripts\build\TestPlatform.Localization.targets = scripts\build\TestPlatform.Localization.targets
+		scripts\build\TestPlatform.Settings.targets = scripts\build\TestPlatform.Settings.targets
+		scripts\build\TestPlatform.targets = scripts\build\TestPlatform.targets
+	EndProjectSection
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}"
 	ProjectSection(SolutionItems) = preProject
 		scripts\build.ps1 = scripts\build.ps1
@@ -73,6 +87,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{EE49
 		scripts\stylecop.test.ruleset = scripts\stylecop.test.ruleset
 		scripts\test.ps1 = scripts\test.ps1
 		scripts\verify-sign.ps1 = scripts\verify-sign.ps1
+		scripts\verify-nupkgs.ps1 = scripts\verify-nupkgs.ps1
+		scripts\PortableToFullPdb.ps1 = scripts\PortableToFullPdb.ps1
+		scripts\vsts-prebuild.ps1 = scripts\vsts-prebuild.ps1
+		scripts\write-release-notes.ps1 = scripts\write-release-notes.ps1
+		scripts\build.sh = scripts\build.sh
+		scripts\test.sh = scripts\test.sh
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E344E0A2-7715-4C7F-BAF7-D64EA94CB19B}"
@@ -100,14 +120,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.PlatformTests
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DED1590A-ED25-413B-8590-006A4DD5B2FD}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\build\TestPlatform.Dependencies.props = scripts\build\TestPlatform.Dependencies.props
-		scripts\build\TestPlatform.Localization.targets = scripts\build\TestPlatform.Localization.targets
-		scripts\build\TestPlatform.Settings.targets = scripts\build\TestPlatform.Settings.targets
-		scripts\build\TestPlatform.targets = scripts\build\TestPlatform.targets
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "package", "src\package\package\package.csproj", "{E141A226-CC0A-4F26-BD17-4AE427D81C3B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platform", "Platform", "{376C19DE-31E2-4FF6-88FC-0D0D6233C999}"
@@ -132,12 +144,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataCollectors", "DataColle
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests", "test\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests\Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj", "{21DB138B-85B7-479E-91FE-01E0F972EC56}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{0D4DF78D-7E5F-4516-B19F-E6AA71A1DBF4}"
-	ProjectSection(SolutionItems) = preProject
-		scripts\perf\perf.ps1 = scripts\perf\perf.ps1
-		scripts\perf\perfconfig.csv = scripts\perf\perfconfig.csv
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "vstest.console.PlatformTests", "test\vstest.console.PlatformTests\vstest.console.PlatformTests.csproj", "{8C068694-23A2-47A2-A0DD-DB82D0AF0142}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Common.PlatformTests", "test\Microsoft.TestPlatform.Common.PlatformTests\Microsoft.TestPlatform.Common.PlatformTests.csproj", "{24C7683D-2607-4901-B8EB-83A57E49E93D}"
@@ -152,7 +158,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Exte
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.collector", "test\coverlet.collector\coverlet.collector.csproj", "{074F5BD6-DC05-460B-B78F-044D125FD787}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.ObjectModel.ManagedNameUtilities.UnitTests", "test\Microsoft.TestPlatform.ObjectModel.ManagedNameUtilities.UnitTests\Microsoft.TestPlatform.ObjectModel.ManagedNameUtilities.UnitTests.csproj", "{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.AdapterUtilities.UnitTests", "test\Microsoft.TestPlatform.AdapterUtilities.UnitTests\Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj", "{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.AdapterUtilities", "src\Microsoft.TestPlatform.AdapterUtilities\Microsoft.TestPlatform.AdapterUtilities.csproj", "{2DE99835-A3A3-4922-82AD-6D10D284816D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -764,6 +772,18 @@ Global
 		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|x64.Build.0 = Release|Any CPU
 		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|x86.ActiveCfg = Release|Any CPU
 		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97}.Release|x86.Build.0 = Release|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x64.Build.0 = Debug|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Debug|x86.Build.0 = Debug|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x64.ActiveCfg = Release|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x64.Build.0 = Release|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x86.ActiveCfg = Release|Any CPU
+		{2DE99835-A3A3-4922-82AD-6D10D284816D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -831,6 +851,7 @@ Global
 		{41248B96-6E15-4E5E-A78F-859897676814} = {020E15EA-731F-4667-95AF-226671E0C3AE}
 		{074F5BD6-DC05-460B-B78F-044D125FD787} = {D9A30E32-D466-4EC5-B4F2-62E17562279B}
 		{DCD0C39E-C78C-4A44-B0BD-7325254A2E97} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
+		{2DE99835-A3A3-4922-82AD-6D10D284816D} = {7D4082EA-7AC9-4DFB-98E8-C5E08BDC0EC3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0541B30C-FF51-4E28-B172-83F5F3934BCD}

diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -334,6 +334,9 @@ function Publish-Package
     $dotnetExe = Get-DotNetPath
     $fullCLRPackage451Dir = Get-FullCLRPackageDirectory
     $fullCLRPackage45Dir = Get-FullCLRPackageDirectory45
+    $uap100PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkUap100");
+    $net20PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\net20");
+    $net35PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\net35");
     $netstandard10PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS10");
     $netstandard13PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS13");
     $netstandard20PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS20");
@@ -478,6 +481,17 @@ function Publish-Package
                 $TPB_TargetFrameworkUap100  = $testhostUapPackageDir         # uap10.0
               }
 
+    ################################################################################
+    # Publish Microsoft.TestPlatform.AdapterUtilities
+    Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.AdapterUtilities\bin\$TPB_Configuration") `
+            -files @{
+              # "net20"                     = $net20PackageDir               # net20 \ net20, and net35 isn't supported by the Test Platform
+              # "net35"                     = $net35PackageDir               # net35 / but this package supports, so adding targets.
+                $TPB_TargetFrameworkNS10    = $netstandard10PackageDir       # netstandard1_0
+                $TPB_TargetFrameworkNS20    = $netstandard20PackageDir       # netstandard2_0
+                $TPB_TargetFrameworkUap100  = $uap100PackageDir              # uap10.0
+            }
+
     ################################################################################
     # Publish msdia
     $comComponentsDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.Dia\14.0.0\contentFiles\any\any\ComComponents"
@@ -805,16 +819,19 @@ function Create-NugetPackages
     $tpNuspecDir = Join-Path $env:TP_PACKAGE_PROJ_DIR "nuspec"
 
     # Copy over the nuspecs to the staging directory
-    $nuspecFiles = @("TestPlatform.TranslationLayer.nuspec",
-                     "TestPlatform.ObjectModel.nuspec",
-                     "TestPlatform.TestHost.nuspec",
-                     "TestPlatform.CLI.nuspec",
-                     "TestPlatform.Build.nuspec",
-                     "TestPlatform.Extensions.TrxLogger.nuspec", 
-                     "Microsoft.NET.Test.Sdk.nuspec",
-                     "Microsoft.TestPlatform.nuspec",
-                     "Microsoft.TestPlatform.Portable.nuspec",
-                     "Microsoft.CodeCoverage.nuspec")
+    $nuspecFiles = @(
+        "Microsoft.CodeCoverage.nuspec",
+        "Microsoft.NET.Test.Sdk.nuspec",
+        "Microsoft.TestPlatform.AdapterUtilities.nuspec",
+        "Microsoft.TestPlatform.nuspec",
+        "Microsoft.TestPlatform.Portable.nuspec",
+        "TestPlatform.Build.nuspec",
+        "TestPlatform.CLI.nuspec",
+        "TestPlatform.Extensions.TrxLogger.nuspec",
+        "TestPlatform.ObjectModel.nuspec",
+        "TestPlatform.TestHost.nuspec",
+        "TestPlatform.TranslationLayer.nuspec"
+    )
 
     $targetFiles = @("Microsoft.CodeCoverage.targets")
     $propFiles = @("Microsoft.NET.Test.Sdk.props", "Microsoft.CodeCoverage.props")

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -215,18 +215,18 @@ function restore_package()
     log "restore_package: Start restoring packages to $TP_PACKAGES_DIR."
     local start=$SECONDS
 
-	if [[ $TP_USE_REPO_API = 0 ]]; then
-		log ".. .. Restore: Source: $TP_ROOT_DIR/src/package/external/external.csproj"
-		$dotnet restore $TP_ROOT_DIR/src/package/external/external.csproj --packages $TP_PACKAGES_DIR -v:minimal -warnaserror -p:Version=$TPB_Version || failed=true
-	else
-		log ".. .. Restore: Source: $TP_ROOT_DIR/src/package/external/external_BuildFromSource.csproj"
-		$dotnet restore $TP_ROOT_DIR/src/package/external/external.csproj --packages $TP_PACKAGES_DIR -v:minimal -warnaserror -p:Version=$TPB_Version  -p:DotNetBuildFromSource=true || failed=true
-	fi
-
-	if [ "$failed" = true ]; then
-		error "Failed to restore packages."
-		return 2
-	fi
+    if [[ $TP_USE_REPO_API = 0 ]]; then
+        log ".. .. Restore: Source: $TP_ROOT_DIR/src/package/external/external.csproj"
+        $dotnet restore $TP_ROOT_DIR/src/package/external/external.csproj --packages $TP_PACKAGES_DIR -v:minimal -warnaserror -p:Version=$TPB_Version || failed=true
+    else
+        log ".. .. Restore: Source: $TP_ROOT_DIR/src/package/external/external_BuildFromSource.csproj"
+        $dotnet restore $TP_ROOT_DIR/src/package/external/external.csproj --packages $TP_PACKAGES_DIR -v:minimal -warnaserror -p:Version=$TPB_Version  -p:DotNetBuildFromSource=true || failed=true
+    fi
+
+    if [ "$failed" = true ]; then
+        error "Failed to restore packages."
+        return 2
+    fi
 
     log "restore_package: Complete. Elapsed $(( SECONDS - start ))s."
 }
@@ -245,9 +245,9 @@ function invoke_build()
     if [ -z "$PROJECT_NAME_PATTERNS" ]
     then
         if [[ $TP_USE_REPO_API = 0 ]]; then
-            $dotnet build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild || failed=true
+            $dotnet build $TPB_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -bl:TestPlatform.binlog || failed=true
         else
-            $dotnet build $TPB_Build_From_Source_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -p:DotNetBuildFromSource=true || failed=true
+            $dotnet build $TPB_Build_From_Source_Solution --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -p:DotNetBuildFromSource=true -bl:TestPlatform.binlog || failed=true
        fi
     else
         find . -name "$PROJECT_NAME_PATTERNS" | xargs -L 1 $dotnet build --configuration $TPB_Configuration -v:minimal -p:Version=$TPB_Version -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild
@@ -370,8 +370,9 @@ function create_package()
     packageOutputDir="$TP_OUT_DIR/$TPB_Configuration/packages"
     mkdir -p $packageOutputDir
 
-    nuspecFiles=("TestPlatform.TranslationLayer.nuspec" "TestPlatform.ObjectModel.nuspec" "TestPlatform.TestHost.nuspec"\
-        "Microsoft.TestPlatform.nuspec" "Microsoft.TestPlatform.Portable.nuspec" "TestPlatform.CLI.nuspec" "TestPlatform.Build.nuspec" "Microsoft.NET.Test.Sdk.nuspec")
+    nuspecFiles=("TestPlatform.TranslationLayer.nuspec" "TestPlatform.ObjectModel.nuspec" "TestPlatform.ObjectModel.nuspec" "TestPlatform.TestHost.nuspec"\
+        "Microsoft.TestPlatform.nuspec" "Microsoft.TestPlatform.Portable.nuspec" "TestPlatform.CLI.nuspec" "TestPlatform.Build.nuspec" "Microsoft.NET.Test.Sdk.nuspec"\
+        "Microsoft.CodeCoverage.nuspec" "Microsoft.TestPlatform.AdapterUtilities.nuspec" "TestPlatform.Extensions.TrxLogger.nuspec")
     projectFiles=("Microsoft.TestPlatform.CLI.csproj" "Microsoft.TestPlatform.Build.csproj")
     binDir="$TP_ROOT_DIR/bin/packages"
 

diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
@@ -19,6 +19,7 @@ function Verify-Nuget-Packages($packageDirectory, $version)
         "Microsoft.TestPlatform.CLI" = 380;
         "Microsoft.TestPlatform.Extensions.TrxLogger" = 34;
         "Microsoft.TestPlatform.ObjectModel" = 179;
+        "Microsoft.TestPlatform.AdapterUtilities" = 47;
         "Microsoft.TestPlatform.Portable" = 569;
         "Microsoft.TestPlatform.TestHost" = 213;
         "Microsoft.TestPlatform.TranslationLayer" = 122;

diff --git a/...nsions/ReflectionExtensions.MethodBase.cs → ...s/Helpers/ReflectionHelpers.MethodBase.cs b/...nsions/ReflectionExtensions.MethodBase.cs → ...s/Helpers/ReflectionHelpers.MethodBase.cs
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Extensions
+namespace Microsoft.TestPlatform.AdapterUtilities.Helpers
 {
     using System;
     using System.Reflection;
 
-    public static partial class ReflectionExtensions
+    internal static partial class ReflectionHelpers
     {
 #if NETSTANDARD1_0 || NETSTANDARD1_3 || WINDOWS_UWP
         private static readonly Type methodBase = typeof(MethodBase);
@@ -20,7 +20,7 @@ public static partial class ReflectionExtensions
         private static readonly PropertyInfo methodHandleProperty = methodBase.GetRuntimeProperty(MethodHandlePropertyName);
 #endif
 
-        public static bool IsMethod(this MethodBase method)
+        internal static bool IsMethod(MethodBase method)
         {
 #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
             return method.MemberType == MemberTypes.Method;
@@ -31,7 +31,7 @@ public static bool IsMethod(this MethodBase method)
 #endif
         }
 
-        public static Type GetReflectedType(this MethodBase method)
+        internal static Type GetReflectedType(MethodBase method)
         {
 #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
             return method.ReflectedType;
@@ -42,7 +42,7 @@ public static Type GetReflectedType(this MethodBase method)
 #endif
         }
 
-        public static RuntimeMethodHandle GetMethodHandle(this MethodBase method)
+        internal static RuntimeMethodHandle GetMethodHandle(MethodBase method)
         {
 #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
             return method.MethodHandle;

diff --git a/...s/Extensions/ReflectionExtensions.Type.cs → ...ilities/Helpers/ReflectionHelpers.Type.cs b/...s/Extensions/ReflectionExtensions.Type.cs → ...ilities/Helpers/ReflectionHelpers.Type.cs
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Extensions
+namespace Microsoft.TestPlatform.AdapterUtilities.Helpers
 {
     using System;
     using System.Reflection;
 
-    public static partial class ReflectionExtensions
+    internal static partial class ReflectionHelpers
     {
-        public static bool IsGenericType(this Type type)
+        internal static bool IsGenericType(Type type)
         {
 #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
             return type.IsGenericType;
@@ -17,7 +17,7 @@ public static bool IsGenericType(this Type type)
 #endif
         }
 
-        public static MethodBase GetDeclaringMethod(this Type type)
+        internal static MethodBase GetDeclaringMethod(Type type)
         {
 #if !NETSTANDARD1_0 && !NETSTANDARD1_3 && !WINDOWS_UWP
             return type.DeclaringMethod;

diff --git a/...lities/Extensions/ReflectionExtensions.cs → ...terUtilities/Helpers/ReflectionHelpers.cs b/...lities/Extensions/ReflectionExtensions.cs → ...terUtilities/Helpers/ReflectionHelpers.cs
@@ -1,15 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Extensions
+namespace Microsoft.TestPlatform.AdapterUtilities.Helpers
 {
-    using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources;
+    using Microsoft.TestPlatform.AdapterUtilities.Resources;
 
     using System;
 
-    public static partial class ReflectionExtensions
+    internal static partial class ReflectionHelpers
     {
-        private static void AssertSupport<T>(T obj, string methodName, string className) 
+        private static void AssertSupport<T>(T obj, string methodName, string className)
             where T : class
         {
             if (obj == null)

diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/Contants.cs b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/Contants.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities
+{
+    public static class Contants
+    {
+        public const string ManagedTypeLabel = "ManagedType";
+        public const string ManagedMethodLabel = "ManagedMethod";
+
+        public const string ManagedTypePropertyId = "TestCase." + ManagedTypeLabel;
+        public const string ManagedMethodPropertyId = "TestCase." + ManagedMethodLabel;
+    }
+}
diff --git a/...eUtilities/InvalidManagedNameException.cs → ...eUtilities/InvalidManagedNameException.cs b/...eUtilities/InvalidManagedNameException.cs → ...eUtilities/InvalidManagedNameException.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.ManagedNameUtilities
+namespace Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities
 {
     using System;