rename backend project with 'Crow.' prefix, set Crow version to 1.0.0-beta

58 files changed, 18 insertions, 25 deletions

diff --git a/Backends/CairoBackend/CairoBackend.csproj b/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 @@
   <PropertyGroup>
 	  <TargetFramework>netcoreapp3.1</TargetFramework>
 
-		<AssemblyVersion>0.0.1</AssemblyVersion>
+		<AssemblyVersion>1.0.0</AssemblyVersion>
 		<PackageVersion>$(AssemblyVersion)-beta</PackageVersion>
 
 		<Title>C.R.O.W Cairo Backend</Title>
diff --git a/Backends/CairoBackend/src/Cairo.cs b/Backends/Crow.CairoBackend/src/Cairo.cs
index 55f1335c..55f1335c 100644
--- a/Backends/CairoBackend/src/Cairo.cs
+++ b/Backends/Crow.CairoBackend/src/Cairo.cs
diff --git a/Backends/CairoBackend/src/CairoBackendBase.cs b/Backends/Crow.CairoBackend/src/CairoBackendBase.cs
index c7821ee3..c7821ee3 100644
--- a/Backends/CairoBackend/src/CairoBackendBase.cs
+++ b/Backends/Crow.CairoBackend/src/CairoBackendBase.cs
diff --git a/Backends/CairoBackend/src/CairoDebug.cs b/Backends/Crow.CairoBackend/src/CairoDebug.cs
index c3e92beb..c3e92beb 100644
--- a/Backends/CairoBackend/src/CairoDebug.cs
+++ b/Backends/Crow.CairoBackend/src/CairoDebug.cs
diff --git a/Backends/CairoBackend/src/Content.cs b/Backends/Crow.CairoBackend/src/Content.cs
index 9096bf07..9096bf07 100644
--- a/Backends/CairoBackend/src/Content.cs
+++ b/Backends/Crow.CairoBackend/src/Content.cs
diff --git a/Backends/CairoBackend/src/Context.cs b/Backends/Crow.CairoBackend/src/Context.cs
index c15ecaa3..c15ecaa3 100644
--- a/Backends/CairoBackend/src/Context.cs
+++ b/Backends/Crow.CairoBackend/src/Context.cs
diff --git a/Backends/CairoBackend/src/DRMDevice.cs b/Backends/Crow.CairoBackend/src/DRMDevice.cs
index 69009fc7..69009fc7 100644
--- a/Backends/CairoBackend/src/DRMDevice.cs
+++ b/Backends/Crow.CairoBackend/src/DRMDevice.cs
diff --git a/Backends/CairoBackend/src/DRMSurface.cs b/Backends/Crow.CairoBackend/src/DRMSurface.cs
index cf57d176..cf57d176 100644
--- a/Backends/CairoBackend/src/DRMSurface.cs
+++ b/Backends/Crow.CairoBackend/src/DRMSurface.cs
diff --git a/Backends/CairoBackend/src/Device.cs b/Backends/Crow.CairoBackend/src/Device.cs
index 2efe76ec..2efe76ec 100644
--- a/Backends/CairoBackend/src/Device.cs
+++ b/Backends/Crow.CairoBackend/src/Device.cs
diff --git a/Backends/CairoBackend/src/DirectFBSurface.cs b/Backends/Crow.CairoBackend/src/DirectFBSurface.cs
index ca7cd718..ca7cd718 100644
--- a/Backends/CairoBackend/src/DirectFBSurface.cs
+++ b/Backends/Crow.CairoBackend/src/DirectFBSurface.cs
diff --git a/Backends/CairoBackend/src/Distance.cs b/Backends/Crow.CairoBackend/src/Distance.cs
index 160fa1e7..160fa1e7 100644
--- a/Backends/CairoBackend/src/Distance.cs
+++ b/Backends/Crow.CairoBackend/src/Distance.cs
diff --git a/Backends/CairoBackend/src/EGLDevice.cs b/Backends/Crow.CairoBackend/src/EGLDevice.cs
index ef3d5542..ef3d5542 100644
--- a/Backends/CairoBackend/src/EGLDevice.cs
+++ b/Backends/Crow.CairoBackend/src/EGLDevice.cs
diff --git a/Backends/CairoBackend/src/EglBackend.cs b/Backends/Crow.CairoBackend/src/EglBackend.cs
index 909c3cd9..909c3cd9 100644
--- a/Backends/CairoBackend/src/EglBackend.cs
+++ b/Backends/Crow.CairoBackend/src/EglBackend.cs
diff --git a/Backends/CairoBackend/src/FontFace.cs b/Backends/Crow.CairoBackend/src/FontFace.cs
index 5b97dc25..5b97dc25 100644
--- a/Backends/CairoBackend/src/FontFace.cs
+++ b/Backends/Crow.CairoBackend/src/FontFace.cs
diff --git a/Backends/CairoBackend/src/FontOptions.cs b/Backends/Crow.CairoBackend/src/FontOptions.cs
index ee952bb3..ee952bb3 100644
--- a/Backends/CairoBackend/src/FontOptions.cs
+++ b/Backends/Crow.CairoBackend/src/FontOptions.cs
diff --git a/Backends/CairoBackend/src/FontType.cs b/Backends/Crow.CairoBackend/src/FontType.cs
index 664c2f58..664c2f58 100644
--- a/Backends/CairoBackend/src/FontType.cs
+++ b/Backends/Crow.CairoBackend/src/FontType.cs
diff --git a/Backends/CairoBackend/src/GLDevice.cs b/Backends/Crow.CairoBackend/src/GLDevice.cs
index 3c90592f..3c90592f 100644
--- a/Backends/CairoBackend/src/GLDevice.cs
+++ b/Backends/Crow.CairoBackend/src/GLDevice.cs
diff --git a/Backends/CairoBackend/src/GLSurface.cs b/Backends/Crow.CairoBackend/src/GLSurface.cs
index 4fa262cc..4fa262cc 100644
--- a/Backends/CairoBackend/src/GLSurface.cs
+++ b/Backends/Crow.CairoBackend/src/GLSurface.cs
diff --git a/Backends/CairoBackend/src/GLXDevice.cs b/Backends/Crow.CairoBackend/src/GLXDevice.cs
index 4a788c99..4a788c99 100644
--- a/Backends/CairoBackend/src/GLXDevice.cs
+++ b/Backends/Crow.CairoBackend/src/GLXDevice.cs
diff --git a/Backends/CairoBackend/src/GlitzSurface.cs b/Backends/Crow.CairoBackend/src/GlitzSurface.cs
index 4497877b..4497877b 100644
--- a/Backends/CairoBackend/src/GlitzSurface.cs
+++ b/Backends/Crow.CairoBackend/src/GlitzSurface.cs
diff --git a/Backends/CairoBackend/src/Glyph.cs b/Backends/Crow.CairoBackend/src/Glyph.cs
index fdd8436b..fdd8436b 100644
--- a/Backends/CairoBackend/src/Glyph.cs
+++ b/Backends/Crow.CairoBackend/src/Glyph.cs
diff --git a/Backends/CairoBackend/src/Gradient.cs b/Backends/Crow.CairoBackend/src/Gradient.cs
index 74ac7d48..74ac7d48 100644
--- a/Backends/CairoBackend/src/Gradient.cs
+++ b/Backends/Crow.CairoBackend/src/Gradient.cs
diff --git a/Backends/CairoBackend/src/HintMetrics.cs b/Backends/Crow.CairoBackend/src/HintMetrics.cs
index 8f4f95c1..8f4f95c1 100644
--- a/Backends/CairoBackend/src/HintMetrics.cs
+++ b/Backends/Crow.CairoBackend/src/HintMetrics.cs
diff --git a/Backends/CairoBackend/src/HintStyle.cs b/Backends/Crow.CairoBackend/src/HintStyle.cs
index 66161747..66161747 100644
--- a/Backends/CairoBackend/src/HintStyle.cs
+++ b/Backends/Crow.CairoBackend/src/HintStyle.cs
diff --git a/Backends/CairoBackend/src/ImageBackend.cs b/Backends/Crow.CairoBackend/src/ImageBackend.cs
index 96899dbd..96899dbd 100644
--- a/Backends/CairoBackend/src/ImageBackend.cs
+++ b/Backends/Crow.CairoBackend/src/ImageBackend.cs
diff --git a/Backends/CairoBackend/src/ImageSurface.cs b/Backends/Crow.CairoBackend/src/ImageSurface.cs
index 2cfec61c..2cfec61c 100644
--- a/Backends/CairoBackend/src/ImageSurface.cs
+++ b/Backends/Crow.CairoBackend/src/ImageSurface.cs
diff --git a/Backends/CairoBackend/src/LinearGradient.cs b/Backends/Crow.CairoBackend/src/LinearGradient.cs
index 49e423ed..49e423ed 100644
--- a/Backends/CairoBackend/src/LinearGradient.cs
+++ b/Backends/Crow.CairoBackend/src/LinearGradient.cs
diff --git a/Backends/CairoBackend/src/Matrix.cs b/Backends/Crow.CairoBackend/src/Matrix.cs
index b565edcc..b565edcc 100644
--- a/Backends/CairoBackend/src/Matrix.cs
+++ b/Backends/Crow.CairoBackend/src/Matrix.cs
diff --git a/Backends/CairoBackend/src/MeshPattern.cs b/Backends/Crow.CairoBackend/src/MeshPattern.cs
index 39fdd2af..39fdd2af 100644
--- a/Backends/CairoBackend/src/MeshPattern.cs
+++ b/Backends/Crow.CairoBackend/src/MeshPattern.cs
diff --git a/Backends/CairoBackend/src/NativeMethods-internal.cs b/Backends/Crow.CairoBackend/src/NativeMethods-internal.cs
index 714ff63a..714ff63a 100644
--- a/Backends/CairoBackend/src/NativeMethods-internal.cs
+++ b/Backends/Crow.CairoBackend/src/NativeMethods-internal.cs
diff --git a/Backends/CairoBackend/src/NativeMethods.cs b/Backends/Crow.CairoBackend/src/NativeMethods.cs
index 7b6053ac..7b6053ac 100644
--- a/Backends/CairoBackend/src/NativeMethods.cs
+++ b/Backends/Crow.CairoBackend/src/NativeMethods.cs
diff --git a/Backends/CairoBackend/src/PSSurface.cs b/Backends/Crow.CairoBackend/src/PSSurface.cs
index 695b05de..695b05de 100644
--- a/Backends/CairoBackend/src/PSSurface.cs
+++ b/Backends/Crow.CairoBackend/src/PSSurface.cs
diff --git a/Backends/CairoBackend/src/Path.cs b/Backends/Crow.CairoBackend/src/Path.cs
index 54ae4300..54ae4300 100644
--- a/Backends/CairoBackend/src/Path.cs
+++ b/Backends/Crow.CairoBackend/src/Path.cs
diff --git a/Backends/CairoBackend/src/Pattern.cs b/Backends/Crow.CairoBackend/src/Pattern.cs
index 3de491ec..3de491ec 100644
--- a/Backends/CairoBackend/src/Pattern.cs
+++ b/Backends/Crow.CairoBackend/src/Pattern.cs
diff --git a/Backends/CairoBackend/src/PdfSurface.cs b/Backends/Crow.CairoBackend/src/PdfSurface.cs
index 061eaa4f..061eaa4f 100644
--- a/Backends/CairoBackend/src/PdfSurface.cs
+++ b/Backends/Crow.CairoBackend/src/PdfSurface.cs
diff --git a/Backends/CairoBackend/src/RadialGradient.cs b/Backends/Crow.CairoBackend/src/RadialGradient.cs
index d27aa548..d27aa548 100644
--- a/Backends/CairoBackend/src/RadialGradient.cs
+++ b/Backends/Crow.CairoBackend/src/RadialGradient.cs
diff --git a/Backends/CairoBackend/src/Region.cs b/Backends/Crow.CairoBackend/src/Region.cs
index 139ebc8e..139ebc8e 100644
--- a/Backends/CairoBackend/src/Region.cs
+++ b/Backends/Crow.CairoBackend/src/Region.cs
diff --git a/Backends/CairoBackend/src/ScaledFont.cs b/Backends/Crow.CairoBackend/src/ScaledFont.cs
index 8fc245e2..8fc245e2 100644
--- a/Backends/CairoBackend/src/ScaledFont.cs
+++ b/Backends/Crow.CairoBackend/src/ScaledFont.cs
diff --git a/Backends/CairoBackend/src/SolidPattern.cs b/Backends/Crow.CairoBackend/src/SolidPattern.cs
index 65e86a01..65e86a01 100644
--- a/Backends/CairoBackend/src/SolidPattern.cs
+++ b/Backends/Crow.CairoBackend/src/SolidPattern.cs
diff --git a/Backends/CairoBackend/src/Status.cs b/Backends/Crow.CairoBackend/src/Status.cs
index 79252f64..79252f64 100644
--- a/Backends/CairoBackend/src/Status.cs
+++ b/Backends/Crow.CairoBackend/src/Status.cs
diff --git a/Backends/CairoBackend/src/SubpixelOrder.cs b/Backends/Crow.CairoBackend/src/SubpixelOrder.cs
index 569225f5..569225f5 100644
--- a/Backends/CairoBackend/src/SubpixelOrder.cs
+++ b/Backends/Crow.CairoBackend/src/SubpixelOrder.cs
diff --git a/Backends/CairoBackend/src/Surface.cs b/Backends/Crow.CairoBackend/src/Surface.cs
index 80435b5e..80435b5e 100644
--- a/Backends/CairoBackend/src/Surface.cs
+++ b/Backends/Crow.CairoBackend/src/Surface.cs
diff --git a/Backends/CairoBackend/src/SurfacePattern.cs b/Backends/Crow.CairoBackend/src/SurfacePattern.cs
index 85a31348..85a31348 100644
--- a/Backends/CairoBackend/src/SurfacePattern.cs
+++ b/Backends/Crow.CairoBackend/src/SurfacePattern.cs
diff --git a/Backends/CairoBackend/src/SurfaceType.cs b/Backends/Crow.CairoBackend/src/SurfaceType.cs
index 816635c9..816635c9 100644
--- a/Backends/CairoBackend/src/SurfaceType.cs
+++ b/Backends/Crow.CairoBackend/src/SurfaceType.cs
diff --git a/Backends/CairoBackend/src/SvgSurface.cs b/Backends/Crow.CairoBackend/src/SvgSurface.cs
index d6d53c33..d6d53c33 100644
--- a/Backends/CairoBackend/src/SvgSurface.cs
+++ b/Backends/Crow.CairoBackend/src/SvgSurface.cs
diff --git a/Backends/CairoBackend/src/SvgVersion.cs b/Backends/Crow.CairoBackend/src/SvgVersion.cs
index f79cc677..f79cc677 100644
--- a/Backends/CairoBackend/src/SvgVersion.cs
+++ b/Backends/Crow.CairoBackend/src/SvgVersion.cs
diff --git a/Backends/CairoBackend/src/WGLDevice.cs b/Backends/Crow.CairoBackend/src/WGLDevice.cs
index 4d7773e5..4d7773e5 100644
--- a/Backends/CairoBackend/src/WGLDevice.cs
+++ b/Backends/Crow.CairoBackend/src/WGLDevice.cs
diff --git a/Backends/CairoBackend/src/Win32Surface.cs b/Backends/Crow.CairoBackend/src/Win32Surface.cs
index a10a9cf2..a10a9cf2 100644
--- a/Backends/CairoBackend/src/Win32Surface.cs
+++ b/Backends/Crow.CairoBackend/src/Win32Surface.cs
diff --git a/Backends/CairoBackend/src/XcbSurface.cs b/Backends/Crow.CairoBackend/src/XcbSurface.cs
index ed557d0c..ed557d0c 100644
--- a/Backends/CairoBackend/src/XcbSurface.cs
+++ b/Backends/Crow.CairoBackend/src/XcbSurface.cs
diff --git a/Backends/CairoBackend/src/XlibSurface.cs b/Backends/Crow.CairoBackend/src/XlibSurface.cs
index 6aea448b..6aea448b 100644
--- a/Backends/CairoBackend/src/XlibSurface.cs
+++ b/Backends/Crow.CairoBackend/src/XlibSurface.cs
diff --git a/Backends/CairoBackend/src/rsvg/SvgHandle.cs b/Backends/Crow.CairoBackend/src/rsvg/SvgHandle.cs
index e767ce3a..e767ce3a 100644
--- a/Backends/CairoBackend/src/rsvg/SvgHandle.cs
+++ b/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 @@
 		<Authors>Jean-Philippe Bruyère</Authors>
 		<LangVersion>7.3</LangVersion>
 
