From df1e91001892f615f6d9c237f260d4c3a9fa3f18 Mon Sep 17 00:00:00 2001 From: David Britch Date: Mon, 20 Jul 2020 15:47:01 +0100 Subject: [PATCH 01/15] 4.8 code updates. --- .../FormsGallery.Android/FormsGallery.Android.csproj | 4 ++-- .../FormsGallery/FormsGallery.UWP/FormsGallery.UWP.csproj | 4 ++-- .../FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj | 4 ++-- FormsGallery/FormsGallery/FormsGallery/FormsGallery.csproj | 4 ++-- .../FormsGallery/XamlExamples/CollectionViewDemoPage.xaml | 7 ++----- .../CollectionViewDemos.Android.csproj | 2 +- .../CollectionViewDemos.iOS/CollectionViewDemos.iOS.csproj | 2 +- .../CollectionViewDemos/CollectionViewDemos.csproj | 2 +- .../HorizontalGridHeaderFooterViewPage.xaml | 7 ++----- .../VerticalGridHeaderFooterViewPage.xaml | 7 ++----- .../Views/Layout/HorizontalGridPage.xaml | 7 ++----- .../Views/Layout/HorizontalGridTextPage.xaml | 6 +----- .../CollectionViewDemos/Views/Layout/VerticalGridPage.xaml | 7 ++----- .../Views/Layout/VerticalGridTextPage.xaml | 6 +----- .../PullToRefresh/HorizontalGridPullToRefreshPage.xaml | 7 ++----- .../Views/Spacing/HorizontalGridSpacingPage.xaml | 7 ++----- .../Views/Spacing/VerticalGridSpacingPage.xaml | 7 ++----- 17 files changed, 29 insertions(+), 61 deletions(-) diff --git a/FormsGallery/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj b/FormsGallery/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj index f10a6fb8ab..b6c41ed396 100644 --- a/FormsGallery/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj +++ b/FormsGallery/FormsGallery/FormsGallery.Android/FormsGallery.Android.csproj @@ -45,10 +45,10 @@ - 4.7.0.968 + 4.8.0.1143-pre1 - 4.7.0.968 + 4.8.0.1143-pre1 diff --git a/FormsGallery/FormsGallery/FormsGallery.UWP/FormsGallery.UWP.csproj b/FormsGallery/FormsGallery/FormsGallery.UWP/FormsGallery.UWP.csproj index a8d887413b..820967f850 100644 --- a/FormsGallery/FormsGallery/FormsGallery.UWP/FormsGallery.UWP.csproj +++ b/FormsGallery/FormsGallery/FormsGallery.UWP/FormsGallery.UWP.csproj @@ -90,8 +90,8 @@ - - + + diff --git a/FormsGallery/FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj b/FormsGallery/FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj index 9912d81a25..754dfa79e9 100644 --- a/FormsGallery/FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj +++ b/FormsGallery/FormsGallery/FormsGallery.iOS/FormsGallery.iOS.csproj @@ -144,10 +144,10 @@ - 4.7.0.968 + 4.8.0.1143-pre1 - 4.7.0.968 + 4.8.0.1143-pre1 diff --git a/FormsGallery/FormsGallery/FormsGallery/FormsGallery.csproj b/FormsGallery/FormsGallery/FormsGallery/FormsGallery.csproj index 2b2e3b6263..ccdfa32894 100644 --- a/FormsGallery/FormsGallery/FormsGallery/FormsGallery.csproj +++ b/FormsGallery/FormsGallery/FormsGallery/FormsGallery.csproj @@ -144,7 +144,7 @@ - - + + diff --git a/FormsGallery/FormsGallery/FormsGallery/XamlExamples/CollectionViewDemoPage.xaml b/FormsGallery/FormsGallery/FormsGallery/XamlExamples/CollectionViewDemoPage.xaml index 3ac81496fa..3af026acc4 100644 --- a/FormsGallery/FormsGallery/FormsGallery/XamlExamples/CollectionViewDemoPage.xaml +++ b/FormsGallery/FormsGallery/FormsGallery/XamlExamples/CollectionViewDemoPage.xaml @@ -9,11 +9,8 @@ FontAttributes="Bold" HorizontalOptions="Center" /> - - - - + diff --git a/UserInterface/CollectionViewDemos/CollectionViewDemos.Android/CollectionViewDemos.Android.csproj b/UserInterface/CollectionViewDemos/CollectionViewDemos.Android/CollectionViewDemos.Android.csproj index e51636c7f7..cfd46fa505 100644 --- a/UserInterface/CollectionViewDemos/CollectionViewDemos.Android/CollectionViewDemos.Android.csproj +++ b/UserInterface/CollectionViewDemos/CollectionViewDemos.Android/CollectionViewDemos.Android.csproj @@ -49,7 +49,7 @@ - 4.7.0.968 + 4.8.0.1143-pre1 diff --git a/UserInterface/CollectionViewDemos/CollectionViewDemos.iOS/CollectionViewDemos.iOS.csproj b/UserInterface/CollectionViewDemos/CollectionViewDemos.iOS/CollectionViewDemos.iOS.csproj index 6b13e7c494..45fc101031 100644 --- a/UserInterface/CollectionViewDemos/CollectionViewDemos.iOS/CollectionViewDemos.iOS.csproj +++ b/UserInterface/CollectionViewDemos/CollectionViewDemos.iOS/CollectionViewDemos.iOS.csproj @@ -156,7 +156,7 @@ - 4.7.0.968 + 4.8.0.1143-pre1 diff --git a/UserInterface/CollectionViewDemos/CollectionViewDemos/CollectionViewDemos.csproj b/UserInterface/CollectionViewDemos/CollectionViewDemos/CollectionViewDemos.csproj index ddeebd2354..f4cc2d4b8d 100644 --- a/UserInterface/CollectionViewDemos/CollectionViewDemos/CollectionViewDemos.csproj +++ b/UserInterface/CollectionViewDemos/CollectionViewDemos/CollectionViewDemos.csproj @@ -67,6 +67,6 @@ - + diff --git a/UserInterface/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml b/UserInterface/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml index b6f89ce9c7..913aa86dd8 100644 --- a/UserInterface/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml +++ b/UserInterface/CollectionViewDemos/CollectionViewDemos/Views/HeadersAndFooters/HorizontalGridHeaderFooterViewPage.xaml @@ -4,11 +4,8 @@ x:Class="CollectionViewDemos.Views.HorizontalGridHeaderFooterView" Title="Grid header and footer (View)"> - - - - +