Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More UWP Cleanup in xunit.console #4142

Merged
merged 1 commit into from
Oct 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/Microsoft.DotNet.XUnitConsoleRunner/src/CommandLine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand All @@ -515,6 +512,5 @@ static void EnsurePathExists(string path)

Directory.CreateDirectory(directory);
}
#endif
}
}
10 changes: 0 additions & 10 deletions src/Microsoft.DotNet.XUnitConsoleRunner/src/ConsoleRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.DotNet.XUnitConsoleRunner/src/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
127 changes: 0 additions & 127 deletions src/Microsoft.DotNet.XUnitConsoleRunner/src/RemoteExecutor.cs

This file was deleted.

This file was deleted.