Rename

wieslawsoltes · Dec 10, 2023 · 1570565 · 1570565
1 parent df15fe8
commit 1570565
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 21 deletions.
diff --git a/SvgToXaml.sln b/SvgToXaml.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 #
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7F50DE02-D1D9-48CF-B810-2F036D022B34}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvgToXamlConverter", "src\SvgToXamlConverter\SvgToXamlConverter.csproj", "{3066AB6A-F627-491B-A187-AE1DAB5C73C5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvgToXaml.Converter", "src\SvgToXaml.Converter\SvgToXaml.Converter.csproj", "{3066AB6A-F627-491B-A187-AE1DAB5C73C5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvgToXaml.Base", "src\SvgToXaml.Base\SvgToXaml.Base.csproj", "{FF9A2CC2-C733-421E-8F6D-39442041C86B}"
 EndProject
@@ -74,6 +74,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvgToXaml.Web", "src\SvgToX
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvgToXaml.Model", "src\SvgToXaml.Model\SvgToXaml.Model.csproj", "{67FC1B34-6B44-47EB-8D70-28A50B9B7F7C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2500DF4E-966C-4DDF-8F48-2D2E96A12F1F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,15 +117,15 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{3066AB6A-F627-491B-A187-AE1DAB5C73C5} = {7F50DE02-D1D9-48CF-B810-2F036D022B34}
-		{FF9A2CC2-C733-421E-8F6D-39442041C86B} = {7F50DE02-D1D9-48CF-B810-2F036D022B34}
-		{3C542F9C-446C-4B77-A4B6-FD0D74DCC9E7} = {7F50DE02-D1D9-48CF-B810-2F036D022B34}
 		{A9A6981E-12E8-4553-AA63-0EF5F1E1B575} = {0A02A9B3-8AF1-4AAD-93B8-2E18438C9A3F}
 		{AEF545DD-DD4E-454A-91E6-A1D82B6382F6} = {3DA1182D-FE58-4135-83B6-12612E71F8E9}
 		{5B9F5688-208D-449D-A2D3-021834123C78} = {3DA1182D-FE58-4135-83B6-12612E71F8E9}
 		{D4B713E6-64FD-411D-93FD-462D35E4A3A1} = {3DA1182D-FE58-4135-83B6-12612E71F8E9}
 		{E9A88CB0-B853-44C3-8A7E-F67DAD2A7F9B} = {3DA1182D-FE58-4135-83B6-12612E71F8E9}
-		{F5405E7E-2C76-406F-B81D-159CC9F712A4} = {7F50DE02-D1D9-48CF-B810-2F036D022B34}
-		{26D44BDD-F30E-42C5-AF90-B93BD53C67AC} = {7F50DE02-D1D9-48CF-B810-2F036D022B34}
 		{67FC1B34-6B44-47EB-8D70-28A50B9B7F7C} = {7F50DE02-D1D9-48CF-B810-2F036D022B34}
+		{F5405E7E-2C76-406F-B81D-159CC9F712A4} = {2500DF4E-966C-4DDF-8F48-2D2E96A12F1F}
+		{26D44BDD-F30E-42C5-AF90-B93BD53C67AC} = {2500DF4E-966C-4DDF-8F48-2D2E96A12F1F}
+		{FF9A2CC2-C733-421E-8F6D-39442041C86B} = {2500DF4E-966C-4DDF-8F48-2D2E96A12F1F}
+		{3C542F9C-446C-4B77-A4B6-FD0D74DCC9E7} = {2500DF4E-966C-4DDF-8F48-2D2E96A12F1F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/SvgToXaml.Base/SvgToXaml.Base.csproj b/src/SvgToXaml.Base/SvgToXaml.Base.csproj
@@ -38,7 +38,7 @@
   <Import Project="..\..\build\ReactiveMarbles.PropertyChanged.props" />
 
   <ItemGroup>
-    <ProjectReference Include="..\SvgToXamlConverter\SvgToXamlConverter.csproj" />
+    <ProjectReference Include="..\SvgToXaml.Converter\SvgToXaml.Converter.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SvgToXaml.Base/ViewModels/MainWindowViewModel.cs b/src/SvgToXaml.Base/ViewModels/MainWindowViewModel.cs
@@ -16,6 +16,7 @@
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.Input;
 using ReactiveMarbles.PropertyChanged;
+using SvgToXaml.Converter;
 using SvgToXaml.Model;
 
 namespace SvgToXaml.ViewModels;
@@ -443,7 +444,7 @@ private async Task Clipboard(string? format)
         {
             if (Project.Settings.EnableGenerateImage)
             {
-                var converter = new SvgToXamlConverter.SvgToXamlConverter()
+                var converter = new SvgToXamlConverter()
                 {
                     UseCompatMode = Project.Settings.UseCompatMode,
                     ReuseExistingResources = Project.Settings.ReuseExistingResources,
@@ -456,7 +457,7 @@ private async Task Clipboard(string? format)
             }
             else
             {
-                var converter = new SvgToXamlConverter.SvgToXamlConverter()
+                var converter = new SvgToXamlConverter()
                 {
                     UseCompatMode = Project.Settings.UseCompatMode,
                     ReuseExistingResources = Project.Settings.ReuseExistingResources,
@@ -533,7 +534,7 @@ private async Task<string> ToXaml(FileItemViewModel fileItemViewModel, bool enab
             {
                 if (enableGenerateImage)
                 {
-                    var converter = new SvgToXamlConverter.SvgToXamlConverter()
+                    var converter = new SvgToXamlConverter()
                     {
                         UseCompatMode = Project.Settings.UseCompatMode,
                         AddTransparentBackground = Project.Settings.AddTransparentBackground,
@@ -547,7 +548,7 @@ private async Task<string> ToXaml(FileItemViewModel fileItemViewModel, bool enab
                 }
                 else
                 {
-                    var converter = new SvgToXamlConverter.SvgToXamlConverter()
+                    var converter = new SvgToXamlConverter()
                     {
                         UseCompatMode = Project.Settings.UseCompatMode,
                         AddTransparentBackground = Project.Settings.AddTransparentBackground,
@@ -569,7 +570,7 @@ private async Task<string> ToXamlStyles(List<InputItem> inputItems)
     {
         return await Task.Run(() =>
         {
-            var converter = new SvgToXamlConverter.SvgToXamlConverter()
+            var converter = new SvgToXamlConverter()
             {
                 UseCompatMode = Project.Settings.UseCompatMode, 
                 ReuseExistingResources = Project.Settings.ReuseExistingResources,
@@ -635,7 +636,7 @@ public record PreviewItem(string Image, string TabControl);
 
         try
         {
-            var converter = new SvgToXamlConverter.SvgToXamlConverter()
+            var converter = new SvgToXamlConverter()
             {
                 UseCompatMode = Project.Settings.UseCompatMode,
                 ReuseExistingResources = Project.Settings.ReuseExistingResources,

diff --git a/...ToXamlConverter/SvgToXamlConverter.csproj → ...Xaml.Converter/SvgToXaml.Converter.csproj b/...ToXamlConverter/SvgToXamlConverter.csproj → ...Xaml.Converter/SvgToXaml.Converter.csproj
@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <Description>An Svg drawing model.</Description>
-    <PackageId>SvgToXamlConverter</PackageId>
+    <PackageId>SvgToXaml.Converter</PackageId>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>svg;xaml;axaml;avalonia;avaloniaui;convert;converter;vector graphics;rendering;2d;graphics;geometry;shapes;skiasharp;skia</PackageTags>
   </PropertyGroup>
@@ -18,6 +18,10 @@
     <ProjectReference Include="..\SvgToXaml.Model\SvgToXaml.Model.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Generator\" />
+  </ItemGroup>
+
   <Import Project="..\..\build\Base.props" />
   <Import Project="..\..\build\SourceLink.props" />
   <Import Project="..\..\build\SignAssembly.props" />

diff --git a/src/SvgToXamlConverter/SvgToXamlConverter.cs → ...SvgToXaml.Converter/SvgToXamlConverter.cs b/src/SvgToXamlConverter/SvgToXamlConverter.cs → ...SvgToXaml.Converter/SvgToXamlConverter.cs
@@ -4,9 +4,8 @@
 using System.Linq;
 using System.Text;
 using System.Xml;
-using SvgToXamlConverter.Generator;
 
-namespace SvgToXamlConverter;
+namespace SvgToXaml.Converter;
 
 public class SvgToXamlConverter
 {

diff --git a/...untime/CompilerServices/IsExternalInit.cs → ...untime/CompilerServices/IsExternalInit.cs b/...untime/CompilerServices/IsExternalInit.cs → ...untime/CompilerServices/IsExternalInit.cs
diff --git a/...oXamlConverter/Generator/XamlGenerator.cs → src/SvgToXaml.Converter/XamlGenerator.cs b/...oXamlConverter/Generator/XamlGenerator.cs → src/SvgToXaml.Converter/XamlGenerator.cs
@@ -7,7 +7,7 @@
 using SvgToXaml.Model.Paint;
 using SvgToXaml.Model.Resources;
 
-namespace SvgToXamlConverter.Generator;
+namespace SvgToXaml.Converter;
 
 public class XamlGenerator
 {

diff --git a/...verter/Generator/XamlGeneratorSettings.cs → ...ToXaml.Converter/XamlGeneratorSettings.cs b/...verter/Generator/XamlGeneratorSettings.cs → ...ToXaml.Converter/XamlGeneratorSettings.cs
@@ -1,6 +1,6 @@
 using SvgToXaml.Model.Resources;
 
-namespace SvgToXamlConverter.Generator;
+namespace SvgToXaml.Converter;
 
 public record XamlGeneratorSettings
 {

diff --git a/src/svgxaml/Program.cs b/src/svgxaml/Program.cs
@@ -4,6 +4,7 @@
 using System.IO.Compression;
 using System.Linq;
 using Svg.Skia;
+using SvgToXaml.Converter;
 using SvgToXaml.Model;
 
 if (args.Length != 1 && args.Length != 2)
@@ -29,7 +30,7 @@
             return;
         }
 
-        var converter = new SvgToXamlConverter.SvgToXamlConverter()
+        var converter = new SvgToXamlConverter()
         {
             UseCompatMode = false,
             ReuseExistingResources = false,
@@ -60,7 +61,7 @@
     }
     else
     {
-        var converter = new SvgToXamlConverter.SvgToXamlConverter()
+        var converter = new SvgToXamlConverter()
         {
             UseCompatMode = false,
             ReuseExistingResources = false,

diff --git a/src/svgxaml/svgxaml.csproj b/src/svgxaml/svgxaml.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SvgToXamlConverter\SvgToXamlConverter.csproj" />
+    <ProjectReference Include="..\SvgToXaml.Converter\SvgToXaml.Converter.csproj" />
   </ItemGroup>
 
   <Import Project="..\..\build\Base.props" />

diff --git a/tests/SvgToXamlConverter.UnitTests/SvgToXamlConverter.UnitTests.csproj b/tests/SvgToXamlConverter.UnitTests/SvgToXamlConverter.UnitTests.csproj
@@ -12,7 +12,7 @@
   <Import Project="..\..\build\XUnit.props" />
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\SvgToXamlConverter\SvgToXamlConverter.csproj" />
+    <ProjectReference Include="..\..\src\SvgToXaml.Converter\SvgToXaml.Converter.csproj" />
   </ItemGroup>
 
 </Project>