More UWP Cleanup in xunit.console (#4142)

dotnet · Oct 17, 2019 · b15aaed · b15aaed
1 parent de92bb3
commit b15aaed
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 228 deletions.
diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/CommandLine.cs b/src/Microsoft.DotNet.XUnitConsoleRunner/src/CommandLine.cs
@@ -472,9 +472,7 @@ protected XunitProject Parse(Predicate<string> fileExists)
                         if (option.Value == null)
                             throw new ArgumentException($"missing filename for {option.Key}");
 
-#if !WINDOWS_UWP
                         EnsurePathExists(option.Value);
-#endif
 
                         project.Output.Add(optionName, option.Value);
                     }
@@ -505,7 +503,6 @@ static KeyValuePair<string, string> PopOption(Stack<string> arguments)
             return new KeyValuePair<string, string>(option, value);
         }
 
-#if !WINDOWS_UWP
         static void EnsurePathExists(string path)
         {
             var directory = Path.GetDirectoryName(path);
@@ -515,6 +512,5 @@ static void EnsurePathExists(string path)
 
             Directory.CreateDirectory(directory);
         }
-#endif
     }
 }
diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/ConsoleRunner.cs b/src/Microsoft.DotNet.XUnitConsoleRunner/src/ConsoleRunner.cs
@@ -28,14 +28,6 @@ public ConsoleRunner(object consoleLock)
 
         public int EntryPoint(string[] args)
         {
-#if WINDOWS_UWP
-            // Handle RemoteExecutor
-            if (args.Length > 0 && args[0] == "remote")
-            {
-                return RemoteExecutor.Execute(args.Skip(1).ToArray());
-            }
-#endif
-
             commandLine = CommandLine.Parse(args);
 
             try
@@ -367,9 +359,7 @@ XElement ExecuteAssembly(object consoleLock,
                 var shadowCopy = assembly.Configuration.ShadowCopyOrDefault;
                 var longRunningSeconds = assembly.Configuration.LongRunningTestSecondsOrDefault;
 
-#if !WINDOWS_UWP
                 using (AssemblyHelper.SubscribeResolveForAssembly(assembly.AssemblyFilename, internalDiagnosticsMessageSink))
-#endif
                 using (var controller = new XunitFrontController(appDomainSupport, assembly.AssemblyFilename, assembly.ConfigFilename, shadowCopy, diagnosticMessageSink: diagnosticMessageSink))
                 using (var discoverySink = new TestDiscoverySink(() => cancel))
                 {

diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
@@ -9,7 +9,6 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsPackable>true</IsPackable>
     <VersionPrefix>2.5.1</VersionPrefix>
-    <DefaultItemExcludes Condition="'$(DefineConstants)' == 'WINDOWS_UWP'">common\AssemblyResolution\**;$(DefaultItemExcludes)</DefaultItemExcludes>
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 

diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Program.cs b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Program.cs
@@ -12,9 +12,7 @@ public static int Main(string[] args)
             var consoleLock = new object();
             var internalDiagnosticsMessageSink = DiagnosticMessageSink.ForInternalDiagnostics(consoleLock, args.Contains("-internaldiagnostics"), args.Contains("-nocolor"));
 
-#if !WINDOWS_UWP
             using (AssemblyHelper.SubscribeResolveForAssembly(typeof(Program), internalDiagnosticsMessageSink))
-#endif
                 return new ConsoleRunner(consoleLock).EntryPoint(args);
         }
     }

diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/RemoteExecutor.cs b/src/Microsoft.DotNet.XUnitConsoleRunner/src/RemoteExecutor.cs
diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Utility/ConsoleRunnerLogger.cs b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Utility/ConsoleRunnerLogger.cs