From dde65e2ba4191f5eb9fb22a156f081a745e32f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Tue, 2 Jul 2024 06:26:15 +0200
Subject: [PATCH] Move the AddAssemblyAliasToReactiveAsync target to
 Directory.Build.targets

---
 Directory.Build.targets                            | 14 ++++++++++++++
 .../OpenIddict.Sandbox.AspNetCore.Server.csproj    | 14 --------------
 .../OpenIddict.EntityFrameworkCore.csproj          | 14 --------------
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index b572572d..872a713a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -221,6 +221,20 @@
     <DefineConstants>$(DefineConstants);SUPPORTS_WINDOWS_RUNTIME</DefineConstants>
   </PropertyGroup>
 
+  <!--
+    Note: Entity Framework Core 2.x references System.Interactive.Async 3.x, that includes
+    its own IAsyncEnumerable. To work around collisions between this type and the new type
+    now included in the BCL (System.Runtime), an alias is added to System.Interactive.Async.
+  -->
+
+  <Target Name="AddAssemblyAliasToReactiveAsync" AfterTargets="ResolveAssemblyReferences">
+    <ItemGroup>
+      <ReferencePath Condition=" '%(FileName)' == 'System.Interactive.Async' ">
+        <Aliases>reactive</Aliases>
+      </ReferencePath>
+    </ItemGroup>
+  </Target>
+
   <!--
     Note: metapackages don't include any build output. To ensure the TFM-specific folders under
     /lib are preserved, a placeholder file is added for each supported target framework moniker.
diff --git a/sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj b/sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj
index bea71b8c..f74506f3 100644
--- a/sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj
+++ b/sandbox/OpenIddict.Sandbox.AspNetCore.Server/OpenIddict.Sandbox.AspNetCore.Server.csproj
@@ -28,18 +28,4 @@
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" />
   </ItemGroup>
 
-  <!--
-    Note: Entity Framework Core 2.x references System.Interactive.Async 3.x, that includes
-    its own IAsyncEnumerable. To work around collisions between this type and the new type
-    now included in the BCL (System.Runtime), an alias is added to System.Interactive.Async.
-  -->
-
-  <Target Name="AddAssemblyAliasToReactiveAsync" AfterTargets="ResolveAssemblyReferences">
-    <ItemGroup>
-      <ReferencePath Condition=" '%(FileName)' == 'System.Interactive.Async' ">
-        <Aliases>reactive</Aliases>
-      </ReferencePath>
-    </ItemGroup>
-  </Target>
-
 </Project>
diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
index 94886679..e52f0377 100644
--- a/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
+++ b/src/OpenIddict.EntityFrameworkCore/OpenIddict.EntityFrameworkCore.csproj
@@ -31,18 +31,4 @@
     <Using Include="Microsoft.EntityFrameworkCore.Storage" />
   </ItemGroup>
 
-  <!--
-    Note: Entity Framework Core 2.x references System.Interactive.Async 3.x, that includes
-    its own IAsyncEnumerable. To work around collisions between this type and the new type
-    now included in the BCL (System.Runtime), an alias is added to System.Interactive.Async.
-  -->
-
-  <Target Name="AddAssemblyAliasToReactiveAsync" AfterTargets="ResolveAssemblyReferences">
-    <ItemGroup>
-      <ReferencePath Condition=" '%(FileName)' == 'System.Interactive.Async' ">
-        <Aliases>reactive</Aliases>
-      </ReferencePath>
-    </ItemGroup>
-  </Target>
-
 </Project>