Skip to content
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

Jump to bottom

[net9.0] Merge main into net9.0. #20654

Merged
merged 9 commits into from
May 28, 2024
Merged

[net9.0] Merge main into net9.0. #20654

merged 9 commits into from
May 28, 2024

Conversation

rolfbjarne
Copy link
Member

No description provided.

rolfbjarne and others added 9 commits May 23, 2024 16:21
@rolfbjarne
[runtime] Add support for additional type encodings. Fixes dotnet#18562…
536f0a1 
…. (dotnet#20521)

Fixes dotnet#18562.
@rolfbjarne @mandel-macaque @dalexsoto
[bgen] Add support for binding constructors in protocols. Fixes dotne…
f78af68 
…t#14039. (dotnet#20583)

Add support for binding constructors in protocols.

Given the api definition:

```cs
[Protocol]
public interface Protocol {
    [Abstract]
    [Export ("init")]
    IntPtr Constructor ();

    [Export ("initWithValue:")]
    IntPtr Constructor (IntPtr value);

    [BindAs ("Create")]
    [Export ("initWithPlanet:")]
    IntPtr Constructor ();
}
```

we're binding it like this:

```cs
[Protocol ("Protocol")]
public interface IProtocol : INativeObject {
    [Export ("init")]
    public static T CreateInstance<T> () where T: NSObject, IProtocol { /* default implementation */ }

    [Export ("initWithValue:")]
    public static T CreateInstance<T> () where T: NSObject, IProtocol { /* default implementation */ }

    [Export ("initWithPlanet:")]
    public static T Create<T> () where T: NSObject, IProtocol { /* default implementation */ }
}
```

Also add documentation and tests.

Fixes dotnet#14039.

---------

Co-authored-by: Manuel de la Pena <[email protected]>
Co-authored-by: Alex Soto <[email protected]>
@rolfbjarne
[src] Fix accidental xml documentation comments. (dotnet#20637)
b59ff7c 
In C# there are two ways to specify that a comment is an xml documentation comment:

1. The single-line '///''
2. The multi-line '/** ... **/'

TIL about the second one, when my upcoming tool to migrate API documentation
to xml comments complained that these members already had an xml comment.

This seems entirely accidental, so just remove/rewrite these few comments.

Also fix a few other typos, grammar mistakes, etc.
@rolfbjarne
[Network] Make P/Invokes in NWProtocol* have blittable signatures. (d…
0e2fec8 
…otnet#20638)

Contributes towards dotnet#15684.
@rolfbjarne
[monotouch-test] Be a bit more lenient with expected results in CGIma…
475ef60 
…geSourceTest. (dotnet#20640)

The exact results seem to depend on a lot of factors, so just accept them all.
@rolfbjarne
[AudioUnit] Make P/Invokes in AUGraph.cs have blittable signatures. (d…
85ff5f7 
…otnet#20636)

Contributes towards dotnet#15684.
@rolfbjarne
[msbuild] Version the Xamarin.Localization.MSBuild assembly. Fixes do…
7b559b1 
…tnet#20062. (dotnet#20623)

Version the Xamarin.Localization.MSBuild assembly correctly (instead of
hardcoding a 1.0.0 version - implicitly so because no version was set), so
that we can load multiple versions of the assembly into the same process.

Fixes dotnet#20062.
@rolfbjarne
[GameController] GCMouse doesn't conform to NSCoding/NSSecureCoding. (d…
6d764a8 
…otnet#20641)

GCMouse doesn't conform to NSCoding/NSSecureCoding, so fix the API definition.
Since this would be a breaking change, also add compat code to preserve binary
compatibility.

Fixes this test:

    Introspection.MacApiSelectorTest
        [FAIL] InstanceMethods :   1 errors found in 33428 instance selector validated:
            Selector not found for GameController.GCMouse : encodeWithCoder: in Void EncodeTo(Foundation.NSCoder) on GameController.GCMouse
                Expected: 0
                But was:  1
        [FAIL] Selector not found for GameController.GCMouse : encodeWithCoder: in Void EncodeTo(Foundation.NSCoder) on GameController.GCMouse
             at Introspection.ApiSelectorTest.InstanceMethods() in /Users/rolf/work/maccore/net9.0/xamarin-macios/tests/introspection/ApiSelectorTest.cs:line 1121
@rolfbjarne
[net9.0] Merge main into net9.0.
8c39f79
@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS M1 - Mac Ventura (13) passed 💻

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

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS M1 - Mac Monterey (12) passed 💻

✅ All tests on macOS M1 - Mac Monterey (12) passed.

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [CI Build] Windows Integration Tests failed ❌

❌ Failed ❌

Pipeline on Agent
Hash: 8c39f793ac24b7d18250cd02709b95b96ff041c4 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
.NET (No breaking changes)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
Legacy Xamarin (stable) vs .NET

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 8c39f793ac24b7d18250cd02709b95b96ff041c4 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS X64 - Mac Sonoma (14) passed 💻

✅ All tests on macOS X64 - Mac Sonoma (14) passed.

Pipeline on Agent
Hash: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: test results.

🎉 All 172 tests passed 🎉

Tests counts

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ install-source: All 1 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 7 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. Html Report (VSDrops) Download
✅ mac-binding-project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 6 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (watchOS): All 4 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: [PR build]

@rolfbjarne
Copy link
Member Author

Test failures are unrelated (#19926).

@rolfbjarne rolfbjarne merged commit e4a754a into dotnet:net9.0 May 28, 2024
61 of 63 checks passed
@rolfbjarne rolfbjarne deleted the bump-main-in-net9.0-2024-05-28 branch May 28, 2024 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalexsoto dalexsoto Awaiting requested review from dalexsoto dalexsoto is a code owner

@mandel-macaque mandel-macaque Awaiting requested review from mandel-macaque mandel-macaque is a code owner

@emaf emaf Awaiting requested review from emaf emaf is a code owner

@mauroa mauroa Awaiting requested review from mauroa mauroa is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rolfbjarne @vs-mobiletools-engineering-service2