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

Update to XF 3.5 #350

Merged
merged 21 commits into from
May 16, 2019
Merged
Changes from 20 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Packages.targets
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="4.5.2" />
<PackageReference Update="FSharp.Data" Version="3.0.0" />
<PackageReference Update="Xamarin.Forms" Version="3.4.0.1009999" />
<PackageReference Update="Xamarin.Forms.Platform.WPF" Version="3.4.0.1009999" />
<PackageReference Update="Xamarin.Forms.Maps" Version="3.4.0.1009999" />
<PackageReference Update="Xamarin.Forms" Version="3.5.0.129452" />
<PackageReference Update="Xamarin.Forms.Platform.WPF" Version="3.5.0.129452" />
<PackageReference Update="Xamarin.Forms.Maps" Version="3.5.0.129452" />
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Update="FSharp.Compiler.Service" Version="25.0.1" />
<PackageReference Update="Dotnet.ProjInfo" Version="0.9.0" />
18 changes: 9 additions & 9 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ group neutral
github fsprojects/FSharp.Compiler.PortaCode:master tests/PortaCodeTests.fs

nuget FSharp.Core 4.5.2
nuget Xamarin.Forms 3.4.0.1009999
nuget Xamarin.Forms.Maps 3.4.0.1009999
nuget Xamarin.Forms 3.5.0.129452
nuget Xamarin.Forms.Maps 3.5.0.129452
nuget SkiaSharp
nuget SkiaSharp.Views.Forms
nuget OxyPlot.Xamarin.Forms 1.0.0
@@ -42,7 +42,7 @@ group androidapp
framework: monoandroid71
source https://api.nuget.org/v3/index.json
nuget FSharp.Core 4.5.2
nuget Xamarin.Forms 3.4.0.1009999
nuget Xamarin.Forms 3.5.0.129452
nuget Xamarin.Android.FSharp.ResourceProvider 1.0.0.25
nuget Xamarin.Android.Arch.Core.Common 1.0.0.1
nuget Xamarin.Android.Arch.Core.Runtime 1.0.0.1
@@ -73,32 +73,32 @@ group iosapp
framework: monotouch
source https://api.nuget.org/v3/index.json
nuget FSharp.Core 4.5.2
nuget Xamarin.Forms 3.4.0.1009999
nuget Xamarin.Forms 3.5.0.129452
nuget Newtonsoft.Json 11.0.2
nuget FSharp.Data 3.0.0

group macosapp
framework: xamarinmac20
source https://api.nuget.org/v3/index.json
nuget FSharp.Core 4.5.2
nuget Xamarin.Forms 3.4.0.1009999
nuget Xamarin.Forms 3.5.0.129452
nuget Newtonsoft.Json 11.0.2
nuget FSharp.Data 3.0.0

group wpfapp
framework: net472
source https://api.nuget.org/v3/index.json
nuget FSharp.Core 4.5.2
nuget Xamarin.Forms 3.4.0.1009999
nuget Xamarin.Forms 3.5.0.129452
nuget Newtonsoft.Json 11.0.2
nuget Xamarin.Forms.Platform.WPF 3.4.0.1009999
nuget Xamarin.Forms.Platform.WPF 3.5.0.129452
nuget FSharp.Data 3.0.0

group gtkapp
framework: net471
source https://api.nuget.org/v3/index.json
nuget FSharp.Core 4.5.2
nuget Xamarin.Forms 3.4.0.1009999
nuget Xamarin.Forms 3.5.0.129452
nuget Newtonsoft.Json 11.0.2
nuget Xamarin.Forms.Platform.GTK 3.4.0.1009999
nuget Xamarin.Forms.Platform.GTK 3.5.0.129452
nuget FSharp.Data 3.0.0
24 changes: 12 additions & 12 deletions paket.lock
Original file line number Diff line number Diff line change
@@ -156,7 +156,7 @@ NUGET
Xamarin.Android.Support.v7.Palette (27.0.2.1)
Xamarin.Android.Support.v7.RecyclerView (27.0.2.1)
Xamarin.Android.Support.Vector.Drawable (27.0.2.1)
Xamarin.Forms (3.4.0.1009999)
Xamarin.Forms (3.5.0.129452)

GROUP fakebuild
STORAGE: NONE
@@ -797,9 +797,9 @@ NUGET
FSharp.Data (3.0)
FSharp.Core (>= 4.0.0.1)
Newtonsoft.Json (11.0.2)
Xamarin.Forms (3.4.0.1009999)
Xamarin.Forms.Platform.GTK (3.4.0.1009999)
Xamarin.Forms (>= 3.4.0.1009999)
Xamarin.Forms (3.5.0.129452)
Xamarin.Forms.Platform.GTK (3.5.0.129452)
Xamarin.Forms (>= 3.5.0.129452)

