From a87cd48ae1aaf0b1a7e8c990d5a4a8b68ebfdf5a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 31 May 2023 17:45:02 +0100
Subject: [PATCH] use our own targets file for private apis.

---
 packages/Avalonia/Avalonia.targets            | 17 +--------------
 packages/Avalonia/AvaloniaPrivateApis.targets | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 packages/Avalonia/AvaloniaPrivateApis.targets

diff --git a/packages/Avalonia/Avalonia.targets b/packages/Avalonia/Avalonia.targets
index 0961c82b5c..eacd287b59 100644
--- a/packages/Avalonia/Avalonia.targets
+++ b/packages/Avalonia/Avalonia.targets
@@ -1,19 +1,4 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)\AvaloniaBuildTasks.targets"/>
-
-  <Target Name="RemoveAvaloniaRefAssemblies" AfterTargets="ResolveTargetingPackAssets" Condition="'$(AvaloniaAccessUnstablePrivateApis)'=='True'">
-    <ItemGroup>
-      <ReferencesToRemove Include="@(Reference)" Condition="'%(Reference.NuGetPackageId)' == 'Avalonia'" />
-    </ItemGroup>
-    <ItemGroup>
-      <Reference Remove="@(ReferencesToRemove)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="AddReferencePathsToRealAvaloniaAssemblies" BeforeTargets="CoreCompile" Condition="'$(AvaloniaAccessUnstablePrivateApis)'=='True'">
-    <ItemGroup>
-      <Reference Include="$(MSBuildThisFileDirectory)/lib/net6.0/*.dll"/>
-      <ReferencePath Include="$(MSBuildThisFileDirectory)/lib/net6.0/*.dll"/>
-      <ReferencePathWithRefAssemblies Include="$(MSBuildThisFileDirectory)/lib/net6.0/*.dll"/>
-    </ItemGroup>
-  </Target>
+  <Import Project="$(MSBuildThisFileDirectory)\AvaloniaPrivateApis.targets" />
 </Project>
diff --git a/packages/Avalonia/AvaloniaPrivateApis.targets b/packages/Avalonia/AvaloniaPrivateApis.targets
new file mode 100644
index 0000000000..fdf60a24e5
--- /dev/null
+++ b/packages/Avalonia/AvaloniaPrivateApis.targets
@@ -0,0 +1,21 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <FrameworkToUse Condition="@(ReferencesToRemove.First().Contains('net6.0')">net6.0</FrameworkToUse>
+    <FrameworkToUse Condition="@(ReferencesToRemove.First().Contains('netstandard2.0')">netstandard2.0</FrameworkToUse>
+  </PropertyGroup>
+  <Target Name="RemoveAvaloniaRefAssemblies" AfterTargets="ResolveTargetingPackAssets" Condition="'$(AvaloniaAccessUnstablePrivateApis)'=='True'">
+    <ItemGroup>
+      <ReferencesToRemove Include="@(Reference)" Condition="'%(Reference.NuGetPackageId)' == 'Avalonia'" />
+    </ItemGroup>
+    <ItemGroup>
+      <Reference Remove="@(ReferencesToRemove)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="AddReferencePathsToRealAvaloniaAssemblies" BeforeTargets="CoreCompile" Condition="'$(AvaloniaAccessUnstablePrivateApis)'=='True'">
+    <ItemGroup>
+      <Reference Include="$(MSBuildThisFileDirectory)/lib/@(FrameworkToUse)/*.dll"/>
+      <ReferencePath Include="$(MSBuildThisFileDirectory)/lib/@(FrameworkToUse)/*.dll"/>
+      <ReferencePathWithRefAssemblies Include="$(MSBuildThisFileDirectory)/lib/@(FrameworkToUse)/*.dll"/>
+    </ItemGroup>
+  </Target>
+</Project>