Skip to content

Remove c#11 features that were retracted #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 11, 2022
Merged

Remove c#11 features that were retracted #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.108" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ctiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="6.0.5" />
<PackageReference Include="System.Text.Json" Version="6.0.6" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/ReactiveMarbles.CacheDatabase.Benchmarks/ReactiveMarbles.CacheDatabase.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net5.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveMarbles.CacheDatabase.Core/HttpService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public HttpService()
/// <param name="fetchAlways">Force a web request to always be issued, skipping the cache.</param>
/// <param name="absoluteExpiration">An optional expiration date.</param>
/// <returns>The data downloaded from the URL.</returns>
public IObservable<byte[]> DownloadUrl(IBlobCache blobCache!!, string url, HttpMethod? method = default, IEnumerable<KeyValuePair<string, string>>? headers = null, bool fetchAlways = false, DateTimeOffset? absoluteExpiration = null) =>
public IObservable<byte[]> DownloadUrl(IBlobCache blobCache, string url, HttpMethod? method = default, IEnumerable<KeyValuePair<string, string>>? headers = null, bool fetchAlways = false, DateTimeOffset? absoluteExpiration = null) =>
blobCache.DownloadUrl(url, url, method, headers, fetchAlways, absoluteExpiration);

/// <summary>
Expand All @@ -64,7 +64,7 @@ public IObservable<byte[]> DownloadUrl(IBlobCache blobCache!!, string url, HttpM
/// <param name="fetchAlways">Force a web request to always be issued, skipping the cache.</param>
/// <param name="absoluteExpiration">An optional expiration date.</param>
/// <returns>The data downloaded from the URL.</returns>
public IObservable<byte[]> DownloadUrl(IBlobCache blobCache!!, Uri url, HttpMethod? method = default, IEnumerable<KeyValuePair<string, string>>? headers = null, bool fetchAlways = false, DateTimeOffset? absoluteExpiration = null) => url is null
public IObservable<byte[]> DownloadUrl(IBlobCache blobCache, Uri url, HttpMethod? method = default, IEnumerable<KeyValuePair<string, string>>? headers = null, bool fetchAlways = false, DateTimeOffset? absoluteExpiration = null) => url is null
? throw new ArgumentNullException(nameof(url))
: blobCache.DownloadUrl(url.ToString(), url, method, headers, fetchAlways, absoluteExpiration);

Expand Down
14 changes: 7 additions & 7 deletions src/ReactiveMarbles.CacheDatabase.Core/SerializerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static class SerializerExtensions
/// <param name="keyValuePairs">The key/value to insert.</param>
/// <param name="absoluteExpiration">An optional expiration date.</param>
/// <returns>A observable which signals when complete.</returns>
public static IObservable<Unit> InsertObjects<T>(this IBlobCache blobCache, IEnumerable<KeyValuePair<string, T>> keyValuePairs!!, DateTimeOffset? absoluteExpiration = null)
public static IObservable<Unit> InsertObjects<T>(this IBlobCache blobCache, IEnumerable<KeyValuePair<string, T>> keyValuePairs, DateTimeOffset? absoluteExpiration = null)
{
if (blobCache is null)
{
Expand All @@ -47,7 +47,7 @@ public static IObservable<Unit> InsertObjects<T>(this IBlobCache blobCache, IEnu
/// <param name="blobCache">The blob cache.</param>
/// <param name="keys">The keys to get the values for.</param>
/// <returns>A observable with the specified values.</returns>
public static IObservable<KeyValuePair<string, T>> GetObjects<T>(this IBlobCache blobCache, IEnumerable<string> keys!!)
public static IObservable<KeyValuePair<string, T>> GetObjects<T>(this IBlobCache blobCache, IEnumerable<string> keys)
{
if (blobCache is null)
{
Expand Down Expand Up @@ -114,7 +114,7 @@ public static IObservable<Unit> InsertObject<T>(this IBlobCache blobCache, strin
/// <param name="blobCache">The blob cache.</param>
/// <returns>A Future result representing all objects in the cache
/// with the specified Type.</returns>
public static IObservable<T> GetAllObjects<T>(this IBlobCache blobCache!!) =>
public static IObservable<T> GetAllObjects<T>(this IBlobCache blobCache) =>
blobCache is null
? throw new ArgumentNullException(nameof(blobCache))
: blobCache
Expand Down Expand Up @@ -219,7 +219,7 @@ blobCache is null
/// <typeparam name="T">The type of item to get.</typeparam>
/// <returns>A Future result representing the deserialized object from
/// the cache.</returns>
public static IObservable<T?> GetOrFetchObject<T>(this IBlobCache blobCache!!, string key, Func<IObservable<T>> fetchFunc, DateTimeOffset? absoluteExpiration = null) =>
public static IObservable<T?> GetOrFetchObject<T>(this IBlobCache blobCache, string key, Func<IObservable<T>> fetchFunc, DateTimeOffset? absoluteExpiration = null) =>
blobCache.GetObject<T>(key).Catch<T?, Exception>(_ => fetchFunc());

/// <summary>
Expand All @@ -242,7 +242,7 @@ blobCache is null
/// <param name="absoluteExpiration">An optional expiration date.</param>
/// <returns>A Future result representing the deserialized object from
/// the cache.</returns>
public static IObservable<T?> GetOrFetchObject<T>(this IBlobCache blobCache!!, string key, Func<Task<T>> fetchFunc, DateTimeOffset? absoluteExpiration = null) =>
public static IObservable<T?> GetOrFetchObject<T>(this IBlobCache blobCache, string key, Func<Task<T>> fetchFunc, DateTimeOffset? absoluteExpiration = null) =>
blobCache.GetOrFetchObject(key, () => fetchFunc().ToObservable(), absoluteExpiration);

/// <summary>
Expand Down Expand Up @@ -309,7 +309,7 @@ blobCache is null
/// <returns>An Observable stream containing either one or two
/// results (possibly a cached version, then the latest version).</returns>
public static IObservable<T?> GetAndFetchLatest<T>(
this IBlobCache blobCache!!,
this IBlobCache blobCache,
string key,
Func<IObservable<T>> fetchFunc,
Func<DateTimeOffset, bool>? fetchPredicate = null,
Expand Down Expand Up @@ -392,7 +392,7 @@ blobCache is null
/// <returns>An Observable stream containing either one or two
/// results (possibly a cached version, then the latest version).</returns>
public static IObservable<T?> GetAndFetchLatest<T>(
this IBlobCache blobCache!!,
this IBlobCache blobCache,
string key,
Func<Task<T>> fetchFunc,
Func<DateTimeOffset, bool>? fetchPredicate = null,
Expand Down
7 changes: 4 additions & 3 deletions ...base.EncryptedSettings.Tests/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
5 changes: 3 additions & 2 deletions ...bles.CacheDatabase.EncryptedSqlite3/ReactiveMarbles.CacheDatabase.EncryptedSqlite3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net48</TargetFrameworks>
<Nullable>enable</Nullable>
<LangVersion>preview</LangVersion>
<DefineConstants>$(DefineConstants);ENCRYPTED</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="sqlite-net-sqlcipher" Version="1.8.116" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.2" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 5 additions & 4 deletions ...eMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
Expand All @@ -8,9 +8,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveMarbles.CacheDatabase.Settings/Core/SettingsStorage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public abstract class SettingsStorage : ISettingsStorage
/// <param name="cache">
/// An <see cref="IBlobCache"/> implementation where you want your settings to be stored.
/// </param>
protected SettingsStorage(string keyPrefix, IBlobCache cache!!)
protected SettingsStorage(string keyPrefix, IBlobCache cache)
{
if (string.IsNullOrWhiteSpace(keyPrefix))
{
Expand Down
3 changes: 2 additions & 1 deletion src/ReactiveMarbles.CacheDatabase.Sqlite3/ReactiveMarbles.CacheDatabase.Sqlite3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net48</TargetFrameworks>
<Nullable>enable</Nullable>
<LangVersion>preview</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.2" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 6 additions & 3 deletions src/ReactiveMarbles.CacheDatabase.Tests/ReactiveMarbles.CacheDatabase.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0</TargetFrameworks>
<LangVersion>preview</LangVersion>
<IsPackable>false</IsPackable>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.2" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.2" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down