Merge remote-tracking branch 'upstream/master' into dev-forms-tizen

2018-04-04 04:51:12 -07:00 · 2018-04-04 04:51:12 -07:00 · d41600c885
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@ -5,7 +5,7 @@ mdoc                    release     5.6.0
 harfbuzz                release     1.4.6
 skia                    release     m60
 xunit.runner.console    release     2.3.1
-Xamarin.Forms           release     2.5.0.77107
+Xamarin.Forms           release     2.5.0.280555

 # native sonames
 libSkiaSharp            soname      60.1.0
--- a/externals/depot_tools
+++ b/externals/depot_tools
@ -1 +1 @@
-Subproject commit 4732b3b1c4bf3f5e05eeafd38e5980b77bde8f8d
+Subproject commit c7d0b34084e589a895875beb9cd7ca0ba961fd4f
--- a/externals/skia
+++ b/externals/skia
@ -1 +1 @@
-Subproject commit bb553479de64257435be51fd83a60ef5b198eb44
+Subproject commit 26241daca4676782152056f05a8dd21a31d43747
--- a/nuget/SkiaSharp.Views.Forms.nuspec
+++ b/nuget/SkiaSharp.Views.Forms.nuspec
@ -28,26 +28,26 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release

    <dependencies>
      <group>
-        <dependency id="Xamarin.Forms" version="2.5.0" />
+        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
        <dependency id="SkiaSharp" version="1.0.0" />
      </group>
      <group targetFramework="MonoAndroid">
-        <dependency id="Xamarin.Forms" version="2.5.0" />
+        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
        <dependency id="SkiaSharp" version="1.0.0" />
        <dependency id="SkiaSharp.Views" version="1.0.0" />
      </group>
      <group targetFramework="XamariniOS">
-        <dependency id="Xamarin.Forms" version="2.5.0" />
+        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
        <dependency id="SkiaSharp" version="1.0.0" />
        <dependency id="SkiaSharp.Views" version="1.0.0" />
      </group>
      <group targetFramework="XamarinMac">
-        <dependency id="Xamarin.Forms" version="2.5.0" />
+        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
        <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="2.5.0" />
+        <dependency id="Xamarin.Forms" version="2.5.0.280555" />
        <dependency id="SkiaSharp" version="1.0.0" />
        <dependency id="SkiaSharp.Views" version="1.0.0" />
      </group>
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
@ -47,7 +47,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj">
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
@ -92,7 +92,7 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
@ -69,7 +69,7 @@
    <Reference Include="Xamarin.iOS" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj">
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
@ -55,7 +55,7 @@
    <Reference Include="Xamarin.Mac" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj">
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
@ -5,7 +5,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj
+++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj
@ -52,7 +52,7 @@
    <Reference Include="System.Xml" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj">
--- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj
+++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj
@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>

  <ItemGroup>
--- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj
+++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj
@ -55,7 +55,7 @@
    <Reference Include="Xamarin.Mac" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj">
--- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
+++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
@ -92,7 +92,7 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj">
--- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj
+++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj
@ -112,7 +112,7 @@
    <Reference Include="Xamarin.iOS" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj">
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
@ -47,7 +47,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="mdoc" Version="5.6.0" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj">
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj
@ -55,7 +55,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="mdoc" Version="5.6.0" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj">
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.NetStandard/SkiaSharp.Views.Forms.NetStandard.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.NetStandard/SkiaSharp.Views.Forms.NetStandard.csproj
@ -16,7 +16,7 @@
    <OutputPath>bin\Release\</OutputPath>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj
@ -44,7 +44,7 @@
  <ItemGroup>
    <PackageReference Include="mdoc" Version="5.6.0" PrivateAssets="All" />
    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj
@ -53,7 +53,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="mdoc" Version="5.6.0" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj">
--- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj
+++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj
@ -20,7 +20,7 @@
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="mdoc" Version="5.6.0" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.77107" />
+    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />