fix(calendarview): Fixed #6160

unoplatform · Jun 7, 2021 · c0c1bc5 · c0c1bc5
1 parent 900be1f
commit c0c1bc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Uno.UI.RuntimeTests/IntegrationTests/common/CalendarHelper.h.cs b/src/Uno.UI.RuntimeTests/IntegrationTests/common/CalendarHelper.h.cs
@@ -90,7 +90,7 @@ internal static DateTimeOffset ConvertToDateTime(
 		{
 			var calendar = new Calendar
 			{
-				Era = era,
+				//Era = era,  -- REMOVE FOR https://github.com/unoplatform/uno/issues/6160
 				Year = year,
 				Month = month,
 				Day = day,

diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs
@@ -2484,7 +2484,7 @@ private void CopyDate(
 				if (copyEra)
 				{
 					// era is always valid.
-					m_tpCalendar.Era = era;
+					//m_tpCalendar.Era = era; --- FIX FOR https://github.com/unoplatform/uno/issues/6160
 				}
 
 				if (copyYear)