瀏覽代碼

Changed name and fixed tests

flabbet 1 年之前
父節點
當前提交
2bda8c48aa
共有 91 個文件被更改,包括 135 次插入355 次删除
  1. 1 1
      samples/PixiEditorExtensionSamples.sln
  2. 1 1
      samples/Sample1_HelloWorld/HelloWorldExtension.cs
  3. 3 3
      samples/Sample1_HelloWorld/Sample1_HelloWorld.csproj
  4. 2 2
      samples/Sample2_LocalizationSample/LocalizationSampleExtension.cs
  5. 3 3
      samples/Sample2_LocalizationSample/Sample2_LocalizationSample.csproj
  6. 1 1
      samples/Sample3_Preferences/PreferencesSampleExtension.cs
  7. 3 3
      samples/Sample3_Preferences/Sample3_Preferences.csproj
  8. 2 2
      samples/Sample4_CreatePopup/CreatePopupSampleExtension.cs
  9. 3 3
      samples/Sample4_CreatePopup/Sample4_CreatePopup.csproj
  10. 1 1
      samples/Sample5_Resources/ResourcesSampleExtension.cs
  11. 3 3
      samples/Sample5_Resources/Sample5_Resources.csproj
  12. 1 1
      samples/Sample6_Palettes/ExamplePaletteDataSource.cs
  13. 1 1
      samples/Sample6_Palettes/PalettesSampleExtension.cs
  14. 3 3
      samples/Sample6_Palettes/Sample6_Palettes.csproj
  15. 1 1
      samples/Sample7_FlyUI/FlyUISampleExtension.cs
  16. 3 3
      samples/Sample7_FlyUI/Sample7_FlyUI.csproj
  17. 3 5
      samples/Sample7_FlyUI/WindowContentElement.cs
  18. 2 2
      src/PixiEditor.Api.CGlueMSBuild/CApiGenerator.cs
  19. 1 1
      src/PixiEditor.Api.CGlueMSBuild/PixiEditor.Api.CGlueMSBuild.csproj
  20. 0 228
      src/PixiEditor.Api.CGlueMSBuild/build/PixiEditor.Api.CGlueMSBuild.deps.json
  21. 二進制
      src/PixiEditor.Api.CGlueMSBuild/build/PixiEditor.Api.CGlueMSBuild.dll
  22. 1 1
      src/PixiEditor.DevTools/PixiEditor.DevTools.csproj
  23. 1 1
      src/PixiEditor.Extensions.MSPackageBuilder/PixiEditor.Extensions.MSPackageBuilder.csproj
  24. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Align.cs
  25. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Border.cs
  26. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Button.cs
  27. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Center.cs
  28. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Column.cs
  29. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/CompiledControl.cs
  30. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Container.cs
  31. 2 2
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Image.cs
  32. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Layout.cs
  33. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/LayoutElement.cs
  34. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/LayoutElementsStore.cs
  35. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/MultiChildLayoutElement.cs
  36. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Padding.cs
  37. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Row.cs
  38. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/SingleChildLayoutElement.cs
  39. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/State.cs
  40. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/StatefulElement.cs
  41. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/StatelessElement.cs
  42. 1 1
      src/PixiEditor.Extensions.Sdk/Api/FlyUI/Text.cs
  43. 2 2
      src/PixiEditor.Extensions.Sdk/Api/Localization/LocalizedString.cs
  44. 2 2
      src/PixiEditor.Extensions.Sdk/Api/Logging/Logger.cs
  45. 2 2
      src/PixiEditor.Extensions.Sdk/Api/Palettes/PalettesProvider.cs
  46. 2 2
      src/PixiEditor.Extensions.Sdk/Api/UserPreferences/Preferences.cs
  47. 2 2
      src/PixiEditor.Extensions.Sdk/Api/Window/PopupWindow.cs
  48. 3 3
      src/PixiEditor.Extensions.Sdk/Api/Window/WindowProvider.cs
  49. 1 1
      src/PixiEditor.Extensions.Sdk/ApiExportAttribute.cs
  50. 1 1
      src/PixiEditor.Extensions.Sdk/Async/ConvertableAsyncCall.cs
  51. 2 2
      src/PixiEditor.Extensions.Sdk/Bridge/Interop.Palettes.cs
  52. 1 1
      src/PixiEditor.Extensions.Sdk/Bridge/Interop.Preferences.cs
  53. 1 1
      src/PixiEditor.Extensions.Sdk/Bridge/Interop.cs
  54. 2 2
      src/PixiEditor.Extensions.Sdk/Bridge/Native.Async.cs
  55. 1 1
      src/PixiEditor.Extensions.Sdk/Bridge/Native.Localization.cs
  56. 2 2
      src/PixiEditor.Extensions.Sdk/Bridge/Native.Palettes.cs
  57. 1 1
      src/PixiEditor.Extensions.Sdk/Bridge/Native.Preferences.cs
  58. 1 1
      src/PixiEditor.Extensions.Sdk/Bridge/Native.Windowing.cs
  59. 2 2
      src/PixiEditor.Extensions.Sdk/Bridge/Native.cs
  60. 1 1
      src/PixiEditor.Extensions.Sdk/ExtensionContext.cs
  61. 0 0
      src/PixiEditor.Extensions.Sdk/PixiEditor.Extensions.Sdk.csproj
  62. 6 6
      src/PixiEditor.Extensions.Sdk/PixiEditorApi.cs
  63. 1 1
      src/PixiEditor.Extensions.Sdk/Utilities/InteropUtility.cs
  64. 1 1
      src/PixiEditor.Extensions.Sdk/WasmExtension.cs
  65. 0 0
      src/PixiEditor.Extensions.Sdk/build/Mono.Cecil.Mdb.dll
  66. 0 0
      src/PixiEditor.Extensions.Sdk/build/Mono.Cecil.Pdb.dll
  67. 0 0
      src/PixiEditor.Extensions.Sdk/build/Mono.Cecil.Rocks.dll
  68. 0 0
      src/PixiEditor.Extensions.Sdk/build/Mono.Cecil.dll
  69. 0 0
      src/PixiEditor.Extensions.Sdk/build/Newtonsoft.Json.dll
  70. 0 0
      src/PixiEditor.Extensions.Sdk/build/PixiEditor.Api.CGlueMSBuild.deps.json
  71. 二進制
      src/PixiEditor.Extensions.Sdk/build/PixiEditor.Api.CGlueMSBuild.dll
  72. 0 0
      src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.MSPackageBuilder.deps.json
  73. 二進制
      src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.MSPackageBuilder.dll
  74. 0 0
      src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.Sdk.props
  75. 1 1
      src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.Sdk.targets
  76. 1 1
      src/PixiEditor.Extensions.Sdk/native/interop.c
  77. 1 1
      src/PixiEditor.sln
  78. 2 2
      tests/CGlueTestLib/CGlueTestLib.csproj
  79. 2 2
      tests/CGlueTestLib/Exports.cs
  80. 5 2
      tests/CGlueTestLib/Program.cs
  81. 1 1
      tests/PixiEditor.Api.CGlueMSBuild.Tests/CApiGeneratorTests.cs
  82. 二進制
      tests/PixiEditor.Api.CGlueMSBuild.Tests/TestAssets/CGlueTestLib.dll
  83. 二進制
      tests/PixiEditor.Api.CGlueMSBuild.Tests/TestAssets/PixiEditor.Extensions.Sdk.dll
  84. 二進制
      tests/PixiEditor.Api.CGlueMSBuild.Tests/TestAssets/PixiEditor.Extensions.Wasm.dll
  85. 0 0
      tests/PixiEditor.Extensions.Sdk.Tests/GlobalUsings.cs
  86. 5 5
      tests/PixiEditor.Extensions.Sdk.Tests/NativeControlSerializationTest.cs
  87. 1 1
      tests/PixiEditor.Extensions.Sdk.Tests/PixiEditor.Extensions.Sdk.Tests.csproj
  88. 4 4
      tests/PixiEditor.Extensions.Tests/LayoutBuilderElementsTests.cs
  89. 5 5
      tests/PixiEditor.Extensions.Tests/LayoutBuilderTests.cs
  90. 1 1
      tests/PixiEditor.Extensions.WasmRuntime.Tests/UnitTest1.cs
  91. 9 2
      tests/PixiEditorTests.sln

