flabbet 8 月之前
父節點
當前提交
f5f0b7061c

+ 0 - 24
src/PixiEditor.Core/PixiEditor.Core.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\PixiEditor.Extensions\PixiEditor.Extensions.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <None Remove="extension.json" />
-      <AvaloniaResource Include="extension.json">
-        <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-      </AvaloniaResource>
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    </ItemGroup>
-
-</Project>

+ 0 - 8
src/PixiEditor.Core/PixiEditorCoreExtension.cs

@@ -1,8 +0,0 @@
-using PixiEditor.Extensions;
-
-namespace PixiEditor.Core;
-
-public class PixiEditorCoreExtension : Extension
-{
-
-}

+ 0 - 2
src/PixiEditor.Core/extension.json

@@ -1,2 +0,0 @@
-{
-}

二進制
src/PixiEditor.Extensions.Sdk/build/PixiEditor.Api.CGlueMSBuild.dll


二進制
src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.MSPackageBuilder.dll


+ 0 - 1
tests/ChunkyImageLibTest/ChunkyImageLibTest.csproj

@@ -22,7 +22,6 @@
   <ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\ChunkyImageLib\ChunkyImageLib.csproj" />
     <ProjectReference Include="..\..\src\ChunkyImageLib\ChunkyImageLib.csproj" />
     <ProjectReference Include="..\..\src\Drawie\src\Drawie.Backend.Skia\Drawie.Backend.Skia.csproj" />
     <ProjectReference Include="..\..\src\Drawie\src\Drawie.Backend.Skia\Drawie.Backend.Skia.csproj" />
-    <ProjectReference Include="..\..\src\PixiEditor.DrawingApi.Skia\PixiEditor.DrawingApi.Skia.csproj" />
   </ItemGroup>
   </ItemGroup>
 
 
 </Project>
 </Project>

+ 1 - 0
tests/PixiEditor.Backend.Tests/NodeSystemTests.cs

@@ -1,5 +1,6 @@
 using System.Reflection;
 using System.Reflection;
 using Drawie.Backend.Core.Bridge;
 using Drawie.Backend.Core.Bridge;
+using Drawie.Interop.Avalonia.Core;
 using Drawie.Interop.VulkanAvalonia;
 using Drawie.Interop.VulkanAvalonia;
 using Drawie.Skia;
 using Drawie.Skia;
 using PixiEditor.ChangeableDocument.Changeables.Graph;
 using PixiEditor.ChangeableDocument.Changeables.Graph;

+ 0 - 1
tests/PixiEditor.Backend.Tests/PixiEditor.Backend.Tests.csproj

@@ -28,7 +28,6 @@
 
 
     <ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\..\src\PixiEditor.ChangeableDocument\PixiEditor.ChangeableDocument.csproj" />
       <ProjectReference Include="..\..\src\PixiEditor.ChangeableDocument\PixiEditor.ChangeableDocument.csproj" />
-      <ProjectReference Include="..\..\src\PixiEditor.DrawingApi.Skia\PixiEditor.DrawingApi.Skia.csproj" />
       <ProjectReference Include="..\..\src\PixiEditor\PixiEditor.csproj" />
       <ProjectReference Include="..\..\src\PixiEditor\PixiEditor.csproj" />
     </ItemGroup>
     </ItemGroup>
 
 

+ 35 - 7
tests/PixiEditorTests.sln

