Remove Android resource type provider.

This commit should be reverted once dotnet/fsharp#4860 is fixed. Re fabulous-dev#48
nosami · May 17, 2018 · 336cbde · 336cbde
1 parent 326ba21
commit 336cbde
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 23 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
@@ -72,8 +72,7 @@
 
     <!-- Do a global restore if required -->
     <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
-    <Exec Command='$(PaketCommand) restore --target-framework "$(TargetFrameworks)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' == '' " ContinueOnError="false" />
-    <Exec Command='$(PaketCommand) restore --target-framework "$(TargetFramework)"' Condition=" '$(PaketRestoreRequired)' == 'true' AND '$(TargetFramework)' != '' " ContinueOnError="false" />
+    <Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />
 
     <!-- Step 2 Detect project specific changes -->
     <ItemGroup>

diff --git a/Samples/AllControls/Droid/AllControls.Droid.fsproj b/Samples/AllControls/Droid/AllControls.Droid.fsproj
@@ -86,9 +86,6 @@
     <Reference Include="System.Numerics" />
     <Reference Include="mscorlib" />
     <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>../../../packages/androidapp/Xamarin.Android.FSharp.ResourceProvider/lib/Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
       <HintPath>../../../packages/androidapp/Xamarin.Android.Support.Animated.Vector.Drawable/lib/MonoAndroid70/Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
     </Reference>

diff --git 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
-[<assembly: Android.Runtime.ResourceDesigner("AllControls.Droid.Resources", IsApplication=true)>]
-
 [<assembly: AssemblyTitle("AllControls.Droid")>]
 [<assembly: AssemblyDescription("")>]
 [<assembly: AssemblyConfiguration("")>]

diff --git a/Samples/CounterApp/Droid/CounterApp.Droid.fsproj b/Samples/CounterApp/Droid/CounterApp.Droid.fsproj
@@ -106,9 +106,6 @@
     <Reference Include="System.Numerics" />
     <Reference Include="mscorlib" />
     <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>../../../packages/androidapp/Xamarin.Android.FSharp.ResourceProvider/lib/Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
       <HintPath>../../../packages/androidapp/Xamarin.Android.Support.Animated.Vector.Drawable/lib/MonoAndroid70/Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
     </Reference>

diff --git 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
@@ -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
-[<assembly: Android.Runtime.ResourceDesigner("TicTacToe.Droid.Resources", IsApplication=true)>]
-
 [<assembly: AssemblyTitle("TicTacToe.Droid")>]
 [<assembly: AssemblyDescription("")>]
 [<assembly: AssemblyConfiguration("")>]

diff --git a/Samples/TicTacToe/Droid/TicTacToe.Droid.fsproj b/Samples/TicTacToe/Droid/TicTacToe.Droid.fsproj
@@ -97,9 +97,6 @@
     <Reference Include="System.Numerics" />
     <Reference Include="mscorlib" />
     <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.FSharp.ResourceProvider.Runtime">
-      <HintPath>../../../packages/androidapp/Xamarin.Android.FSharp.ResourceProvider/lib/Xamarin.Android.FSharp.ResourceProvider.Runtime.dll</HintPath>
-    </Reference>
     <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
       <HintPath>../../../packages/androidapp/Xamarin.Android.Support.Animated.Vector.Drawable/lib/MonoAndroid70/Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
     </Reference>

diff --git 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
@@ -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)