Increment to 0.11.0

FOGProject · Jun 19, 2016 · 2212ee4 · 2212ee4
1 parent d44d243
commit 2212ee4
Show file tree

Hide file tree

Showing 26 changed files with 133 additions and 107 deletions.
diff --git a/Debugger/obj/Debug/Debugger.csproj.FileListAbsolute.txt b/Debugger/obj/Debug/Debugger.csproj.FileListAbsolute.txt
@@ -18,3 +18,9 @@ D:\fog\client\Debugger\bin\x86\Debug\Modules.pdb
 D:\fog\client\Debugger\bin\x86\Debug\Newtonsoft.Json.xml
 D:\fog\client\Debugger\bin\x86\Debug\PipeServer.pdb
 D:\fog\client\Debugger\bin\x86\Debug\PipeClient.pdb
+C:\Users\Administrator\dev\fog-client\bin\Debugger.exe.config
+C:\Users\Administrator\dev\fog-client\bin\Debugger.exe
+C:\Users\Administrator\dev\fog-client\bin\Debugger.pdb
+C:\Users\Administrator\dev\fog-client\Debugger\obj\Debug\Debugger.csprojResolveAssemblyReference.cache
+C:\Users\Administrator\dev\fog-client\Debugger\obj\Debug\Debugger.exe
+C:\Users\Administrator\dev\fog-client\Debugger\obj\Debug\Debugger.pdb
diff --git a/Debugger/obj/Release/Debugger.csproj.FileListAbsolute.txt b/Debugger/obj/Release/Debugger.csproj.FileListAbsolute.txt
@@ -16,3 +16,5 @@ D:\fog\fog-client\bin\Debugger.exe.config
 D:\fog\fog-client\bin\Debugger.exe
 D:\fog\fog-client\Debugger\obj\Release\Debugger.csprojResolveAssemblyReference.cache
 D:\fog\fog-client\Debugger\obj\Release\Debugger.exe
+C:\Users\Administrator\dev\fog-client\bin\Debugger.exe.config
+C:\Users\Administrator\dev\fog-client\Debugger\obj\Release\Debugger.exe
diff --git a/FOGService.sln.DotSettings b/FOGService.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FOG/@EntryIndexedValue">FOG</s:String></wpf:ResourceDictionary>
diff --git a/MSI/Files.wxs b/MSI/Files.wxs
@@ -54,6 +54,9 @@
             <File Id="SuperWebSocket" Name="SuperWebSocket.dll" Source="..\bin\SuperWebSocket.dll" />
             <File Id="WebSocket4Net" Name="WebSocket4Net.dll" Source="..\bin\WebSocket4Net.dll" />
             <File Id="ProcessPrivileges" Name="ProcessPrivileges.dll" Source="..\bin\ProcessPrivileges.dll" />
+            <File Id="CommonLoggingCore" Name="Common.Logging.Core.dll" Source="..\bin\Common.Logging.Core.dll" />
+            <File Id="CommonLogging" Name="Common.Logging.dll" Source="..\bin\Common.Logging.dll" />
+            <File Id="Quartz" Name="Quartz.dll" Source="..\bin\Quartz.dll" />
 
             <File Id="FOGShutdownGUIconf" Name="FOGShutdownGUI.exe.config" Source="..\bin\FOGShutdownGUI.exe.config" />
             <File Id="FOGTrayconf" Name="FOGTray.exe.config" Source="..\bin\FOGTray.exe.config" />

diff --git a/MSI/Product.wxs b/MSI/Product.wxs
@@ -20,14 +20,14 @@
 -->
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension">
-  <Product Id="*" Name="FOG Service" Language="1033" Version="0.10.6" UpgradeCode="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA"
+  <Product Id="*" Name="FOG Service" Language="1033" Version="0.11.0" UpgradeCode="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA"
            Manufacturer="FOG">
     <Package Description="FOG Service" Comments="A client for the FOG project" InstallerVersion="300" Compressed="yes"
              InstallScope="perMachine" />
     <!-- Remove old versions -->
     <Upgrade Id="1CCFDEAF-53E9-43AC-AE18-F9F86CEFA4EA">
       <UpgradeVersion OnlyDetect="yes" Minimum="0.0.0" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
-      <UpgradeVersion OnlyDetect="no" Minimum="0.0.0" Maximum="0.10.5" Property="OLDERVERSIONBEINGUPGRADED"
+      <UpgradeVersion OnlyDetect="no" Minimum="0.0.0" Maximum="0.10.6" Property="OLDERVERSIONBEINGUPGRADED"
                       IncludeMinimum="no" IncludeMaximum="yes" MigrateFeatures="yes" />
     </Upgrade>
     <InstallExecuteSequence>

