From d1ac18d9f5895cad92d10555683280404f3f957b Mon Sep 17 00:00:00 2001
From: Smit Patel <smitpatel@users.noreply.github.com>
Date: Mon, 3 Jun 2019 14:47:44 -0700
Subject: [PATCH] Remove dependency on IX-Async

Resolves #12048
---
 Directory.Build.targets  | 10 ----------
 eng/Versions.props       |  1 -
 src/EFCore/EFCore.csproj |  1 -
 3 files changed, 12 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index d030c24ba28..325ff7c0196 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -18,14 +18,4 @@
     </KnownFrameworkReference>
   </ItemGroup>
 
-  <!-- This is required to workaround overlap between System.Collections.Generic.IAsyncEnumerable in System.Runtime and System.Interactive.Async. -->
-  <Target Name="AddAssemblyAliasToReactiveAsync"
-          AfterTargets="ResolveAssemblyReferences"
-          Condition=" '$(TargetFramework)' != '' AND ( '$(TargetFramework)' == 'netcoreapp3.0' OR '$(TargetFramework)' == 'netstandard2.1' ) ">
-    <ItemGroup>
-      <ReferencePath Condition=" '%(FileName)' == 'System.Interactive.Async' ">
-        <Aliases>reactive</Aliases>
-      </ReferencePath>
-    </ItemGroup>
-  </Target>
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 145ef8777de..fe967bcac8f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -24,7 +24,6 @@
     <SQLitePCLRawBundleSqlcipherPackageVersion>1.1.12</SQLitePCLRawBundleSqlcipherPackageVersion>
     <SQLitePCLRawCorePackageVersion>1.1.12</SQLitePCLRawCorePackageVersion>
     <StyleCopAnalyzersPackageVersion>1.1.1-beta.61</StyleCopAnalyzersPackageVersion>
-    <SystemInteractiveAsyncPackageVersion>3.2.0</SystemInteractiveAsyncPackageVersion>
     <BenchmarkDotNetPackageVersion>0.11.3</BenchmarkDotNetPackageVersion>
     <MicrosoftDataSqlClientPackageVersion>1.0.19128.1-Preview</MicrosoftDataSqlClientPackageVersion>
   </PropertyGroup>
diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj
index da6e7fda382..15175a90f11 100644
--- a/src/EFCore/EFCore.csproj
+++ b/src/EFCore/EFCore.csproj
@@ -29,7 +29,6 @@ Microsoft.EntityFrameworkCore.DbSet
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="$(SystemComponentModelAnnotationsPackageVersion)" />
-    <PackageReference Include="System.Interactive.Async" Version="$(SystemInteractiveAsyncPackageVersion)" />
     <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" PrivateAssets="All" />
   </ItemGroup>