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. (#18937)

Backport of #18936.
  • Loading branch information
rolfbjarne authored Sep 7, 2023
1 parent c70a2f5 commit 14986e7
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

6 comments on commit 14986e7

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

💻 [CI Build] Tests on macOS M1 - Mac Ventura (13.0) passed 💻

All tests on macOS M1 - Mac Ventura (13.0) passed.

Pipeline on Agent
Hash: 14986e777453d9a11e236582566efeb925654a6a [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

💻 [CI Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻

All tests on macOS M1 - Mac Big Sur (11.5) passed.

Pipeline on Agent
Hash: 14986e777453d9a11e236582566efeb925654a6a [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

✅ API diff for current PR / commit

NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

.NET (No breaking changes)

✅ Generator diff

Generator diff is empty

Pipeline on Agent
Hash: 14986e777453d9a11e236582566efeb925654a6a [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

💻 [CI Build] Windows Integration Tests passed 💻

All Windows Integration Tests passed.

Pipeline on Agent
Hash: 14986e777453d9a11e236582566efeb925654a6a [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

📚 [CI Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMMINI-068.Ventura
Hash: 14986e777453d9a11e236582566efeb925654a6a [CI build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

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

🔥 [CI Build] Test results 🔥

Test results

❌ Tests failed on VSTS: simulator tests

0 tests crashed, 4 tests failed, 73 tests passed.

Failures

❌ dotnettests tests

1 tests failed, 0 tests passed.
  • DotNet tests: Failed (Execution failed with exit code 1)

Html Report (VSDrops) Download

❌ monotouch tests

3 tests failed, 10 tests passed.
  • monotouch-test/Mac [dotnet]/Debug [dotnet]: Failed (Test run failed.
    Tests run: 2765 Passed: 2680 Inconclusive: 3 Failed: 2 Ignored: 83)
  • monotouch-test/Mac [dotnet]/Debug (static registrar) [dotnet]: Failed (Test run failed.
    Tests run: 2762 Passed: 2678 Inconclusive: 3 Failed: 2 Ignored: 82)
  • monotouch-test/Mac [dotnet]/Release [dotnet]: Failed (Test run failed.
    Tests run: 2762 Passed: 2676 Inconclusive: 3 Failed: 2 Ignored: 84)

Html Report (VSDrops) Download

Successes

⚠️ bcl: No tests selected. Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 2 tests passed. Html Report (VSDrops) Download
✅ framework: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 1 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 4 tests passed. Html Report (VSDrops) Download
⚠️ install_source: No tests selected. Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 40 tests passed. Html Report (VSDrops) Download
⚠️ mac_binding_project: No tests selected. Html Report (VSDrops) Download
⚠️ mmp: No tests selected. Html Report (VSDrops) Download
⚠️ mononative: No tests selected. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
⚠️ mtouch: No tests selected. Html Report (VSDrops) Download
⚠️ xammac: No tests selected. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 14986e777453d9a11e236582566efeb925654a6a [CI build]

Please sign in to comment.