Feature : Add Net 8.0 (#195)

ChrisPulman · web-flow · commit fc765e6558a1 · 2023-12-20T06:43:09.000Z
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -16,34 +16,20 @@ jobs:
     outputs:
       nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
     steps:
-    - name: Get Current Visual Studio Information
-      shell: bash
-      run: |
-        dotnet tool update -g dotnet-vs
-        echo "-- About RELEASE --"
-        vs where release
-        
-    - name: Update Visual Studio Latest Release
-      shell: bash
-      run: |
-        echo "-- Update RELEASE --"
-        vs update release Enterprise
-        vs modify release Enterprise +mobile +desktop +uwp +web
-        echo "-- About RELEASE Updated --"
-        vs where release
 
     - name: Checkout
       uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 0
         lfs: true
         
-    - name: Install .NET 6 & 7
+    - name: Install .NET 6 / 7 / 8
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
             6.0.x
             7.0.x
+            8.0.x
 
     - name: NBGV
       id: nbgv
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,34 +16,20 @@ jobs:
     outputs:
       nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
     steps:
-    - name: Get Current Visual Studio Information
-      shell: bash
-      run: |
-        dotnet tool update -g dotnet-vs
-        echo "-- About RELEASE --"
-        vs where release
-        
-    - name: Update Visual Studio Latest Release
-      shell: bash
-      run: |
-        echo "-- Update RELEASE --"
-        vs update release Enterprise
-        vs modify release Enterprise +mobile +desktop +uwp +web
-        echo "-- About RELEASE Updated --"
-        vs where release
 
     - name: Checkout
       uses: actions/checkout@v4.1.1
       with:
         fetch-depth: 0
         lfs: true
         
-    - name: Install .NET 6 & 7
+    - name: Install .NET 6 / 7 / 8
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
             6.0.x
             7.0.x
+            8.0.x
         
     - name: NBGV
       id: nbgv
@@ -59,9 +45,6 @@ jobs:
       run: dotnet build --configuration=${{ env.configuration }} --verbosity=minimal --no-restore
       working-directory: src
 
-    - uses: nuget/setup-nuget@v1
-      name: Setup NuGet
-
     - name: Pack
       run: dotnet pack --configuration=${{ env.configuration }} --verbosity=minimal --no-restore
       working-directory: src
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;IDE0190;IDE1006;IDE0071</NoWarn>
+    <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;IDE0190;IDE1006;IDE0071;SA1010</NoWarn>
     <Platform>AnyCPU</Platform>
     <IsTestProject>$(MSBuildProjectName.Contains('Tests'))</IsTestProject>
     <DebugType>embedded</DebugType>
@@ -38,6 +38,21 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="ReactiveUI.Testing" Version="19.5.1" />
+  </ItemGroup>
+
    <PropertyGroup>
     <SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
   </PropertyGroup>
diff --git a/src/ReactiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj b/src/ReactiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="7.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ReactiveMarbles.CacheDatabase.Benchmarks/ReactiveMarbles.CacheDatabase.Benchmarks.csproj b/src/ReactiveMarbles.CacheDatabase.Benchmarks/ReactiveMarbles.CacheDatabase.Benchmarks.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ReactiveMarbles.CacheDatabase.Core/ReactiveMarbles.CacheDatabase.Core.csproj b/src/ReactiveMarbles.CacheDatabase.Core/ReactiveMarbles.CacheDatabase.Core.csproj
@@ -1,13 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests.csproj b/src/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -14,16 +14,6 @@
 
   <ItemGroup>
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ReactiveMarbles.CacheDatabase.EncryptedSettings/ReactiveMarbles.CacheDatabase.EncryptedSettings.csproj b/src/ReactiveMarbles.CacheDatabase.EncryptedSettings/ReactiveMarbles.CacheDatabase.EncryptedSettings.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>ReactiveMarbles.CacheDatabase.EncryptedSettings</RootNamespace>
diff --git a/src/ReactiveMarbles.CacheDatabase.EncryptedSqlite3/ReactiveMarbles.CacheDatabase.EncryptedSqlite3.csproj b/src/ReactiveMarbles.CacheDatabase.EncryptedSqlite3/ReactiveMarbles.CacheDatabase.EncryptedSqlite3.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
     <DefineConstants>$(DefineConstants);ENCRYPTED</DefineConstants>
diff --git a/src/ReactiveMarbles.CacheDatabase.NewtonsoftJson/ReactiveMarbles.CacheDatabase.NewtonsoftJson.csproj b/src/ReactiveMarbles.CacheDatabase.NewtonsoftJson/ReactiveMarbles.CacheDatabase.NewtonsoftJson.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
diff --git a/src/ReactiveMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj b/src/ReactiveMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -9,19 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
-    <PackageReference Include="ReactiveUI.Testing" Version="19.5.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ReactiveMarbles.CacheDatabase.Settings/ReactiveMarbles.CacheDatabase.Settings.csproj b/src/ReactiveMarbles.CacheDatabase.Settings/ReactiveMarbles.CacheDatabase.Settings.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>ReactiveMarbles.CacheDatabase.Settings</RootNamespace>
diff --git a/src/ReactiveMarbles.CacheDatabase.Sqlite3/CacheEntry.cs b/src/ReactiveMarbles.CacheDatabase.Sqlite3/CacheEntry.cs
@@ -47,6 +47,6 @@ internal class CacheEntry
         /// <summary>
         /// Gets or sets the value of the entry.
         /// </summary>
-        public byte[]? Value { get; set; } = Array.Empty<byte>();
+        public byte[]? Value { get; set; } = [];
     }
 }
