Skip to content

[publish] Copy dSYMs before disconnecting remote builds #26905

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

Open
rolfbjarne wants to merge 4 commits into
base: main
Choose a base branch
from
+82 −1
Open

[publish] Copy dSYMs before disconnecting remote builds #26905

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
cbb48ce
[publish] Copy dSYMs before disconnecting remote builds
rolfbjarne Oct 16, 2026
7cd7735
[publish] Simplify dSYM ordering with post-processing dependency
rolfbjarne Oct 16, 2026
9ad3814
[tests] Validate XML roots in dSYM ordering regression
rolfbjarne Oct 16, 2026
62ff35e
[publish] Remove redundant dSYM copy dependency
rolfbjarne Oct 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
6 changes: 5 additions & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="_PrePublish">
<PropertyGroup>
<_PostProcessAppBundleDependsOn>
$(_PostProcessAppBundleDependsOn);
_CopyDSymToPublishDirectory;
</_PostProcessAppBundleDependsOn>
Comment thread
rolfbjarne marked this conversation as resolved.
<BuildIpa Condition="'$(BuildIpa)' == '' And '$(SdkIsMobile)' == 'true'">true</BuildIpa>
<CreatePackage Condition="'$(CreatePackage)' == '' And '$(SdkIsDesktop)' == 'true'">true</CreatePackage>

Expand All @@ -20,7 +24,7 @@
Condition="$(RuntimeIdentifiers.Contains('iossimulator-')) Or $(RuntimeIdentifiers.Contains('tvossimulator-'))"
/>
</Target>
<Target Name="Publish" DependsOnTargets="_PrePublish;GetApplicationArtifacts;_CopyDSymToPublishDirectory" Returns="@(ApplicationArtifact)">
<Target Name="Publish" DependsOnTargets="_PrePublish;GetApplicationArtifacts" Returns="@(ApplicationArtifact)">
Comment thread
rolfbjarne marked this conversation as resolved.
<Message Importance="high" Text="Created the package: $(IpaPackagePath)" Condition="'$(BuildIpa)' == 'true' And '$(SdkIsMobile)' == 'true'" />
<Message Importance="high" Text="Created the package: $(PkgPackagePath)" Condition="'$(CreatePackage)' == 'true' And '$(SdkIsDesktop)' == 'true'" />
</Target>
Expand Down
77 changes: 77 additions & 0 deletions tests/dotnet/UnitTests/PostBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.IO.Compression;
using System.Text.Json;
using System.Xml.Linq;

using Microsoft.Build.Framework;
using Microsoft.Build.Logging.StructuredLogger;
Expand Down Expand Up @@ -801,6 +802,82 @@ public void PublishDSymToPublishDirectory (ApplePlatform platform, string runtim
}
}

