2
0
flabbet 9 сар өмнө
parent
commit
39e76d8c15

+ 2 - 1
src/PixiEditor.Beta/PixiEditor.Beta.csproj

@@ -9,7 +9,8 @@
     <PublishTrimmed>true</PublishTrimmed>
     <WasmSingleFileBundle>true</WasmSingleFileBundle>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PixiExtOutputPath>..\PixiEditor.Desktop\bin\Debug\net8.0\Extensions</PixiExtOutputPath>
+    <!--TODO: Temp solution, make it properly build by build system and copy to target dir on publish-->
+    <PixiExtOutputPath>$(MSBuildProjectDirectory)\..\PixiEditor\Extensions</PixiExtOutputPath>
     <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
     <RootNamespace>PixiEditor.Beta</RootNamespace>
   </PropertyGroup>

+ 2 - 2
src/PixiEditor.Extensions.Sdk/build/PixiEditor.Extensions.Sdk.targets

@@ -14,10 +14,10 @@
              Condition="'$(RuntimeIdentifier)' == 'wasi-wasm' And '$(GenerateExtensionPackage)' == 'true'"/>
 
   <Target Name="BuildPackageTask" AfterTargets="_WasiGenerateAppBundle" Condition="'$(RuntimeIdentifier)' == 'wasi-wasm' And '$(GenerateExtensionPackage)' == 'true'">
-    <Message Text="Building extension package"/>
     <PropertyGroup Condition="'$(PixiExtOutputPath)' == ''">
-      <PixiExtOutputPath>$(OutputPath)PixiExtension</PixiExtOutputPath>
+      <PixiExtOutputPath>$(OutputPath)\Extensions</PixiExtOutputPath>
     </PropertyGroup>
+    <Message Text="Building extension package to $(PixiExtOutputPath)" Importance="high"/>
     <BuildPackageTask BuildResultDirectory="$(OutputPath)" TargetDirectory="$(PixiExtOutputPath)" />
   </Target>
 </Project>

BIN
src/PixiEditor/Extensions/PixiEditor.Beta.pixiext


+ 7 - 0
src/PixiEditor/PixiEditor.csproj

@@ -132,6 +132,9 @@
     <None Include="../../Third Party Licenses/**" LinkBase="Third Party Licenses/">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Extensions\PixiEditor.Beta.pixiext">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
@@ -141,4 +144,8 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Extensions\" />
+  </ItemGroup>
+
 </Project>

+ 2 - 2
src/PixiEditor/Properties/AssemblyInfo.cs

@@ -41,5 +41,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.23")]
-[assembly: AssemblyFileVersion("2.0.0.23")]
+[assembly: AssemblyVersion("2.0.0.24")]
+[assembly: AssemblyFileVersion("2.0.0.24")]