-		<CrowVersion>0.9.9</CrowVersion>
-		<CrowPackageVersion>$(CrowVersion)-beta</CrowPackageVersion>
-
 		<!-- If you dont have a native libstb on your system, enable the managed version of stb here
 				TODO: this could be detected on startup or install automatically-->
 		<CrowStbSharp>true</CrowStbSharp>
diff --git a/Backends/SkiaBackend/SkiaBackend.csproj b/Backends/SkiaBackend/Crow.SkiaBackend.csproj
index 6b7c32d0..b713fe9f 100644
--- a/Backends/SkiaBackend/SkiaBackend.csproj
+++ b/Backends/SkiaBackend/Crow.SkiaBackend.csproj
@@ -2,6 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+		<AssemblyVersion>0.1.0</AssemblyVersion>
+		<PackageVersion>$(AssemblyVersion)-beta</PackageVersion>
+
 	  <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
 
diff --git a/Backends/VkvgBackend/VkvgBackend.csproj b/Backends/VkvgBackend/Crow.VkvgBackend.csproj
index 7a9d15da..54fd15f5 100644
--- a/Backends/VkvgBackend/VkvgBackend.csproj
+++ b/Backends/VkvgBackend/Crow.VkvgBackend.csproj
@@ -2,6 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+
+		<AssemblyVersion>1.0.0</AssemblyVersion>
+		<PackageVersion>$(AssemblyVersion)-beta</PackageVersion>
+
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
 
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;
 		/// <summary>
 		/// 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<AssemblyName> 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<Type> 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<Type> 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 @@
 		<Authors>Jean-Philippe Bruyère</Authors>
 		<LangVersion>7.3</LangVersion>
 
