From 1f8c642adb4426a6bdf8c4135ae00975cf817b31 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@gmail.com>
Date: Fri, 4 Dec 2020 09:28:59 -0700
Subject: [PATCH 1/6] Update System.Runtime.CompilerServices.Unsafe to 5.0.0

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 4c437d1e45bb8..050b4fa7e23d2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -215,7 +215,7 @@
     <SystemManagementVersion>5.0.0-preview.8.20407.11</SystemManagementVersion>
     <SystemMemoryVersion>4.5.4</SystemMemoryVersion>
     <SystemResourcesExtensionsVersion>4.7.1</SystemResourcesExtensionsVersion>
-    <SystemRuntimeCompilerServicesUnsafeVersion>4.7.1</SystemRuntimeCompilerServicesUnsafeVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>5.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
     <SystemSecurityPrincipalVersion>4.3.0</SystemSecurityPrincipalVersion>
     <SystemTextEncodingCodePagesVersion>4.5.1</SystemTextEncodingCodePagesVersion>

From a575a7a63e03e5762880910d53bc5f94b5d4bf84 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@gmail.com>
Date: Fri, 4 Dec 2020 09:35:55 -0700
Subject: [PATCH 2/6] Update System.Threading.Tasks.Dataflow to 5.0.0

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 050b4fa7e23d2..8f9fff2a05b9c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -220,7 +220,7 @@
     <SystemSecurityPrincipalVersion>4.3.0</SystemSecurityPrincipalVersion>
     <SystemTextEncodingCodePagesVersion>4.5.1</SystemTextEncodingCodePagesVersion>
     <SystemTextEncodingExtensionsVersion>4.3.0</SystemTextEncodingExtensionsVersion>
-    <SystemThreadingTasksDataflowVersion>4.11.1</SystemThreadingTasksDataflowVersion>
+    <SystemThreadingTasksDataflowVersion>5.0.0</SystemThreadingTasksDataflowVersion>
     <!-- We need System.ValueTuple assembly version at least 4.0.3.0 on net47 to make F5 work against Dev15 - see https://github.com/dotnet/roslyn/issues/29705 -->
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>

From 82351910b6abd6d248f38ec7f1273f0c423f48d3 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@gmail.com>
Date: Fri, 4 Dec 2020 09:48:58 -0700
Subject: [PATCH 3/6] Update System.IO.Pipelines to 5.0.0

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 8f9fff2a05b9c..bb40e4f8a39df 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -211,7 +211,7 @@
     <SystemIOFileSystemVersion>4.3.0</SystemIOFileSystemVersion>
     <SystemIOFileSystemPrimitivesVersion>4.3.0</SystemIOFileSystemPrimitivesVersion>
     <SystemIOPipesAccessControlVersion>4.5.1</SystemIOPipesAccessControlVersion>
-    <SystemIOPipelinesVersion>4.7.0</SystemIOPipelinesVersion>
+    <SystemIOPipelinesVersion>5.0.0</SystemIOPipelinesVersion>
     <SystemManagementVersion>5.0.0-preview.8.20407.11</SystemManagementVersion>
     <SystemMemoryVersion>4.5.4</SystemMemoryVersion>
     <SystemResourcesExtensionsVersion>4.7.1</SystemResourcesExtensionsVersion>

From fbf8bda067cedc502b3b36fe8094a5461bfdaf9a Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@gmail.com>
Date: Fri, 4 Dec 2020 09:49:53 -0700
Subject: [PATCH 4/6] Update Microsoft.Bcl.AsyncInterfaces to 5.0.0

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index bb40e4f8a39df..0ef25f9e234a4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -257,7 +257,7 @@
     <StreamJsonRpcVersion>2.6.104</StreamJsonRpcVersion>
     <SystemCollectionsImmutableVersion>5.0.0</SystemCollectionsImmutableVersion>
     <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
-    <MicrosoftBclAsyncInterfacesVersion>1.1.1</MicrosoftBclAsyncInterfacesVersion>
+    <MicrosoftBclAsyncInterfacesVersion>5.0.0</MicrosoftBclAsyncInterfacesVersion>
   </PropertyGroup>
   <PropertyGroup>
     <UsingToolPdbConverter>true</UsingToolPdbConverter>

From 90d1c94118489d120ca183f92169abb1a0ef7219 Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Mon, 7 Dec 2020 19:10:43 -0800
Subject: [PATCH 5/6] Add Microsoft.Bcl.AsyncInterfaces binding redirect

---
 src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs        | 2 +-
 .../Roslyn.VisualStudio.Setup.Dependencies.csproj               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs b/src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs
index d6b2d42439305..63f40f7ff0507 100644
--- a/src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs
@@ -17,7 +17,7 @@ public static class Helper
         /// <summary>
         /// A long timeout used to avoid hangs in tests, where a test failure manifests as an operation never occurring.
         /// </summary>
-        public static readonly TimeSpan HangMitigatingTimeout = TimeSpan.FromMinutes(1);
+        public static readonly TimeSpan HangMitigatingTimeout = TimeSpan.FromMinutes(10);
 
         private static IUIAutomation2 _automation;
 
diff --git a/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj b/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj
index 4ea0c7a648b89..6b30fd02bbd6e 100644
--- a/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj
+++ b/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj
@@ -24,6 +24,7 @@
       This project deploys them to RoslynDev hive to enable F5 scenario, 
       but the resulting VSIX not inserted into VS.
     -->
+    <NuGetPackageToIncludeInVsix Include="Microsoft.Bcl.AsyncInterfaces" PkgDefEntry="BindingRedirect" />
     <NuGetPackageToIncludeInVsix Include="Microsoft.DiaSymReader" PkgDefEntry="BindingRedirect" />
     <NuGetPackageToIncludeInVsix Include="Microsoft.DiaSymReader.PortablePdb" PkgDefEntry="BindingRedirect" />
     <NuGetPackageToIncludeInVsix Include="System.Buffers" PkgDefEntry="BindingRedirect" />
@@ -46,6 +47,7 @@
     <!-- Work around https://devdiv.visualstudio.com/DevDiv/_workitems/edit/725508 -->
     <PackageReference Include="Microsoft.VisualStudio.Text.Data" Version="$(MicrosoftVisualStudioTextDataVersion)" />
     <!-- All packages that we depend on, either as facades or implementations -->
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
     <PackageReference Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
     <PackageReference Include="Microsoft.DiaSymReader.PortablePdb" Version="$(MicrosoftDiaSymReaderPortablePdbVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers" Version="$(MicrosoftVisualStudioSDKAnalyzersVersion)" PrivateAssets="all" />

From a28f92d5be9ee6b7899ded2979d1a34afa52b0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Tue, 8 Dec 2020 09:43:06 -0800
Subject: [PATCH 6/6] Revert unintended change

---
 src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs b/src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs
index 63f40f7ff0507..d6b2d42439305 100644
--- a/src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs
+++ b/src/VisualStudio/IntegrationTest/TestUtilities/Helper.cs
@@ -17,7 +17,7 @@ public static class Helper
         /// <summary>
         /// A long timeout used to avoid hangs in tests, where a test failure manifests as an operation never occurring.
         /// </summary>
-        public static readonly TimeSpan HangMitigatingTimeout = TimeSpan.FromMinutes(10);
+        public static readonly TimeSpan HangMitigatingTimeout = TimeSpan.FromMinutes(1);
 
         private static IUIAutomation2 _automation;