[RGen] Add the new added methods to smart enums. #22250

mandel-macaque · 2025-02-26T17:42:32Z

In order to simplify the BindAs/BindFrom code, new methods were added to the smart enums generated by bgen. We have to do the same in rgen.

In order to simplify the BindAs/BindFrom code, nes methods were added to the smart enums generated by bgen. We have to do the same in rgen.

github-actions · 2025-02-26T17:46:40Z

⚠️ Your code has been reformatted. ⚠️

If this is not desired, add the actions-disable-autoformat label, and revert the reformatting commit.

If files unrelated to your change were modified, try reverting the reformatting commit + merging with the target branch (and push those changes).

rolfbjarne · 2025-02-26T18:25:25Z

src/rgen/Microsoft.Macios.Generator/Emitters/EnumEmitter.cs

+
+		// get value from a handle, this is a helper method used in the BindAs bindings.
+		using (var getValueFromHandle =
+			   classBlock.CreateBlock ($"public static {binding.Name} GetValueFromHandle (NativeHandle handle)",


Can this be internal instead of public? That way we don't have to worry about API diffs, etc.

Can it when we are using it for bindings? I don't think so right?

That depends on where these methods are going to be used. Is it always going to be from the same assembly?

well, this are a diff assembly if bgen is used to generate the bindings for a client or third party. If they use BindAs in their code, they'll need this to be public.

I think we can just use GetValue, it'll be an overload of the other `GetValue method:

Suggested change

classBlock.CreateBlock ($"public static {binding.Name} GetValueFromHandle (NativeHandle handle)",

classBlock.CreateBlock ($"public static {binding.Name} GetValue (NativeHandle handle)",

Let me land this and change it in bgen too. Because bgen is already doing GetValueFromHandle. Sounds good?

src/rgen/Microsoft.Macios.Generator/Emitters/EnumEmitter.cs

vs-mobiletools-engineering-service2 · 2025-02-27T21:54:03Z

✅ [PR Build #0dd0b98] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T21:54:08Z

✅ [PR Build #0dd0b98] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T22:00:07Z

✅ [PR Build #0dd0b98] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T22:13:52Z

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

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

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T22:14:38Z

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

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

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T22:15:53Z

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

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

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T22:16:15Z

💻 [PR Build #0dd0b98] Tests on macOS arm64 - Mac Sequoia (15) passed 💻

✅ All tests on macOS arm64 - Mac Sequoia (15) passed.

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T22:25:47Z

✅ API diff for current PR / commit

.NET ( No breaking changes )

iOS: vsdrops gist ( No breaking changes )
tvOS: vsdrops gist ( No breaking changes )
MacCatalyst: vsdrops gist ( No breaking changes )
macOS: vsdrops gist ( No breaking changes )

❗ API diff vs stable (Breaking changes)

.NET ( ❗ Breaking changes ❗ )

iOS: vsdrops gist ( ❗ Breaking changes ❗ )
tvOS: vsdrops gist ( ❗ Breaking changes ❗ )
MacCatalyst: vsdrops gist ( ❗ Breaking changes ❗ )
macOS: vsdrops gist ( ❗ Breaking changes ❗ )

ℹ️ Generator diff

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

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T22:31:39Z

💻 [CI Build #0dd0b98] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

vs-mobiletools-engineering-service2 · 2025-02-27T23:34:03Z

🔥 [CI Build #0dd0b98] Test results 🔥

Test results

❌ Tests failed on VSTS: test results

0 tests crashed, 1 tests failed, 111 tests passed.

Failures

❌ dotnettests tests (MacCatalyst)

1 tests failed, 0 tests passed.

DotNet tests: Failed (Execution failed with exit code 1)

Html Report (VSDrops) Download

Successes

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): 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 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 5 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. Html Report (VSDrops) Download
✅ introspection: All 4 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 8 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 9 tests passed. Html Report (VSDrops) Download
✅ monotouch (tvOS): All 8 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. 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: 0dd0b987633ec9e111e2757705c00bd1641b3a77 [PR build]

rolfbjarne · 2025-02-28T08:22:08Z

src/rgen/Microsoft.Macios.Generator/Emitters/EnumEmitter.cs

+
+		// get value from a handle, this is a helper method used in the BindAs bindings.
+		using (var getValueFromHandle =
+			   classBlock.CreateBlock ($"public static {binding.Name} GetValueFromHandle (NativeHandle handle)",


I think we can just use GetValue, it'll be an overload of the other `GetValue method:

Suggested change

classBlock.CreateBlock ($"public static {binding.Name} GetValueFromHandle (NativeHandle handle)",

classBlock.CreateBlock ($"public static {binding.Name} GetValue (NativeHandle handle)",

mandel-macaque and others added 2 commits February 26, 2025 12:41

[RGen] Add the new added methods to smart enums.

77217d9

In order to simplify the BindAs/BindFrom code, nes methods were added to the smart enums generated by bgen. We have to do the same in rgen.

Auto-format source code

022e35e

This comment has been minimized.

Sign in to view

rolfbjarne reviewed Feb 26, 2025

View reviewed changes

mandel-macaque commented Feb 26, 2025

View reviewed changes

src/rgen/Microsoft.Macios.Generator/Emitters/EnumEmitter.cs Outdated Show resolved Hide resolved

Ignore null.

d6db2e7

dalexsoto approved these changes Feb 26, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

Merge branch 'main' into dev/mandel/add-new-methods-smart-enum

5c1eb5e

This comment has been minimized.

Sign in to view

Fix failing tests.

0dd0b98

rolfbjarne approved these changes Feb 28, 2025

View reviewed changes

mandel-macaque merged commit c31fe77 into main Feb 28, 2025
45 of 47 checks passed

mandel-macaque deleted the dev/mandel/add-new-methods-smart-enum branch February 28, 2025 20:51

	classBlock.CreateBlock ($"public static {binding.Name} GetValueFromHandle (NativeHandle handle)",
	classBlock.CreateBlock ($"public static {binding.Name} GetValue (NativeHandle handle)",

[RGen] Add the new added methods to smart enums. #22250

[RGen] Add the new added methods to smart enums. #22250

Uh oh!

Conversation

mandel-macaque commented Feb 26, 2025 • edited by rolfbjarne Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Feb 26, 2025

⚠️ Your code has been reformatted. ⚠️

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rolfbjarne Feb 26, 2025

Choose a reason for hiding this comment

Uh oh!

mandel-macaque Feb 26, 2025

Choose a reason for hiding this comment

Uh oh!

rolfbjarne Feb 26, 2025

Choose a reason for hiding this comment

Uh oh!

mandel-macaque Feb 27, 2025

Choose a reason for hiding this comment

Uh oh!

rolfbjarne Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

mandel-macaque Feb 28, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

vs-mobiletools-engineering-service2 commented Feb 27, 2025

✅ [PR Build #0dd0b98] Build passed (Detect API changes) ✅

Uh oh!

vs-mobiletools-engineering-service2 commented Feb 27, 2025

✅ [PR Build #0dd0b98] Build passed (Build packages) ✅

Uh oh!

vs-mobiletools-engineering-service2 commented Feb 27, 2025

✅ [PR Build #0dd0b98] Build passed (Build macOS tests) ✅

Uh oh!

vs-mobiletools-engineering-service2 commented Feb 27, 2025

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

Uh oh!

vs-mobiletools-engineering-service2 commented Feb 27, 2025

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

Uh oh!

vs-mobiletools-engineering-service2 commented Feb 27, 2025

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

Uh oh!

vs-mobiletools-engineering-service2 commented Feb 27, 2025

💻 [PR Build #0dd0b98] Tests on macOS arm64 - Mac Sequoia (15) passed 💻

Uh oh!

vs-mobiletools-engineering-service2 commented Feb 27, 2025

✅ API diff for current PR / commit

❗ API diff vs stable (Breaking changes)

ℹ️ Generator diff

Uh oh!

mandel-macaque commented Feb 26, 2025 •

edited by rolfbjarne

Loading