GROUP iosapp
RESTRICTION: == monotouch
@@ -936,7 +936,7 @@ NUGET
System.Xml.ReaderWriter (4.3.1)
System.Xml.XDocument (4.3)
System.Xml.XmlDocument (4.3)
Xamarin.Forms (3.4.0.1009999)
Xamarin.Forms (3.5.0.129452)

GROUP macosapp
RESTRICTION: == xamarinmac
@@ -1073,7 +1073,7 @@ NUGET
System.Xml.ReaderWriter (4.3.1)
System.Xml.XDocument (4.3)
System.Xml.XmlDocument (4.3)
Xamarin.Forms (3.4.0.1009999)
Xamarin.Forms (3.5.0.129452)

GROUP neutral
RESTRICTION: == netstandard2.0
@@ -1089,9 +1089,9 @@ NUGET
SkiaSharp.Views.Forms (1.68)
SkiaSharp (>= 1.68)
Xamarin.Forms (>= 3.3.0.912540)
Xamarin.Forms (3.4.0.1009999)
Xamarin.Forms.Maps (3.4.0.1009999)
Xamarin.Forms (>= 3.4.0.1009999)
Xamarin.Forms (3.5.0.129452)
Xamarin.Forms.Maps (3.5.0.129452)
Xamarin.Forms (>= 3.5.0.129452)
GITHUB
remote: fsprojects/FSharp.Compiler.PortaCode
src/CodeModel.fs (0c6686bcc518246d879bb3d0e3cd4cdbbc72d5ad)
@@ -1111,8 +1111,8 @@ NUGET
OpenTK (3.0.1)
OpenTK.GLControl (3.0.1)
OpenTK (>= 3.0.1)
Xamarin.Forms (3.4.0.1009999)
Xamarin.Forms.Platform.WPF (3.4.0.1009999)
Xamarin.Forms (3.5.0.129452)
Xamarin.Forms.Platform.WPF (3.5.0.129452)
OpenTK (>= 2.0)
OpenTK.GLControl (>= 1.1.2349.61993)
Xamarin.Forms (>= 3.4.0.1009999)
Xamarin.Forms (>= 3.5.0.129452)
87 changes: 81 additions & 6 deletions samples/AllControls/AllControls/AllControls.fs
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@ type RootPageKind =
| Animations
| WebCall
| ScrollView
| ShellView
| CollectionView
| CarouselView

type Model =
{ RootPageKind: RootPageKind
@@ -115,6 +118,8 @@ type Msg =
| ScrollFabulous of float * float * AnimationKind
| ScrollXamarinForms of float * float * AnimationKind
| Scrolled of float * float
// For ShellView page demo
//| ShowShell

[<AutoOpen>]
module MyExtension =
@@ -342,8 +347,8 @@ module App =
[ yield
View.ContentPage(useSafeArea=true,
padding = new Thickness (10.0, 20.0, 10.0, 5.0),
content= View.StackLayout(
children=[
content= View.ListView(
items=[
View.Button(text = "TabbedPage #1 (various controls)", command=(fun () -> dispatch (SetRootPageKind Tabbed1)))
View.Button(text = "TabbedPage #2 (various controls)", command=(fun () -> dispatch (SetRootPageKind Tabbed2)))
View.Button(text = "TabbedPage #3 (various controls)", command=(fun () -> dispatch (SetRootPageKind Tabbed3)))
@@ -355,11 +360,14 @@ module App =
View.Button(text = "Pop-up", command=(fun () -> dispatch ShowPopup))
View.Button(text = "WebRequest", command=(fun () -> dispatch (SetRootPageKind WebCall)))
View.Button(text = "ScrollView", command=(fun () -> dispatch (SetRootPageKind ScrollView)))
View.Button(text = "Shell", command=(fun () -> dispatch (SetRootPageKind ShellView)))
View.Button(text = "CollectionView", command=(fun () -> dispatch (SetRootPageKind CollectionView)))
View.Button(text = "CarouselView", command=(fun () -> dispatch (SetRootPageKind CarouselView)))
]))
.ToolbarItems([View.ToolbarItem(text="About", command=(fun () -> dispatch (SetRootPageKind (Choice true))))] )
.ToolbarItems([View.ToolbarItem(text="about", command=(fun () -> dispatch (SetRootPageKind (Choice true))))] )
.TitleView(View.StackLayout(orientation=StackOrientation.Horizontal, children=[
View.Label(text="Fabulous", verticalOptions=LayoutOptions.Center)
View.Label(text="RootPage", verticalOptions=LayoutOptions.Center, horizontalOptions=LayoutOptions.CenterAndExpand)
View.Label(text="fabulous", verticalOptions=LayoutOptions.Center)
View.Label(text="rootpage", verticalOptions=LayoutOptions.Center, horizontalOptions=LayoutOptions.CenterAndExpand)
]
))

@@ -910,7 +918,74 @@ module App =
)
]
)
)
)
| ShellView ->

match Device.RuntimePlatform with
| Device.iOS | Device.Android ->

