diff --git a/.paket/paket.exe b/.paket/paket.exe index 716fe2549..b98e000b2 100644 Binary files a/.paket/paket.exe and b/.paket/paket.exe differ diff --git a/README.md b/README.md index e4ececdd7..3fa3e2e36 100644 --- a/README.md +++ b/README.md @@ -241,10 +241,11 @@ Roadmap * Make some small F# langauge improvements to improve code: * Remove `yield` in more cases * Automatically save function values that do not capture any arguments and consider making the `dispatch` function global (partly to avoid is being seen as a captured argument) - * Allow syntax `Xaml.Foo(prop1=expr1, [ // end of line` + * [Allow syntax `Xaml.Foo(prop1=expr1, [ // end of line`](https://github.com/Microsoft/visualfsharp/pull/4929) * [`TryGetValue` on F# immutable map](https://github.com/Microsoft/visualfsharp/pull/4827/) * Allow a default unnamed argument for `children` so the argument name doesn't have to be given explicitly * Allow the use of struct options for optional arguments (to reduce allocations) + * Implement the C# 5.0 "open static classes" feature in F# to allow the `Xaml.` prefix to be dropped Static Views and "Half Elmish" ------ diff --git a/Samples/AllControls/Droid/AllControls.Droid.fsproj b/Samples/AllControls/Droid/AllControls.Droid.fsproj index 2ce503cc0..208601fc5 100644 --- a/Samples/AllControls/Droid/AllControls.Droid.fsproj +++ b/Samples/AllControls/Droid/AllControls.Droid.fsproj @@ -86,9 +86,6 @@ - - ../../../packages/androidapp/Xamarin.Android.FSharp.ResourceProvider/lib/Xamarin.Android.FSharp.ResourceProvider.Runtime.dll - ../../../packages/androidapp/Xamarin.Android.Support.Animated.Vector.Drawable/lib/MonoAndroid70/Xamarin.Android.Support.Animated.Vector.Drawable.dll diff --git a/Samples/AllControls/Droid/Properties/AssemblyInfo.fs b/Samples/AllControls/Droid/Properties/AssemblyInfo.fs index 689d14374..8bfa5771a 100644 --- a/Samples/AllControls/Droid/Properties/AssemblyInfo.fs +++ b/Samples/AllControls/Droid/Properties/AssemblyInfo.fs @@ -2,10 +2,6 @@ open System.Reflection open System.Runtime.CompilerServices -// the name of the type here needs to match the name inside the ResourceDesigner attribute -type Resources = AllControls.Droid.Resource -[] - [] [] [] diff --git a/Samples/CounterApp/Droid/CounterApp.Droid.fsproj b/Samples/CounterApp/Droid/CounterApp.Droid.fsproj index 73074feaa..58d4e2984 100644 --- a/Samples/CounterApp/Droid/CounterApp.Droid.fsproj +++ b/Samples/CounterApp/Droid/CounterApp.Droid.fsproj @@ -106,9 +106,6 @@ - - ../../../packages/androidapp/Xamarin.Android.FSharp.ResourceProvider/lib/Xamarin.Android.FSharp.ResourceProvider.Runtime.dll - ../../../packages/androidapp/Xamarin.Android.Support.Animated.Vector.Drawable/lib/MonoAndroid70/Xamarin.Android.Support.Animated.Vector.Drawable.dll diff --git a/Samples/TicTacToe/Droid/MainActivity.fs b/Samples/TicTacToe/Droid/MainActivity.fs index fb0c32ee8..c35b469c3 100644 --- a/Samples/TicTacToe/Droid/MainActivity.fs +++ b/Samples/TicTacToe/Droid/MainActivity.fs @@ -16,8 +16,6 @@ open Xamarin.Forms.Platform.Android type MainActivity() = inherit FormsAppCompatActivity() override this.OnCreate (bundle: Bundle) = - FormsAppCompatActivity.TabLayoutResource <- TicTacToe.Droid.Resources.Layout.Tabbar - FormsAppCompatActivity.ToolbarResource <- TicTacToe.Droid.Resources.Layout.Toolbar base.OnCreate (bundle) Xamarin.Forms.Forms.Init (this, bundle) diff --git a/Samples/TicTacToe/Droid/Properties/AssemblyInfo.fs b/Samples/TicTacToe/Droid/Properties/AssemblyInfo.fs index d93167d43..e3a851bd2 100644 --- a/Samples/TicTacToe/Droid/Properties/AssemblyInfo.fs +++ b/Samples/TicTacToe/Droid/Properties/AssemblyInfo.fs @@ -3,10 +3,6 @@ open System.Reflection open System.Runtime.CompilerServices -// the name of the type here needs to match the name inside the ResourceDesigner attribute -type Resources = TicTacToe.Droid.Resource -[] - [] [] [] diff --git a/Samples/TicTacToe/Droid/TicTacToe.Droid.fsproj b/Samples/TicTacToe/Droid/TicTacToe.Droid.fsproj index c9973c3cf..70d1d50d8 100644 --- a/Samples/TicTacToe/Droid/TicTacToe.Droid.fsproj +++ b/Samples/TicTacToe/Droid/TicTacToe.Droid.fsproj @@ -97,9 +97,6 @@ - - ../../../packages/androidapp/Xamarin.Android.FSharp.ResourceProvider/lib/Xamarin.Android.FSharp.ResourceProvider.Runtime.dll - ../../../packages/androidapp/Xamarin.Android.Support.Animated.Vector.Drawable/lib/MonoAndroid70/Xamarin.Android.Support.Animated.Vector.Drawable.dll diff --git a/paket.dependencies b/paket.dependencies index b46669455..39194163e 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -18,7 +18,6 @@ group androidapp source https://www.nuget.org/api/v2 nuget FSharp.Core 4.3.3 nuget Xamarin.Forms - nuget Xamarin.Android.FSharp.ResourceProvider 1.0.0.14 nuget Xamarin.Android.Support.Animated.Vector.Drawable 25.4.0.2 nuget Xamarin.Android.Support.Annotations 25.4.0.2 nuget Xamarin.Android.Support.Compat 25.4.0.2 diff --git a/paket.lock b/paket.lock index 1bdda6f5d..9cd1d98ce 100644 --- a/paket.lock +++ b/paket.lock @@ -54,7 +54,6 @@ NUGET System.Threading.Thread (4.3) System.Threading.ThreadPool (4.3) System.Threading.Timer (4.3) - Xamarin.Android.FSharp.ResourceProvider (1.0.0.14) Xamarin.Android.Support.Animated.Vector.Drawable (25.4.0.2) Xamarin.Android.Support.Vector.Drawable (25.4.0.2) Xamarin.Android.Support.Annotations (25.4.0.2)