+ 1 - 1
samples/PixiEditorExtensionSamples.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Wasm", "..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj", "{FD9B4C32-4D2E-410E-BC6B-787779BEB6E2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Sdk", "..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj", "{FD9B4C32-4D2E-410E-BC6B-787779BEB6E2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample1_HelloWorld", "Sample1_HelloWorld\Sample1_HelloWorld.csproj", "{82A85041-A666-42DB-8F84-7D91EF9A5C9D}"
 EndProject

+ 1 - 1
samples/Sample1_HelloWorld/HelloWorldExtension.cs

@@ -1,6 +1,6 @@
 namespace HelloWorld;
 
-using PixiEditor.Extensions.Wasm;
+using PixiEditor.Extensions.Sdk;
 
 public class HelloWorldExtension : WasmExtension
 {

+ 3 - 3
samples/Sample1_HelloWorld/Sample1_HelloWorld.csproj

@@ -12,12 +12,12 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
     
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.props"/>
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.targets" />
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.props"/>
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.targets" />
     
     <ItemGroup>
         <None Remove="extension.json" />

+ 2 - 2
samples/Sample2_LocalizationSample/LocalizationSampleExtension.cs

@@ -1,5 +1,5 @@
-using PixiEditor.Extensions.Wasm;
-using PixiEditor.Extensions.Wasm.Api.Localization;
+using PixiEditor.Extensions.Sdk;
+using PixiEditor.Extensions.Sdk.Api.Localization;
 
 namespace LocalizationSample;
 

+ 3 - 3
samples/Sample2_LocalizationSample/Sample2_LocalizationSample.csproj

@@ -26,11 +26,11 @@
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
     <ItemGroup>
-        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.props"/>
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.targets" />
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.props"/>
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.targets" />
 
 </Project>

+ 1 - 1
samples/Sample3_Preferences/PreferencesSampleExtension.cs

@@ -1,4 +1,4 @@
-using PixiEditor.Extensions.Wasm;
+using PixiEditor.Extensions.Sdk;
 
 namespace Preferences;
 

+ 3 - 3
samples/Sample3_Preferences/Sample3_Preferences.csproj

@@ -26,11 +26,11 @@
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
     <ItemGroup>
-        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.props"/>
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.targets" />
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.props"/>
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.targets" />
 
 </Project>

+ 2 - 2
samples/Sample4_CreatePopup/CreatePopupSampleExtension.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
-using PixiEditor.Extensions.Wasm;
-using PixiEditor.Extensions.Wasm.Api.FlyUI;
+using PixiEditor.Extensions.Sdk;
+using PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 namespace CreatePopupSample;
 

+ 3 - 3
samples/Sample4_CreatePopup/Sample4_CreatePopup.csproj

@@ -26,11 +26,11 @@
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
     <ItemGroup>
-        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.props"/>
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.targets" />
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.props"/>
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.targets" />
 
 </Project>

+ 1 - 1
samples/Sample5_Resources/ResourcesSampleExtension.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using PixiEditor.Extensions.Wasm;
+using PixiEditor.Extensions.Sdk;
 
 namespace ResourcesSample;
 

+ 3 - 3
samples/Sample5_Resources/Sample5_Resources.csproj

@@ -32,11 +32,11 @@
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
     <ItemGroup>
-        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.props"/>
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.targets" />
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.props"/>
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.targets" />
 
 </Project>

+ 1 - 1
samples/Sample6_Palettes/ExamplePaletteDataSource.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using PixiEditor.Extensions.CommonApi.Async;
 using PixiEditor.Extensions.CommonApi.Palettes;
-using PixiEditor.Extensions.Wasm;
+using PixiEditor.Extensions.Sdk;
 
 namespace PalettesSample;
 

+ 1 - 1
samples/Sample6_Palettes/PalettesSampleExtension.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using PixiEditor.Extensions.Wasm;
+using PixiEditor.Extensions.Sdk;
 
 namespace PalettesSample;
 

+ 3 - 3
samples/Sample6_Palettes/Sample6_Palettes.csproj

@@ -32,11 +32,11 @@
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
     <ItemGroup>
-        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.props"/>
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.targets" />
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.props"/>
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.targets" />
 
 </Project>

+ 1 - 1
samples/Sample7_FlyUI/FlyUISampleExtension.cs

@@ -1,4 +1,4 @@
-using PixiEditor.Extensions.Wasm;
+using PixiEditor.Extensions.Sdk;
 
 namespace FlyUISample;
 

+ 3 - 3
samples/Sample7_FlyUI/Sample7_FlyUI.csproj

@@ -32,11 +32,11 @@
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
     <ItemGroup>
-        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+        <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
 
     <!--Below is not required if you use Nuget package, this sample references project directly, so it must be here-->
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.props"/>
-    <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.targets" />
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.props"/>
+    <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.targets" />
 
 </Project>

+ 3 - 5
samples/Sample7_FlyUI/WindowContentElement.cs

@@ -1,8 +1,6 @@
-using PixiEditor.Extensions.CommonApi.FlyUI;
-using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
-using PixiEditor.Extensions.Wasm.Api.FlyUI;
-using PixiEditor.Extensions.Wasm.Api.Localization;
-using PixiEditor.Extensions.Wasm.Api.Window;
+using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
+using PixiEditor.Extensions.Sdk.Api.FlyUI;
+using PixiEditor.Extensions.Sdk.Api.Window;
 
 namespace FlyUISample;
 

+ 2 - 2
src/PixiEditor.Api.CGlueMSBuild/CApiGenerator.cs

@@ -44,7 +44,7 @@ public class CApiGenerator
     {
         var exportedMethods = types
             .SelectMany(t => t.Methods)
-            .Where(m => m.IsStatic && m.CustomAttributes.Any(a => a.AttributeType.FullName == "PixiEditor.Extensions.Wasm.ApiExportAttribute"))
+            .Where(m => m.IsStatic && m.CustomAttributes.Any(a => a.AttributeType.FullName == "PixiEditor.Extensions.Sdk.ApiExportAttribute"))
             .ToArray();
         return exportedMethods;
     }
@@ -113,7 +113,7 @@ public class CApiGenerator
 
     private string BuildExportFunction(MethodDefinition method)
     {
-        string exportName = method.CustomAttributes.First(a => a.AttributeType.FullName == "PixiEditor.Extensions.Wasm.ApiExportAttribute").ConstructorArguments[0].Value.ToString();
+        string exportName = method.CustomAttributes.First(a => a.AttributeType.FullName == "PixiEditor.Extensions.Sdk.ApiExportAttribute").ConstructorArguments[0].Value.ToString();
         StringBuilder sb = new StringBuilder();
         sb.Append($"__attribute__((export_name(\"{exportName}\")))");
         sb.AppendLine();

+ 1 - 1
src/PixiEditor.Api.CGlueMSBuild/PixiEditor.Api.CGlueMSBuild.csproj

@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <OutputType>Library</OutputType>
-    <OutputPath>../PixiEditor.Extensions.Wasm/build/</OutputPath>
+    <OutputPath>../PixiEditor.Extensions.Sdk/build/</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <DebugType>None</DebugType>

+ 0 - 228
src/PixiEditor.Api.CGlueMSBuild/build/PixiEditor.Api.CGlueMSBuild.deps.json

@@ -1,228 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETStandard,Version=v2.0/",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETStandard,Version=v2.0": {},
-    ".NETStandard,Version=v2.0/": {
-      "PixiEditor.Api.CGlueMSBuild/1.0.0": {
-        "dependencies": {
-          "Microsoft.Build.Utilities.Core": "17.9.5",
-          "NETStandard.Library": "2.0.3",
-          "StyleCop.Analyzers": "1.1.118"
-        },
-        "runtime": {
-          "PixiEditor.Api.CGlueMSBuild.dll": {}
-        }
-      },
-      "Microsoft.Build.Framework/17.9.5": {
-        "dependencies": {
-          "Microsoft.Win32.Registry": "5.0.0",
-          "System.Memory": "4.5.5",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0",
-          "System.Security.Principal.Windows": "5.0.0"
-        }
-      },
-      "Microsoft.Build.Utilities.Core/17.9.5": {
-        "dependencies": {
-          "Microsoft.Build.Framework": "17.9.5",
-          "Microsoft.NET.StringTools": "17.9.5",
-          "Microsoft.Win32.Registry": "5.0.0",
-          "System.Collections.Immutable": "8.0.0",
-          "System.Configuration.ConfigurationManager": "8.0.0",
-          "System.Memory": "4.5.5",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0",
-          "System.Security.Principal.Windows": "5.0.0",
-          "System.Text.Encoding.CodePages": "7.0.0"
-        }
-      },
-      "Microsoft.NET.StringTools/17.9.5": {
-        "dependencies": {
-          "System.Memory": "4.5.5",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
-      },
-      "Microsoft.NETCore.Platforms/1.1.0": {},
-      "Microsoft.Win32.Registry/5.0.0": {
-        "dependencies": {
-          "System.Buffers": "4.5.1",
-          "System.Memory": "4.5.5",
-          "System.Security.AccessControl": "5.0.0",
-          "System.Security.Principal.Windows": "5.0.0"
-        }
-      },
-      "NETStandard.Library/2.0.3": {
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0"
-        }
-      },
-      "StyleCop.Analyzers/1.1.118": {},
-      "System.Buffers/4.5.1": {},
-      "System.Collections.Immutable/8.0.0": {
-        "dependencies": {
-          "System.Memory": "4.5.5",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
-      },
-      "System.Configuration.ConfigurationManager/8.0.0": {
-        "dependencies": {
-          "System.Security.Cryptography.ProtectedData": "8.0.0"
-        }
-      },
-      "System.Memory/4.5.5": {
-        "dependencies": {
-          "System.Buffers": "4.5.1",
-          "System.Numerics.Vectors": "4.4.0",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
-      },
-      "System.Numerics.Vectors/4.4.0": {},
-      "System.Runtime.CompilerServices.Unsafe/6.0.0": {},
-      "System.Security.AccessControl/5.0.0": {
-        "dependencies": {
-          "System.Security.Principal.Windows": "5.0.0"
-        }
-      },
-      "System.Security.Cryptography.ProtectedData/8.0.0": {
-        "dependencies": {
-          "System.Memory": "4.5.5"
-        }
-      },
-      "System.Security.Principal.Windows/5.0.0": {},
-      "System.Text.Encoding.CodePages/7.0.0": {
-        "dependencies": {
-          "System.Memory": "4.5.5",
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
-      }
-    }
-  },
-  "libraries": {
-    "PixiEditor.Api.CGlueMSBuild/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    },
-    "Microsoft.Build.Framework/17.9.5": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-CjRmqu9Wv2fyC1d7NKOuBDXcNMI8+GiXGM6izygB+skGGu4Vf0cBcoPq7AFqZCcMpn5DtZ+y7RpaLpB2qrzanQ==",
-      "path": "microsoft.build.framework/17.9.5",
-      "hashPath": "microsoft.build.framework.17.9.5.nupkg.sha512"
-    },
-    "Microsoft.Build.Utilities.Core/17.9.5": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-H2hpVdm7cX/uGJD1HOfab3RKgD5tlnvzQkFqvsrAqGHRi0sqb2w1+hRwERFm23witCjmERnqNgiQjYks6/ds8A==",
-      "path": "microsoft.build.utilities.core/17.9.5",
-      "hashPath": "microsoft.build.utilities.core.17.9.5.nupkg.sha512"
-    },
-    "Microsoft.NET.StringTools/17.9.5": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-C/oPRnjcIZBRzcpl1V06R1eEMCxOGt6mIm+8ioyblELgJEXLM8XjUPuCwljMO52VetsHw54xMcYwU8UEeHEIEg==",
-      "path": "microsoft.net.stringtools/17.9.5",
-      "hashPath": "microsoft.net.stringtools.17.9.5.nupkg.sha512"
-    },
-    "Microsoft.NETCore.Platforms/1.1.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
-      "path": "microsoft.netcore.platforms/1.1.0",
-      "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
-    },
-    "Microsoft.Win32.Registry/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
-      "path": "microsoft.win32.registry/5.0.0",
-      "hashPath": "microsoft.win32.registry.5.0.0.nupkg.sha512"
-    },
-    "NETStandard.Library/2.0.3": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
-      "path": "netstandard.library/2.0.3",
-      "hashPath": "netstandard.library.2.0.3.nupkg.sha512"
-    },
-    "StyleCop.Analyzers/1.1.118": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-Onx6ovGSqXSK07n/0eM3ZusiNdB6cIlJdabQhWGgJp3Vooy9AaLS/tigeybOJAobqbtggTamoWndz72JscZBvw==",
-      "path": "stylecop.analyzers/1.1.118",
-      "hashPath": "stylecop.analyzers.1.1.118.nupkg.sha512"
-    },
-    "System.Buffers/4.5.1": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==",
-      "path": "system.buffers/4.5.1",
-      "hashPath": "system.buffers.4.5.1.nupkg.sha512"
-    },
-    "System.Collections.Immutable/8.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==",
-      "path": "system.collections.immutable/8.0.0",
-      "hashPath": "system.collections.immutable.8.0.0.nupkg.sha512"
-    },
-    "System.Configuration.ConfigurationManager/8.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==",
-      "path": "system.configuration.configurationmanager/8.0.0",
-      "hashPath": "system.configuration.configurationmanager.8.0.0.nupkg.sha512"
-    },
-    "System.Memory/4.5.5": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
-      "path": "system.memory/4.5.5",
-      "hashPath": "system.memory.4.5.5.nupkg.sha512"
-    },
-    "System.Numerics.Vectors/4.4.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==",
-      "path": "system.numerics.vectors/4.4.0",
-      "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512"
-    },
-    "System.Runtime.CompilerServices.Unsafe/6.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==",
-      "path": "system.runtime.compilerservices.unsafe/6.0.0",
-      "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512"
-    },
-    "System.Security.AccessControl/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
-      "path": "system.security.accesscontrol/5.0.0",
-      "hashPath": "system.security.accesscontrol.5.0.0.nupkg.sha512"
-    },
-    "System.Security.Cryptography.ProtectedData/8.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==",
-      "path": "system.security.cryptography.protecteddata/8.0.0",
-      "hashPath": "system.security.cryptography.protecteddata.8.0.0.nupkg.sha512"
-    },
-    "System.Security.Principal.Windows/5.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==",
-      "path": "system.security.principal.windows/5.0.0",
-      "hashPath": "system.security.principal.windows.5.0.0.nupkg.sha512"
-    },
-    "System.Text.Encoding.CodePages/7.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ==",
-      "path": "system.text.encoding.codepages/7.0.0",
-      "hashPath": "system.text.encoding.codepages.7.0.0.nupkg.sha512"
-    }
-  }
-}

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


