Housekeeping Update packages (#129)

* Update packages

Tested new packages with net48, still has issue with e_sqlite3 not found

* Update packages, Add Net 7.0

* update build scripts

* remove conditions

Author: ChrisPulman

.github/workflows/ci-build.yml

@@ -16,17 +16,34 @@ 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/[email protected]
       with:
         fetch-depth: 0
         lfs: true
 
-    - name: Install .NET 6
+    - name: Install .NET 6 & 7
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
-        dotnet-quality: 'preview'
+        dotnet-version: |
+            6.0.x
+            7.0.x
 
     - name: NBGV
       id: nbgv
@@ -43,27 +60,21 @@ jobs:
       working-directory: src
 
     - name: Run Unit Tests and Generate Coverage
-      uses: glennawatson/coverlet-msbuild@v2
+      uses: glennawatson/coverlet-msbuild@v2.1
       with:
         project-files: '**/*Tests*.csproj'
         no-build: true
         exclude-filter: '[${{env.productNamespacePrefix}}.*.Tests.*]*'
         include-filter: '[${{env.productNamespacePrefix}}*]*'
         output-format: cobertura
-        output: '../../artifacts/'
         configuration: ${{ env.configuration }}
 
     - name: Pack
       run: dotnet pack --configuration=${{ env.configuration }} --verbosity=minimal --no-restore
       working-directory: src
 
     - name: Upload Code Coverage
-      shell: bash
-      run: |
-        echo $PWD
-        bash <(curl -s https://codecov.io/bash) -X gcov -X coveragepy -t ${{ env.CODECOV_TOKEN }} -s '$PWD/artifacts' -f '*.xml'
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      uses: codecov/codecov-action@v3
 
     - name: Create NuGet Artifacts
       uses: actions/upload-artifact@master

.github/workflows/release.yml

@@ -16,17 +16,34 @@ 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/[email protected]
       with:
         fetch-depth: 0
         lfs: true
-
-    - name: Install .NET 6
+        
+    - name: Install .NET 6 & 7
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
-        dotnet-quality: 'preview'
+        dotnet-version: |
+            6.0.x
+            7.0.x
         
     - name: NBGV
       id: nbgv

src/ReactiveMarbles.CacheData.SystemTextJson/ReactiveMarbles.CacheDatabase.SystemTextJson.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>

src/ReactiveMarbles.CacheDatabase.Core/ReactiveMarbles.CacheDatabase.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>

src/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests/ReactiveMarbles.CacheDatabase.EncryptedSettings.Tests.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.3" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

src/ReactiveMarbles.CacheDatabase.EncryptedSettings/ReactiveMarbles.CacheDatabase.EncryptedSettings.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>ReactiveMarbles.CacheDatabase.EncryptedSettings</RootNamespace>

src/ReactiveMarbles.CacheDatabase.EncryptedSqlite3/ReactiveMarbles.CacheDatabase.EncryptedSqlite3.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</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.3" />
+    <PackageReference Include="sqlite-net-sqlcipher" Version="1.9.141-beta" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlcipher" Version="2.1.4" />
   </ItemGroup>
 
   <ItemGroup>

src/ReactiveMarbles.CacheDatabase.NewtonsoftJson/ReactiveMarbles.CacheDatabase.NewtonsoftJson.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>

src/ReactiveMarbles.CacheDatabase.Settings.Tests/ReactiveMarbles.CacheDatabase.Settings.Tests.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.3" />
+    <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

src/ReactiveMarbles.CacheDatabase.Settings/ReactiveMarbles.CacheDatabase.Settings.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RootNamespace>ReactiveMarbles.CacheDatabase.Settings</RootNamespace>