Merge remote-tracking branch 'origin/master' into temp/remove-retry-facts

david-driscoll · david-driscoll · commit 81b402f90c35 · 2021-04-21T22:28:54.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -28,6 +28,7 @@ nuget.exe
 debugSettings.json
 buildlog
 /.vs
+osharp_pack/
 
 # NuGet
 *.nuget.targets
diff --git a/src/Dap.Protocol/Feature/Requests/ThreadsFeature.cs b/src/Dap.Protocol/Feature/Requests/ThreadsFeature.cs
@@ -2,7 +2,6 @@
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.JsonRpc.Generation;
-using Thread = System.Threading.Thread;
 
 // ReSharper disable once CheckNamespace
 namespace OmniSharp.Extensions.DebugAdapter.Protocol
