Merge branch 'develop' into release/v6/6.0.3

.github/workflows/build.yml

@@ -0,0 +1,52 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build-ubuntu:
+    name: Build on Ubuntu (full)
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.0'
+    - uses: actions/checkout@v3
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --logger "trx;LogFileName=test-results.trx"
+    - name: Test Report
+      uses: actions/upload-artifact@v3
+      if: success() || failure()
+      with:
+        name: test-results
+        path: '**/TestResults/*.trx'
+
+  build-windows:
+    name: Build on Windows
+    runs-on: windows-latest
+    steps:
+    - uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.0'
+    - uses: actions/checkout@v3
+    - name: Enable Postgres
+      run: sc config postgresql-x64-14 start= demand
+    - name: Start Postgres
+      run: net start postgresql-x64-14
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore /p:POSTGRES_ONLY=true
+    - name: Test
+      env:
+        USE_LOCAL_SERVICE: 'true'
+      run: dotnet test ./test/FlexLabs.EntityFrameworkCore.Upsert.IntegrationTests --no-build --logger "trx;LogFileName=test-results.trx"
+    - name: Test Report
+      uses: actions/upload-artifact@v3
+      if: success() || failure()
+      with:
+        name: test-results-win
+        path: '**/TestResults/*.trx'

.github/workflows/test-report.yml

@@ -0,0 +1,31 @@
+name: 'Test Report'
+
+on:
+  workflow_run:
+    workflows: ['Build']
+    types:
+      - completed
+
+permissions:
+  contents: read
+  actions: read
+  checks: write
+
+jobs:
+  report:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Extract test results
+      uses: dorny/test-reporter@v1
+      with:
+        artifact: test-results
+        name: Test Results (Ubuntu)
+        path: '**/TestResults/*.trx'
+        reporter: dotnet-trx
+    - name: Extract test results (Windows)
+      uses: dorny/test-reporter@v1
+      with:
+        artifact: test-results-win
+        name: Test Results (Windows)
+        path: '**/TestResults/*.trx'
+        reporter: dotnet-trx

Directory.Build.props

@@ -0,0 +1,9 @@
+<Project>
+
+  <Sdk Name="DotNet.ReproducibleBuilds.Isolated" Version="1.2.25" />
+
+  <ItemGroup>
+    <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25" PrivateAssets="All"/>
+  </ItemGroup>
+
+</Project>

FlexLabs.Upsert.sln

@@ -5,16 +5,14 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solution", ".solution", "{8F601D76-FA75-4B32-AACB-559A63305223}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		appveyor.signed.yml = appveyor.signed.yml
-		appveyor.yml = appveyor.yml
 		build.release.signed.bat = build.release.signed.bat
+		Directory.Build.props = Directory.Build.props
 		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github-workflows", "github-workflows", "{3B24B110-DA69-4764-9EB3-E7E89695A6DC}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\build-full.yml = .github\workflows\build-full.yml
-		.github\workflows\build-quick.yml = .github\workflows\build-quick.yml
+		.github\workflows\build.yml = .github\workflows\build.yml
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0DCBBEBD-A5B9-46F1-B9DE-F469447630F1}"

README.md

@@ -7,7 +7,7 @@ CI build: [![FlexLabs.EntityFrameworkCore.Upsert on MyGet](https://img.shields.i
 
 This library adds basic support for "Upsert" operations to EF Core.
 
-Uses `INSERT … ON CONFLICT DO UPDATE` in PostgreSQL/Sqlite, `MERGE` in SqlServer and `INSERT INTO … ON DUPLICATE KEY UPDATE` in MySQL.
+Uses `INSERT … ON CONFLICT DO UPDATE` in PostgreSQL/Sqlite, `MERGE` in SqlServer & Oracle and `INSERT INTO … ON DUPLICATE KEY UPDATE` in MySQL.
 
 Also supports injecting sql command runners to add support for other providers
 

build.release.signed.bat

@@ -7,7 +7,7 @@ SET VERSION=%1
 )
 
 @ECHO -- Building solution in release mode
-dotnet pack -c Release -p:SignCertificateName="Open Source Developer%%2c Artiom Chilaru" %SUFFIX%
+dotnet pack -c Release -p:SignCertificateName="Open Source Developer%%2c Artiom Chilaru" -p:ContinuousIntegrationBuild=true %SUFFIX%
 @IF ERRORLEVEL 1 goto ERROR
 
 @ECHO -- Signing the nuget package

src/FlexLabs.EntityFrameworkCore.Upsert/FlexLabs.EntityFrameworkCore.Upsert.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <NeutralLanguage>en</NeutralLanguage>
     <Nullable>enable</Nullable>
@@ -15,13 +15,19 @@
 Uses `INSERT … ON CONFLICT DO UPDATE` in PostgreSQL/Sqlite, `MERGE` in SqlServer and `INSERT INTO … ON DUPLICATE KEY UPDATE` in MySQL.
 
 Also supports injecting sql command generators to add support for other providers</Description>
-    <Copyright>Artiom Chilaru © 2019</Copyright>
+    <Copyright>Artiom Chilaru © 2023</Copyright>
     <PackageProjectUrl>https://github.com/artiomchi/FlexLabs.Upsert</PackageProjectUrl>
     <RepositoryUrl>https://github.com/artiomchi/FlexLabs.Upsert</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>Entity Framework Core entity-framework-core EF EntityFramework EntityFrameworkCore EFCore Upsert</PackageTags>
-    <VersionPrefix>6.0.2</VersionPrefix>
+    <VersionPrefix>8.0.0</VersionPrefix>
     <PackageReleaseNotes>
+v8.0.0
++ Adding support for EF Core 8
+
+v7.0.0
++ Adding support for EF Core 7
+
 v6.0.2
 * Improving entity type detection when using DbSet&lt;&gt;
 ! Patching MySQL handling of null columns
@@ -46,36 +52,22 @@ v4.0.0
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <DebugType>embedded</DebugType>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\certs\FlexLabsStrongKey.snk</AssemblyOriginatorKeyFile>
-    <SignCertificateName>Open Source Developer, Artiom Chilaru</SignCertificateName>
+    <SignCertificateName>Artiom Chilaru</SignCertificateName>
     <PostBuildEvent>signtool.exe sign /n "$(SignCertificateName)" /fd sha256 /tr "http://timestamp.digicert.com" /td sha256 FlexLabs.EntityFrameworkCore.Upsert.dll</PostBuildEvent>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(Configuration)'=='Release'">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+    <PackageReference Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.11.0-beta1.24508.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Update="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+    <EmbeddedResource Update="*.resx" EmitFormatMethods="true" />
   </ItemGroup>
 
 </Project>

src/FlexLabs.EntityFrameworkCore.Upsert/HelpLinks.cs

@@ -1,6 +1,6 @@
 namespace FlexLabs.EntityFrameworkCore.Upsert
 {
-    internal class HelpLinks
+    internal static class HelpLinks
     {
         internal const string Sqlite3Instructions = "https://go.flexlabs.org/upsert.sqlite3";
         // Also referenced in the xml comment for InvalidMatchColumnsException