Forráskód Böngészése

Fixed "Valid/NoSignal" messages from OEMServer
Fixed Package version mismatches

frankvandenbos 2 hete
szülő
commit
6e8ec7797a

+ 1 - 0
PRS.Avalonia/PRS.Avalonia.Desktop/PRS.Avalonia.Desktop.csproj

@@ -26,6 +26,7 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     </ItemGroup>
 

+ 1 - 0
PRS.DigitalKey/Prs.DigitalKey.Desktop/Prs.DigitalKey.Desktop.csproj

@@ -26,6 +26,7 @@
 
     <ItemGroup>
       <PackageReference Include="Avalonia.Desktop" Version="11.2.2" />
+      <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2" />
     </ItemGroup>
     
 </Project>

+ 1 - 1
prs.desktop/PRSDesktop.csproj

@@ -938,7 +938,7 @@
       <PackageReference Include="Syncfusion.Themes.Office2019White.WPF" Version="29.2.7" />
       <PackageReference Include="Syncfusion.Themes.SystemTheme.WPF" Version="29.2.7" />
       <PackageReference Include="Syncfusion.Tools.WPF" Version="29.2.7" />
-      <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+      <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
       <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
       <PackageReference Include="System.IO.Ports" Version="8.0.0" />
       <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />

+ 1 - 1
prs.desktop/prsdesktop.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "8.43d"
+#define MyAppVersion "8.43e"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

+ 1 - 1
prs.licensing/PRSLicensing.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Licensing"
-#define MyAppVersion "8.43d"
+#define MyAppVersion "8.43e"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

+ 1 - 1
prs.server/Engines/GPS/OEMConnection.cs

@@ -91,7 +91,7 @@ namespace PRSServer
             var flags = gps.StatusFlags();
             // Sometimes we get a ping that has both "Valid" and "NoSignal" set 
             // In this case, lets treat it as valid
-            if (flags.Contains(GPSStatus.NoSignal) && !flags.Contains(GPSStatus.Valid))
+            if (!flags.Contains(GPSStatus.Valid) && flags.Contains(GPSStatus.NoSignal))
             {
                 Logger.Send(LogType.Information, Serial, $"- Skipping: Invalid Signal ({Serial})");
                 return null;

+ 1 - 0
prs.server/PRSServer.csproj

@@ -104,6 +104,7 @@
         <PackageReference Include="Syncfusion.Licensing" Version="29.2.7" />
         <PackageReference Include="Syncfusion.Pdf.Wpf" Version="29.2.7" />
         <PackageReference Include="Syncfusion.Shared.WPF.Classic" Version="19.4.0.56" />
+        <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.6" />
         <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
     </ItemGroup>

+ 1 - 1
prs.server/PRSServer.iss

@@ -8,7 +8,7 @@
 #define public Dependency_Path_NetCoreCheck "dependencies\"
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "8.43d"
+#define MyAppVersion "8.43e"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"

+ 1 - 1
prs.shared/PRS.Shared.csproj

@@ -55,7 +55,7 @@
 
   <ItemGroup>
     <PackageReference Include="RestSharp" Version="111.2.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="9.0.4" />
+    <PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
   </ItemGroup>
   
 </Project>