@@ -99,12 +99,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Windowing", "..\src\
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Backend.Skia", "..\src\Drawie\src\Drawie.Backend.Skia\Drawie.Backend.Skia.csproj", "{8044BAB5-5EF5-45FE-B819-18BDCC914C1B}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Backend.Skia", "..\src\Drawie\src\Drawie.Backend.Skia\Drawie.Backend.Skia.csproj", "{8044BAB5-5EF5-45FE-B819-18BDCC914C1B}"
 EndProject
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.VulkanAvalonia", "..\src\Drawie\src\Drawie.Interop.VulkanAvalonia\Drawie.Interop.VulkanAvalonia.csproj", "{B2C312C3-E1D6-4970-BBFF-FA2E47ED505C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.RenderApi.Vulkan", "..\src\Drawie\src\Drawie.RenderApi.Vulkan\Drawie.RenderApi.Vulkan.csproj", "{54C073D4-88F8-46D2-9EDB-86C0A7819968}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.RenderApi.Vulkan", "..\src\Drawie\src\Drawie.RenderApi.Vulkan\Drawie.RenderApi.Vulkan.csproj", "{54C073D4-88F8-46D2-9EDB-86C0A7819968}"
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.SVG", "..\src\PixiEditor.SVG\PixiEditor.SVG.csproj", "{A0424CAD-F2F5-4A2A-A638-F5457BD098C6}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.SVG", "..\src\PixiEditor.SVG\PixiEditor.SVG.csproj", "{A0424CAD-F2F5-4A2A-A638-F5457BD098C6}"
 EndProject
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.Vulkan", "..\src\Drawie\src\Drawie.Interop.Avalonia.Vulkan\Drawie.Interop.Avalonia.Vulkan.csproj", "{B973129E-33DD-408F-988A-974F90C3B76C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.Core", "..\src\Drawie\src\Drawie.Interop.Avalonia.Core\Drawie.Interop.Avalonia.Core.csproj", "{94AD7598-865A-41A2-A2DE-A866FE7C54F3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia", "..\src\Drawie\src\Drawie.Interop.Avalonia\Drawie.Interop.Avalonia.csproj", "{D00D836B-6EAD-4E86-8F6A-A0FE10CC8A8C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.OpenGl", "..\src\Drawie\src\Drawie.Interop.Avalonia.OpenGl\Drawie.Interop.Avalonia.OpenGl.csproj", "{404E524C-A719-4B3F-981E-98A0EC33E3F2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.RenderApi.OpenGl", "..\src\Drawie\src\Drawie.RenderApi.OpenGl\Drawie.RenderApi.OpenGl.csproj", "{924CA5E4-F579-435F-B39A-11802F9B1390}"
+EndProject
 Global
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Any CPU = Debug|Any CPU
@@ -286,10 +294,6 @@ Global
 		{8044BAB5-5EF5-45FE-B819-18BDCC914C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8044BAB5-5EF5-45FE-B819-18BDCC914C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8044BAB5-5EF5-45FE-B819-18BDCC914C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8044BAB5-5EF5-45FE-B819-18BDCC914C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8044BAB5-5EF5-45FE-B819-18BDCC914C1B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8044BAB5-5EF5-45FE-B819-18BDCC914C1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2C312C3-E1D6-4970-BBFF-FA2E47ED505C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2C312C3-E1D6-4970-BBFF-FA2E47ED505C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2C312C3-E1D6-4970-BBFF-FA2E47ED505C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2C312C3-E1D6-4970-BBFF-FA2E47ED505C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54C073D4-88F8-46D2-9EDB-86C0A7819968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54C073D4-88F8-46D2-9EDB-86C0A7819968}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54C073D4-88F8-46D2-9EDB-86C0A7819968}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54C073D4-88F8-46D2-9EDB-86C0A7819968}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54C073D4-88F8-46D2-9EDB-86C0A7819968}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54C073D4-88F8-46D2-9EDB-86C0A7819968}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -298,6 +302,26 @@ Global
 		{A0424CAD-F2F5-4A2A-A638-F5457BD098C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0424CAD-F2F5-4A2A-A638-F5457BD098C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0424CAD-F2F5-4A2A-A638-F5457BD098C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0424CAD-F2F5-4A2A-A638-F5457BD098C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0424CAD-F2F5-4A2A-A638-F5457BD098C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0424CAD-F2F5-4A2A-A638-F5457BD098C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B973129E-33DD-408F-988A-974F90C3B76C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B973129E-33DD-408F-988A-974F90C3B76C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B973129E-33DD-408F-988A-974F90C3B76C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B973129E-33DD-408F-988A-974F90C3B76C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94AD7598-865A-41A2-A2DE-A866FE7C54F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94AD7598-865A-41A2-A2DE-A866FE7C54F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94AD7598-865A-41A2-A2DE-A866FE7C54F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94AD7598-865A-41A2-A2DE-A866FE7C54F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D00D836B-6EAD-4E86-8F6A-A0FE10CC8A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D00D836B-6EAD-4E86-8F6A-A0FE10CC8A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D00D836B-6EAD-4E86-8F6A-A0FE10CC8A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D00D836B-6EAD-4E86-8F6A-A0FE10CC8A8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{404E524C-A719-4B3F-981E-98A0EC33E3F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{404E524C-A719-4B3F-981E-98A0EC33E3F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{404E524C-A719-4B3F-981E-98A0EC33E3F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{404E524C-A719-4B3F-981E-98A0EC33E3F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{924CA5E4-F579-435F-B39A-11802F9B1390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{924CA5E4-F579-435F-B39A-11802F9B1390}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{924CA5E4-F579-435F-B39A-11802F9B1390}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{924CA5E4-F579-435F-B39A-11802F9B1390}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	GlobalSection(NestedProjects) = preSolution
 		{0EF3CAB9-7361-472C-8789-D17D4EA2DEBB} = {D914C08C-5F1A-4E13-AAA6-F25E8C9748E2}
 		{0EF3CAB9-7361-472C-8789-D17D4EA2DEBB} = {D914C08C-5F1A-4E13-AAA6-F25E8C9748E2}
@@ -345,8 +369,12 @@ Global
 		{23A9B33D-118E-4BCE-85FB-0AAC6E4D15B6} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{23A9B33D-118E-4BCE-85FB-0AAC6E4D15B6} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{B8DFAB77-3FD1-4FFF-A018-215EFC73D916} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{B8DFAB77-3FD1-4FFF-A018-215EFC73D916} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{8044BAB5-5EF5-45FE-B819-18BDCC914C1B} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{8044BAB5-5EF5-45FE-B819-18BDCC914C1B} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
-		{B2C312C3-E1D6-4970-BBFF-FA2E47ED505C} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{54C073D4-88F8-46D2-9EDB-86C0A7819968} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{54C073D4-88F8-46D2-9EDB-86C0A7819968} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{A0424CAD-F2F5-4A2A-A638-F5457BD098C6} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 		{A0424CAD-F2F5-4A2A-A638-F5457BD098C6} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
+		{B973129E-33DD-408F-988A-974F90C3B76C} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
+		{94AD7598-865A-41A2-A2DE-A866FE7C54F3} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
+		{D00D836B-6EAD-4E86-8F6A-A0FE10CC8A8C} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
+		{404E524C-A719-4B3F-981E-98A0EC33E3F2} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
+		{924CA5E4-F579-435F-B39A-11802F9B1390} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 	EndGlobalSection
 	EndGlobalSection
 EndGlobal
 EndGlobal