Merge pull request #101 from Webreaper/develop

New PR
Webreaper · Feb 16, 2021 · e8b0b65 · e8b0b65
2 parents e3af91e + 35bd4d8
commit e8b0b65
Show file tree

Hide file tree

Showing 45 changed files with 1,518 additions and 416 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/damselfly-actions.yml b/.github/workflows/damselfly-actions.yml
@@ -13,6 +13,8 @@ jobs:
             os: ubuntu-latest
           - target: mac
             os: macos-latest
+          - target: m1
+            os: macos-latest
 
     steps:
       - name: Checkout Source
@@ -103,6 +105,13 @@ jobs:
         with:
           name: Desktop-Dist
           path: publish/wwwroot/desktop
+
+      - name: Validate Desktop and server artifacts
+        run: |
+             echo "Desktop artifacts:"
+             ls publish/wwwroot/desktop
+             echo "Server artifacts:"
+             ls server
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -118,11 +127,11 @@ jobs:
 
       - name: Build Docker for Dev (develop only)
         if: github.ref == 'refs/heads/develop'
-        run: sh scripts/makedocker.sh dev
+        run: sh scripts/makedocker.sh
 
       - name: Build Docker for Release (master only)
         if: github.ref == 'refs/heads/master'
-        run: sh scripts/makedocker.sh
+        run: sh scripts/makedocker.sh master
 
       - name: Create Release (master only)
         id: create_release
@@ -131,12 +140,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
         with:
-          tag_name: ${{ github.ref }}
+          tag_name: ${{ steps.getversion.outputs.version }}-beta
           release_name: Release v${{ steps.getversion.outputs.version }}
           body: |
-            Changes in this Release
-            - First Change
-            - Second Change
+            Docker: docker pull webreaper/damselfly:${{ steps.getversion.outputs.version }}-beta
           draft: false
           prerelease: true
 

diff --git a/Damselfly.Core/Damselfly.Core.csproj b/Damselfly.Core/Damselfly.Core.csproj
@@ -6,33 +6,34 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="MetadataExtractor" Version="2.4.3" />
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="WordPressPCL" Version="1.8.5" />
-    <PackageReference Include="EFCore.BulkExtensions" Version="3.2.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.2" />
+    <PackageReference Include="EFCore.BulkExtensions" Version="3.3.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.3" />
     <PackageReference Include="NExifTool" Version="0.9.0" />
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00839" />
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.2" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.2">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="EntityFramework" Version="6.4.4" />
     <PackageReference Include="font-awesome" Version="4.7.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.2">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.80.3-pr.1518.1" />
     <PackageReference Include="SkiaSharp" Version="2.80.3-pr.1518.1" />
+    <PackageReference Include="System.Text.Json" Version="5.0.1" />
+    <PackageReference Include="FluentValidation" Version="9.5.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="LogHandler.cs" />
@@ -44,6 +45,7 @@
     <Folder Include="Interfaces\" />
     <Folder Include="DBAbstractions\" />
     <Folder Include="ImageProcessing\" />
+    <Folder Include="Models\SideCars\" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="mono_crash.a7f6ef992.0.json" />