diff --git a/.gitmodules b/.gitmodules
index bfb843304..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "externals/SVG"]
- path = externals/SVG
- url = https://github.com/wieslawsoltes/SVG.git
-[submodule "externals/resvg"]
- path = externals/resvg
- url = https://github.com/wieslawsoltes/resvg.git
diff --git a/Svg.Skia.sln b/Svg.Skia.sln
index 046bc01a6..bdc45ed16 100644
--- a/Svg.Skia.sln
+++ b/Svg.Skia.sln
@@ -72,8 +72,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Svg.Skia", "src\Av
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSvgSkiaSample", "samples\AvaloniaSvgSkiaSample\AvaloniaSvgSkiaSample.csproj", "{81724F00-B7C3-4E25-B473-C7433BABDC81}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.Custom", "src\Svg.Custom\Svg.Custom.csproj", "{CFA46E73-0050-4C57-85CE-6C5868A2483C}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Svg.Skia.UnitTests", "tests\Avalonia.Svg.Skia.UnitTests\Avalonia.Svg.Skia.UnitTests.csproj", "{D4467DCA-494D-4C32-9525-4A9713221A53}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.Model", "src\Svg.Model\Svg.Model.csproj", "{4C970B2C-6C96-445B-B80B-4EFBF803FD5F}"
@@ -82,12 +80,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.CodeGen.Skia", "src\Svg
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.Skia", "src\Avalonia.Controls.Skia\Avalonia.Controls.Skia.csproj", "{223B7A5A-E263-4D40-9A6E-FE31EAE92F45}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Svg.Generators", "externals\SVG\Generators\Svg.Generators.csproj", "{AF8AEF5B-0664-4106-9BD3-389758F39B12}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "samples\TestApp\TestApp.csproj", "{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "externals", "externals", "{C5FFCF4B-86DC-453E-8006-44EE9EEFEE39}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimSkiaSharp", "src\ShimSkiaSharp\ShimSkiaSharp.csproj", "{6D2786A1-F110-4448-9CBF-D3CC9D803F31}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaControlsSample", "samples\AvaloniaControlsSample\AvaloniaControlsSample.csproj", "{BE25FC07-9A8C-4494-A6AE-F2561CF89010}"
@@ -137,10 +131,6 @@ Global
{81724F00-B7C3-4E25-B473-C7433BABDC81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81724F00-B7C3-4E25-B473-C7433BABDC81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81724F00-B7C3-4E25-B473-C7433BABDC81}.Release|Any CPU.Build.0 = Release|Any CPU
- {CFA46E73-0050-4C57-85CE-6C5868A2483C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CFA46E73-0050-4C57-85CE-6C5868A2483C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CFA46E73-0050-4C57-85CE-6C5868A2483C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CFA46E73-0050-4C57-85CE-6C5868A2483C}.Release|Any CPU.Build.0 = Release|Any CPU
{D4467DCA-494D-4C32-9525-4A9713221A53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4467DCA-494D-4C32-9525-4A9713221A53}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4467DCA-494D-4C32-9525-4A9713221A53}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,10 +147,6 @@ Global
{223B7A5A-E263-4D40-9A6E-FE31EAE92F45}.Debug|Any CPU.Build.0 = Debug|Any CPU
{223B7A5A-E263-4D40-9A6E-FE31EAE92F45}.Release|Any CPU.ActiveCfg = Release|Any CPU
{223B7A5A-E263-4D40-9A6E-FE31EAE92F45}.Release|Any CPU.Build.0 = Release|Any CPU
- {AF8AEF5B-0664-4106-9BD3-389758F39B12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AF8AEF5B-0664-4106-9BD3-389758F39B12}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AF8AEF5B-0664-4106-9BD3-389758F39B12}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AF8AEF5B-0664-4106-9BD3-389758F39B12}.Release|Any CPU.Build.0 = Release|Any CPU
{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -219,8 +205,6 @@ Global
{29F59C87-EAE6-4DD3-8666-B79BFAF6B34D} = {4C42912C-9F8C-43D9-A4B5-4427F7EC8F18}
{223B7A5A-E263-4D40-9A6E-FE31EAE92F45} = {4C42912C-9F8C-43D9-A4B5-4427F7EC8F18}
{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
- {CFA46E73-0050-4C57-85CE-6C5868A2483C} = {C5FFCF4B-86DC-453E-8006-44EE9EEFEE39}
- {AF8AEF5B-0664-4106-9BD3-389758F39B12} = {C5FFCF4B-86DC-453E-8006-44EE9EEFEE39}
{6D2786A1-F110-4448-9CBF-D3CC9D803F31} = {4C42912C-9F8C-43D9-A4B5-4427F7EC8F18}
{BE25FC07-9A8C-4494-A6AE-F2561CF89010} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{380E7565-C6FF-45C1-A683-E4E1FC744DCC} = {32B4A27D-6FC0-498C-9AD8-5510ACF2C4A1}
diff --git a/build/Svg.props b/build/Svg.props
index 0e44cc6be..ece07a79f 100644
--- a/build/Svg.props
+++ b/build/Svg.props
@@ -1,6 +1,6 @@
-
+
diff --git a/externals/SVG b/externals/SVG
deleted file mode 160000
index c21c914c5..000000000
--- a/externals/SVG
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c21c914c560b285fdead795fa37fd4e5264094a3
diff --git a/externals/resvg b/externals/resvg
deleted file mode 160000
index a739aef5d..000000000
--- a/externals/resvg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a739aef5d01360ec238c886bc50674f31458df00
diff --git a/samples/TestApp/Views/MainWindow.axaml.cs b/samples/TestApp/Views/MainWindow.axaml.cs
index 8e4025db1..b9a098f52 100644
--- a/samples/TestApp/Views/MainWindow.axaml.cs
+++ b/samples/TestApp/Views/MainWindow.axaml.cs
@@ -1,4 +1,3 @@
-using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
diff --git a/samples/svgc/svgc.csproj b/samples/svgc/svgc.csproj
index 20b2f7696..f01ef6208 100644
--- a/samples/svgc/svgc.csproj
+++ b/samples/svgc/svgc.csproj
@@ -33,7 +33,6 @@
-
diff --git a/src/Svg.Custom/LICENSE.TXT b/src/Svg.Custom/LICENSE.TXT
deleted file mode 100644
index 622a544b7..000000000
--- a/src/Svg.Custom/LICENSE.TXT
+++ /dev/null
@@ -1,31 +0,0 @@
-Microsoft Public License (Ms-PL)
-
-This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
-
-1. Definitions
-
-The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
-
-A "contribution" is the original software, or any additions or changes to the software.
-
-A "contributor" is any person that distributes its contribution under this license.
-
-"Licensed patents" are a contributor's patent claims that read directly on its contribution.
-
-2. Grant of Rights
-
-(A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
-
-(B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
-
-3. Conditions and Limitations
-
-(A) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
-
-(B) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
-
-(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
-
-(D) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
-
-(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
\ No newline at end of file
diff --git a/src/Svg.Custom/Properties/AssemblyInfo.cs b/src/Svg.Custom/Properties/AssemblyInfo.cs
deleted file mode 100644
index 9155b469a..000000000
--- a/src/Svg.Custom/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,3 +0,0 @@
-using System;
-
-[assembly: CLSCompliant(false)]
diff --git a/src/Svg.Custom/Svg.Custom.csproj b/src/Svg.Custom/Svg.Custom.csproj
deleted file mode 100644
index 535dcdcf8..000000000
--- a/src/Svg.Custom/Svg.Custom.csproj
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- Library
- netstandard2.0;net6.0;net8.0
- False
- False
- True
- CS1591;SYSLIB0014
- True
- disable
- true
- $(BaseIntermediateOutputPath)\$(Configuration)\$(TargetFramework)\GeneratedFiles
- $(DefineConstants);NO_SDC
-
-
-
- Custom build of the SVG rendering library.
- Svg.Custom
- MS-PL
- svg;vector graphics;rendering;2d;graphics;geometry;shapes
-
-
-
-
-
-
-
-
- ..\..\externals\SVG
-
-
-
-
-
-
- Resources\svg11.dtd
- Svg.Resources.svg11.dtd
-
-
-
-
-
-
-
-
-
-
-
- $(DefineConstants);NETSTANDARD;NETSTANDARD20
-
-
-
- $(DefineConstants);NETCORE;NET6
-
-
-
-
-
-
-
-
-
-
-
- $(DefineConstants);USE_SOURCE_GENERATORS
-
-
-
-
-
-
-
diff --git a/src/Svg.Model/Svg.Model.csproj b/src/Svg.Model/Svg.Model.csproj
index 557a522ac..6e4e4e47e 100644
--- a/src/Svg.Model/Svg.Model.csproj
+++ b/src/Svg.Model/Svg.Model.csproj
@@ -25,12 +25,10 @@
-
+
-
-
diff --git a/src/Svg.Skia/SKSvg.Model.cs b/src/Svg.Skia/SKSvg.cs
similarity index 100%
rename from src/Svg.Skia/SKSvg.Model.cs
rename to src/Svg.Skia/SKSvg.cs
diff --git a/src/Svg.Skia/Svg.Skia.csproj b/src/Svg.Skia/Svg.Skia.csproj
index 1da5e006f..591868343 100644
--- a/src/Svg.Skia/Svg.Skia.csproj
+++ b/src/Svg.Skia/Svg.Skia.csproj
@@ -23,12 +23,10 @@
+
-
-
-
diff --git a/src/Svg.SourceGenerator.Skia/Svg.SourceGenerator.Skia.csproj b/src/Svg.SourceGenerator.Skia/Svg.SourceGenerator.Skia.csproj
index 7644b5ef1..6cc2e0a58 100644
--- a/src/Svg.SourceGenerator.Skia/Svg.SourceGenerator.Skia.csproj
+++ b/src/Svg.SourceGenerator.Skia/Svg.SourceGenerator.Skia.csproj
@@ -37,13 +37,13 @@
+
-
@@ -51,9 +51,9 @@
+
-
@@ -64,10 +64,10 @@
+
-