Merge branch 'js/gif-fixes' into js/png-pallete

3 years ago · c7da0705d6
2 changed files with 2 additions and 1 deletions
--- a/ImageSharp.sln
+++ b/ImageSharp.sln
@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_root", "_root", "{C317F1B1
 		Directory.Build.targets = Directory.Build.targets
 		LICENSE = LICENSE
 		README.md = README.md
+		SixLabors.ImageSharp.props = SixLabors.ImageSharp.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{1799C43E-5C54-4A8F-8D64-B1475241DB0D}"
--- a/SixLabors.ImageSharp.props
+++ b/SixLabors.ImageSharp.props
@ -2,7 +2,7 @@
 <Project>

  <!--Add common namespaces to implicit global usings if enabled.-->
-  <ItemGroup Condition="'$(ImplicitUsings)'=='enable' OR '$(ImplicitUsings)'=='true'">
+  <ItemGroup Condition="'$(UseImageSharp)'=='enable' OR '$(UseImageSharp)'=='true'">
    <Using Include="SixLabors.ImageSharp" />
    <Using Include="SixLabors.ImageSharp.PixelFormats" />
    <Using Include="SixLabors.ImageSharp.Processing" />