CI for linux and osx

openprotest · Dec 30, 2023 · f5870cd · f5870cd
1 parent 3738a62
commit f5870cd
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/.github/workflows/codeql-cs.yml b/.github/workflows/codeql-cs.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest] #ubuntu-latest, macos-latest
+        os: [windows-latest, ubuntu-latest, macos-latest]
         language: [ 'csharp' ]
 
     steps:

diff --git a/Protest/Front/oversight.js b/Protest/Front/oversight.js
@@ -29,7 +29,7 @@ class Oversight extends Window {
 
 		this.SetupToolbar();
 		this.connectButton = this.AddToolbarButton("Connect", "mono/connect.svg?light");
-		this.addStatButton = this.AddToolbarButton("Add", "mono/add.svg?light");
+		this.addStatButton = this.AddToolbarButton("Add chart", "mono/add.svg?light");
 		this.AddToolbarSeparator();
 		this.startButton = this.AddToolbarButton("Start", "mono/play.svg?light");
 		this.pauseButton = this.AddToolbarButton("Pause", "mono/pause.svg?light");
@@ -50,7 +50,7 @@ class Oversight extends Window {
 		this.content.append(this.scrollable, this.consoleBox, this.toggleConsoleButton);
 
 		this.connectButton.onclick = ()=> this.InitializeSocketConnection();
-		this.addStatButton.onclick = ()=> this.AddStat();
+		this.addStatButton.onclick = ()=> this.AddChart();
 		this.startButton.onclick = ()=> this.Start();
 		this.pauseButton.onclick = ()=> this.Pause();
 
@@ -229,7 +229,7 @@ class Oversight extends Window {
 		}
 	}
 
-	async AddStat() {
+	async AddChart() {
 		if (!this.socket) {
 			this.ConfirmBox("Web-socket is disconnected.", "mono/oversight.svg", true);
 			return;
@@ -302,7 +302,7 @@ class Oversight extends Window {
 
 			const templatesBox = document.createElement("div");
 			templatesBox.style.border = "var(--clr-control) solid 1.5px";
-			templatesBox.style.gridArea = "1 / 1 / 7 / 4";
+			templatesBox.style.gridArea = "1 / 1 / 9 / 4";
 			templatesBox.style.overflowY = "scroll";
 			innerBox.appendChild(templatesBox);
 

diff --git a/Protest/Http/Cache.cs b/Protest/Http/Cache.cs
@@ -14,6 +14,12 @@
 
 namespace Protest.Http;
 
+#if !OS_WINDOWS
+public static class StaticCacheSerialization {
+    public static Dictionary<string, byte[]> cache = new Dictionary<string, byte[]>() {};
+}
+#endif
+
 internal sealed class Cache {
     public struct Entry {
         public byte[] bytes;

diff --git a/Protest/Program.cs b/Protest/Program.cs
@@ -18,9 +18,9 @@ Released into the public domain under the GPL v3
 
 global using System;
 global using System.Linq;
+using System.Diagnostics;
 
 namespace Protest;
-
 internal class Program {
     internal static readonly string[] alternativeUriPrefixes = new string[] { "http://127.0.0.1:8080/" };
 

diff --git a/Protest/Protest.csproj b/Protest/Protest.csproj
@@ -25,7 +25,7 @@
         <!--<AssemblyVersion>5.0.*</AssemblyVersion>-->
 
         <Deterministic>false</Deterministic>
-        <VersionSuffix>5.0.$([System.DateTime]::UtcNow.ToString(yyMM)).$([System.DateTime]::UtcNow.ToString(ddhh))</VersionSuffix>
+        <VersionSuffix>5.0.$([System.DateTime]::UtcNow.ToString(yyMM))0.$([System.DateTime]::UtcNow.ToString(ddhh))</VersionSuffix>
         <AssemblyVersion>$(VersionSuffix)</AssemblyVersion>
         <Version>$(VersionSuffix)</Version>
 
@@ -34,7 +34,6 @@
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
 
-
         <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
         <RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
 
@@ -45,18 +44,27 @@
         <PublishReadyToRun>true</PublishReadyToRun>
         <PublishSingleFile>true</PublishSingleFile>
         <Copyright>2023 veniware. Released into the public domain.</Copyright>
-
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.2" />
-      <PackageReference Include="SSH.NET" Version="2023.0.0" />
-      <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
-      <PackageReference Include="System.Management" Version="8.0.0" />
+        <PackageReference Include="Lextm.SharpSnmpLib" Version="12.5.2" />
+        <PackageReference Include="SSH.NET" Version="2023.0.0" />
+        <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
+        <PackageReference Include="System.Management" Version="8.0.0" />
     </ItemGroup>
-  
-    <ItemGroup>
-      <ProjectReference Include="..\Protest-CacheGenerator\Protest-CacheGenerator.csproj" OutputItemType="Analyzer" />
+
+    <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+        <ProjectReference Include="..\Protest-CacheGenerator\Protest-CacheGenerator.csproj" OutputItemType="Analyzer" />
     </ItemGroup>
 
+    <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+        <DefineConstants>OS_WINDOWS</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+        <DefineConstants>OS_MAC</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+        <DefineConstants>OS_LINUX</DefineConstants>
+    </PropertyGroup>
+
 </Project>
diff --git a/RELEASE b/RELEASE
@@ -1 +1 @@
-5.0.2312
+5.0.23120