Skip to content

Commit

Permalink
Update Xamarin.Forms to v4.2.0.910310 (#1109)
Browse files Browse the repository at this point in the history
* Use mono 6.4.0
* Things have moved around in Forms
  • Loading branch information
mattleibow authored Jan 19, 2020
1 parent 544abe8 commit b2d486a
Show file tree
Hide file tree
Showing 36 changed files with 54 additions and 52 deletions.
6 changes: 3 additions & 3 deletions VERSIONS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ harfbuzz release 2.6.1
skia release m68
xunit release 2.4.1
xunit.runner.console release 2.4.1
Xamarin.Forms release 4.0.0.540366
Xamarin.Forms.Platform.WPF release 4.0.0.540366
Xamarin.Forms.Platform.GTK release 4.0.0.540366
Xamarin.Forms release 4.2.0.910310
Xamarin.Forms.Platform.WPF release 4.2.0.910310
Xamarin.Forms.Platform.GTK release 4.2.0.910310
Tizen.NET release 4.0.0
OpenTK release 3.0.1
OpenTK.GLControl release 3.0.1
Expand Down
4 changes: 2 additions & 2 deletions nuget/SkiaSharp.Views.Forms.GTK.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

<dependencies>
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms.Platform.GTK" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms.Platform.GTK" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="SkiaSharp.Views.Gtk2" version="1.0.0" />
Expand Down
4 changes: 2 additions & 2 deletions nuget/SkiaSharp.Views.Forms.WPF.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

<dependencies>
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms.Platform.WPF" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms.Platform.WPF" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="SkiaSharp.Views.WindowsForms" version="1.0.0" />
Expand Down
16 changes: 8 additions & 8 deletions nuget/SkiaSharp.Views.Forms.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,40 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release

<dependencies>
<group targetFramework="netstandard1.3">
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="monoandroid1.0">
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="xamarinios1.0">
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="xamarinmac2.0">
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="uap10.0">
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="tizen40">
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="net45">
<dependency id="Xamarin.Forms" version="4.0.0.540366" />
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>
Expand Down
3 changes: 2 additions & 1 deletion samples/Basic/Tizen/SkiaSharpSample/Program.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Xamarin.Forms.Platform.Tizen;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Tizen;

namespace SkiaSharpSample
{
Expand Down
2 changes: 1 addition & 1 deletion samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.GTK" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms.Platform.GTK" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj">
Expand Down
9 changes: 5 additions & 4 deletions samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/Program.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
using System;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Tizen;

namespace SkiaSharpSample
{
public class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication
public class Program : FormsApplication
{
protected override void OnCreate()
{
base.OnCreate();

LoadApplication(new App());
}

public static void Main(string[] args)
{
var app = new Program();
global::Xamarin.Forms.Platform.Tizen.Forms.Init(app, true);
Forms.Init(app, true);
app.Run(args);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<Reference Include="Xamarin.Mac" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Xamarin.Forms/Android/Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj">
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Xamarin.Forms/Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Xamarin.Forms/Mac/Mac.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<Reference Include="Xamarin.Mac" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj">
Expand Down
1 change: 1 addition & 0 deletions samples/Gallery/Xamarin.Forms/Tizen/Program.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Xamarin.Forms;
using Xamarin.Forms.Platform.Tizen;

namespace SkiaSharpSample.Platform
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj">
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Xamarin.Forms/WPF/WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj">
Expand Down
2 changes: 1 addition & 1 deletion samples/Gallery/Xamarin.Forms/iOS/iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj">
Expand Down
2 changes: 1 addition & 1 deletion scripts/Docker/ubuntu16/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM amd64/ubuntu:16.04
RUN apt-get update \
&& apt-get install -y apt-transport-https curl wget \
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
&& echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
&& echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial/snapshots/6.4.0 main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
&& curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main" | tee /etc/apt/sources.list.d/llvm.list \
&& apt-get update \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackagingPlatform>monoandroid1.0</PackagingPlatform>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms.Platform.Gtk" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms.Platform.Gtk" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
using Xamarin.Forms.Platform.Tizen;
using SKNativeView = SkiaSharp.Views.Tizen.SKCanvasView;
using SKNativePaintSurfaceEventArgs = SkiaSharp.Views.Tizen.SKPaintSurfaceEventArgs;
using TForms = Xamarin.Forms.Platform.Tizen.Forms;
using TForms = Xamarin.Forms.Forms;
#elif __WPF__
using System.Windows;
using Xamarin.Forms.Platform.WPF;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
using Xamarin.Forms.Platform.Tizen;
using SKNativeView = SkiaSharp.Views.Tizen.SKGLSurfaceView;
using SKNativePaintGLSurfaceEventArgs = SkiaSharp.Views.Tizen.SKPaintGLSurfaceEventArgs;
using TForms = Xamarin.Forms.Platform.Tizen.Forms;
using TForms = Xamarin.Forms.Forms;
#elif __WPF__
using System.Windows;
using Xamarin.Forms.Platform.WPF;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xamarin.Forms.Platform.Tizen;
using Xamarin.Forms;
using Xamarin.Forms;

using SKFormsView = SkiaSharp.Views.Forms.SKCanvasView;
using SKNativeView = SkiaSharp.Views.Tizen.SKCanvasView;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using SkiaSharp.Views.Tizen;
using Xamarin.Forms.Platform.Tizen;
using Xamarin.Forms;

using SKFormsView = SkiaSharp.Views.Forms.SKGLView;
using SKNativeView = SkiaSharp.Views.Tizen.SKGLSurfaceView;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<PackagingPlatform>uap10.0</PackagingPlatform>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackagingGroup>SkiaSharp.Views.Forms</PackagingGroup>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
Expand Down

0 comments on commit b2d486a

Please sign in to comment.