+ 1 - 1
src/PixiEditor.DevTools/PixiEditor.DevTools.csproj

@@ -11,7 +11,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\PixiEditor.Extensions.Runtime\PixiEditor.Extensions.Runtime.csproj" />
-      <ProjectReference Include="..\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+      <ProjectReference Include="..\\.csproj" />
       <ProjectReference Include="..\PixiEditor.Extensions\PixiEditor.Extensions.csproj" />
     </ItemGroup>
 

+ 1 - 1
src/PixiEditor.Extensions.MSPackageBuilder/PixiEditor.Extensions.MSPackageBuilder.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <OutputType>Library</OutputType>
     <LangVersion>default</LangVersion>
-    <OutputPath>../PixiEditor.Extensions.Wasm/build/</OutputPath>
+    <OutputPath>../PixiEditor.Extensions.Sdk/build/</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Align.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Align.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Align : SingleChildLayoutElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Border.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Border.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Border : SingleChildLayoutElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Button.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Button.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 using PixiEditor.Extensions.CommonApi.FlyUI.Events;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Button : SingleChildLayoutElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Center.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Center.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Center : SingleChildLayoutElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Column.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Column.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Column : MultiChildLayoutElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/CompiledControl.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/CompiledControl.cs

@@ -4,7 +4,7 @@ using System.Text;
 using PixiEditor.Extensions.CommonApi.FlyUI;
 using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class CompiledControl
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Container.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Container.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Container : SingleChildLayoutElement
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Image.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Image.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
-using PixiEditor.Extensions.Wasm.Bridge;
+using PixiEditor.Extensions.Sdk.Bridge;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Image : StatelessElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Layout.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Layout.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public sealed class Layout : SingleChildLayoutElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/LayoutElement.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/LayoutElement.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 using PixiEditor.Extensions.CommonApi.FlyUI.Events;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public abstract class LayoutElement : ILayoutElement<CompiledControl>
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/LayoutElementsStore.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/LayoutElementsStore.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 internal static class LayoutElementsStore
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/MultiChildLayoutElement.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/MultiChildLayoutElement.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public abstract class MultiChildLayoutElement : LayoutElement, IMultiChildLayoutElement<CompiledControl>
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Padding.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Padding.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Padding : SingleChildLayoutElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Row.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Row.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Row : MultiChildLayoutElement
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/SingleChildLayoutElement.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/SingleChildLayoutElement.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public abstract class SingleChildLayoutElement : LayoutElement, ISingleChildLayoutElement<CompiledControl>
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/State.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/State.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 using PixiEditor.Extensions.CommonApi.FlyUI.State;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public abstract class State : IState<CompiledControl>
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/StatefulElement.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/StatefulElement.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI.State;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public abstract class StatefulElement<TState> : LayoutElement, IStatefulElement<CompiledControl, TState> where TState : IState<CompiledControl>
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/StatelessElement.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/StatelessElement.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 using PixiEditor.Extensions.CommonApi.FlyUI.State;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public abstract class StatelessElement : LayoutElement, IStatelessElement<CompiledControl>
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Api/FlyUI/Text.cs → src/PixiEditor.Extensions.Sdk/Api/FlyUI/Text.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.FlyUI.Properties;
 
