Merge branch 'dev-v5' into main-v5

Jeavon · May 8, 2024 · be92e39 · be92e39
2 parents 4b1ddb6 + 1a4da8e
commit be92e39
Show file tree

Hide file tree

Showing 7 changed files with 145 additions and 126 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -33,4 +33,5 @@ Slimsy Change log
 - 4.1.0 - Minor tweaks only from the beta release
 - 5.0.0 - Umbraco v13.2 compatability
 - 4.2.0 - Added AppendSourceDimensions & EncodeCommas options
-- 5.1.0 - Added AppendSourceDimensions & EncodeCommas options
+- 5.1.0 - Added AppendSourceDimensions & EncodeCommas options
+- 5.1.1 & 4.2.1 - Added AutoOrient global option
diff --git a/README.md b/README.md
@@ -114,6 +114,7 @@ Add/Edit `appsettings.json`
     "BackgroundColor": "",
     "AppendSourceDimensions": true,
     "EncodeCommas": true,
+    "AutoOrient": true
   }
 ```
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 5.1.1.{build}
+version: 5.1.2.{build}
 
 os: Visual Studio 2022
 
@@ -27,6 +27,11 @@ dotnet_csproj:
   file_version: '$(appveyor_file_version)'
   informational_version: '$(semver)'
 
+before_build:
+- pwsh: |
+    dotnet tool install --global GitVersion.Tool --version 5.*
+    dotnet-gitversion $env:APPVEYOR_BUILD_FOLDER /l console /nofetch /b $env:APPVEYOR_REPO_BRANCH
+
 build_script:
 - cmd: >-
     cd build
@@ -67,24 +72,4 @@ deploy:
       secure: SASQGWG/4zNns7bwSSsJ5RPvKcKfJsBeEPuw69wsVPA3PO739QmzVtc5VwQwgvbr
     artifact: /.*\.nupkg/
     on:
-      branch: dev-v4
-
-    # NuGet Deployment for releases
-  - provider: NuGet
-    server: 
-    api_key:
-      secure: adk3pI9HCByZg2VRxplX9UR6qHf97bA3as6dusxLswCKI8BQQE8DO5a0frLrI+EO
-    artifact: /.*\.nupkg/
-    on:
-      branch: main-v4
-      appveyor_repo_tag: true
-
-    # NuGet Deployment for releases
-  - provider: NuGet
-    server: 
-    api_key:
-      secure: adk3pI9HCByZg2VRxplX9UR6qHf97bA3as6dusxLswCKI8BQQE8DO5a0frLrI+EO
-    artifact: /.*\.nupkg/
-    on:
-      branch: main-v5
-      appveyor_repo_tag: true
+      branch: dev-v4
diff --git a/src/Slimsy.TestSite/appsettings.json b/src/Slimsy.TestSite/appsettings.json
@@ -32,7 +32,7 @@
   },
   "Slimsy": {
     "WidthStep": 180,
-    "UseCropAsSrc": false,
+    "UseCropAsSrc": true,
     "DefaultQuality": 70,
     "Format": "",
     "BackgroundColor": "white",

diff --git a/src/Slimsy.TestSite/umbraco/Data/Umbraco.sqlite.db b/src/Slimsy.TestSite/umbraco/Data/Umbraco.sqlite.db
diff --git a/src/Slimsy.TestSite/wwwroot/css/umbraco-starterkit-style.css b/src/Slimsy.TestSite/wwwroot/css/umbraco-starterkit-style.css
@@ -1989,7 +1989,8 @@ article {
 
     article img {
         max-width: 100%;
-        width:100%
+        width:100%;
+        height:auto
     }
 
     article iframe, article img {

diff --git a/src/Slimsy/Services/SlimsyService.cs b/src/Slimsy/Services/SlimsyService.cs