From 28fa1580b211f564ef71d0e36668a4363309a283 Mon Sep 17 00:00:00 2001
From: Mark Gibbons <markgibbons25@gmail.com>
Date: Wed, 27 Apr 2022 09:26:02 +1000
Subject: [PATCH] Include SVGO in main nuget package again as it is much
 smaller

---
 README.md                                     |  7 +++---
 build/PackageNuGet.ps1                        |  3 +--
 ...Svg.config.disabled => Dianoga.Svg.config} |  0
 src/Dianoga/Dianoga.csproj                    |  6 ++---
 src/Dianoga/Dianoga.svgtools.nuspec           | 23 -------------------
 5 files changed, 8 insertions(+), 31 deletions(-)
 rename src/Dianoga/Default Config Files/{Dianoga.Svg.config.disabled => Dianoga.Svg.config} (100%)
 delete mode 100644 src/Dianoga/Dianoga.svgtools.nuspec

diff --git a/README.md b/README.md
index db60b53..235de09 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,8 @@ Dianoga 3+ allows for ignoring specific paths in the media library. See `Dianoga
 
 ## Installation
 
-Dianoga 5+ has a NuGet package for the main code and configs, and a separate package for the SVGO tools - `Dianoga.svgtools`. This was done as SVGO is an 80MB library.
+Add the [Dianoga NuGet package](https://www.nuget.org/packages/Dianoga) to your solution. 
+If you're using PackageReferences instead of packages.config then also copy the config files and Dianoga Tools to your solution.
 Once Dianoga is installed, __clear your App_Data/MediaCache folder__, and you're done.
 
 To perform a manual installation:
@@ -64,8 +65,8 @@ To perform a manual installation:
 
 ### Dianoga.svgtools
 
-If you are enabling the SVGO optimiser, you'll also need the [Dianoga.svgtools](https://www.nuget.org/packages/Dianoga.svgtools) NuGet package.
-This is simply a prepackaged compiled version of SVGO called from [here](https://github.com/Antonytm/svgo-executable).
+In Dianoga 5, there was a separate package for SVGO. In Dianoga 6, SVGO is in the main NuGet package again.
+The SVGO executable is a compiled version of SVGO called from [here](https://github.com/Antonytm/svgo-executable).
 
 ## Next-gen Formats Support
 
diff --git a/build/PackageNuGet.ps1 b/build/PackageNuGet.ps1
index 08beac6..5425eac 100644
--- a/build/PackageNuGet.ps1
+++ b/build/PackageNuGet.ps1
@@ -35,5 +35,4 @@ $solution = "$scriptRoot\..\Dianoga.sln"
 & $nuGet restore $solution
 & $msBuild $solution /p:Configuration=Release /t:Rebuild /m
 
-& dotnet pack "$scriptRoot\..\src\Dianoga\Dianoga.csproj" -Property:Configuration=Release -o $scriptRoot --include-symbols
-& $nuGet pack "$scriptRoot\..\src\Dianoga\Dianoga.svgtools.nuspec"
\ No newline at end of file
+& dotnet pack "$scriptRoot\..\src\Dianoga\Dianoga.csproj" -Property:Configuration=Release -o $scriptRoot --include-symbols
\ No newline at end of file
diff --git a/src/Dianoga/Default Config Files/Dianoga.Svg.config.disabled b/src/Dianoga/Default Config Files/Dianoga.Svg.config
similarity index 100%
rename from src/Dianoga/Default Config Files/Dianoga.Svg.config.disabled
rename to src/Dianoga/Default Config Files/Dianoga.Svg.config
diff --git a/src/Dianoga/Dianoga.csproj b/src/Dianoga/Dianoga.csproj
index 66121f3..293f130 100644
--- a/src/Dianoga/Dianoga.csproj
+++ b/src/Dianoga/Dianoga.csproj
@@ -4,14 +4,14 @@
 		<TargetFrameworks>net452;net462;net471;net48</TargetFrameworks>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<Description>Automatic media library image file optimization for Sitecore</Description>
-		<Version>6.0.0-beta.3</Version>
+		<Version>6.0.0</Version>
 		<Authors>Kam Figy, Mark Gibbons</Authors>
 		<PackageProjectUrl>https://github.com/kamsar/Dianoga</PackageProjectUrl>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryUrl>https://github.com/kamsar/Dianoga</RepositoryUrl>
 		<PackageIconUrl>https://kamsar.net/nuget/dianoga/logo.png</PackageIconUrl>
 		<PackageTags>sitecore image optimization</PackageTags>
-		<Copyright>Copyright 2021</Copyright>
+		<Copyright>Copyright 2022</Copyright>
 		<Company />
 		<Product />
 		<RepositoryType>git</RepositoryType>
@@ -81,6 +81,6 @@
 	</ItemGroup>
 	<ItemGroup>
 		<Content Include="Default Config Files\*" PackagePath="content\App_Config\Include\Dianoga" />
-		<Content Include="Dianoga Tools\**\*" Exclude="Dianoga Tools\SVGO\**\*" PackagePath="content\App_Data\Dianoga Tools" />
+		<Content Include="Dianoga Tools\**\*" PackagePath="content\App_Data\Dianoga Tools" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Dianoga/Dianoga.svgtools.nuspec b/src/Dianoga/Dianoga.svgtools.nuspec
deleted file mode 100644
index 44becf3..0000000
--- a/src/Dianoga/Dianoga.svgtools.nuspec
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<package>
-	<metadata>
-		<id>Dianoga.svgtools</id>
-		<version>6.0.0-beta.3</version>
-		<title>Dianoga.svgtools</title>
-		<authors>Kam Figy, Mark Gibbons</authors>
-		<owners>Kam Figy, Mark Gibbons</owners>
-		<license type="expression">MIT</license>
-		<projectUrl>https://github.com/kamsar/Dianoga</projectUrl>
-		<iconUrl>https://kamsar.net/nuget/dianoga/logo.png</iconUrl>
-		<requireLicenseAcceptance>false</requireLicenseAcceptance>
-		<description>Dianoga - SVGO package for SVG optimization</description>
-		<copyright>Copyright 2021</copyright>
-		<tags>sitecore image optimization</tags>
-		<dependencies>
-			<dependency id="Dianoga" version="6.0.0-beta.3" />
-		</dependencies>
-	</metadata> 
-	<files>
-		<file src="Dianoga Tools\SVGO\**\*" target="content\App_Data\Dianoga Tools\SVGO" />
-	</files>
-</package>
\ No newline at end of file