-namespace PixiEditor.Extensions.Wasm.Api.FlyUI;
+namespace PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 public class Text : StatelessElement
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Api/Localization/LocalizedString.cs → src/PixiEditor.Extensions.Sdk/Api/Localization/LocalizedString.cs

@@ -1,6 +1,6 @@
-using PixiEditor.Extensions.Wasm.Bridge;
+using PixiEditor.Extensions.Sdk.Bridge;
 
-namespace PixiEditor.Extensions.Wasm.Api.Localization;
+namespace PixiEditor.Extensions.Sdk.Api.Localization;
 
 public struct LocalizedString
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Api/Logging/Logger.cs → src/PixiEditor.Extensions.Sdk/Api/Logging/Logger.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.Logging;
-using PixiEditor.Extensions.Wasm.Bridge;
+using PixiEditor.Extensions.Sdk.Bridge;
 
-namespace PixiEditor.Extensions.Wasm.Api.Logging;
+namespace PixiEditor.Extensions.Sdk.Api.Logging;
 
 public class Logger : ILogger
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Api/Palettes/PalettesProvider.cs → src/PixiEditor.Extensions.Sdk/Api/Palettes/PalettesProvider.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.Palettes;
-using PixiEditor.Extensions.Wasm.Bridge;
+using PixiEditor.Extensions.Sdk.Bridge;
 
