Include SVGO in main nuget package again as it is much smaller

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
 

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"
+& dotnet pack "$scriptRoot\..\src\Dianoga\Dianoga.csproj" -Property:Configuration=Release -o $scriptRoot --include-symbols

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>