View.Shell( title = "TitleShell",
items = [
View.ShellItem(
items = [
View.ShellSection(items = [
View.ShellContent(content=View.ContentPage(content=MainPageButton, title="ContentpageTitle"))
])
])
])
| _ -> View.ContentPage(content = View.Label(text="Your Platform does not support Shell"))

| CollectionView ->
match Device.RuntimePlatform with
| Device.iOS | Device.Android ->
View.ContentPage(content=View.StackLayout(children = [
MainPageButton
// use Collectionview instead of listview
View.CollectionView(items= [
View.Label(text="Person 1")
View.Label(text="Person2")
View.Label(text="Person3")
View.Label(text="Person4")
View.Label(text="Person5")
View.Label(text="Person6")
View.Label(text="Person7")
View.Label(text="Person8")
View.Label(text="Person9")
View.Label(text="Person11")
View.Label(text="Person12")
View.Label(text="Person13")
View.Label(text="Person14")] )
]
))

| _ -> View.ContentPage(content = View.Label(text="Your Platform does not support CollectionView"))

| CarouselView ->
match Device.RuntimePlatform with
| Device.iOS | Device.Android ->
View.ContentPage(content=
View.StackLayout(
children = [
MainPageButton
View.CarouselView(itemsSource = [
View.Label(text="Person1")
View.Label(text="Person2")
View.Label(text="Person3")
View.Label(text="Person4")
View.Label(text="Person5")
View.Label(text="Person6")
View.Label(text="Person7")
View.Label(text="Person8")
View.Label(text="Person9")
View.Label(text="Person11")
View.Label(text="Person12")
View.Label(text="Person13")
View.Label(text="Person14")
], margin=10.)
]
))

| _ -> View.ContentPage(content = View.Label(text="Your Platform does not support CarouselView"))


type App () as app =
10 changes: 5 additions & 5 deletions samples/AllControls/Droid/AllControls.Droid.fsproj
Original file line number Diff line number Diff line change
@@ -150,19 +150,19 @@
<HintPath>../../../packages/androidapp/Xamarin.Android.Support.Vector.Drawable/lib/MonoAndroid81/Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Core.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Platform.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/FormsViewGroup.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="FSharp.Core">
<HintPath>../../../packages/androidapp/FSharp.Core/lib/netstandard1.6/FSharp.Core.dll</HintPath>
3 changes: 2 additions & 1 deletion samples/AllControls/Droid/MainActivity.fs
Original file line number Diff line number Diff line change
@@ -20,7 +20,8 @@ type MainActivity() =

override this.OnCreate (bundle: Bundle) =
base.OnCreate (bundle)

global.Xamarin.Forms.Forms.SetFlags([|"Shell_Experimental"; "CollectionView_Experimental"; "Visual_Experimental"|])

Xamarin.Forms.Forms.Init (this, bundle)

let app = new AllControls.App()
1 change: 1 addition & 0 deletions samples/AllControls/iOS/AppDelegate.fs
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ type AppDelegate () =
let mutable _app: AllControls.App option = None

override this.FinishedLaunching (uiApp, options) =
Xamarin.Forms.Forms.SetFlags([|"Shell_Experimental"; "CollectionView_Experimental"; "Visual_Experimental"|]);
Forms.Init()
let app = new AllControls.App()
this.LoadApplication (app)
10 changes: 5 additions & 5 deletions samples/Calculator/Droid/Calculator.Droid.fsproj
Original file line number Diff line number Diff line change
@@ -153,19 +153,19 @@
<HintPath>../../../packages/androidapp/Xamarin.Android.Support.Vector.Drawable/lib/MonoAndroid81/Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Core.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Platform.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/FormsViewGroup.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<ProjectReference Include="..\..\..\src\Fabulous.Core\Fabulous.Core.fsproj">
<Project>{B459AFAD-BB5B-43C3-BD86-609E8DB3E3FD}</Project>
10 changes: 5 additions & 5 deletions samples/CounterApp/Droid/CounterApp.Droid.fsproj
Original file line number Diff line number Diff line change
@@ -153,19 +153,19 @@
<HintPath>../../../packages/androidapp/Xamarin.Android.Support.Vector.Drawable/lib/MonoAndroid81/Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Core.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Platform.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/FormsViewGroup.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<ProjectReference Include="..\CounterApp\CounterApp.fsproj">
<Project>{AC36B11A-383D-45A3-8999-4F6475E9DD13}</Project>
Original file line number Diff line number Diff line change
@@ -148,19 +148,19 @@
<HintPath>../../../../packages/androidapp/Xamarin.Android.Support.Vector.Drawable/lib/MonoAndroid81/Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Core.dll</HintPath>
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Platform.dll</HintPath>
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/FormsViewGroup.dll</HintPath>
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid10/Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>../../../../packages/androidapp/Xamarin.Forms/lib/MonoAndroid81/Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="FSharp.Core">
<HintPath>../../../../packages/androidapp/FSharp.Core/lib/netstandard1.6/FSharp.Core.dll</HintPath>
Loading