-namespace PixiEditor.Extensions.Wasm.Api.Palettes;
+namespace PixiEditor.Extensions.Sdk.Api.Palettes;
 
 public class PalettesProvider : IPalettesProvider
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Api/UserPreferences/Preferences.cs → src/PixiEditor.Extensions.Sdk/Api/UserPreferences/Preferences.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.UserPreferences;
-using PixiEditor.Extensions.Wasm.Bridge;
+using PixiEditor.Extensions.Sdk.Bridge;
 
-namespace PixiEditor.Extensions.Wasm.Api.UserPreferences;
+namespace PixiEditor.Extensions.Sdk.Api.UserPreferences;
 
 /// <summary>
 ///     Add, remove and update user preferences.

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Api/Window/PopupWindow.cs → src/PixiEditor.Extensions.Sdk/Api/Window/PopupWindow.cs

@@ -1,8 +1,8 @@
 using PixiEditor.Extensions.CommonApi.Async;
 using PixiEditor.Extensions.CommonApi.Windowing;
-using PixiEditor.Extensions.Wasm.Bridge;
+using PixiEditor.Extensions.Sdk.Bridge;
 
-namespace PixiEditor.Extensions.Wasm.Api.Window;
+namespace PixiEditor.Extensions.Sdk.Api.Window;
 
 public class PopupWindow : IPopupWindow
 {

+ 3 - 3
src/PixiEditor.Extensions.Wasm/Api/Window/WindowProvider.cs → src/PixiEditor.Extensions.Sdk/Api/Window/WindowProvider.cs

@@ -1,9 +1,9 @@
 using System.Runtime.InteropServices;
 using PixiEditor.Extensions.CommonApi.Windowing;
-using PixiEditor.Extensions.Wasm.Api.FlyUI;
-using PixiEditor.Extensions.Wasm.Bridge;
+using PixiEditor.Extensions.Sdk.Api.FlyUI;
+using PixiEditor.Extensions.Sdk.Bridge;
 
-namespace PixiEditor.Extensions.Wasm.Api.Window;
+namespace PixiEditor.Extensions.Sdk.Api.Window;
 
 public class WindowProvider : IWindowProvider
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/ApiExportAttribute.cs → src/PixiEditor.Extensions.Sdk/ApiExportAttribute.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Extensions.Wasm;
+namespace PixiEditor.Extensions.Sdk;
 
 internal class ApiExportAttribute : Attribute
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Async/ConvertableAsyncCall.cs → src/PixiEditor.Extensions.Sdk/Async/ConvertableAsyncCall.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.Async;
 
-namespace PixiEditor.Extensions.Wasm.Async;
+namespace PixiEditor.Extensions.Sdk.Async;
 
 public class ConvertableAsyncCall<TResult, TInput> : AsyncCall<TResult>
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Bridge/Interop.Palettes.cs → src/PixiEditor.Extensions.Sdk/Bridge/Interop.Palettes.cs

@@ -1,8 +1,8 @@
 using PixiEditor.Extensions.CommonApi.Palettes;
-using PixiEditor.Extensions.Wasm.Utilities;
+using PixiEditor.Extensions.Sdk.Utilities;
 using ProtoBuf;
 
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal static partial class Interop
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Bridge/Interop.Preferences.cs → src/PixiEditor.Extensions.Sdk/Bridge/Interop.Preferences.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal static partial class Interop
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Bridge/Interop.cs → src/PixiEditor.Extensions.Sdk/Bridge/Interop.cs

@@ -1,6 +1,6 @@
 using PixiEditor.Extensions.CommonApi.Palettes;
 
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal static partial class Interop
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Bridge/Native.Async.cs → src/PixiEditor.Extensions.Sdk/Bridge/Native.Async.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.Async;
-using PixiEditor.Extensions.Wasm.Async;
+using PixiEditor.Extensions.Sdk.Async;
 
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal partial class Native
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Bridge/Native.Localization.cs → src/PixiEditor.Extensions.Sdk/Bridge/Native.Localization.cs

@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal static partial class Native
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Bridge/Native.Palettes.cs → src/PixiEditor.Extensions.Sdk/Bridge/Native.Palettes.cs

@@ -1,9 +1,9 @@
 using System.Runtime.CompilerServices;
 using PixiEditor.Extensions.CommonApi.Palettes;
-using PixiEditor.Extensions.Wasm.Utilities;
+using PixiEditor.Extensions.Sdk.Utilities;
 using ProtoBuf;
 
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal static partial class Native
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Bridge/Native.Preferences.cs → src/PixiEditor.Extensions.Sdk/Bridge/Native.Preferences.cs

@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal static partial class Native
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Bridge/Native.Windowing.cs → src/PixiEditor.Extensions.Sdk/Bridge/Native.Windowing.cs

@@ -1,6 +1,6 @@
 using System.Runtime.CompilerServices;
 
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal static partial class Native
 {

+ 2 - 2
src/PixiEditor.Extensions.Wasm/Bridge/Native.cs → src/PixiEditor.Extensions.Sdk/Bridge/Native.cs

@@ -4,9 +4,9 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using PixiEditor.Extensions.CommonApi.FlyUI;
 using PixiEditor.Extensions.CommonApi.FlyUI.Events;
-using PixiEditor.Extensions.Wasm.Api.FlyUI;
+using PixiEditor.Extensions.Sdk.Api.FlyUI;
 
-namespace PixiEditor.Extensions.Wasm.Bridge;
+namespace PixiEditor.Extensions.Sdk.Bridge;
 
 internal static class Program { internal static void Main() { } } // Required for compilation
 

+ 1 - 1
src/PixiEditor.Extensions.Wasm/ExtensionContext.cs → src/PixiEditor.Extensions.Sdk/ExtensionContext.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Extensions.Wasm;
+namespace PixiEditor.Extensions.Sdk;
 
 public static class ExtensionContext
 {

+ 0 - 0
src/PixiEditor.Extensions.Wasm/PixiEditor.Extensions.Wasm.csproj → src/PixiEditor.Extensions.Sdk/PixiEditor.Extensions.Sdk.csproj


+ 6 - 6
src/PixiEditor.Extensions.Wasm/PixiEditorApi.cs → src/PixiEditor.Extensions.Sdk/PixiEditorApi.cs

@@ -1,11 +1,11 @@
 using PixiEditor.Extensions.CommonApi.Windowing;
-using PixiEditor.Extensions.Wasm.Api;
-using PixiEditor.Extensions.Wasm.Api.Logging;
-using PixiEditor.Extensions.Wasm.Api.Palettes;
-using PixiEditor.Extensions.Wasm.Api.UserPreferences;
-using PixiEditor.Extensions.Wasm.Api.Window;
+using PixiEditor.Extensions.Sdk.Api;
+using PixiEditor.Extensions.Sdk.Api.Logging;
+using PixiEditor.Extensions.Sdk.Api.Palettes;
+using PixiEditor.Extensions.Sdk.Api.UserPreferences;
+using PixiEditor.Extensions.Sdk.Api.Window;
 
-namespace PixiEditor.Extensions.Wasm;
+namespace PixiEditor.Extensions.Sdk;
 
 public class PixiEditorApi
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/Utilities/InteropUtility.cs → src/PixiEditor.Extensions.Sdk/Utilities/InteropUtility.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace PixiEditor.Extensions.Wasm.Utilities;
+namespace PixiEditor.Extensions.Sdk.Utilities;
 
 public static class InteropUtility
 {

+ 1 - 1
src/PixiEditor.Extensions.Wasm/WasmExtension.cs → src/PixiEditor.Extensions.Sdk/WasmExtension.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Extensions.Wasm;
+namespace PixiEditor.Extensions.Sdk;
 
 public abstract class WasmExtension
 {

+ 0 - 0
src/PixiEditor.Extensions.Wasm/build/Mono.Cecil.Mdb.dll → src/PixiEditor.Extensions.Sdk/build/Mono.Cecil.Mdb.dll


+ 0 - 0
src/PixiEditor.Extensions.Wasm/build/Mono.Cecil.Pdb.dll → src/PixiEditor.Extensions.Sdk/build/Mono.Cecil.Pdb.dll


+ 0 - 0
src/PixiEditor.Extensions.Wasm/build/Mono.Cecil.Rocks.dll → src/PixiEditor.Extensions.Sdk/build/Mono.Cecil.Rocks.dll


+ 0 - 0
src/PixiEditor.Extensions.Wasm/build/Mono.Cecil.dll → src/PixiEditor.Extensions.Sdk/build/Mono.Cecil.dll


+ 0 - 0
src/PixiEditor.Extensions.Wasm/build/Newtonsoft.Json.dll → src/PixiEditor.Extensions.Sdk/build/Newtonsoft.Json.dll


+ 0 - 0
src/PixiEditor.Extensions.Wasm/build/PixiEditor.Api.CGlueMSBuild.deps.json → src/PixiEditor.Extensions.Sdk/build/PixiEditor.Api.CGlueMSBuild.deps.json


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


+ 0 - 0
src/PixiEditor.Extensions.Wasm/build/PixiEditor.Extensions.MSPackageBuilder.deps.json → src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.MSPackageBuilder.deps.json


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


+ 0 - 0
src/PixiEditor.Extensions.Wasm/build/PixiEditor.Extensions.Wasm.props → src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.Sdk.props


+ 1 - 1
src/PixiEditor.Extensions.Wasm/build/PixiEditor.Extensions.Wasm.targets → src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.Sdk.targets

@@ -1,5 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <!-- <Target Name="GenerateLayouts" AfterTargets="Build" Inputs="bin\Debug\$(TargetFramework)\PixiEditor.Extensions.Wasm.dll" Outputs="$(RootFolder)\Layouts\">
+ <!-- <Target Name="GenerateLayouts" AfterTargets="Build" Inputs="bin\Debug\$(TargetFramework)\PixiEditor.Extensions.Sdk.dll" Outputs="$(RootFolder)\Layouts\">
     <Exec  ConsoleToMSBuild="true"
           Command="..\PixiEditor.Extensions.MSBuildLayoutCompiler\bin\Debug\net8.0\PixiEditor.Extensions.MSBuildLayoutCompiler.exe $(OutputPath)\$(MSBuildProjectName).dll $(OutputPath)\Layouts\"/>
   </Target>-->

+ 1 - 1
src/PixiEditor.Extensions.Wasm/native/interop.c → src/PixiEditor.Extensions.Sdk/native/interop.c

@@ -11,7 +11,7 @@ extern void _start(void);
 MonoMethod* lookup_interop_method(const char* method_name)
 {
     MonoMethod* method = NULL;
-    method = lookup_dotnet_method("PixiEditor.Extensions.Wasm.dll", "PixiEditor.Extensions.Wasm.Bridge", "Native", method_name, -1);
+    method = lookup_dotnet_method("PixiEditor.Extensions.Sdk.dll", "PixiEditor.Extensions.Sdk.Bridge", "Native", method_name, -1);
     assert(method);
 
     return method;

+ 1 - 1
src/PixiEditor.sln

@@ -70,7 +70,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.AvaloniaUI.Brows
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PixiEditor.AvaloniaUI.Desktop", "PixiEditor.AvaloniaUI.Desktop\PixiEditor.AvaloniaUI.Desktop.csproj", "{8F4FFC91-BE9F-4476-A372-FBD952865F15}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Wasm", "PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj", "{71907779-F1D1-4AA6-BA11-E990DB089841}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Sdk", "PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj", "{71907779-F1D1-4AA6-BA11-E990DB089841}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.WasmRuntime", "PixiEditor.Extensions.WasmRuntime\PixiEditor.Extensions.WasmRuntime.csproj", "{B30622ED-9177-4930-8E64-2B2352D4D8DC}"
 EndProject

+ 2 - 2
tests/CGlueTestLib/CGlueTestLib.csproj

@@ -9,10 +9,10 @@
     <GenerateExtensionPackage>false</GenerateExtensionPackage>
   </PropertyGroup>
 
-  <Import Project="..\..\src\PixiEditor.Extensions.Wasm\build\PixiEditor.Extensions.Wasm.targets"/>
+  <Import Project="..\..\src\PixiEditor.Extensions.Sdk\build\PixiEditor.Extensions.Sdk.targets"/>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+      <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
 
 </Project>

+ 2 - 2
tests/CGlueTestLib/Exports.cs

@@ -1,7 +1,7 @@
 using PixiEditor.Extensions.CommonApi.FlyUI;
 using PixiEditor.Extensions.CommonApi.FlyUI.Events;
-using PixiEditor.Extensions.Wasm;
-using PixiEditor.Extensions.Wasm.Api.FlyUI;
+using PixiEditor.Extensions.Sdk;
+using PixiEditor.Extensions.Sdk.Api.FlyUI;
 
 namespace CGlueTestLib;
 

+ 5 - 2
tests/CGlueTestLib/Program.cs

@@ -1,9 +1,12 @@
-namespace CGlueTestLib;
+using PixiEditor.Extensions.Sdk;
+using PixiEditor.Extensions.Sdk.Utilities;
+
+namespace CGlueTestLib;
 
 public static class Program
 {
     public static void Main()
     {
-        
+        PixiEditorApi api = new PixiEditorApi(); // to prevent linker from removing the assembly
     }
 }

+ 1 - 1
tests/PixiEditor.Api.CGlueMSBuild.Tests/CApiGeneratorTests.cs

@@ -96,6 +96,6 @@ public class CApiGeneratorTests
         string sanitizedImports = attachCode.Replace("\n", "").Replace("\r", "");
 
         Assert.Contains("void attach_imported_functions()", sanitizedImports);
-        Assert.Contains("mono_add_internal_call(\"PixiEditor.Extensions.Wasm.Interop::subscribe_to_event\", internal_subscribe_to_event);", sanitizedImports);
+        Assert.Contains("mono_add_internal_call(\"PixiEditor.Extensions.Sdk.Bridge.Native::subscribe_to_event\", internal_subscribe_to_event);", sanitizedImports);
     }
 }

二進制
tests/PixiEditor.Api.CGlueMSBuild.Tests/TestAssets/CGlueTestLib.dll


二進制
tests/PixiEditor.Api.CGlueMSBuild.Tests/TestAssets/PixiEditor.Extensions.Sdk.dll


二進制
tests/PixiEditor.Api.CGlueMSBuild.Tests/TestAssets/PixiEditor.Extensions.Wasm.dll


+ 0 - 0
tests/PixiEditor.Extensions.Wasm.Tests/GlobalUsings.cs → tests/PixiEditor.Extensions.Sdk.Tests/GlobalUsings.cs


+ 5 - 5
tests/PixiEditor.Extensions.Wasm.Tests/NativeControlSerializationTest.cs → tests/PixiEditor.Extensions.Sdk.Tests/NativeControlSerializationTest.cs

@@ -1,8 +1,8 @@
 using System.Text;
 using PixiEditor.Extensions.CommonApi.FlyUI;
-using PixiEditor.Extensions.Wasm.Api.FlyUI;
+using PixiEditor.Extensions.Sdk.Api.FlyUI;
 
-namespace PixiEditor.Extensions.Wasm.Tests;
+namespace PixiEditor.Extensions.Sdk.Tests;
 
 public class NativeControlSerializationTest
 {
@@ -10,7 +10,7 @@ public class NativeControlSerializationTest
     public void TestThatNoChildLayoutSerializesCorrectBytes()
     {
         CompiledControl layout = new CompiledControl(0, "Layout");
-        layout.AddProperty("Title", typeof(string));
+        layout.AddProperty("Title");
 
         int uniqueId = 0;
         byte[] uniqueIdBytes = BitConverter.GetBytes(uniqueId);
@@ -93,7 +93,7 @@ public class NativeControlSerializationTest
         CompiledControl layout = new CompiledControl(0, "Layout");
         CompiledControl center = new CompiledControl(1, "Center");
         CompiledControl text = new CompiledControl(2, "Text");
-        text.AddProperty("Hello world", typeof(string));
+        text.AddProperty("Hello world");
         center.AddChild(text);
         layout.AddChild(center);
 
@@ -181,7 +181,7 @@ public class NativeControlSerializationTest
         Assert.Empty(compiledControl.Children[0].Properties);
 
         Assert.Equal("Text", compiledControl.Children[0].Children[0].ControlTypeId);
-        Assert.Single(compiledControl.Children[0].Children[0].Properties);
+        Assert.True(compiledControl.Children[0].Children[0].Properties.Count > 0);
         Assert.Equal("hello sexy.", compiledControl.Children[0].Children[0].Properties[0].value);
     }
 

+ 1 - 1
tests/PixiEditor.Extensions.Wasm.Tests/PixiEditor.Extensions.Wasm.Tests.csproj → tests/PixiEditor.Extensions.Sdk.Tests/PixiEditor.Extensions.Sdk.Tests.csproj

@@ -23,7 +23,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj" />
+      <ProjectReference Include="..\..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj" />
     </ItemGroup>
 
 </Project>

+ 4 - 4
tests/PixiEditor.Extensions.Tests/LayoutBuilderElementsTests.cs

@@ -19,8 +19,8 @@ public class LayoutBuilderElementsTests
         Panel grid = (Panel)result;
         Assert.Single(grid.Children);
 
-        Assert.IsType<DockPanel>(grid.Children[0]);
-        Panel childGrid = (DockPanel)grid.Children[0];
+        Assert.IsType<StackPanel>(grid.Children[0]);
+        Panel childGrid = (StackPanel)grid.Children[0];
 
         Assert.Equal(Avalonia.Layout.HorizontalAlignment.Stretch, childGrid.HorizontalAlignment);
         Assert.Equal(Avalonia.Layout.VerticalAlignment.Stretch, childGrid.VerticalAlignment);
@@ -52,8 +52,8 @@ public class LayoutBuilderElementsTests
         Panel grid = (Panel)result;
         Assert.Single(grid.Children);
 
-        Assert.IsType<DockPanel>(grid.Children[0]);
-        Panel childGrid = (DockPanel)grid.Children[0];
+        Assert.IsType<StackPanel>(grid.Children[0]);
+        Panel childGrid = (StackPanel)grid.Children[0];
 
         Assert.Equal(Avalonia.Layout.HorizontalAlignment.Stretch, childGrid.HorizontalAlignment);
         Assert.Equal(Avalonia.Layout.VerticalAlignment.Stretch, childGrid.VerticalAlignment);

+ 5 - 5
tests/PixiEditor.Extensions.Tests/LayoutBuilderTests.cs

@@ -153,19 +153,19 @@ public class LayoutBuilderTests
         var native = testStatefulElement.BuildNative();
 
         Assert.IsType<ContentPresenter>(native);
-        Assert.IsType<DockPanel>((native as ContentPresenter).Content);
-        DockPanel panel = (native as ContentPresenter).Content as DockPanel;
+        Assert.IsType<StackPanel>((native as ContentPresenter).Content);
+        StackPanel panel = (native as ContentPresenter).Content as StackPanel;
 
         Assert.Equal(2, panel.Children.Count);
 
         Assert.IsType<Avalonia.Controls.Button>(panel.Children[0]);
-        Assert.IsType<DockPanel>(panel.Children[1]);
+        Assert.IsType<StackPanel>(panel.Children[1]);
 
-        Assert.Empty((panel.Children[1] as DockPanel).Children);
+        Assert.Empty((panel.Children[1] as StackPanel).Children);
         Assert.Empty(testStatefulElement.State.Rows);
 
         Avalonia.Controls.Button button = (Avalonia.Controls.Button)panel.Children[0];
-        DockPanel innerPanel = (DockPanel)panel.Children[1];
+        StackPanel innerPanel = (StackPanel)panel.Children[1];
 
         button.RaiseEvent(new RoutedEventArgs(Avalonia.Controls.Button.ClickEvent));
 

+ 1 - 1
tests/PixiEditor.Extensions.WasmRuntime.Tests/UnitTest1.cs

@@ -1,4 +1,4 @@
-namespace PixiEditor.Extensions.WasmRuntime.Tests;
+namespace PixiEditor.Extensions.SdkRuntime.Tests;
 
 public class UnitTest1
 {

+ 9 - 2
tests/PixiEditorTests.sln

@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D914C08C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CGlueTestLib", "CGlueTestLib\CGlueTestLib.csproj", "{9C7FFCAD-DDC1-4B69-9B39-30FD4A566CCB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Wasm", "..\src\PixiEditor.Extensions.Wasm\PixiEditor.Extensions.Wasm.csproj", "{3C73AAB4-FA0C-475F-AAFE-DB682CB57027}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Sdk", "..\src\PixiEditor.Extensions.Sdk\PixiEditor.Extensions.Sdk.csproj", "{3C73AAB4-FA0C-475F-AAFE-DB682CB57027}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{AEB5E9CA-91FB-45DA-A9BF-7E286710C8EF}"
 EndProject
@@ -33,12 +33,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Api.CGlueMSBuild
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Tests", "PixiEditor.Extensions.Tests\PixiEditor.Extensions.Tests.csproj", "{B6AAC494-8D5E-4378-8305-84EC80C0A358}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Wasm.Tests", "PixiEditor.Extensions.Wasm.Tests\PixiEditor.Extensions.Wasm.Tests.csproj", "{5851EC52-2875-4AC0-8C69-EA0B5E0D2B8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.Sdk.Tests", "PixiEditor.Extensions.Sdk.Tests\PixiEditor.Extensions.Sdk.Tests.csproj", "{5851EC52-2875-4AC0-8C69-EA0B5E0D2B8A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.WasmRuntime.Tests", "PixiEditor.Extensions.WasmRuntime.Tests\PixiEditor.Extensions.WasmRuntime.Tests.csproj", "{DA31D2E8-2AC2-41D1-921B-7571881EE85F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.MSPackageBuilder", "..\src\PixiEditor.Extensions.MSPackageBuilder\PixiEditor.Extensions.MSPackageBuilder.csproj", "{6D965165-3B4D-4C70-A559-6AD093879D5A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.Extensions.CommonApi", "..\src\PixiEditor.Extensions.CommonApi\PixiEditor.Extensions.CommonApi.csproj", "{AE174C40-F7CB-4A17-A87A-F1CDCE218B78}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -108,6 +110,10 @@ Global
 		{6D965165-3B4D-4C70-A559-6AD093879D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D965165-3B4D-4C70-A559-6AD093879D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D965165-3B4D-4C70-A559-6AD093879D5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE174C40-F7CB-4A17-A87A-F1CDCE218B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE174C40-F7CB-4A17-A87A-F1CDCE218B78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE174C40-F7CB-4A17-A87A-F1CDCE218B78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE174C40-F7CB-4A17-A87A-F1CDCE218B78}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7F2DBBFC-FBDB-4772-806F-3B0829032DC0} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
@@ -124,5 +130,6 @@ Global
 		{B6AAC494-8D5E-4378-8305-84EC80C0A358} = {D914C08C-5F1A-4E13-AAA6-F25E8C9748E2}
 		{5851EC52-2875-4AC0-8C69-EA0B5E0D2B8A} = {D914C08C-5F1A-4E13-AAA6-F25E8C9748E2}
 		{DA31D2E8-2AC2-41D1-921B-7571881EE85F} = {D914C08C-5F1A-4E13-AAA6-F25E8C9748E2}
+		{AE174C40-F7CB-4A17-A87A-F1CDCE218B78} = {E118E6FE-67E7-4472-A8D7-E7F470E66131}
 	EndGlobalSection
 EndGlobal