diff --git a/Modules/DisplayManager/DisplayManager.cs b/Modules/DisplayManager/DisplayManager.cs
@@ -49,11 +49,11 @@ protected override void DoWork(Response data, DisplayMessage msg)
             _display.LoadDisplaySettings();
             if (_display.PopulatedSettings)
             {
-                //Get task info
-                var response = Communication.GetResponse("/service/displaymanager.php", true);
-
-                if (response.Error) return;
-
+                if (msg.X <= 0 || msg.Y <= 0)
+                {
+                    Log.Error(Name, "Invalid settings provided");
+                    return;
+                }
                 ChangeResolution(GetDisplays().Count > 0 ? GetDisplays()[0] : "", msg.X, msg.Y, msg.R);
             }
             else

diff --git a/Modules/Modules.csproj b/Modules/Modules.csproj
@@ -160,9 +160,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="job_scheduling_data_2_0.xsd">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Modules/PrinterManager/DefaultPrinterManager.cs b/Modules/PrinterManager/DefaultPrinterManager.cs
@@ -34,7 +34,7 @@ public class DefaultPrinterManager : AbstractModule<DefaultPrinterMessage>
 
         public DefaultPrinterManager()
         {
-            Name = "PrinterManager";
+            Name = "DefaultPrinterManager";
 
             switch (Settings.OS)
             {
@@ -49,8 +49,7 @@ public DefaultPrinterManager()
 
         protected override void DoWork(Response data, DefaultPrinterMessage msg)
         {
-            //Get printers
-            if (data.Error || string.IsNullOrWhiteSpace(msg.Name)) return;
+            if (string.IsNullOrEmpty(msg.Name)) return;
 
             Log.Entry(Name, "Checking defaults");
             var printer = new Printer {Name = msg.Name};

diff --git a/Modules/PrinterManager/PrinterManager.cs b/Modules/PrinterManager/PrinterManager.cs
@@ -57,17 +57,15 @@ public PrinterManager()
 
         protected override void DoWork(Response data, PrinterMessage msg)
         {
-
             Log.Entry(Name, "Getting installed printers");
             var installedPrinters = _instance.GetPrinters();
 
-
             var printerAdded = false;
 
             //Get printers
-            if (msg.Mode.Equals("0")) return;
+            if (msg.Mode == "0") return;
 
-            if (data.Error && data.ReturnCode.Equals("np"))
+            if (data.Error && data.ReturnCode.Equals("np", StringComparison.OrdinalIgnoreCase))
             {
                 RemoveExtraPrinters(new List<Printer>(), msg, installedPrinters);
                 return;
@@ -81,8 +79,6 @@ protected override void DoWork(Response data, PrinterMessage msg)
 
             RemoveExtraPrinters(msg.Printers, msg, installedPrinters);
 
-
-
             Log.Entry(Name, "Adding printers");
             foreach (var printer in msg.Printers)
             {
@@ -108,7 +104,7 @@ private void RemoveExtraPrinters(List<Printer> newPrinters, PrinterMessage msg,
         {
             var managedPrinters = newPrinters.Where(printer => printer != null).Select(printer => printer.Name).ToList();
 
-            if (!msg.Mode.Equals("ar"))
+            if (!msg.Mode.Equals("ar", StringComparison.OrdinalIgnoreCase))
             {
                 foreach (var name in msg.AllPrinters.Where(name => !managedPrinters.Contains(name) && existingPrinters.Contains(name)))
                     CleanPrinter(name, true);

diff --git a/PrinterManagerHelper/Form1.Designer.cs b/PrinterManagerHelper/Form1.Designer.cs
diff --git a/PrinterManagerHelper/Form1.cs b/PrinterManagerHelper/Form1.cs
@@ -1,6 +1,6 @@
 /*
  * FOG Service : A computer management client for the FOG Project
- * Copyright (C) 2014-2015 FOG Project
+ * Copyright (C) 2014-2016 FOG Project
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License

diff --git a/Service/FOGSystemService.cs b/Service/FOGSystemService.cs
@@ -67,9 +67,9 @@ protected override Response GetLoopData()
                     Settings.Set("DefaultPrinter", (pDefault == null) ? "" : pDefault.GetField("default"));
 
                     var display = response.GetSubResponse("displaymanager");
-                    Settings.Set("DisplayX", (display == null) ? "0" : display.GetField("x"));
-                    Settings.Set("DisplayY", (display == null) ? "0" : display.GetField("y"));
-                    Settings.Set("DisplayR", (display == null) ? "0" : display.GetField("r"));
+                    Settings.Set("DisplayX", (display == null || display.Error) ? "" : display.GetField("x"));
+                    Settings.Set("DisplayY", (display == null || display.Error) ? "" : display.GetField("y"));
+                    Settings.Set("DisplayR", (display == null || display.Error) ? "" : display.GetField("r"));
                 }
                 catch (Exception ex)
                 {

diff --git a/Service/obj/Debug/Service.csproj.FileListAbsolute.txt b/Service/obj/Debug/Service.csproj.FileListAbsolute.txt
@@ -27,3 +27,9 @@ D:\fog\client\Service\bin\x86\Debug\Modules.pdb
 D:\fog\client\Service\bin\x86\Debug\PipeServer.pdb
 D:\fog\client\Service\bin\x86\Debug\FOGUpdateHelper.pdb
 D:\fog\client\Service\bin\x86\Debug\FOGUpdateWaiter.pdb
+C:\Users\Administrator\dev\fog-client\bin\FOGService.exe.config
+C:\Users\Administrator\dev\fog-client\bin\FOGService.exe
+C:\Users\Administrator\dev\fog-client\bin\FOGService.pdb
+C:\Users\Administrator\dev\fog-client\Service\obj\Debug\Service.csprojResolveAssemblyReference.cache
+C:\Users\Administrator\dev\fog-client\Service\obj\Debug\FOGService.exe
+C:\Users\Administrator\dev\fog-client\Service\obj\Debug\FOGService.pdb
diff --git a/Tray/obj/Debug/Tray.csproj.FileListAbsolute.txt b/Tray/obj/Debug/Tray.csproj.FileListAbsolute.txt
@@ -12,3 +12,12 @@ C:\Users\jbob\Desktop\fog-client\Tray\obj\Debug\FOG.NotificationIcon.resources
 C:\Users\jbob\Desktop\fog-client\Tray\obj\Debug\Tray.csproj.GenerateResource.Cache
 C:\Users\jbob\Desktop\fog-client\Tray\obj\Debug\FOGTray.exe
 C:\Users\jbob\Desktop\fog-client\Tray\obj\Debug\FOGTray.pdb
+C:\Users\Administrator\dev\fog-client\bin\logo.ico
+C:\Users\Administrator\dev\fog-client\bin\FOGTray.exe.config
+C:\Users\Administrator\dev\fog-client\bin\FOGTray.exe
+C:\Users\Administrator\dev\fog-client\bin\FOGTray.pdb
+C:\Users\Administrator\dev\fog-client\Tray\obj\Debug\Tray.csprojResolveAssemblyReference.cache
+C:\Users\Administrator\dev\fog-client\Tray\obj\Debug\FOG.NotificationIcon.resources
+C:\Users\Administrator\dev\fog-client\Tray\obj\Debug\Tray.csproj.GenerateResource.Cache
+C:\Users\Administrator\dev\fog-client\Tray\obj\Debug\FOGTray.exe
+C:\Users\Administrator\dev\fog-client\Tray\obj\Debug\FOGTray.pdb
diff --git a/Tray/obj/Release/Tray.csproj.FileListAbsolute.txt b/Tray/obj/Release/Tray.csproj.FileListAbsolute.txt
@@ -20,3 +20,5 @@ D:\fog\fog-client\bin\FOGTray.exe.config
 D:\fog\fog-client\bin\FOGTray.exe
 D:\fog\fog-client\Tray\obj\Release\Tray.csprojResolveAssemblyReference.cache
 D:\fog\fog-client\Tray\obj\Release\FOGTray.exe
+C:\Users\Administrator\dev\fog-client\bin\FOGTray.exe.config
+C:\Users\Administrator\dev\fog-client\Tray\obj\Release\FOGTray.exe
diff --git a/UniversalInstaller/Helper.cs b/UniversalInstaller/Helper.cs
@@ -28,7 +28,7 @@ namespace FOG
     public static class Helper
     {
         private const string LogName = "Installer";
-        public const string ClientVersion = "0.10.6";
+        public const string ClientVersion = "0.11.0";
 
         public static IInstall Instance { get;  }
 

diff --git a/UniversalInstaller/UniversalInstaller.cs b/UniversalInstaller/UniversalInstaller.cs
@@ -47,6 +47,7 @@ static void Main(string[] args)
             var https = false;
             var server = "";
             var webRoot = "";
+            var logFile = "";
 
             var p = new OptionSet() {
                 { "server=|SERVER=", "the FOG server address, defaults to fogserver",
@@ -65,10 +66,18 @@ static void Main(string[] args)
                   v => uninstall = v != null },
                 { "upgrade",  "upgrade an existing installation",
                   v => upgrade = v != null },
+                { "l|log",  "the log file to use",
+                  v => logFile = v },
             };
 
             p.Parse(args);
 
+            if (!string.IsNullOrWhiteSpace(logFile))
+            {
+                LogPath = logFile;
+                Log.FilePath = LogPath;
+            }
+
             if (args.Length == 1)
             {
                 if (args[0].Equals("upgrade"))

diff --git a/UpdateHelper/AbstractUpdate.cs b/UpdateHelper/AbstractUpdate.cs
@@ -27,7 +27,7 @@ abstract class AbstractUpdate :  IUpdate
     {
         public void ApplyUpdate()
         {
-            ProcessHandler.RunClientEXE("SmartInstaller.exe", "--upgrade");
+            ProcessHandler.RunClientEXE("SmartInstaller.exe", $"/upgrade /log=\"{Log.FilePath}\"");
         }
 
         public abstract void StartService();