Skip to content

Fix URFW auto-init reference to EnsureIsLoaded()#2501

Merged
DrusTheAxe merged 1 commit intomainfrom
user/drustheaxe/EnsureIsLoaded-fix-name
May 12, 2022
Merged

Fix URFW auto-init reference to EnsureIsLoaded()#2501
DrusTheAxe merged 1 commit intomainfrom
user/drustheaxe/EnsureIsLoaded-fix-name

Conversation

@DrusTheAxe
Copy link
Copy Markdown
Member

URFW auto-initializers were incorrectly referencing UndockedRegFreeWinRT_EnsureIsLoaded() when it should have been WindowsAppRuntime_EnsureIsLoaded(). This was usually harmless to the C++ auto-init but fatal to C# :-(

@DrusTheAxe DrusTheAxe added bug Something isn't working area-UndockedRegFreeWinRT Topics related to Undocked RegFree WinRT in Windows App SDK labels May 12, 2022
@DrusTheAxe DrusTheAxe self-assigned this May 12, 2022
@ghost ghost added the needs-triage label May 12, 2022
@DrusTheAxe
Copy link
Copy Markdown
Member Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@DrusTheAxe DrusTheAxe enabled auto-merge (squash) May 12, 2022 07:54
@DrusTheAxe DrusTheAxe merged commit 883570f into main May 12, 2022
@DrusTheAxe DrusTheAxe deleted the user/drustheaxe/EnsureIsLoaded-fix-name branch May 12, 2022 08:52
sachintaMSFT added a commit that referenced this pull request May 12, 2022
…elf-contained (#2502)

* Fix UndockedRegFreeWinRT auto-initializer issues (#2476)

* Fix bad filename

* No precompiledheaders when compiling the auto-initializer

* Some refinements on the UndockedRegFreeWinRT self-contained and auto-initialization support (#2493)

* UrfwInitialize() didn't report if ExtRoLoadCatalog() errored and returned a failing HRESULT (only trapped thrown exceptions, but the implementation does both) (#2498)

* Remove C# auto-initialization check for reflection (#2500)

* Remove the 'if (Assembly.GetEntryAssembly() != Assembly.GetExecutingAssembly()) { return; }' shortcircuit as it catches loading for reflection AND for common test cases e.g. 'te.exe foo.dll' as auto-initialization isn't restricted to exes (i.e. it gets compiled into foo.dll) and then Entry!=Executing. Revert this for now and restore later when #2456 is addressed (by restrcting auto-init to only compile into exes)

* Fix typo

* Fix URFW auto-init reference to EnsureIsLoaded() (#2501)

Co-authored-by: Howard Kapustein <howardk@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-UndockedRegFreeWinRT Topics related to Undocked RegFree WinRT in Windows App SDK bug Something isn't working needs-triage

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants