Fix API breakage in Xamarin.Forms 4.7-pre (#55)

* Implemented `IPlatformServices.GetHash` * Updated other various NuGet packages like NUnit Co-authored-by: Jonathan Peppers <[email protected]>
jonathanpeppers · May 15, 2020 · 6079f72 · 6079f72
1 parent 546013c
commit 6079f72
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -163,6 +163,7 @@ Make sure to choose the appropriate version of this package for the version of X
 
 | Xamarin.Forms  | Xamarin.Forms.Mocks |
 | -------------- | ------------------- |
+| 4.7.0.x        | 4.7.0.x             |
 | 4.6.0.x        | 4.6.0.x             |
 | 3.5.x-4.5.x    | 3.5.0.x             |
 | 3.0.0.x        | 3.0.0.x             |

diff --git a/TestAssembly/TestAssembly.csproj b/TestAssembly/TestAssembly.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.6.0.220655" />
+    <PackageReference Include="Xamarin.Forms" Version="4.7.0.773-pre1" />
   </ItemGroup>
 
 </Project>
diff --git a/Xamarin.Forms.Mocks.Tests/Xamarin.Forms.Mocks.Tests.csproj b/Xamarin.Forms.Mocks.Tests/Xamarin.Forms.Mocks.Tests.csproj
@@ -5,13 +5,16 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
-    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="Xamarin.Forms" Version="4.7.0.773-pre1" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TestAssembly\TestAssembly.csproj" />
     <ProjectReference Include="..\Xamarin.Forms.Mocks\Xamarin.Forms.Mocks.csproj" />
     <ProjectReference Include="..\Xamarin.Forms.Mocks.Xaml\Xamarin.Forms.Mocks.Xaml.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Xamarin.Forms.Mocks.Xaml/Xamarin.Forms.Mocks.Xaml.csproj b/Xamarin.Forms.Mocks.Xaml/Xamarin.Forms.Mocks.Xaml.csproj
@@ -4,6 +4,6 @@
 		<AssemblyName>Xamarin.Forms.Xaml.UnitTests</AssemblyName>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
+		<PackageReference Include="Xamarin.Forms" Version="4.7.0.773-pre1" />
 	</ItemGroup>
-</Project>
+</Project>
diff --git a/Xamarin.Forms.Mocks.nuspec b/Xamarin.Forms.Mocks.nuspec
@@ -15,7 +15,7 @@
       <releaseNotes>Upgraded to netstandard2.0</releaseNotes>
       <tags>Xamarin, Xamarin.Forms, Mocks, Unit Testing</tags>
       <dependencies>
-         <dependency id="Xamarin.Forms" version="4.6.0.726" />
+         <dependency id="Xamarin.Forms" version="4.7.0.773-pre1" />
       </dependencies>
    </metadata>
-</package>
+</package>
diff --git a/Xamarin.Forms.Mocks/PlatformServices.cs b/Xamarin.Forms.Mocks/PlatformServices.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Xamarin.Forms.Internals;
@@ -50,6 +52,20 @@ public string GetMD5Hash(string input)
             throw new NotImplementedException();
         }
 
+        public string GetHash(string input)
+        {
+            var stringBuilder = new StringBuilder();
+            using (var hash = SHA256.Create())
+            {
+                var enc = Encoding.UTF8;
+                byte[] result = hash.ComputeHash(enc.GetBytes(input));
+                foreach (byte b in result)
+                    stringBuilder.Append(b.ToString("x2"));
+            }
+
+            return stringBuilder.ToString();
+        }
+
         public double GetNamedSize(NamedSize size, Type targetElementType, bool useOldSizes)
         {
             return 14;

diff --git a/Xamarin.Forms.Mocks/Xamarin.Forms.Mocks.csproj b/Xamarin.Forms.Mocks/Xamarin.Forms.Mocks.csproj
@@ -4,9 +4,9 @@
 		<AssemblyName>Xamarin.Forms.Core.UnitTests</AssemblyName>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Xamarin.Forms" Version="4.6.0.726" />
+		<PackageReference Include="Xamarin.Forms" Version="4.7.0.773-pre1" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Xamarin.Forms.Mocks.Xaml\Xamarin.Forms.Mocks.Xaml.csproj" />
 	</ItemGroup>
-</Project>
+</Project>
diff --git a/build.cake b/build.cake
@@ -17,8 +17,8 @@ var dirs = new[]
     Directory("./Xamarin.Forms.Mocks.Xaml/obj") + Directory(configuration),
 };
 string sln = "./Xamarin.Forms.Mocks.sln";
-string version = "4.6.0.1";
-string suffix = "";
+string version = "4.7.0.1";
+string suffix = "-pre";
 
 MSBuildSettings MSBuildSettings()
 {