From 1aa0f18efa7f4f9c198e2e4a037a78673365b9b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Thu, 23 Dec 2021 06:07:56 +0100 Subject: [PATCH] rename backend project with 'Crow.' prefix, set Crow version to 1.0.0-beta --- .../Crow.CairoBackend.csproj} | 2 +- .../src/Cairo.cs | 0 .../src/CairoBackendBase.cs | 0 .../src/CairoDebug.cs | 0 .../src/Content.cs | 0 .../src/Context.cs | 0 .../src/DRMDevice.cs | 0 .../src/DRMSurface.cs | 0 .../src/Device.cs | 0 .../src/DirectFBSurface.cs | 0 .../src/Distance.cs | 0 .../src/EGLDevice.cs | 0 .../src/EglBackend.cs | 0 .../src/FontFace.cs | 0 .../src/FontOptions.cs | 0 .../src/FontType.cs | 0 .../src/GLDevice.cs | 0 .../src/GLSurface.cs | 0 .../src/GLXDevice.cs | 0 .../src/GlitzSurface.cs | 0 .../src/Glyph.cs | 0 .../src/Gradient.cs | 0 .../src/HintMetrics.cs | 0 .../src/HintStyle.cs | 0 .../src/ImageBackend.cs | 0 .../src/ImageSurface.cs | 0 .../src/LinearGradient.cs | 0 .../src/Matrix.cs | 0 .../src/MeshPattern.cs | 0 .../src/NativeMethods-internal.cs | 0 .../src/NativeMethods.cs | 0 .../src/PSSurface.cs | 0 .../src/Path.cs | 0 .../src/Pattern.cs | 0 .../src/PdfSurface.cs | 0 .../src/RadialGradient.cs | 0 .../src/Region.cs | 0 .../src/ScaledFont.cs | 0 .../src/SolidPattern.cs | 0 .../src/Status.cs | 0 .../src/SubpixelOrder.cs | 0 .../src/Surface.cs | 0 .../src/SurfacePattern.cs | 0 .../src/SurfaceType.cs | 0 .../src/SvgSurface.cs | 0 .../src/SvgVersion.cs | 0 .../src/WGLDevice.cs | 0 .../src/Win32Surface.cs | 0 .../src/XcbSurface.cs | 0 .../src/XlibSurface.cs | 0 .../src/rsvg/SvgHandle.cs | 0 Backends/Directory.Build.props | 3 --- ...SkiaBackend.csproj => Crow.SkiaBackend.csproj} | 3 +++ ...VkvgBackend.csproj => Crow.VkvgBackend.csproj} | 4 ++++ Crow.sln | 6 +++--- Crow/src/Interface.cs | 15 ++------------- Directory.Build.props | 2 +- Samples/Directory.Build.props | 8 ++++---- 58 files changed, 18 insertions(+), 25 deletions(-) rename Backends/{CairoBackend/CairoBackend.csproj => Crow.CairoBackend/Crow.CairoBackend.csproj} (97%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Cairo.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/CairoBackendBase.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/CairoDebug.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Content.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Context.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/DRMDevice.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/DRMSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Device.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/DirectFBSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Distance.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/EGLDevice.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/EglBackend.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/FontFace.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/FontOptions.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/FontType.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/GLDevice.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/GLSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/GLXDevice.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/GlitzSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Glyph.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Gradient.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/HintMetrics.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/HintStyle.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/ImageBackend.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/ImageSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/LinearGradient.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Matrix.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/MeshPattern.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/NativeMethods-internal.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/NativeMethods.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/PSSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Path.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Pattern.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/PdfSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/RadialGradient.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Region.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/ScaledFont.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/SolidPattern.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Status.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/SubpixelOrder.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Surface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/SurfacePattern.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/SurfaceType.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/SvgSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/SvgVersion.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/WGLDevice.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/Win32Surface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/XcbSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/XlibSurface.cs (100%) rename Backends/{CairoBackend => Crow.CairoBackend}/src/rsvg/SvgHandle.cs (100%) rename Backends/SkiaBackend/{SkiaBackend.csproj => Crow.SkiaBackend.csproj} (86%) rename Backends/VkvgBackend/{VkvgBackend.csproj => Crow.VkvgBackend.csproj} (85%) diff --git a/Backends/CairoBackend/CairoBackend.csproj b/Backends/Crow.CairoBackend/Crow.CairoBackend.csproj similarity index 97% rename from Backends/CairoBackend/CairoBackend.csproj rename to Backends/Crow.CairoBackend/Crow.CairoBackend.csproj index 17c0eb88..95741749 100644 --- a/Backends/CairoBackend/CairoBackend.csproj +++ b/Backends/Crow.CairoBackend/Crow.CairoBackend.csproj @@ -3,7 +3,7 @@ netcoreapp3.1 - 0.0.1 + 1.0.0 $(AssemblyVersion)-beta C.R.O.W Cairo Backend diff --git a/Backends/CairoBackend/src/Cairo.cs b/Backends/Crow.CairoBackend/src/Cairo.cs similarity index 100% rename from Backends/CairoBackend/src/Cairo.cs rename to Backends/Crow.CairoBackend/src/Cairo.cs diff --git a/Backends/CairoBackend/src/CairoBackendBase.cs b/Backends/Crow.CairoBackend/src/CairoBackendBase.cs similarity index 100% rename from Backends/CairoBackend/src/CairoBackendBase.cs rename to Backends/Crow.CairoBackend/src/CairoBackendBase.cs diff --git a/Backends/CairoBackend/src/CairoDebug.cs b/Backends/Crow.CairoBackend/src/CairoDebug.cs similarity index 100% rename from Backends/CairoBackend/src/CairoDebug.cs rename to Backends/Crow.CairoBackend/src/CairoDebug.cs diff --git a/Backends/CairoBackend/src/Content.cs b/Backends/Crow.CairoBackend/src/Content.cs similarity index 100% rename from Backends/CairoBackend/src/Content.cs rename to Backends/Crow.CairoBackend/src/Content.cs diff --git a/Backends/CairoBackend/src/Context.cs b/Backends/Crow.CairoBackend/src/Context.cs similarity index 100% rename from Backends/CairoBackend/src/Context.cs rename to Backends/Crow.CairoBackend/src/Context.cs diff --git a/Backends/CairoBackend/src/DRMDevice.cs b/Backends/Crow.CairoBackend/src/DRMDevice.cs similarity index 100% rename from Backends/CairoBackend/src/DRMDevice.cs rename to Backends/Crow.CairoBackend/src/DRMDevice.cs diff --git a/Backends/CairoBackend/src/DRMSurface.cs b/Backends/Crow.CairoBackend/src/DRMSurface.cs similarity index 100% rename from Backends/CairoBackend/src/DRMSurface.cs rename to Backends/Crow.CairoBackend/src/DRMSurface.cs diff --git a/Backends/CairoBackend/src/Device.cs b/Backends/Crow.CairoBackend/src/Device.cs similarity index 100% rename from Backends/CairoBackend/src/Device.cs rename to Backends/Crow.CairoBackend/src/Device.cs diff --git a/Backends/CairoBackend/src/DirectFBSurface.cs b/Backends/Crow.CairoBackend/src/DirectFBSurface.cs similarity index 100% rename from Backends/CairoBackend/src/DirectFBSurface.cs rename to Backends/Crow.CairoBackend/src/DirectFBSurface.cs diff --git a/Backends/CairoBackend/src/Distance.cs b/Backends/Crow.CairoBackend/src/Distance.cs similarity index 100% rename from Backends/CairoBackend/src/Distance.cs rename to Backends/Crow.CairoBackend/src/Distance.cs diff --git a/Backends/CairoBackend/src/EGLDevice.cs b/Backends/Crow.CairoBackend/src/EGLDevice.cs similarity index 100% rename from Backends/CairoBackend/src/EGLDevice.cs rename to Backends/Crow.CairoBackend/src/EGLDevice.cs diff --git a/Backends/CairoBackend/src/EglBackend.cs b/Backends/Crow.CairoBackend/src/EglBackend.cs similarity index 100% rename from Backends/CairoBackend/src/EglBackend.cs rename to Backends/Crow.CairoBackend/src/EglBackend.cs diff --git a/Backends/CairoBackend/src/FontFace.cs b/Backends/Crow.CairoBackend/src/FontFace.cs similarity index 100% rename from Backends/CairoBackend/src/FontFace.cs rename to Backends/Crow.CairoBackend/src/FontFace.cs diff --git a/Backends/CairoBackend/src/FontOptions.cs b/Backends/Crow.CairoBackend/src/FontOptions.cs similarity index 100% rename from Backends/CairoBackend/src/FontOptions.cs rename to Backends/Crow.CairoBackend/src/FontOptions.cs diff --git a/Backends/CairoBackend/src/FontType.cs b/Backends/Crow.CairoBackend/src/FontType.cs similarity index 100% rename from Backends/CairoBackend/src/FontType.cs rename to Backends/Crow.CairoBackend/src/FontType.cs diff --git a/Backends/CairoBackend/src/GLDevice.cs b/Backends/Crow.CairoBackend/src/GLDevice.cs similarity index 100% rename from Backends/CairoBackend/src/GLDevice.cs rename to Backends/Crow.CairoBackend/src/GLDevice.cs diff --git a/Backends/CairoBackend/src/GLSurface.cs b/Backends/Crow.CairoBackend/src/GLSurface.cs similarity index 100% rename from Backends/CairoBackend/src/GLSurface.cs rename to Backends/Crow.CairoBackend/src/GLSurface.cs diff --git a/Backends/CairoBackend/src/GLXDevice.cs b/Backends/Crow.CairoBackend/src/GLXDevice.cs similarity index 100% rename from Backends/CairoBackend/src/GLXDevice.cs rename to Backends/Crow.CairoBackend/src/GLXDevice.cs diff --git a/Backends/CairoBackend/src/GlitzSurface.cs b/Backends/Crow.CairoBackend/src/GlitzSurface.cs similarity index 100% rename from Backends/CairoBackend/src/GlitzSurface.cs rename to Backends/Crow.CairoBackend/src/GlitzSurface.cs diff --git a/Backends/CairoBackend/src/Glyph.cs b/Backends/Crow.CairoBackend/src/Glyph.cs similarity index 100% rename from Backends/CairoBackend/src/Glyph.cs rename to Backends/Crow.CairoBackend/src/Glyph.cs diff --git a/Backends/CairoBackend/src/Gradient.cs b/Backends/Crow.CairoBackend/src/Gradient.cs similarity index 100% rename from Backends/CairoBackend/src/Gradient.cs rename to Backends/Crow.CairoBackend/src/Gradient.cs diff --git a/Backends/CairoBackend/src/HintMetrics.cs b/Backends/Crow.CairoBackend/src/HintMetrics.cs similarity index 100% rename from Backends/CairoBackend/src/HintMetrics.cs rename to Backends/Crow.CairoBackend/src/HintMetrics.cs diff --git a/Backends/CairoBackend/src/HintStyle.cs b/Backends/Crow.CairoBackend/src/HintStyle.cs similarity index 100% rename from Backends/CairoBackend/src/HintStyle.cs rename to Backends/Crow.CairoBackend/src/HintStyle.cs diff --git a/Backends/CairoBackend/src/ImageBackend.cs b/Backends/Crow.CairoBackend/src/ImageBackend.cs similarity index 100% rename from Backends/CairoBackend/src/ImageBackend.cs rename to Backends/Crow.CairoBackend/src/ImageBackend.cs diff --git a/Backends/CairoBackend/src/ImageSurface.cs b/Backends/Crow.CairoBackend/src/ImageSurface.cs similarity index 100% rename from Backends/CairoBackend/src/ImageSurface.cs rename to Backends/Crow.CairoBackend/src/ImageSurface.cs diff --git a/Backends/CairoBackend/src/LinearGradient.cs b/Backends/Crow.CairoBackend/src/LinearGradient.cs similarity index 100% rename from Backends/CairoBackend/src/LinearGradient.cs rename to Backends/Crow.CairoBackend/src/LinearGradient.cs diff --git a/Backends/CairoBackend/src/Matrix.cs b/Backends/Crow.CairoBackend/src/Matrix.cs similarity index 100% rename from Backends/CairoBackend/src/Matrix.cs rename to Backends/Crow.CairoBackend/src/Matrix.cs diff --git a/Backends/CairoBackend/src/MeshPattern.cs b/Backends/Crow.CairoBackend/src/MeshPattern.cs similarity index 100% rename from Backends/CairoBackend/src/MeshPattern.cs rename to Backends/Crow.CairoBackend/src/MeshPattern.cs diff --git a/Backends/CairoBackend/src/NativeMethods-internal.cs b/Backends/Crow.CairoBackend/src/NativeMethods-internal.cs similarity index 100% rename from Backends/CairoBackend/src/NativeMethods-internal.cs rename to Backends/Crow.CairoBackend/src/NativeMethods-internal.cs diff --git a/Backends/CairoBackend/src/NativeMethods.cs b/Backends/Crow.CairoBackend/src/NativeMethods.cs similarity index 100% rename from Backends/CairoBackend/src/NativeMethods.cs rename to Backends/Crow.CairoBackend/src/NativeMethods.cs diff --git a/Backends/CairoBackend/src/PSSurface.cs b/Backends/Crow.CairoBackend/src/PSSurface.cs similarity index 100% rename from Backends/CairoBackend/src/PSSurface.cs rename to Backends/Crow.CairoBackend/src/PSSurface.cs diff --git a/Backends/CairoBackend/src/Path.cs b/Backends/Crow.CairoBackend/src/Path.cs similarity index 100% rename from Backends/CairoBackend/src/Path.cs rename to Backends/Crow.CairoBackend/src/Path.cs diff --git a/Backends/CairoBackend/src/Pattern.cs b/Backends/Crow.CairoBackend/src/Pattern.cs similarity index 100% rename from Backends/CairoBackend/src/Pattern.cs rename to Backends/Crow.CairoBackend/src/Pattern.cs diff --git a/Backends/CairoBackend/src/PdfSurface.cs b/Backends/Crow.CairoBackend/src/PdfSurface.cs similarity index 100% rename from Backends/CairoBackend/src/PdfSurface.cs rename to Backends/Crow.CairoBackend/src/PdfSurface.cs diff --git a/Backends/CairoBackend/src/RadialGradient.cs b/Backends/Crow.CairoBackend/src/RadialGradient.cs similarity index 100% rename from Backends/CairoBackend/src/RadialGradient.cs rename to Backends/Crow.CairoBackend/src/RadialGradient.cs diff --git a/Backends/CairoBackend/src/Region.cs b/Backends/Crow.CairoBackend/src/Region.cs similarity index 100% rename from Backends/CairoBackend/src/Region.cs rename to Backends/Crow.CairoBackend/src/Region.cs diff --git a/Backends/CairoBackend/src/ScaledFont.cs b/Backends/Crow.CairoBackend/src/ScaledFont.cs similarity index 100% rename from Backends/CairoBackend/src/ScaledFont.cs rename to Backends/Crow.CairoBackend/src/ScaledFont.cs diff --git a/Backends/CairoBackend/src/SolidPattern.cs b/Backends/Crow.CairoBackend/src/SolidPattern.cs similarity index 100% rename from Backends/CairoBackend/src/SolidPattern.cs rename to Backends/Crow.CairoBackend/src/SolidPattern.cs diff --git a/Backends/CairoBackend/src/Status.cs b/Backends/Crow.CairoBackend/src/Status.cs similarity index 100% rename from Backends/CairoBackend/src/Status.cs rename to Backends/Crow.CairoBackend/src/Status.cs diff --git a/Backends/CairoBackend/src/SubpixelOrder.cs b/Backends/Crow.CairoBackend/src/SubpixelOrder.cs similarity index 100% rename from Backends/CairoBackend/src/SubpixelOrder.cs rename to Backends/Crow.CairoBackend/src/SubpixelOrder.cs diff --git a/Backends/CairoBackend/src/Surface.cs b/Backends/Crow.CairoBackend/src/Surface.cs similarity index 100% rename from Backends/CairoBackend/src/Surface.cs rename to Backends/Crow.CairoBackend/src/Surface.cs diff --git a/Backends/CairoBackend/src/SurfacePattern.cs b/Backends/Crow.CairoBackend/src/SurfacePattern.cs similarity index 100% rename from Backends/CairoBackend/src/SurfacePattern.cs rename to Backends/Crow.CairoBackend/src/SurfacePattern.cs diff --git a/Backends/CairoBackend/src/SurfaceType.cs b/Backends/Crow.CairoBackend/src/SurfaceType.cs similarity index 100% rename from Backends/CairoBackend/src/SurfaceType.cs rename to Backends/Crow.CairoBackend/src/SurfaceType.cs diff --git a/Backends/CairoBackend/src/SvgSurface.cs b/Backends/Crow.CairoBackend/src/SvgSurface.cs similarity index 100% rename from Backends/CairoBackend/src/SvgSurface.cs rename to Backends/Crow.CairoBackend/src/SvgSurface.cs diff --git a/Backends/CairoBackend/src/SvgVersion.cs b/Backends/Crow.CairoBackend/src/SvgVersion.cs similarity index 100% rename from Backends/CairoBackend/src/SvgVersion.cs rename to Backends/Crow.CairoBackend/src/SvgVersion.cs diff --git a/Backends/CairoBackend/src/WGLDevice.cs b/Backends/Crow.CairoBackend/src/WGLDevice.cs similarity index 100% rename from Backends/CairoBackend/src/WGLDevice.cs rename to Backends/Crow.CairoBackend/src/WGLDevice.cs diff --git a/Backends/CairoBackend/src/Win32Surface.cs b/Backends/Crow.CairoBackend/src/Win32Surface.cs similarity index 100% rename from Backends/CairoBackend/src/Win32Surface.cs rename to Backends/Crow.CairoBackend/src/Win32Surface.cs diff --git a/Backends/CairoBackend/src/XcbSurface.cs b/Backends/Crow.CairoBackend/src/XcbSurface.cs similarity index 100% rename from Backends/CairoBackend/src/XcbSurface.cs rename to Backends/Crow.CairoBackend/src/XcbSurface.cs diff --git a/Backends/CairoBackend/src/XlibSurface.cs b/Backends/Crow.CairoBackend/src/XlibSurface.cs similarity index 100% rename from Backends/CairoBackend/src/XlibSurface.cs rename to Backends/Crow.CairoBackend/src/XlibSurface.cs diff --git a/Backends/CairoBackend/src/rsvg/SvgHandle.cs b/Backends/Crow.CairoBackend/src/rsvg/SvgHandle.cs similarity index 100% rename from Backends/CairoBackend/src/rsvg/SvgHandle.cs rename to Backends/Crow.CairoBackend/src/rsvg/SvgHandle.cs diff --git a/Backends/Directory.Build.props b/Backends/Directory.Build.props index b78ea8c6..306a123e 100644 --- a/Backends/Directory.Build.props +++ b/Backends/Directory.Build.props @@ -5,9 +5,6 @@ Jean-Philippe Bruyère 7.3 - 0.9.9 - $(CrowVersion)-beta - true diff --git a/Backends/SkiaBackend/SkiaBackend.csproj b/Backends/SkiaBackend/Crow.SkiaBackend.csproj similarity index 86% rename from Backends/SkiaBackend/SkiaBackend.csproj rename to Backends/SkiaBackend/Crow.SkiaBackend.csproj index 6b7c32d0..b713fe9f 100644 --- a/Backends/SkiaBackend/SkiaBackend.csproj +++ b/Backends/SkiaBackend/Crow.SkiaBackend.csproj @@ -2,6 +2,9 @@ netcoreapp3.1 + 0.1.0 + $(AssemblyVersion)-beta + false diff --git a/Backends/VkvgBackend/VkvgBackend.csproj b/Backends/VkvgBackend/Crow.VkvgBackend.csproj similarity index 85% rename from Backends/VkvgBackend/VkvgBackend.csproj rename to Backends/VkvgBackend/Crow.VkvgBackend.csproj index 7a9d15da..54fd15f5 100644 --- a/Backends/VkvgBackend/VkvgBackend.csproj +++ b/Backends/VkvgBackend/Crow.VkvgBackend.csproj @@ -2,6 +2,10 @@ netcoreapp3.1 + + 1.0.0 + $(AssemblyVersion)-beta + false diff --git a/Crow.sln b/Crow.sln index dc5009cf..28566ee5 100644 --- a/Crow.sln +++ b/Crow.sln @@ -25,11 +25,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawing2D", "Drawing2D\Draw EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{451F5727-2A2E-4361-A41B-089429ADE8F9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CairoBackend", "Backends\CairoBackend\CairoBackend.csproj", "{E06441A9-0CFD-45BB-9478-99D28CEB327F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crow.CairoBackend", "Backends\Crow.CairoBackend\Crow.CairoBackend.csproj", "{E06441A9-0CFD-45BB-9478-99D28CEB327F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkvgBackend", "Backends\VkvgBackend\VkvgBackend.csproj", "{34976828-80CF-4AC5-8C81-F66F635DC5FC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crow.VkvgBackend", "Backends\VkvgBackend\Crow.VkvgBackend.csproj", "{34976828-80CF-4AC5-8C81-F66F635DC5FC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaBackend", "Backends\SkiaBackend\SkiaBackend.csproj", "{ADAABC24-0152-41E2-BBEC-3AC9ACEE1175}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crow.SkiaBackend", "Backends\SkiaBackend\Crow.SkiaBackend.csproj", "{ADAABC24-0152-41E2-BBEC-3AC9ACEE1175}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Crow/src/Interface.cs b/Crow/src/Interface.cs index ac0e20ba..1505ed12 100644 --- a/Crow/src/Interface.cs +++ b/Crow/src/Interface.cs @@ -154,17 +154,6 @@ namespace Crow return IntPtr.Zero; } static string[] backends = {"CairoBackend", "VkvgBackend", "SkiaBackend"}; - static Assembly resolving (System.Runtime.Loader.AssemblyLoadContext ctx, AssemblyName name) { - if (name.Name == "CrowBackend") { - string bp = Path.GetDirectoryName (Assembly.GetExecutingAssembly().Location); - foreach (string b in backends) { - string bPath = Path.Combine (bp, b + ".dll"); - if (File.Exists (bPath)) - return ctx.LoadFromAssemblyPath (bPath); - } - } - return ctx.LoadFromAssemblyName (name); - } public static BackendType PreferedBackendType = BackendType.Default; /// /// If not null, backends assemblies will be search in this directory, else @@ -173,6 +162,7 @@ namespace Crow public static string BackendsDirectory = null; protected static bool tryFindBackendType (out Type backendType) { backendType = default; + //IEnumerable backendAssemblies = Assembly.GetEntryAssembly ().GetReferencedAssemblies().Where (ra=>backends.Contains (ra.Name)); System.Runtime.Loader.AssemblyLoadContext ldCtx = System.Runtime.Loader.AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()); foreach (Assembly a in ldCtx.Assemblies.Where (asb => backends.Contains (asb.GetName ().Name))) { IEnumerable backendTypes = a.ExportedTypes?.Where (e=>e.IsSubclassOf(typeof(CrowBackend)) && !e.IsAbstract); @@ -185,7 +175,7 @@ namespace Crow (!string.IsNullOrEmpty(BackendsDirectory) && Directory.Exists(BackendsDirectory)) ? BackendsDirectory : Path.GetDirectoryName (Assembly.GetExecutingAssembly().Location); foreach (string b in backends) { - string bPath = Path.Combine (bp, b + ".dll"); + string bPath = Path.Combine (bp,$"Crow.{b}.dll"); if (File.Exists (bPath)) { Assembly a = ldCtx.LoadFromAssemblyPath (bPath); IEnumerable backendTypes = a.ExportedTypes?.Where (e=>e.IsSubclassOf(typeof(CrowBackend)) && !e.IsAbstract); @@ -215,7 +205,6 @@ namespace Crow { System.Runtime.Loader.AssemblyLoadContext ldCtx = System.Runtime.Loader.AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()); ldCtx.ResolvingUnmanagedDll += resolveUnmanaged; - ldCtx.Resolving += resolving; CROW_CONFIG_ROOT = System.IO.Path.Combine ( diff --git a/Directory.Build.props b/Directory.Build.props index 15fef0b4..ac78d7ae 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,7 +6,7 @@ Jean-Philippe Bruyère 7.3 - 0.9.9 + 1.0.0 $(CrowVersion)-beta - - + + + + -- 2.47.3