From 01123bfb0e10f87d43e09d8e792152dc5fc5aa2c Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 19 Dec 2022 18:37:10 +0100
Subject: [PATCH] [tests] Fix the
 AppWithNativeDynamicLibrariesInPackageReference to work when not all
 platforms are enabled. (#17081)

---
 tests/dotnet/UnitTests/ProjectTest.cs         |   1 +
 ...cLibrariesInRuntimesNativeDirectory.csproj | 127 ++++++++++--------
 2 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index 1241b02420..c23f4ce20a 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -1164,6 +1164,7 @@ namespace Xamarin.Tests {
 		public void BuildAndExecuteAppWithNativeDynamicLibrariesInPackageReference (ApplePlatform platform, string runtimeIdentifier)
 		{
 			var project = "AppWithNativeDynamicLibrariesInPackageReference";
+			Configuration.IgnoreIfIgnoredPlatform (platform);
 
 			var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifier, platform: platform, out var appPath);
 			Clean (project_path);
diff --git a/tests/test-libraries/nugets/DynamicLibrariesInRuntimesNativeDirectory/DynamicLibrariesInRuntimesNativeDirectory.csproj b/tests/test-libraries/nugets/DynamicLibrariesInRuntimesNativeDirectory/DynamicLibrariesInRuntimesNativeDirectory.csproj
index 2a6a6e2873..b89a52fa78 100644
--- a/tests/test-libraries/nugets/DynamicLibrariesInRuntimesNativeDirectory/DynamicLibrariesInRuntimesNativeDirectory.csproj
+++ b/tests/test-libraries/nugets/DynamicLibrariesInRuntimesNativeDirectory/DynamicLibrariesInRuntimesNativeDirectory.csproj
@@ -12,58 +12,77 @@
     <TestFrameworksDirectory>$(RootTestDirectory)/test-libraries/frameworks</TestFrameworksDirectory>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!-- Dynamic library in native directory -->
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\macos\libtest.x86_64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>runtimes/osx-x64/native/libtest.dylib</PackagePath>
-    </Content>
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\macos\libtest.arm64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>runtimes/osx-arm64/native/libtest.dylib</PackagePath>
-    </Content>
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.x86_64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>runtimes/maccatalyst-x64/native/libtest.dylib</PackagePath>
-    </Content>
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.arm64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>runtimes/maccatalyst-arm64/native/libtest.dylib</PackagePath>
-    </Content>
-    <!-- Dynamic library in native subdirectory -->
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\macos\libtest.x86_64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>bin/osx-x64/libtest.dylib</PackagePath>
-    </Content>
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\macos\libtest.arm64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>bin/osx-arm64/libtest.dylib</PackagePath>
-    </Content>
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.x86_64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>bin/maccatalyst-x64/libtest.dylib</PackagePath>
-    </Content>
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.arm64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>bin/maccatalyst-arm64/libtest.dylib</PackagePath>
-    </Content>
-    <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.arm64.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <PackagePath>bin/maccatalyst-arm64/libtest2.dylib</PackagePath>
-    </Content>
-    <!-- Targets file -->
-    <Content Include="$(MSBuildThisFileDirectory)\Xamarin.Tests.DynamicLibrariesInRuntimesNativeDirectory.targets">
-      <Pack>true</Pack>
-      <PackagePath>build/Xamarin.Tests.DynamicLibrariesInRuntimesNativeDirectory.targets</PackagePath>
-    </Content>
-  </ItemGroup>
+  <Target Name="ComputeContent">
+    <ItemGroup>
+      <DotnetPlatforms Include="$(DOTNET_PLATFORMS)" />
+    </ItemGroup>
+    <PropertyGroup>
+      <iOS_Included Condition="@(DotnetPlatforms->AnyHaveMetadataValue('Identity', 'iOS'))">true</iOS_Included>
+      <tvOS_Included Condition="@(DotnetPlatforms->AnyHaveMetadataValue('Identity', 'tvOS'))">true</tvOS_Included>
+      <macOS_Included Condition="@(DotnetPlatforms->AnyHaveMetadataValue('Identity', 'macOS'))">true</macOS_Included>
+      <MacCatalyst_Included Condition="@(DotnetPlatforms->AnyHaveMetadataValue('Identity', 'MacCatalyst'))">true</MacCatalyst_Included>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- Dynamic library in native directory -->
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\macos\libtest.x86_64.dylib" Condition="'$(macOS_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>runtimes/osx-x64/native/libtest.dylib</PackagePath>
+      </Content>
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\macos\libtest.arm64.dylib" Condition="'$(macOS_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>runtimes/osx-arm64/native/libtest.dylib</PackagePath>
+      </Content>
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.x86_64.dylib" Condition="'$(MacCatalyst_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>runtimes/maccatalyst-x64/native/libtest.dylib</PackagePath>
+      </Content>
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.arm64.dylib" Condition="'$(MacCatalyst_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>runtimes/maccatalyst-arm64/native/libtest.dylib</PackagePath>
+      </Content>
+      <!-- Dynamic library in native subdirectory -->
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\macos\libtest.x86_64.dylib" Condition="'$(macOS_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>bin/osx-x64/libtest.dylib</PackagePath>
+      </Content>
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\macos\libtest.arm64.dylib" Condition="'$(macOS_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>bin/osx-arm64/libtest.dylib</PackagePath>
+      </Content>
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.x86_64.dylib" Condition="'$(MacCatalyst_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>bin/maccatalyst-x64/libtest.dylib</PackagePath>
+      </Content>
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.arm64.dylib" Condition="'$(MacCatalyst_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>bin/maccatalyst-arm64/libtest.dylib</PackagePath>
+      </Content>
+      <Content Include="$(RootTestDirectory)\test-libraries\.libs\maccatalyst\libtest.arm64.dylib" Condition="'$(MacCatalyst_Included)' == 'true'">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <Pack>true</Pack>
+        <PackagePath>bin/maccatalyst-arm64/libtest2.dylib</PackagePath>
+      </Content>
+      <!-- Targets file -->
+      <Content Include="$(MSBuildThisFileDirectory)\Xamarin.Tests.DynamicLibrariesInRuntimesNativeDirectory.targets">
+        <Pack>true</Pack>
+        <PackagePath>build/Xamarin.Tests.DynamicLibrariesInRuntimesNativeDirectory.targets</PackagePath>
+      </Content>
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <BeforePack>
+      ComputeContent;
+      $(BeforePack);
+    </BeforePack>
+  </PropertyGroup>
 </Project>