Переглянути джерело

Fixed installation extension path

Krzysztof Krysiński 2 тижнів тому
батько
коміт
242e59c10d

+ 4 - 3
src/PixiEditor.Platform.Standalone/StandaloneAdditionalContentProvider.cs

@@ -1,4 +1,5 @@
-using System.Security.Principal;
+using System.Reflection;
+using System.Security.Principal;
 using PixiEditor.IdentityProvider;
 using PixiEditor.IdentityProvider.PixiAuth;
 using PixiEditor.PixiAuth;
@@ -82,8 +83,8 @@ public sealed class StandaloneAdditionalContentProvider : IAdditionalContentProv
         string filePath = Path.Combine(ExtensionsPath, $"{productId}.pixiext");
         bool exists = File.Exists(filePath);
         if (exists) return true;
-
-        filePath = Path.Combine(Path.GetDirectoryName(Environment.ProcessPath), "Extensions", $"{productId}.pixiext");
+        
+        filePath = Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "Extensions", $"{productId}.pixiext");
         exists = File.Exists(filePath);
 
         return exists;

+ 5 - 2
src/PixiEditor/PixiEditor.csproj

@@ -141,11 +141,14 @@
     <None Include="../../Third Party Licenses/**" LinkBase="Third Party Licenses/">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+
+    <None Include="Extensions\*.pixiext">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
   <ItemGroup>
     <Folder Include="Extensions\"/>
-    <Folder Include="Models\User\"/>
   </ItemGroup>
-
+  
 </Project>