Replace NET451 compiler directives with NETFRAMEWORK (#2516)

* Replace NET451 compiler directives with NETFRAMEWORK * Revert change in acceptance test * Fix Linux build hopefully
microsoft · Aug 12, 2020 · f171738 · f171738
1 parent 7a83a15
commit f171738
Show file tree

Hide file tree

Showing 53 changed files with 105 additions and 103 deletions.
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginCache.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework
 {
-#if NET451
+#if NETFRAMEWORK
     using System.Threading;
 #endif
     using System;
@@ -196,7 +196,7 @@ public Dictionary<string, TPluginInfo> DiscoverTestExtensions<TPluginInfo, TExte
 
                 this.LogExtensions();
             }
-#if NET451
+#if NETFRAMEWORK
             catch (ThreadAbortException)
             {
                 // Nothing to do here, we just do not want to do an EqtTrace.Fail for this thread

diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginManager.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/TestPluginManager.cs
@@ -91,7 +91,7 @@ public static T CreateTestExtension<T>(Type extensionType)
                     }
                     throw;
                 }
-#if NET451
+#if NETFRAMEWORK
                 else if (ex is SystemException)
                 {
                     if (EqtTrace.IsErrorEnabled)

diff --git a/src/Microsoft.TestPlatform.Common/Logging/InternalTestLoggerEvents.cs b/src/Microsoft.TestPlatform.Common/Logging/InternalTestLoggerEvents.cs
@@ -11,7 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.Logging
     using System.Collections.ObjectModel;
     using System.Diagnostics;
 
-#if NET451
+#if NETFRAMEWORK
     using System.Configuration;
 #endif
 
@@ -398,7 +398,7 @@ private int GetMaxBytesQueueCanHold()
         private static bool IsBoundsEnabledOnLoggerEventQueue()
         {
             bool enableBounds;
-#if NET451
+#if NETFRAMEWORK
             string enableBoundsOnEventQueueIsDefined = ConfigurationManager.AppSettings[TestPlatformDefaults.EnableBoundsOnLoggerEventQueue];
 #else
             string enableBoundsOnEventQueueIsDefined = null;
@@ -444,7 +444,7 @@ private static int FindTestResultSize(TestResultEventArgs args)
         private int GetSetting(string appSettingKey, int defaultValue)
         {
             int value;
-#if NET451
+#if NETFRAMEWORK
             string appSettingValue = ConfigurationManager.AppSettings[appSettingKey];
 #else
             string appSettingValue = null;

diff --git a/src/Microsoft.TestPlatform.Common/Utilities/FakesUtilities.cs b/src/Microsoft.TestPlatform.Common/Utilities/FakesUtilities.cs
@@ -216,7 +216,7 @@ private static void EnsureSettingsNode(XmlDocument settings, TestRunSettings set
 
         private static Func<IEnumerable<string>, string> TryGetNetFrameworkFakesDataCollectorConfigurator()
         {
-#if NET451
+#if NETFRAMEWORK
             try
             {
                 Assembly assembly = Assembly.Load(FakesConfiguratorAssembly);

diff --git a/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsProviderExtensions.cs b/src/Microsoft.TestPlatform.Common/Utilities/RunSettingsProviderExtensions.cs
@@ -226,7 +226,7 @@ private static XmlDocument GetRunSettingXmlDocument(this IRunSettingsProvider ru
             {
                 var settingsXml = runSettingsProvider.ActiveRunSettings.SettingsXml;
 
-#if NET451
+#if NETFRAMEWORK
                 using (var reader = XmlReader.Create(new StringReader(settingsXml), new XmlReaderSettings() { XmlResolver = null, CloseInput = true, DtdProcessing = DtdProcessing.Prohibit }))
                 {
 #else
@@ -240,7 +240,7 @@ private static XmlDocument GetRunSettingXmlDocument(this IRunSettingsProvider ru
             }
             else
             {
-#if NET451
+#if NETFRAMEWORK
                 doc = (XmlDocument) XmlRunSettingsUtilities.CreateDefaultRunSettings();
 #else
                 using (

diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketClient.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketClient.cs
@@ -115,7 +115,7 @@ private void Stop(Exception error)
                 this.stopped = true;
 
                 // Close the client and dispose the underlying stream
-#if NET451
+#if NETFRAMEWORK
                 // tcpClient.Close() calls tcpClient.Dispose().
                 this.tcpClient?.Close();
 #else

diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs
@@ -222,7 +222,7 @@ public bool WaitForServerConnection(int connectionTimeout)
         /// </summary>
         public void StopClient()
         {
-#if NET451
+#if NETFRAMEWORK
             // tcpClient.Close() calls tcpClient.Dispose().
             this.tcpClient?.Close();
 #else

diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketServer.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketServer.cs
@@ -117,7 +117,7 @@ private void Stop(Exception error)
                 this.tcpListener.Stop();
 
                 // Close the client and dispose the underlying stream
-#if NET451
+#if NETFRAMEWORK
                 // tcpClient.Close() calls tcpClient.Dispose().
                 this.tcpClient?.Close();
 #else

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
@@ -25,7 +25,7 @@ public static class EqtTrace
     {
         private static IPlatformEqtTrace traceImpl = new PlatformEqtTrace();
 
-#if NET451
+#if NETFRAMEWORK
         public static void SetupRemoteEqtTraceListeners(AppDomain childDomain)
         {
             traceImpl.SetupRemoteEqtTraceListeners(childDomain);

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestPlatformFormatException.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestPlatformFormatException.cs
@@ -10,7 +10,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
     /// Exception thrown on parsing error in user provided filter expression.
     /// This can happen when filter has invalid format or has unsupported properties.
     /// </summary>
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     public class TestPlatformFormatException : Exception
@@ -55,7 +55,7 @@ public TestPlatformFormatException(string message, Exception innerException)
         {
         }
 
-#if NET451
+#if NETFRAMEWORK
         /// <summary>
         /// Serialization constructor.
         /// </summary>
@@ -79,7 +79,7 @@ public string FilterValue
             private set;
         }
 
-#if NET451
+#if NETFRAMEWORK
         /// <summary>
         /// Serialization helper.
         /// </summary>

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestsCanceledException.cs b/src/Microsoft.TestPlatform.ObjectModel/Adapter/TestsCanceledException.cs
@@ -5,15 +5,15 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter
 {
     using System;
 
-#if NET451
+#if NETFRAMEWORK
     using System.Runtime.Serialization;
 #endif
 
     /// <summary>
     /// Exception thrown by the framework when an executor attempts to send
     /// test result to the framework when the test is canceled.
     /// </summary>
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     public class TestCanceledException : Exception
@@ -46,7 +46,7 @@ public TestCanceledException(string message, Exception innerException)
         {
         }
 
-#if NET451
+#if NETFRAMEWORK
         /// <summary>
         /// Serialization constructor.
         /// </summary>

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Constants.cs b/src/Microsoft.TestPlatform.ObjectModel/Constants.cs
@@ -194,7 +194,7 @@ public static class Constants
         /// The default execution thread apartment state.
         /// </summary>
         [CLSCompliant(false)]
-#if NET451
+#if NETFRAMEWORK
         // Keeping default STA thread for desktop tests for UI/Functional test scenarios
         public static readonly PlatformApartmentState DefaultExecutionThreadApartmentState = PlatformApartmentState.STA;
 #else

diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionEnvironmentContext.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/DataCollectionEnvironmentContext.cs
@@ -3,14 +3,14 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
 {
-#if NET451
+#if NETFRAMEWORK
     using System;
 #endif
 
     /// <summary>
     /// Encapsulates the context of the environment a data collector is being hosted in.
     /// </summary>
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     public sealed class DataCollectionEnvironmentContext

diff --git a/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEventArgs.cs b/src/Microsoft.TestPlatform.ObjectModel/DataCollector/Events/DataCollectionEventArgs.cs
@@ -9,7 +9,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection
     /// <summary>
     /// Base class for all execution event arguments
     /// </summary>
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     public abstract class DataCollectionEventArgs : EventArgs

diff --git a/src/Microsoft.TestPlatform.ObjectModel/ExceptionConverter.cs b/src/Microsoft.TestPlatform.ObjectModel/ExceptionConverter.cs
@@ -9,7 +9,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
     /// <summary>
     /// Base exception for all Rocksteady service exceptions
     /// </summary>
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors")]
@@ -96,7 +96,7 @@ private static Exception ConvertException(String exceptionType, String message,
     }
 #endif
 
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors")]

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Framework.cs b/src/Microsoft.TestPlatform.ObjectModel/Framework.cs
@@ -11,7 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
     /// </summary>
     public class Framework
     {
-#if NET451
+#if NETFRAMEWORK
         private static readonly Framework Default = Framework.FromString(".NETFramework,Version=v4.0");
 #else
         private static readonly Framework Default = Framework.FromString(".NETCoreApp,Version=v1.0");

diff --git a/src/Microsoft.TestPlatform.ObjectModel/RegistryFreeActivationContext.cs b/src/Microsoft.TestPlatform.ObjectModel/RegistryFreeActivationContext.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.
 
-#if NET451
+#if NETFRAMEWORK
 
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {

diff --git a/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsException.cs b/src/Microsoft.TestPlatform.ObjectModel/RunSettings/SettingsException.cs
@@ -4,7 +4,7 @@
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
     using System;
-#if NET451
+#if NETFRAMEWORK
     using System.Runtime.Serialization;
 #endif
 
@@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
     /// Exception thrown by Run Settings when an error with a settings provider
     /// is encountered.
     /// </summary>
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     public class SettingsException : Exception
@@ -46,7 +46,7 @@ public SettingsException(string message, Exception innerException)
         {
         }
 
-#if NET451
+#if NETFRAMEWORK
         /// <summary>
         /// Serialization constructor.
         /// </summary>

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Trait.cs b/src/Microsoft.TestPlatform.ObjectModel/Trait.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
-#if NET451
+#if NETFRAMEWORK
     using System;
 #endif
     using System.Collections.Generic;
@@ -13,7 +13,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
     /// Class that holds Trait.
     /// A traits is Name, Value pair.
     /// </summary>
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     [DataContract]

diff --git a/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs b/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs
@@ -11,7 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
     /// <summary>
     /// Class that holds collection of traits
     /// </summary>
-#if NET451
+#if NETFRAMEWORK
     [Serializable]
 #endif
     public class TraitCollection : IEnumerable<Trait>
@@ -33,7 +33,7 @@ public class TraitCollection : IEnumerable<Trait>
 #pragma warning restore 618
             typeof(TestObject));
 
-#if NET451
+#if NETFRAMEWORK
         [NonSerialized]
 #endif
         private readonly TestObject testObject;

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyHelper.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyHelper.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
 {
-#if NET451
+#if NETFRAMEWORK
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/AssemblyLoadWorker.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
 {
-#if NET451
+#if NETFRAMEWORK
     using System;
     using System.Diagnostics;
     using System.IO;

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Utilities/SuspendCodeCoverage.cs b/src/Microsoft.TestPlatform.ObjectModel/Utilities/SuspendCodeCoverage.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities
 {
-#if NET451
+#if NETFRAMEWORK
     using System;
 
     /// <summary>

diff --git a/src/Microsoft.TestPlatform.Utilities/XmlUtilities.cs b/src/Microsoft.TestPlatform.Utilities/XmlUtilities.cs
@@ -5,7 +5,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Utilities
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
-#if NET451
+#if NETFRAMEWORK
     using System.Security;
 #endif
     using System.Xml;
@@ -62,7 +62,7 @@ internal static void AppendOrModifyChild(
 
             // TODO: There isn't an equivalent API to SecurityElement.Escape in Core yet.
             // So trusting that the XML is always valid for now.
-#if NET451
+#if NETFRAMEWORK
             var secureInnerXml = SecurityElement.Escape(innerXml);
 #else
             // fixing manually as we currently target to netcore 1.1 and we don't have default implementation for Escape functionality

diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs
@@ -4,7 +4,7 @@
 namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
 {
     using System;
-#if NET451
+#if NETFRAMEWORK
     using System.Collections.Generic;
 #endif
     using System.Diagnostics;
@@ -40,7 +40,7 @@ public ConsoleParameters(IFileHelper fileHelper)
             this.fileHelper = fileHelper;
         }
 
-#if NET451
+#if NETFRAMEWORK
 
         /// <summary>
         /// TODO: Remove the #if when project is targeted to netstandard2.0

diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs
@@ -113,7 +113,7 @@ public void StartProcess(ConsoleParameters consoleParameters)
 
             EqtTrace.Verbose("VsTestCommandLineWrapper: Process Start Info {0} {1}", info.FileName, info.Arguments);
 
-#if NET451
+#if NETFRAMEWORK
             if (consoleParameters.EnvironmentVariables != null)
             {
                 info.EnvironmentVariables.Clear();

diff --git a/src/testhost.x86/AppDomainEngineInvoker.cs b/src/testhost.x86/AppDomainEngineInvoker.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.VisualStudio.TestPlatform.TestHost
 {
-#if NET451
+#if NETFRAMEWORK
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Tracing;