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.

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

The fix for 1256569 broke a test. Partial revert #1322

Merged
merged 1 commit into from
Jul 22, 2020

Conversation

UnityAlex
Copy link
Collaborator

@UnityAlex UnityAlex commented Jul 22, 2020

Reverting most of that change and breaking the CreateLocal -> WinRTFallback -> CreateLocal loop by calling GetLocalTimeZoneInfoWinRTFallback instead of accessing Local from within FindSystemTimeZoneByIdWinRTFallback fixes both issues.

Partial revert of: https://github.com/Unity-Technologies/mono/pull/1310/files

@UnityAlex UnityAlex force-pushed the unity-master-fix-xb1-timezone branch from 2623bd0 to 567e5f4 Compare July 22, 2020 18:35
@UnityAlex UnityAlex changed the title The fix for 1256569 doesn't work for xb1 because it relies on having … The fix for 1256569 broke a xb1 test. Partial revert Jul 22, 2020
@UnityAlex UnityAlex changed the title The fix for 1256569 broke a xb1 test. Partial revert The fix for 1256569 broke a test. Partial revert Jul 22, 2020
@UnityAlex UnityAlex force-pushed the unity-master-fix-xb1-timezone branch 2 times, most recently from e0530f3 to 3ddcd59 Compare July 22, 2020 19:09
…reaking the CreateLocal -> WinRTFallback -> CreateLocal loop by calling GetLocalTimeZoneInfoWinRTFallback instead of accessing Local from within FindSystemTimeZoneByIdWinRTFallback fixes both issues.

Need to make sure we don't duplicate the timezone and create a new local when we already have one.
@UnityAlex UnityAlex merged commit c79b153 into unity-master Jul 22, 2020
@UnityAlex UnityAlex deleted the unity-master-fix-xb1-timezone branch July 23, 2020 11:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants