Making all of the utility classes private, especially the async-await…

… syntax support shims for netfx40, so that to hide them from the compiler and prevent ambiguity when compiling for netfx45+ (gh-20). Added a testbed usage which demonstrated the problem and got fixed.
Maximus5 · Apr 30, 2016 · 857eb7c · vbjay · Jul 24, 2016 · ArsenShnurkov
1 parent ce6e2fc
commit 857eb7c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 8 deletions.
diff --git a/ConEmuWinForms/Util/AsyncTaskMethodBuilder!1.cs b/ConEmuWinForms/Util/AsyncTaskMethodBuilder!1.cs
@@ -3,7 +3,7 @@
 
 namespace System.Runtime.CompilerServices
 {
-	public struct AsyncTaskMethodBuilder<TResult>
+	internal struct AsyncTaskMethodBuilder<TResult>
 	{
 		private TaskCompletionSource<TResult> _tasker;
 

diff --git a/ConEmuWinForms/Util/CommandLineBuilder.cs b/ConEmuWinForms/Util/CommandLineBuilder.cs
@@ -17,7 +17,7 @@ namespace Microsoft.Build.Utilities
 	/// 	-- Functional double quotes (for example to handle spaces) are best put around both name and value
 	/// 	    in switches like /Dname=value.
 	/// </summary> 
-	public sealed class CommandLineBuilder
+	internal sealed class CommandLineBuilder
     {
 		public static readonly string License = 
 @"

diff --git a/ConEmuWinForms/Util/IAsyncStateMachine.cs b/ConEmuWinForms/Util/IAsyncStateMachine.cs
@@ -3,7 +3,7 @@
 
 namespace System.Runtime.CompilerServices
 {
-	public interface IAsyncStateMachine
+	internal interface IAsyncStateMachine
 	{
 		void MoveNext();
 

diff --git a/ConEmuWinForms/Util/ICriticalNotifyCompletion.cs b/ConEmuWinForms/Util/ICriticalNotifyCompletion.cs
@@ -3,7 +3,7 @@
 
 namespace System.Runtime.CompilerServices
 {
-	public interface ICriticalNotifyCompletion : INotifyCompletion
+	internal interface ICriticalNotifyCompletion : INotifyCompletion
 	{
 		[SecurityCritical]
 		void UnsafeOnCompleted(Action continuation);

diff --git a/ConEmuWinForms/Util/INotifyCompletion.cs b/ConEmuWinForms/Util/INotifyCompletion.cs
@@ -3,7 +3,7 @@
 
 namespace System.Runtime.CompilerServices
 {
-	public interface INotifyCompletion
+	internal interface INotifyCompletion
 	{
 		void OnCompleted(Action continuation);
 	}

diff --git a/ConEmuWinForms/Util/TaskAwaiter!1.cs b/ConEmuWinForms/Util/TaskAwaiter!1.cs
@@ -6,7 +6,7 @@
 
 namespace System.Threading.Tasks
 {
-	public struct TaskAwaiter<TResult> : INotifyCompletion
+	internal struct TaskAwaiter<TResult> : INotifyCompletion
 	{
 		private readonly bool _isctx;
 

diff --git a/ConEmuWinForms/Util/TaskAwaiter.cs b/ConEmuWinForms/Util/TaskAwaiter.cs
@@ -6,7 +6,7 @@
 
 namespace System.Threading.Tasks
 {
-	public struct TaskAwaiter : INotifyCompletion
+	internal struct TaskAwaiter : INotifyCompletion
 	{
 		private readonly bool _isctx;
 

diff --git a/Tests/ControlDllTestbed/Testbed.cs b/Tests/ControlDllTestbed/Testbed.cs
@@ -97,10 +97,23 @@ private static Form RenderView(Form form)
 				if(result == DialogResult.Cancel)
 					return;
 				ConEmuSession session = conemu.Start(new ConEmuStartInfo() {ConsoleProcessCommandLine = "choice", IsEchoingConsoleCommandLine = true, WhenConsoleProcessExits = result == DialogResult.Yes ? WhenConsoleProcessExits.KeepConsoleEmulatorAndShowMessage : WhenConsoleProcessExits.CloseConsoleEmulator, ConsoleProcessExitedEventSink = (sender, args) => MessageBox.Show($"Your choice is {args.ExitCode} (powered by startinfo event sink).")});
-				session.WaitForConsoleProcessExitAsync().ContinueWith(task => MessageBox.Show($"Your choice is {task.Result.ExitCode} (powered by wait-for-exit-async)."));
+#pragma warning disable 4014
+				ShowMessageForChoiceAsync(session);
+#pragma warning restore 4014
 			};
 
 			return form;
 		}
+
+		/// <summary>
+		/// This method checks that the async-await compiler syntax is not prevented in netfx45+ projects due to the shim types present in the conemu assembly (https://github.com/Maximus5/conemu-inside/issues/20).
+		/// </summary>
+		private static async Task ShowMessageForChoiceAsync(ConEmuSession session)
+		{
+			if(session == null)
+				throw new ArgumentNullException(nameof(session));
+			ConsoleProcessExitedEventArgs exitargs = await session.WaitForConsoleProcessExitAsync();
+			MessageBox.Show($"Your choice is {exitargs.ExitCode} (powered by wait-for-exit-async).");
+		}
 	}
 }