Merge pull request #9277 from drewnoakes/simplify-polyfill

Simplify using non-generic TaskCompletionSource polyfill
dotnet · Oct 10, 2023 · d0efb44 · d0efb44
2 parents 9b28338 + fea9bc3
commit d0efb44
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 27 deletions.
diff --git a/...lStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs b/...lStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/LanguageServiceHost.cs
@@ -6,10 +6,6 @@
 using Microsoft.VisualStudio.ProjectSystem.Utilities;
 using Microsoft.VisualStudio.Threading;
 
-// .NET Core defines a non-generic TaskCompletionSource but .NETFramework does not.
-// For consistency, always use the one we define.
-using TaskCompletionSource = Microsoft.VisualStudio.Threading.Tasks.TaskCompletionSource;
-
 namespace Microsoft.VisualStudio.ProjectSystem.LanguageServices;
 
 /// <summary>

diff --git a/...soft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/Workspace.cs b/...soft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/LanguageServices/Workspace.cs
@@ -8,10 +8,6 @@
 using Microsoft.VisualStudio.ProjectSystem.Utilities;
 using Microsoft.VisualStudio.Threading;
 
-// .NET Core defines a non-generic TaskCompletionSource but .NETFramework does not.
-// For consistency, always use the one we define.
-using TaskCompletionSource = Microsoft.VisualStudio.Threading.Tasks.TaskCompletionSource;
-
 namespace Microsoft.VisualStudio.ProjectSystem.LanguageServices;
 
 /// <summary>

diff --git a/...crosoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/VsSolutionEventListener.cs b/...crosoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/VsSolutionEventListener.cs
@@ -3,7 +3,6 @@
 using Microsoft.VisualStudio.ProjectSystem.Properties;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
-using Microsoft.VisualStudio.Threading.Tasks;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS
 {

diff --git a/...rojectSystem.Managed/ProjectSystem/Build/ImplicitlyActiveConfiguredProjectReadyToBuild.cs b/...rojectSystem.Managed/ProjectSystem/Build/ImplicitlyActiveConfiguredProjectReadyToBuild.cs
@@ -1,9 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
-// .NET Core defines a non-generic TaskCompletionSource but .NETFramework does not.
-// For consistency, always use the one we define.
-using TaskCompletionSource = Microsoft.VisualStudio.Threading.Tasks.TaskCompletionSource;
-
 namespace Microsoft.VisualStudio.ProjectSystem.Build
 {
     [Export(typeof(IConfiguredProjectReadyToBuild))]

diff --git a/...icrosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Debug/LaunchSettingsProvider.cs b/...icrosoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/Debug/LaunchSettingsProvider.cs
@@ -6,10 +6,6 @@
 using Microsoft.VisualStudio.Threading;
 using Microsoft.VisualStudio.Threading.Tasks;
 
-// .NET Core defines a non-generic TaskCompletionSource but .NETFramework does not.
-// For consistency, always use the one we define.
-using TaskCompletionSource = Microsoft.VisualStudio.Threading.Tasks.TaskCompletionSource;
-
 namespace Microsoft.VisualStudio.ProjectSystem.Debug
 {
     /// <summary>

diff --git a/...osoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/UnconfiguredProjectTasksService.cs b/...osoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/UnconfiguredProjectTasksService.cs
@@ -2,10 +2,6 @@
 
 using Microsoft.VisualStudio.Threading;
 
-// .NET Core defines a non-generic TaskCompletionSource but .NETFramework does not.
-// For consistency, always use the one we define.
-using TaskCompletionSource = Microsoft.VisualStudio.Threading.Tasks.TaskCompletionSource;
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     [Export]

diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Threading/Tasks/TaskCompletionSource.cs b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Threading/Tasks/TaskCompletionSource.cs
@@ -1,8 +1,10 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+#if NETFRAMEWORK
+
 using System.ComponentModel;
 
-namespace Microsoft.VisualStudio.Threading.Tasks
+namespace System.Threading.Tasks
 {
     /// <inheritdoc cref="TaskCompletionSource{TResult}"/>
     /// <remarks>
@@ -54,3 +56,5 @@ public bool TrySetResult()
         }
     }
 }
+
+#endif
diff --git a/...System.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTrackerTests.cs b/...System.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTrackerTests.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
-using Microsoft.VisualStudio.Threading.Tasks;
 using Xunit.Sdk;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.TempPE

diff --git a/...ojectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsCompilerTests.cs b/...ojectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsCompilerTests.cs
@@ -4,7 +4,6 @@
 using Microsoft.VisualStudio.LanguageServices.ProjectSystem;
 using Microsoft.VisualStudio.ProjectSystem.LanguageServices;
 using Microsoft.VisualStudio.Telemetry;
-using Microsoft.VisualStudio.Threading.Tasks;
 using Xunit.Sdk;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.TempPE

diff --git a/...ctSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcherTests.cs b/...ctSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcherTests.cs
@@ -2,7 +2,6 @@
 
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Threading.Tasks;
 using Xunit.Sdk;
 
 // Nullable annotations don't add a lot of value to this class, and until https://github.com/dotnet/roslyn/issues/33199 is fixed

diff --git a/...ft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Utilities/TestUtil.cs b/...ft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Utilities/TestUtil.cs
@@ -1,7 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
-using Microsoft.VisualStudio.Threading.Tasks;
-
 namespace Microsoft.VisualStudio.ProjectSystem.VS.Utilities
 {
     internal static class TestUtil