From 9919e20ad47d4a6e41a97c8081c90a1bdc48023e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Apr 2023 00:56:32 +0000
Subject: [PATCH 1/2] build(deps): bump PublicApiGenerator from 10.3.0 to
 11.0.0 in /src

Bumps [PublicApiGenerator](https://github.com/PublicApiGenerator/PublicApiGenerator) from 10.3.0 to 11.0.0.
- [Release notes](https://github.com/PublicApiGenerator/PublicApiGenerator/releases)
- [Commits](https://github.com/PublicApiGenerator/PublicApiGenerator/compare/10.3.0...11.0.0)

---
updated-dependencies:
- dependency-name: PublicApiGenerator
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 src/Akavache.Tests/Akavache.Tests.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Akavache.Tests/Akavache.Tests.csproj b/src/Akavache.Tests/Akavache.Tests.csproj
index 513f3882..bf6ac5d7 100644
--- a/src/Akavache.Tests/Akavache.Tests.csproj
+++ b/src/Akavache.Tests/Akavache.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
@@ -20,7 +20,7 @@
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" />
     <PackageReference Include="FluentAssertions" Version="6.9.0" />
     <PackageReference Include="DiffEngine" Version="11.1.0" />
-    <PackageReference Include="PublicApiGenerator" Version="10.3.0" />
+    <PackageReference Include="PublicApiGenerator" Version="11.0.0" />
     <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

From 5bf01222294a2fb98d3c3bf703b014ef0ecae9d3 Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Wed, 12 Apr 2023 02:14:07 +0100
Subject: [PATCH 2/2] Update packages, fix API test

---
 src/Akavache.Core/Akavache.Core.csproj                 | 10 ++--------
 .../ApiApprovalTests.AkavacheCore.net6.0.approved.txt  |  4 ----
 src/Akavache.Tests/API/ApiApprovalTests.cs             |  2 +-
 src/Akavache.Tests/Akavache.Tests.csproj               |  4 ++--
 src/Akavache/Akavache.csproj                           |  9 ---------
 5 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/Akavache.Core/Akavache.Core.csproj b/src/Akavache.Core/Akavache.Core.csproj
index 78d2702b..6f442704 100644
--- a/src/Akavache.Core/Akavache.Core.csproj
+++ b/src/Akavache.Core/Akavache.Core.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
     <PackageReference Include="Splat" Version="14.*" />
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
-    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.0" />
+    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="7.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
@@ -69,12 +69,6 @@
     <Compile Include="Platforms\apple-common\**\*.cs" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="netstandard" />
-    <Reference Include="Xamarin.Mac">
-      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
-      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
-      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
-      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
-    </Reference>
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net6.0-macos')) or $(TargetFramework.StartsWith('net7.0-macos')) ">
diff --git a/src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.net6.0.approved.txt b/src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.net6.0.approved.txt
index 60e4f238..c1e6bda0 100644
--- a/src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.net6.0.approved.txt
+++ b/src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.net6.0.approved.txt
@@ -281,8 +281,4 @@ namespace Akavache.Internal
         Delete = 4,
         Inheritable = 16,
     }
-}
-namespace System
-{
-    public static class StreamMixins { }
 }
\ No newline at end of file
diff --git a/src/Akavache.Tests/API/ApiApprovalTests.cs b/src/Akavache.Tests/API/ApiApprovalTests.cs
index 972f0c4a..6bfe934d 100644
--- a/src/Akavache.Tests/API/ApiApprovalTests.cs
+++ b/src/Akavache.Tests/API/ApiApprovalTests.cs
@@ -69,7 +69,7 @@ private static void CheckApproval(Assembly assembly, [CallerMemberName] string m
 
         var approvedPublicApi = File.ReadAllText(approvedFileName);
 
-        var generatorOptions = new ApiGeneratorOptions { WhitelistedNamespacePrefixes = new[] { "Akavache" } };
+        var generatorOptions = new ApiGeneratorOptions { AllowNamespacePrefixes = new[] { "Akavache" } };
         var receivedPublicApi = Filter(assembly.GeneratePublicApi(generatorOptions));
 
         if (!string.Equals(receivedPublicApi, approvedPublicApi, StringComparison.InvariantCulture))
diff --git a/src/Akavache.Tests/Akavache.Tests.csproj b/src/Akavache.Tests/Akavache.Tests.csproj
index bf6ac5d7..2dcfef79 100644
--- a/src/Akavache.Tests/Akavache.Tests.csproj
+++ b/src/Akavache.Tests/Akavache.Tests.csproj
@@ -18,8 +18,8 @@
     <PackageReference Include="ReactiveUI.Testing" Version="18.*" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" />
-    <PackageReference Include="FluentAssertions" Version="6.9.0" />
-    <PackageReference Include="DiffEngine" Version="11.1.0" />
+    <PackageReference Include="FluentAssertions" Version="6.10.0" />
+    <PackageReference Include="DiffEngine" Version="11.2.0" />
     <PackageReference Include="PublicApiGenerator" Version="11.0.0" />
     <PackageReference Include="coverlet.msbuild" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Akavache/Akavache.csproj b/src/Akavache/Akavache.csproj
index 07b91a91..6915ce91 100644
--- a/src/Akavache/Akavache.csproj
+++ b/src/Akavache/Akavache.csproj
@@ -10,15 +10,6 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
-    <Reference Include="Xamarin.Mac">
-      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
-      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
-      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
-      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   
   <ItemGroup>
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.4" />