Skip to content

Commit

Permalink
[release/7.0.3xx] [tools] Skip more types and namespaces when using X…
Browse files Browse the repository at this point in the history
…code 15.

Makes the iTravel submission test compile successfully.

Backport of dotnet#18936.
  • Loading branch information
rolfbjarne committed Sep 6, 2023
1 parent c70a2f5 commit 571fa1d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
5 changes: 5 additions & 0 deletions tools/common/Frameworks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,11 @@ static void Gather (Application app, AssemblyDefinition product_assembly, HashSe

static bool FilterFrameworks (Application app, Framework framework)
{
if (framework.Name == "NewsstandKit" && Driver.XcodeVersion.Major >= 15) {
Driver.Log (3, "Not linking with the framework {0} because it's not available when using Xcode 15+.", framework.Name);
return false;
}

switch (app.Platform) {
#if !NET
// CHIP has been removed in Xcode 14 Beta 5 in favor of Matter
Expand Down
2 changes: 1 addition & 1 deletion tools/common/StaticRegistrar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2865,7 +2865,7 @@ void Specialize (AutoIndentStringBuilder sb, out string initialization_method)
continue;
}

if (@class.Type.Is ("PassKit", "PKDisbursementAuthorizationControllerDelegate")) {
if (@class.Type.Is ("PassKit", "PKDisbursementAuthorizationControllerDelegate") || @class.Type.Is ("PassKit", "IPKDisbursementAuthorizationControllerDelegate")) {
exceptions.Add (ErrorHelper.CreateWarning (4189, $"The class '{@class.Type.FullName}' will not be registered it has been removed from the {App.Platform} SDK."));
continue;
}
Expand Down
6 changes: 6 additions & 0 deletions tools/common/Target.cs
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,12 @@ public void GatherFrameworks ()
continue;
}
break;
case "NewsstandKit":
if (Driver.XcodeVersion.Major >= 15) {
Driver.Log (3, "Not linking with the framework {0} because it's not available when using Xcode 15+.", framework.Name);
continue;
}
break;
default:
if (App.IsSimulatorBuild && !App.IsFrameworkAvailableInSimulator (framework.Name)) {
if (App.AreAnyAssembliesTrimmed) {
Expand Down

0 comments on commit 571fa1d

Please sign in to comment.