Merge remote-tracking branch 'origin/main'

one-ware · Oct 9, 2024 · 0cf4624 · 0cf4624
2 parents 1ff219c + f97088b
commit 0cf4624
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/publish-studio-linux-flathub.yml b/.github/workflows/publish-studio-linux-flathub.yml
@@ -19,6 +19,7 @@ jobs:
           python-version: '3.x'
       - name: Install Flatpak and Flathub
         run: |
+          sudo apt-get update
           sudo apt-get install flatpak -y
           sudo flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
           sudo flatpak install flathub org.freedesktop.Sdk//23.08 -y --noninteractive 

diff --git a/src/OneWare.OssCadSuiteIntegration/OssCadSuiteIntegrationModule.cs b/src/OneWare.OssCadSuiteIntegration/OssCadSuiteIntegrationModule.cs
@@ -1,4 +1,5 @@
-using CommunityToolkit.Mvvm.Input;
+using System.Runtime.InteropServices;
+using CommunityToolkit.Mvvm.Input;
 using Dock.Model.Core;
 using OneWare.Essentials.Helpers;
 using OneWare.Essentials.Models;
@@ -188,6 +189,14 @@ public void OnInitialized(IContainerProvider containerProvider)
                 Path.Combine(x, "share", $"verilator"));
             environmentService.SetEnvironmentVariable("GHDL_PREFIX",
                 Path.Combine(x, "lib", $"ghdl"));
+            environmentService.SetEnvironmentVariable("GTK_EXE_PREFIX", x);
+            environmentService.SetEnvironmentVariable("GTK_DATA_PREFIX", x);
+            environmentService.SetEnvironmentVariable("GDK_PIXBUF_MODULEDIR", Path.Combine(x, "lib", "gdk-pixbuf-2.0", "2.10.0", "loaders"));
+            environmentService.SetEnvironmentVariable("GDK_PIXBUF_MODULE_FILE", Path.Combine(x, "lib", "gdk-pixbuf-2.0", "2.10.0", "loaders.cache"));
+            
+            if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                _ = containerProvider.Resolve<IChildProcessService>().ExecuteShellAsync($"gdk-pixbuf-query-loaders{PlatformHelper.ExecutableExtension}",
+                    ["--update-cache"], x, "Updating gdk-pixbuf cache");
         });
 
         containerProvider.Resolve<IProjectExplorerService>().RegisterConstructContextMenu((x, l) =>

diff --git a/src/OneWare.WaveFormViewer/Controls/WaveFormScale.cs b/src/OneWare.WaveFormViewer/Controls/WaveFormScale.cs
@@ -57,7 +57,7 @@ public static List<Marker> CalculateMarkers(long beginOffset, long endOffset, in
 
     var range = (double)(endOffset - beginOffset);
     var mainStep = FindBeautifulStep(range, maxMainMarkers);
-    var intermediateStep = (long)(mainStep / 10);
+    var intermediateStep = (mainStep / 10);
 
     var firstMainMarker = Math.Ceiling(beginOffset / mainStep) * mainStep;
 
@@ -76,7 +76,7 @@ public static List<Marker> CalculateMarkers(long beginOffset, long endOffset, in
             var intermediateMarker = mainMarker + i * intermediateStep;
             if (intermediateMarker < endOffset && intermediateMarker > beginOffset)
             {
-                markers.Add(new Marker { Position = intermediateMarker, IsMainMarker = false });
+                markers.Add(new Marker { Position = (long)intermediateMarker, IsMainMarker = false });
             }
         }
     }

diff --git a/...o/OneWare.Studio.Desktop.WindowsInstaller/OneWare.Studio.Desktop.WindowsInstaller.wixproj b/...o/OneWare.Studio.Desktop.WindowsInstaller/OneWare.Studio.Desktop.WindowsInstaller.wixproj
@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/4.0.4" InitialTargets="BeforeBuild">
+<Project Sdk="WixToolset.Sdk/5.0.1" InitialTargets="BeforeBuild">
 
   <PropertyGroup>
     <InstallerPlatform>x64</InstallerPlatform>
@@ -14,26 +14,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Heat" Version="4.0.4" />
-    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.4" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <HarvestDirectory Include="$(StudioPublish)">
-      <ComponentGroupName>HarvestedComponents</ComponentGroupName>
-      <DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
-      <SuppressRegistry>true</SuppressRegistry>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestDirectory>
-
-    <BindPath Include="$(StudioPublish)" />
+    <BindPath Include="$(StudioPublish)">
+      <BindName>publish</BindName>
+    </BindPath>
   </ItemGroup>
 
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
     <!-- Clean previous build folder -->
     <Exec Command="rd /s /q $(StudioPublish)" />
     <!-- Publish Oneware Studio -->
-    <Exec Command="dotnet publish $(StudioProj) -f net8.0 -c Release -r win-x64 --self-contained" />
+    <Exec Command="dotnet publish $(StudioProj) -f net8.0 -c Release -r win-x64" />
     <!-- Get assembly version -->
     <GetAssemblyIdentity AssemblyFiles="$(StudioPublish)/OneWareStudio.dll">
       <Output TaskParameter="Assemblies" ItemName="AssemblyVersion" />

diff --git a/studio/OneWare.Studio.Desktop.WindowsInstaller/StudioComponents.wxs b/studio/OneWare.Studio.Desktop.WindowsInstaller/StudioComponents.wxs
@@ -86,9 +86,8 @@
 
             </Component>
 
-            <!--Harvested
-            Components-->
-            <ComponentGroupRef Id="HarvestedComponents" />
+            <Files Include="!(bindpath.publish)\**\*.*" />
+
         </ComponentGroup>
     </Fragment>
 </Wix>
diff --git a/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml b/studio/OneWare.Studio.Desktop/com.one_ware.OneWare.metainfo.xml
@@ -65,7 +65,8 @@
     </provides>
     <content_rating type="oars-1.1"/>
     <releases>
-        <release version="0.20.3.0" date="2024-08-09" type="stable"/>
+        <release version="0.20.4.0" date="2024-10-04" type="stable"/>
+        <release version="0.20.3.0" date="2024-09-20" type="stable"/>
         <release version="0.20.1.0" date="2024-08-09" type="stable"/>
         <release version="0.20.0.0" date="2024-08-09" type="stable"/>
         <release version="0.19.2.0" date="2024-07-31" type="stable"/>