Remove TestNugetRuntimeId where used, now obsolete.

StephenBonikowsky · Feb 10, 2018 · 40ff2c5 · 40ff2c5
1 parent c377d64
commit 40ff2c5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/OSHelper.cs b/src/System.Private.ServiceModel/tests/Common/Infrastructure/OSHelper.cs
@@ -142,27 +142,6 @@ private static OSID DetectCurrentOS()
             return osid;
         }
 
-        // The $(TestNugetRuntimeId) property was deprecated in build tools v2.
-        // No longer calling this method.
-        private static OSID OSIDfromTestRuntime()
-        {
-            string testRuntime = TestProperties.GetProperty(TestProperties.TestNugetRuntimeId_PropertyName);
-            if (string.IsNullOrEmpty(testRuntime))
-            {
-                return OSID.None;
-            }
-
-            foreach (var pair in _runtimeToOSID)
-            {
-                string runtime = pair.Item1;
-                if (testRuntime.IndexOf(runtime, StringComparison.OrdinalIgnoreCase) >= 0)
-                {
-                    return pair.Item2;
-                }
-            }
-            return OSID.None;
-        }
-
         // Detects the OSID based on the current OS description.
         // Currently this is used only for Windows because the non-Windows
         // descriptions vary widely in format.

diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.targets b/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.targets
@@ -49,7 +49,6 @@ namespace Infrastructure.Common
         public static readonly string ExplicitUserName_PropertyName = "ExplicitUserName"%3B
         public static readonly string ExplicitPassword_PropertyName = "ExplicitPassword"%3B
         public static readonly string SSL_Available_PropertyName = "SSL_Available"%3B
-        public static readonly string TestNugetRuntimeId_PropertyName = "TestNugetRuntimeId"%3B
         public static readonly string IncludeTestsWithIssues_PropertyName = "IncludeTestsWithIssues"%3B
                 
         static partial void Initialize(Dictionary<string, string> properties)
@@ -86,7 +85,6 @@ namespace Infrastructure.Common
             properties["ExplicitUserName"] = "$(ExplicitUserName)"%3B
             properties["ExplicitPassword"] = "$(ExplicitPassword)"%3B
             properties["SSL_Available"] = "$(SSL_Available)"%3B
-            properties["TestNugetRuntimeId"] = "$(TestNugetRuntimeId)"%3B
             properties["IncludeTestsWithIssues"] = "$(IncludeTestsWithIssues)"%3B
         }
     }