diff --git a/src/ReactiveMarbles.CacheDatabase.Sqlite3/ReactiveMarbles.CacheDatabase.Sqlite3.csproj b/src/ReactiveMarbles.CacheDatabase.Sqlite3/ReactiveMarbles.CacheDatabase.Sqlite3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
diff --git a/src/ReactiveMarbles.CacheDatabase.Sqlite3/SqliteBlobCache.cs b/src/ReactiveMarbles.CacheDatabase.Sqlite3/SqliteBlobCache.cs
@@ -100,10 +100,14 @@ public EncryptedSqliteBlobCache(SQLiteConnectionString connectionString, ISchedu
         public SqliteBlobCache(SQLiteConnectionString connectionString, IScheduler? scheduler = null)
 #endif
         {
+#if NETSTANDARD
             if (connectionString is null)
             {
                 throw new ArgumentNullException(nameof(connectionString));
             }
+#else
+            ArgumentNullException.ThrowIfNull(connectionString);
+#endif
 
             Connection = new SQLiteAsyncConnection(connectionString);
             Scheduler = scheduler ?? CoreRegistrations.TaskpoolScheduler;
diff --git a/src/ReactiveMarbles.CacheDatabase.Tests/BlobCacheTestsBase.cs b/src/ReactiveMarbles.CacheDatabase.Tests/BlobCacheTestsBase.cs
diff --git a/src/ReactiveMarbles.CacheDatabase.Tests/ReactiveMarbles.CacheDatabase.Tests.csproj b/src/ReactiveMarbles.CacheDatabase.Tests/ReactiveMarbles.CacheDatabase.Tests.csproj
diff --git a/src/ReactiveMarbles.CacheDatabase.sln b/src/ReactiveMarbles.CacheDatabase.sln

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,6 @@ internal class CacheEntry`
`47`	`47`	`/// <summary>`
`48`	`48`	`/// Gets or sets the value of the entry.`
`49`	`49`	`/// </summary>`
`50`		`- public byte[]? Value { get; set; } = Array.Empty<byte>();`
	`50`	`+ public byte[]? Value { get; set; } = [];`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,14 @@ public EncryptedSqliteBlobCache(SQLiteConnectionString connectionString, ISchedu`
`100`	`100`	`public SqliteBlobCache(SQLiteConnectionString connectionString, IScheduler? scheduler = null)`
`101`	`101`	`#endif`
`102`	`102`	`{`
	`103`	`+#if NETSTANDARD`
`103`	`104`	`if (connectionString is null)`
`104`	`105`	`{`
`105`	`106`	`throw new ArgumentNullException(nameof(connectionString));`
`106`	`107`	`}`
	`108`	`+#else`
	`109`	`+ ArgumentNullException.ThrowIfNull(connectionString);`
	`110`	`+#endif`
`107`	`111`
`108`	`112`	`Connection = new SQLiteAsyncConnection(connectionString);`
`109`	`113`	`Scheduler = scheduler ?? CoreRegistrations.TaskpoolScheduler;`