[Test]
[Combinatorial]
public void PublishDSymTargetOrdering ([Values ("Build", "Publish")] string target, [Values] bool remote, [Values] bool copyDSym)
{
var directory = Cache.CreateTemporaryDirectory ();
var publishTargets = XDocument.Load (Path.Combine (Configuration.SourceRoot, "dotnet", "targets", "Xamarin.Shared.Sdk.Publish.targets"));
var publishRoot = publishTargets.Root ?? throw new InvalidOperationException ("Missing publish targets root.");
var ns = publishRoot.Name.Namespace;
var sharedTargets = XDocument.Load (Path.Combine (Configuration.SourceRoot, "msbuild", "Xamarin.Shared", "Xamarin.Shared.targets"));
var sharedRoot = sharedTargets.Root ?? throw new InvalidOperationException ("Missing shared targets root.");
var postProcessDependencies = sharedRoot.Elements (ns + "PropertyGroup").Single (v => v.Element (ns + "_PostProcessAppBundleDependsOn") is not null);
publishRoot.AddFirst (new XElement (postProcessDependencies));
publishRoot.Add (new XElement (sharedRoot.Elements (ns + "Target").Single (v => (string?) v.Attribute ("Name") == "_PostProcessAppBundle")));
var dependencies = postProcessDependencies.Elements (ns + "_PostProcessAppBundleDependsOn").Single ().Value.Split (';')
.Select (v => v.Trim ())
.Where (v => v.Length > 0 && !v.StartsWith ("$(", StringComparison.Ordinal) && v != "_GenerateDSym");
foreach (var dependency in dependencies)
publishRoot.Add (new XElement (ns + "Target", new XAttribute ("Name", dependency)));
var copyTarget = publishRoot.Elements (ns + "Target").Single (v => (string?) v.Attribute ("Name") == "_CopyDSymToPublishDirectory");
// Keep the real target graph and conditions, replacing only the session-aware task bodies.
copyTarget.ReplaceNodes (
new XElement (ns + "Error", new XAttribute ("Condition", "'$(_DSymGenerated)' != 'true'"), new XAttribute ("Text", "dSYM copy ran before symbol generation.")),
new XElement (ns + "Error", new XAttribute ("Condition", "'$(IsRemoteBuild)' == 'true' And '$(_Connected)' != 'true'"), new XAttribute ("Text", "dSYM copy ran after disconnect.")),
new XElement (ns + "PropertyGroup", new XElement (ns + "_CopyCount", "$(_CopyCount)x")));
var publishTargetsPath = Path.Combine (directory, "Publish.targets");
publishTargets.Save (publishTargetsPath);

var projectPath = Path.Combine (directory, "Ordering.proj");
var messagingTargetsPath = Path.Combine (Configuration.SourceRoot, "msbuild", "Xamarin.iOS.Tasks.Windows", "Xamarin.Messaging.targets");
File.WriteAllText (projectPath, $"""
<Project>
<PropertyGroup>
<_TaskAssemblyName>$(MSBuildToolsPath)/Microsoft.Build.Tasks.Core.dll</_TaskAssemblyName>
<BuildDependsOn>_PostProcessAppBundle</BuildDependsOn>
<_CanOutputAppBundle>true</_CanOutputAppBundle>
<IsMacEnabled>true</IsMacEnabled>
</PropertyGroup>
<Import Project="{messagingTargetsPath}" Condition="'$(IsRemoteBuild)' == 'true'" />
<Import Project="{publishTargetsPath}" />
<Target Name="Restore" />
<Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
<Target Name="GetApplicationArtifacts" DependsOnTargets="Build" />
<Target Name="_GenerateBundleName" />
<Target Name="_GenerateBuildSessionId" />
<Target Name="_VerifyBuildSignature" />
<Target Name="_GenerateDSym">
<PropertyGroup>
<_DSymGenerated>true</_DSymGenerated>
</PropertyGroup>
</Target>
<Target Name="_SayHello">
<PropertyGroup>
<_Connected>true</_Connected>
</PropertyGroup>
</Target>
<Target Name="_SayGoodbye">
<PropertyGroup>
<_Connected>false</_Connected>
</PropertyGroup>
</Target>
<Target Name="_AssertOrdering">
<Error Condition="'$(_CopyCount)' != '$(ExpectedCopyCount)'"
Text="Unexpected dSYM copy count: '$(_CopyCount)', expected '$(ExpectedCopyCount)'." />
<Error Condition="'$(IsRemoteBuild)' == 'true' And '$(_Connected)' != 'false'" Text="Build did not disconnect." />
</Target>
</Project>
""");

var properties = new Dictionary<string, string> {
["IsRemoteBuild"] = remote.ToString (),
["CopyDSYMToPublishDirectory"] = copyDSym.ToString (),
["ExpectedCopyCount"] = target == "Publish" && copyDSym ? "x" : "",
};
DotNet.AssertBuild (projectPath, properties, target: $"{target};_AssertOrdering");
}

static ITaskItem AssertApplicationArtifact (string binLogPath, string path, ApplePlatform platform, string packageFormat, bool isDirectory)
{
var outputs = GetItems (binLogPath, "ApplicationArtifact");
Expand Down
Loading