Enable default compile items for Microsoft.TestPlatform.PlatformAbstr…

…actions (#2556)
microsoft · Sep 3, 2020 · 60d87bb · 60d87bb
1 parent ef1d067
commit 60d87bb
Show file tree

Hide file tree

Showing 40 changed files with 169 additions and 26 deletions.
diff --git a/...soft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/...soft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
@@ -8,7 +8,6 @@
     <AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
     <TargetFrameworks>netcoreapp2.1;net451;uap10.0;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard2.0;netcoreapp2.1</TargetFrameworks>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <EnableCodeAnalysis>true</EnableCodeAnalysis>
     <NoWarn>NU1605</NoWarn>
   </PropertyGroup>
@@ -28,16 +27,7 @@
     <TargetFrameworkVersion Condition="'$(OS)' != 'Windows_NT'">v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="Interfaces\**\*.cs" />
-    <Compile Include="Properties\**\*.cs" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <Compile Include="netstandard\**\*.cs" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <Compile Include="netcore\**\*.cs" />
-    <Compile Include="common\**\*.cs" />
     <PackageReference Include="System.Threading.Thread">
       <Version>4.0.0</Version>
     </PackageReference>
@@ -58,8 +48,6 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Compile Include="net451\**\*.cs" />
-    <Compile Include="common\**\*.cs" />
     <PackageReference Include="Microsoft.Internal.Dia.Interop">
       <Version>14.0.0</Version>
     </PackageReference>
@@ -68,7 +56,6 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <Compile Include="uap10.0\**\*.cs" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
       <Version>4.0.0</Version>
     </PackageReference>

diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/IO/PlatformStream.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/IO/PlatformStream.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK || NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System.IO;
@@ -15,4 +17,6 @@ public Stream CreateBufferedStream(Stream stream, int bufferSize)
             return new BufferedStream(stream, bufferSize);
         }
     }
-}
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/System/ProcessHelper.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK || NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -215,3 +217,5 @@ public void WaitForProcessExit(object process)
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/PlatformEqtTrace.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK || NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
     using System;
@@ -434,4 +436,6 @@ private static void UnInitializeTrace()
             Source.Switch.Level = SourceLevels.Off;
         }
     }
-}
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/RollingFileTraceListener.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/common/Tracing/RollingFileTraceListener.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK || NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
     using System;
@@ -471,4 +473,6 @@ public override void Write(string value)
             }
         }
     }
-}
+}
+
+#endif
diff --git a/...icrosoft.TestPlatform.PlatformAbstractions/net451/Interfaces/Tracing/IPlatformEqtTrace.cs b/...icrosoft.TestPlatform.PlatformAbstractions/net451/Interfaces/Tracing/IPlatformEqtTrace.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
     using System;
@@ -24,4 +26,6 @@ public partial interface IPlatformEqtTrace
         /// </param>
         void SetupListener(TraceListener listener);
     }
-}
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyExtensions.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System.Reflection;
@@ -21,3 +23,5 @@ public static string GetAssemblyLocation(this Assembly assembly)
         }
     }
 }
+
+#endif
diff --git a/...Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyLoadContext.cs b/...Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyLoadContext.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System.Reflection;
@@ -22,3 +24,5 @@ public Assembly LoadAssemblyFromPath(string assemblyPath)
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyResolver.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -75,3 +77,5 @@ private Assembly AssemblyResolverEvent(object sender, object eventArgs)
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformEnvironment.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -63,3 +65,5 @@ public int GetCurrentManagedThreadId()
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -46,3 +48,5 @@ public void Run(Action action, PlatformApartmentState apartmentState, bool waitF
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessHelper.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -21,4 +23,6 @@ public IntPtr GetProcessHandle(int processId)
             return Process.GetProcessById(processId).Handle;
         }
     }
-}
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessStartInfoExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessStartInfoExtensions.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System.Diagnostics;
@@ -19,3 +21,5 @@ public static void AddEnvironmentVariable(this ProcessStartInfo startInfo, strin
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
     using System;
@@ -73,4 +75,6 @@ public void SetupListener(TraceListener listener)
             }
         }
     }
-}
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETFRAMEWORK
+
 namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
     using System;
@@ -39,3 +41,5 @@ internal void SetupRemoteListeners(TraceListener listener)
         }
     }
 }
+
+#endif
diff --git a/...Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyExtensions.cs b/...Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyExtensions.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System.Reflection;
@@ -21,3 +23,5 @@ public static string GetAssemblyLocation(this Assembly assembly)
         }
     }
 }
+
+#endif
diff --git a/...icrosoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyLoadContext.cs b/...icrosoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyLoadContext.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System.Reflection;
@@ -23,3 +25,5 @@ public Assembly LoadAssemblyFromPath(string assemblyPath)
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/Runtime/PlatformAssemblyResolver.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -77,3 +79,5 @@ private Assembly AssemblyResolverEvent(object sender, object eventArgs)
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -68,3 +70,5 @@ public int GetCurrentManagedThreadId()
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformThread.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -49,3 +51,5 @@ public void Run(Action action, PlatformApartmentState apartmentState, bool waitF
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -25,4 +27,6 @@ public IntPtr GetProcessHandle(int processId)
             return Process.GetProcessById(processId).SafeHandle.DangerousGetHandle();
         }
     }
-}
+}
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessStartInfoExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessStartInfoExtensions.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETCOREAPP
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System.Diagnostics;
@@ -19,3 +21,5 @@ public static void AddEnvironmentVariable(this ProcessStartInfo startInfo, strin
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/IO/PlatformStream.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/netstandard/IO/PlatformStream.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if NETSTANDARD
+
 namespace Microsoft.VisualStudio.TestPlatform.PlatformAbstractions
 {
     using System;
@@ -16,4 +18,6 @@ public Stream CreateBufferedStream(Stream stream, int bufferSize)
             throw new NotImplementedException();
         }
     }
-}
+}
+
+#endif