-		<CrowVersion>0.9.9</CrowVersion>
+		<CrowVersion>1.0.0</CrowVersion>
 		<CrowPackageVersion>$(CrowVersion)-beta</CrowPackageVersion>
 
 		<!-- If you dont have a native libstb on your system, enable the managed version of stb here
diff --git a/Samples/Directory.Build.props b/Samples/Directory.Build.props
index da64b9b8..0effb2d8 100644
--- a/Samples/Directory.Build.props
+++ b/Samples/Directory.Build.props
@@ -21,10 +21,10 @@
 		<ProjectReference Include="$(SolutionDir)Crow\Crow.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\Drawing2D\Drawing2D.csproj" />
-	  <!--<ProjectReference Include="..\Backends\SkiaBackend\SkiaBackend.csproj" />-->
-	  <ProjectReference Include="..\Backends\CairoBackend\CairoBackend.csproj" />
-	  <!--<ProjectReference Include="..\Backends\VkvgBackend\VkvgBackend.csproj" />-->
+	  <ProjectReference Include="$(SolutionDir)Drawing2D\Drawing2D.csproj" />
+	  <!--<ProjectReference Include="$(SolutionDir)Backends\SkiaBackend\Crow.SkiaBackend.csproj" />-->
+	  <ProjectReference Include="$(SolutionDir)Backends\Crow.CairoBackend\Crow.CairoBackend.csproj" />
+	  <!--<ProjectReference Include="$(SolutionDir)Backends\VkvgBackend\Crow.VkvgBackend.csproj" />-->
 	</ItemGroup>
 	<ItemGroup>
 		<None Include="$(SamplesDir)common\ui\Interfaces\**\*.*">