Skip to content

[release/10.0.1xx] [dotnet] Fix handling binding frameworks embedded in binding assemblies remotely. #24538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 4 commits into from
Jan 22, 2026
Merged

[release/10.0.1xx] [dotnet] Fix handling binding frameworks embedded in binding assemblies remotely. #24538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0ea0c0
[dotnet] Fix handling binding frameworks embedded in binding assembli…
rolfbjarne Jan 15, 2026
c2600bd
tweaks
rolfbjarne Jan 19, 2026
c48e56b
No SetupOSSpecificProps target.
rolfbjarne Jan 19, 2026
f157327
Revert "No SetupOSSpecificProps target."
rolfbjarne Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion msbuild/Xamarin.MacDev.Tasks/Tasks/FilterStaticFrameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,16 @@ public IEnumerable<ITaskItem> GetAdditionalItemsToBeCopied ()
if (FrameworkToPublish is not null) {
foreach (var item in FrameworkToPublish) {
var fw = item.ItemSpec;
var finfo = new FileInfo (fw);
// Copy all the files from the framework to the mac (copying only the executable won't work if it's just a symlink to elsewhere)
if (File.Exists (fw))
if (finfo.Exists) {
if (finfo.Length == 0) {
// an empty file is most likely an output file from the Mac, so don't overwrite the corresponding file on the Mac with the empty output file from Windows
Log.LogMessage (MessageImportance.Low, "Not copying {0} to the Mac, it's an empty file.", fw);
continue;
}
fw = Path.GetDirectoryName (fw);
}
if (!Directory.Exists (fw))
continue;
foreach (var file in Directory.EnumerateFiles (fw, "*.*", SearchOption.AllDirectories)) {
Copy link

Copilot AI Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GetAdditionalItemsToBeCopied still yields every file in the framework directory without filtering out zero-length files. If the Windows side contains placeholder/empty files inside the framework directory, they will still be copied to the Mac and can overwrite non-empty files there. Consider skipping any enumerated file where new FileInfo (file).Length == 0 (and/or reusing the same empty-file logic for each yielded file).

Suggested change
foreach (var file in Directory.EnumerateFiles (fw, "*.*", SearchOption.AllDirectories)) {
foreach (var file in Directory.EnumerateFiles (fw, "*.*", SearchOption.AllDirectories)) {
var fileInfo = new FileInfo (file);
if (fileInfo.Length == 0) {
// an empty file is most likely an output file from the Mac, so don't overwrite the corresponding file on the Mac with the empty output file from Windows
Log.LogMessage (MessageImportance.Low, "Not copying {0} to the Mac, it's an empty file.", file);
continue;
}

Copilot uses AI. Check for mistakes.
Expand Down
11 changes: 10 additions & 1 deletion msbuild/Xamarin.MacDev.Tasks/Tasks/GetFullPaths.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,16 @@ bool ExecuteLocally ()
return !Log.HasLoggedErrors;
}

public bool ShouldCopyToBuildServer (ITaskItem item) => true;
public bool ShouldCopyToBuildServer (ITaskItem item)
{
var finfo = new FileInfo (item.ItemSpec);
if (finfo.Exists && finfo.Length == 0) {
// an empty file is most likely an output file from the Mac, so don't overwrite the corresponding file on the Mac with the empty output file from Windows
Log.LogMessage (MessageImportance.Low, "Not copying {0} to the Mac, it's an empty file.", item.ItemSpec);
return false;
}
return true;
}

public bool ShouldCreateOutputFile (ITaskItem item) => false;

Expand Down
2 changes: 1 addition & 1 deletion tests/bindings-framework-test/dotnet/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<SignAssembly>True</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\..\product.snk</AssemblyOriginatorKeyFile>
<AssemblyName>bindings-framework-test</AssemblyName>
<NoBindingEmbedding>true</NoBindingEmbedding>
<NoBindingEmbedding Condition="'$(NoBindingEmbedding)' == ''">true</NoBindingEmbedding>

<RootTestsDirectory>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\..'))</RootTestsDirectory>
<TestLibrariesDirectory>$(RootTestsDirectory)\test-libraries</TestLibrariesDirectory>
Expand Down
1 change: 1 addition & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/ApiDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
using Foundation;
8 changes: 8 additions & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/MacCatalyst/BindingWithEmbeddedFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>

1 change: 1 addition & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/MacCatalyst/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
8 changes: 8 additions & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/MyClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System;
namespace BindingWithEmbeddedFramework {
public class MyClass {
public MyClass ()
{
}
}
}
8 changes: 8 additions & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/StructsAndEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System.Runtime.InteropServices;

namespace BindingWithEmbeddedFramework {
public static class CFunctions {
[DllImport ("XTest.framework/XTest")]
public static extern int theUltimateAnswer ();
}
}
8 changes: 8 additions & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/iOS/BindingWithEmbeddedFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>

1 change: 1 addition & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/iOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
8 changes: 8 additions & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/macOS/BindingWithEmbeddedFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-macos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>

1 change: 1 addition & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/macOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
15 changes: 15 additions & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<IsBindingProject>true</IsBindingProject>
<NoBindingEmbedding>false</NoBindingEmbedding>
</PropertyGroup>

<Import Project="../../common/shared-dotnet.csproj" />

<ItemGroup>
<ObjcBindingApiDefinition Include="../ApiDefinition.cs" />
<ObjcBindingCoreSource Include="../StructsAndEnums.cs" />
<NativeReference Include="../../../test-libraries/.libs/$(NativeLibName)/XTest.framework" Kind="Framework" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/shared.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
TOP=../../../..
include $(TOP)/tests/common/shared-dotnet.mk
8 changes: 8 additions & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/tvOS/BindingWithEmbeddedFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-tvos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>

1 change: 1 addition & 0 deletions tests/dotnet/BindingWithEmbeddedFramework/tvOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
19 changes: 19 additions & 0 deletions tests/dotnet/EmbeddedFrameworkInBindingProjectApp/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Runtime.InteropServices;

using Foundation;

namespace EmbeddedFrameworkInBindingProjectApp {
public class Program {
static int Main (string [] args)
{
Console.WriteLine ($"Embedded framework: {BindingWithEmbeddedFramework.CFunctions.theUltimateAnswer ()}");

GC.KeepAlive (typeof (NSObject)); // prevent linking away the platform assembly

Console.WriteLine (Environment.GetEnvironmentVariable ("MAGIC_WORD"));

return 0;
}
}
}
7 changes: 7 additions & 0 deletions ...eddedFrameworkInBindingProjectApp/MacCatalyst/EmbeddedFrameworkInBindingProjectApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-maccatalyst</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/EmbeddedFrameworkInBindingProjectApp/MacCatalyst/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
7 changes: 7 additions & 0 deletions ...tnet/EmbeddedFrameworkInBindingProjectApp/iOS/EmbeddedFrameworkInBindingProjectApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-ios</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/EmbeddedFrameworkInBindingProjectApp/iOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
7 changes: 7 additions & 0 deletions ...et/EmbeddedFrameworkInBindingProjectApp/macOS/EmbeddedFrameworkInBindingProjectApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-macos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/EmbeddedFrameworkInBindingProjectApp/macOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
20 changes: 20 additions & 0 deletions tests/dotnet/EmbeddedFrameworkInBindingProjectApp/shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<OutputType>Exe</OutputType>

<ApplicationTitle>EmbeddedFrameworkInBindingProjectApp</ApplicationTitle>
<ApplicationId>com.xamarin.embeddedframeworkinbindingprojectapp</ApplicationId>
<ApplicationVersion>1.0</ApplicationVersion>
</PropertyGroup>

<Import Project="../../common/shared-dotnet.csproj" />

<ItemGroup>
<ProjectReference Include="..\..\BindingWithEmbeddedFramework\$(_PlatformName)\BindingWithEmbeddedFramework.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Include="../*.cs" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions tests/dotnet/EmbeddedFrameworkInBindingProjectApp/shared.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
TOP=../../../..
TESTNAME=EmbeddedFrameworkInBindingProjectApp
include $(TOP)/tests/common/shared-dotnet.mk
7 changes: 7 additions & 0 deletions ...net/EmbeddedFrameworkInBindingProjectApp/tvOS/EmbeddedFrameworkInBindingProjectApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net$(BundledNETCoreAppTargetFrameworkVersion)-tvos</TargetFramework>
</PropertyGroup>
<Import Project="..\shared.csproj" />
</Project>
1 change: 1 addition & 0 deletions tests/dotnet/EmbeddedFrameworkInBindingProjectApp/tvOS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../shared.mk
19 changes: 19 additions & 0 deletions tests/dotnet/UnitTests/WindowsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,25 @@ public void PluralRuntimeIdentifiersWithRemoteMac (ApplePlatform platform, strin
DotNetProjectTest.PluralRuntimeIdentifiersImpl (platform, runtimeIdentifiers, properties);
}

[Category ("RemoteWindows")]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64")]
public void BuildEmbeddedFrameworkInBindingProjectApp (ApplePlatform platform, string runtimeIdentifiers)
{
var project = "EmbeddedFrameworkInBindingProjectApp";
var configuration = "Debug";

Configuration.IgnoreIfIgnoredPlatform (platform);
Configuration.AssertRuntimeIdentifiersAvailable (platform, runtimeIdentifiers);
Configuration.IgnoreIfNotOnWindows ();

var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifiers, platform: platform, out var appPath, configuration: configuration);
Clean (project_path);

var properties = GetDefaultProperties (runtimeIdentifiers);

DotNet.AssertBuild (project_path, properties, timeout: TimeSpan.FromMinutes (15));
}

static void AssertWarningsEqual (IList<string> expected, IList<string> actual, string message)
{
if (expected.Count == actual.Count) {
Expand Down
Loading