Skip to content

Commit 66031df

Browse files
ChrisPulmanChrisPulman
authored
Update packages resolve conflicts (#1012)
1 parent e8eec72 commit 66031df

17 files changed

+385
-56
lines changed

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012 GitHub
1+
Copyright (c) ReactiveUI 2012 - 2025
22

33
Permission is hereby granted, free of charge, to any person obtaining a
44
copy of this software and associated documentation files (the "Software"),

‎src/Akavache.Core/Akavache.Core.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
14+
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
1515
<PackageReference Include="System.Reactive" Version="6.0.1" />
1616
<PackageReference Include="Splat" Version="15.3.1" />
17-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.2" />
17+
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.3" />
18+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
1819
</ItemGroup>
1920

2021
<ItemGroup>

‎src/Akavache.Drawing/Akavache.Drawing.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Splat.Drawing" Version="15.2.22" />
17+
<PackageReference Include="Splat.Drawing" Version="15.3.1" />
18+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
1819
</ItemGroup>
1920
</Project>

‎src/Akavache.Mobile/Akavache.Mobile.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
</ItemGroup>
1313
<ItemGroup>
1414
<PackageReference Include="reactiveui" Version="20.1.63" />
15+
<PackageReference Include="System.Text.Json" Version="9.0.3" />
16+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
1517
</ItemGroup>
1618

1719
<ItemGroup>

‎src/Akavache.Sqlite3/Akavache.Sqlite3.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</ItemGroup>
1515
<ItemGroup>
1616
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
17+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.3" />
1718
</ItemGroup>
1819

1920
<ItemGroup>

‎src/Akavache.Sqlite3/SqlLiteCache/SqlRawPersistentBlobCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ private byte[] SerializeObject<T>(T value)
783783
{
784784
try
785785
{
786-
var boxedVal = serializer.Deserialize<ObjectWrapper<T>>(reader).Value;
786+
var boxedVal = serializer.Deserialize<ObjectWrapper<T>>(reader)!.Value;
787787
return Observable.Return(boxedVal);
788788
}
789789
catch (Exception ex)

‎src/Akavache.Tests/API/ApiApprovalTests.AkavacheCore.DotNet8_0.verified.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ namespace Akavache
1111
public class AkavacheHttpMixin : Akavache.IAkavacheHttpMixin
1212
{
1313
public AkavacheHttpMixin() { }
14-
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
1514
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
16-
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
15+
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
1716
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
18-
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
17+
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
1918
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string key, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
20-
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
19+
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
2120
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
21+
public System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
2222
}
2323
[System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Registrations for Akavache.Core")]
2424
[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCode("Registrations for Akavache.Core")]
@@ -47,10 +47,10 @@ namespace Akavache
4747
public class CacheEntry
4848
{
4949
public CacheEntry(string? typeName, byte[] value, System.DateTimeOffset createdAt, System.DateTimeOffset? expiresAt) { }
50-
public System.DateTimeOffset CreatedAt { get; set; }
51-
public System.DateTimeOffset? ExpiresAt { get; set; }
52-
public string? TypeName { get; set; }
53-
public byte[] Value { get; set; }
50+
public System.DateTimeOffset CreatedAt { get; protected set; }
51+
public System.DateTimeOffset? ExpiresAt { get; protected set; }
52+
public string? TypeName { get; protected set; }
53+
public byte[] Value { get; protected set; }
5454
}
5555
public enum DataProtectionScope
5656
{
@@ -75,29 +75,29 @@ namespace Akavache
7575
}
7676
public static class HttpMixinExtensions
7777
{
78-
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
7978
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
80-
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
79+
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
8180
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
82-
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
81+
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
8382
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, string key, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
84-
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
83+
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
8584
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
85+
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default) { }
8686
}
8787
public interface IAkavacheHttpClientFactory
8888
{
8989
System.Net.Http.HttpClient CreateClient(string name);
9090
}
9191
public interface IAkavacheHttpMixin
9292
{
93-
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
9493
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
95-
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
94+
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
9695
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
97-
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
96+
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
9897
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string key, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
99-
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
98+
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
10099
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, System.Uri url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
100+
System.IObservable<byte[]> DownloadUrl(Akavache.IBlobCache blobCache, System.Net.Http.HttpMethod method, string key, string url, System.Collections.Generic.IDictionary<string, string>? headers = null, bool fetchAlways = false, System.DateTimeOffset? absoluteExpiration = default);
101101
}
102102
public interface IBlobCache : System.IDisposable
103103
{
@@ -169,7 +169,7 @@ namespace Akavache
169169
public InMemoryBlobCache(System.Reactive.Concurrency.IScheduler scheduler) { }
170170
public InMemoryBlobCache(System.Reactive.Concurrency.IScheduler? scheduler, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, byte[]>>? initialContents) { }
171171
public System.DateTimeKind? ForcedDateTimeKind { get; set; }
172-
public System.Reactive.Concurrency.IScheduler Scheduler { get; set; }
172+
public System.Reactive.Concurrency.IScheduler Scheduler { get; protected set; }
173173
public System.IObservable<System.Reactive.Unit> Shutdown { get; }
174174
public void Dispose() { }
175175
protected virtual void Dispose(bool isDisposing) { }
@@ -237,8 +237,8 @@ namespace Akavache
237237
}
238238
public static class RelativeTimeMixin
239239
{
240-
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, string url, System.TimeSpan expiration, System.Collections.Generic.Dictionary<string, string>? headers = null, bool fetchAlways = false) { }
241240
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, System.Uri url, System.TimeSpan expiration, System.Collections.Generic.Dictionary<string, string>? headers = null, bool fetchAlways = false) { }
241+
public static System.IObservable<byte[]> DownloadUrl(this Akavache.IBlobCache blobCache, string url, System.TimeSpan expiration, System.Collections.Generic.Dictionary<string, string>? headers = null, bool fetchAlways = false) { }
242242
public static System.IObservable<System.Reactive.Unit> Insert(this Akavache.IBlobCache blobCache, string key, byte[] data, System.TimeSpan expiration) { }
243243
public static System.IObservable<System.Reactive.Unit> InsertObject<T>(this Akavache.IBlobCache blobCache, string key, T value, System.TimeSpan expiration) { }
244244
public static System.IObservable<System.Reactive.Unit> SaveLogin(this Akavache.ISecureBlobCache blobCache, string user, string password, string host, System.TimeSpan expiration) { }

0 commit comments

Comments
 (0)