fix(calendarview): Fixed #6160

carldebilly · carldebilly · commit c0c1bc51a55b · 2021-06-07T16:21:11.000-04:00
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)

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ internal static DateTimeOffset ConvertToDateTime(`
`90`	`90`	`{`
`91`	`91`	`var calendar = new Calendar`
`92`	`92`	`{`
`93`		`- Era = era,`
	`93`	`+ //Era = era, -- REMOVE FOR https://github.com/unoplatform/uno/issues/6160`
`94`	`94`	`Year = year,`
`95`	`95`	`Month = month,`
`96`	`96`	`Day = day,`
Original file line number	Diff line number	Diff line change
`@@ -2484,7 +2484,7 @@ private void CopyDate(`
`2484`	`2484`	`if (copyEra)`
`2485`	`2485`	`{`
`2486`	`2486`	`// era is always valid.`
`2487`		`- m_tpCalendar.Era = era;`
	`2487`	`+ //m_tpCalendar.Era = era; --- FIX FOR https://github.com/unoplatform/uno/issues/6160`
`2488`	`2488`	`}`
`2489`	`2489`
`2490`	`2490`	`if (copyYear)`