From c0c1bc51a55b705c83dc97ae41942601cd78ce73 Mon Sep 17 00:00:00 2001 From: Carl de Billy Date: Mon, 7 Jun 2021 16:21:11 -0400 Subject: [PATCH] fix(calendarview): Fixed https://github.com/unoplatform/uno/issues/6160 --- .../IntegrationTests/common/CalendarHelper.h.cs | 2 +- .../UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Uno.UI.RuntimeTests/IntegrationTests/common/CalendarHelper.h.cs b/src/Uno.UI.RuntimeTests/IntegrationTests/common/CalendarHelper.h.cs index 62f5df08eb5e..3b6ddb5370af 100644 --- 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 index 871c2c928bf6..48ec5766c4c0 100644 --- 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)