Merge pull request #1302 from praeclarum/rel1.10

Prepare 1.11 Release

Author: praeclarum

.github/workflows/build.yml

@@ -11,11 +11,11 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
 
     steps:
 
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v6
 
     - name: Update Versions
       env:
@@ -24,10 +24,13 @@ jobs:
         sed -i.bak "s:</VersionPrefix>:.$VERSION_BUILD</VersionPrefix>:g" Directory.Build.props
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
         global-json-file: global.json
 
+    - name: Restore Workloads
+      run: dotnet workload restore SQLite.sln
+
     - name: Install Code Coverarage Tool
       run: dotnet tool install --global dotnet-reportgenerator-globaltool
 
@@ -64,7 +67,7 @@ jobs:
         customSettings: '' # Optional custom settings (separated by semicolon). See: https://github.com/danielpalme/ReportGenerator/wiki/Settings.
 
     - name: Deploy Code Coverage Report
-      uses: peaceiris/actions-gh-pages@v3
+      uses: peaceiris/actions-gh-pages@v4
       if: github.event_name == 'push'
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -77,7 +80,7 @@ jobs:
       run: |
         make nuget
 
-    - uses: actions/upload-artifact@master
+    - uses: actions/upload-artifact@v7
       if: github.event_name == 'push'
       with:
         name: Packages

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>1.10</VersionPrefix>
+        <VersionPrefix>1.11</VersionPrefix>
         <VersionSuffix>beta</VersionSuffix>
 
         <PackageIcon>Logo-low.png</PackageIcon>

Directory.Packages.props

@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="AltCover" Version="8.7.3" />
+    <PackageVersion Include="ListDiff" Version="1.2.10" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageVersion Include="NUnit" Version="3.12.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageVersion Include="SourceGear.sqlite3" Version="3.50.4.5" />
+    <PackageVersion Include="SQLitePCLRaw.config.e_sqlite3" Version="3.0.3" />
+    <PackageVersion Include="SQLitePCLRaw.core" Version="3.0.3" />
+    <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="3.0.3" />
+    <PackageVersion Include="SQLitePCLRaw.provider.e_sqlite3" Version="3.0.3" />
+  </ItemGroup>
+</Project>

Makefile

@@ -5,15 +5,15 @@ PACKAGES_OUT=$(abspath PackagesOut)
 
 all: nuget
 
-nuget: pclnuget basenuget sqlciphernuget staticnuget
+nuget: enuget pclnuget basenuget staticnuget
 
-pclnuget: nuget/SQLite-net-std/SQLite-net-std.csproj $(SRC)
+enuget: nuget/SQLite-net-e/SQLite-net-e.csproj $(SRC)
 	dotnet pack -c Release -o $(PACKAGES_OUT) $<
 
-basenuget: nuget/SQLite-net-base/SQLite-net-base.csproj $(SRC)
+pclnuget: nuget/SQLite-net-std/SQLite-net-std.csproj $(SRC)
 	dotnet pack -c Release -o $(PACKAGES_OUT) $<
 
-sqlciphernuget: nuget/SQLite-net-sqlcipher/SQLite-net-sqlcipher.csproj $(SRC)
+basenuget: nuget/SQLite-net-base/SQLite-net-base.csproj $(SRC)
 	dotnet pack -c Release -o $(PACKAGES_OUT) $<
 
 staticnuget: nuget/SQLite-net-static/SQLite-net-static.csproj $(SRC)

README.md

@@ -8,7 +8,6 @@ Use one of these packages:
 | Version | Package | Description |
 | ------- | ------- | ----------- |
 | [![NuGet Package](https://img.shields.io/nuget/v/sqlite-net-pcl.svg)](https://www.nuget.org/packages/sqlite-net-pcl) | [sqlite-net-pcl](https://www.nuget.org/packages/sqlite-net-pcl) | .NET Standard Library |
-| [![NuGet Package with Encryption](https://img.shields.io/nuget/v/sqlite-net-sqlcipher.svg)](https://www.nuget.org/packages/sqlite-net-sqlcipher) | [sqlite-net-sqlcipher](https://www.nuget.org/packages/sqlite-net-sqlcipher) | With Encryption Support |
 | [![NuGet Package using P/Invoke](https://img.shields.io/nuget/v/sqlite-net-static.svg)](https://www.nuget.org/packages/sqlite-net-static) | [sqlite-net-static](https://www.nuget.org/packages/sqlite-net-static) | Special version that uses P/Invokes to platform-provided sqlite3 |
 | [![NuGet Package without a SQLitePCLRaw bundle](https://img.shields.io/nuget/v/sqlite-net-base.svg)](https://www.nuget.org/packages/sqlite-net-base) | [sqlite-net-base](https://www.nuget.org/packages/sqlite-net-base) | without a SQLitePCLRaw bundle so you can choose your own provider |
 
@@ -204,9 +203,9 @@ db.Execute ("insert into Stock(Symbol) values (?)", "MSFT");
 var stocks = db.Query<Stock> ("select * from Stock");
 ```
 
-## Using SQLCipher
+## Using encryption
 
-You can use an encrypted database by using the [sqlite-net-sqlcipher NuGet package](https://www.nuget.org/packages/sqlite-net-sqlcipher).
+If you are using a native SQLite instance which supports encryption:
 
 The database key is set in the `SqliteConnectionString` passed to the connection constructor: