From 173572516b30e2bb37eb7a420043fa9d74ceb787 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 12:49:27 -0700 Subject: [PATCH 01/54] Creating build automation First attempt at this, probably many more to come. --- .github/workflows/build-validate.yaml | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/build-validate.yaml diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml new file mode 100644 index 0000000..eba9878 --- /dev/null +++ b/.github/workflows/build-validate.yaml @@ -0,0 +1,37 @@ +name: build + +on: + push: + pull_request: + branches: [ main, Dev-2.2 ] # Build for dev primarily, probably don't need main...? + paths: + - '**.vb' + - '**.vbproj' + +env: + DOTNET_VERSION: '4.7.2' # The .NET SDK version to use + +jobs: + build: + + name: build-${{matrix.os}} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-latest] # Only building for Windows. Should have MSBuild. + steps: + + - name: Checkout Code + uses: actions/checkout@v3 + + - name: Build solution + run: msbuild WinNUT_V2/WinNUT_V2.sln /p:Configuration=Release + + - name: Upload Artifact + uses: actions/upload-artifact@v3 + with: + name: built-winnut + if-no-files-found: error + path: | + WinNUT_V2/WinNUT_GUI/bin/Release + WinNUT_V2/Setup/Release From 5c1fdf1fb89a7729c6cfd06039b72d8bcf55bfb2 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 12:51:03 -0700 Subject: [PATCH 02/54] Trying to fix syntax error @L31 Maybe tabs are an issue? Also tweaked output name. --- .github/workflows/build-validate.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index eba9878..da97a33 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -28,10 +28,10 @@ jobs: run: msbuild WinNUT_V2/WinNUT_V2.sln /p:Configuration=Release - name: Upload Artifact - uses: actions/upload-artifact@v3 - with: - name: built-winnut - if-no-files-found: error - path: | - WinNUT_V2/WinNUT_GUI/bin/Release - WinNUT_V2/Setup/Release + uses: actions/upload-artifact@v3 + with: + name: build-winnut + if-no-files-found: error + path: | + WinNUT_V2/WinNUT_GUI/bin/Release + WinNUT_V2/Setup/Release From 3cdc5513586d9697ad541c91c42140e0c2b76f81 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 12:57:34 -0700 Subject: [PATCH 03/54] Allow dispatching workflow manually For when I only need to test something on the website. --- .github/workflows/build-validate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index da97a33..eff57ac 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -2,6 +2,7 @@ name: build on: push: + workflow_dispatch: pull_request: branches: [ main, Dev-2.2 ] # Build for dev primarily, probably don't need main...? paths: From fe859b958e3a5d26b7717ad4592cec27194f8636 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 13:05:22 -0700 Subject: [PATCH 04/54] Setup MSBuild --- .github/workflows/build-validate.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index eff57ac..c82e76a 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -21,6 +21,9 @@ jobs: matrix: os: [windows-latest] # Only building for Windows. Should have MSBuild. steps: + # Make MSBuild available from $PATH. + - name: setup-msbuild + uses: microsoft/setup-msbuild@v1.1 - name: Checkout Code uses: actions/checkout@v3 From c2fca4571eba1f9e8ae66e31372d6e020017ae89 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 13:34:06 -0700 Subject: [PATCH 05/54] Upgrade AGauge compiled framework Upgrade targeted .Net Framework in AGauge project from 4.0 to 4.7.2 as with the rest of the project. Appears to build fine. --- WinNUT_V2/AGauge_mod/AGauge.csproj | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/WinNUT_V2/AGauge_mod/AGauge.csproj b/WinNUT_V2/AGauge_mod/AGauge.csproj index b890445..adf3d38 100644 --- a/WinNUT_V2/AGauge_mod/AGauge.csproj +++ b/WinNUT_V2/AGauge_mod/AGauge.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,8 +10,9 @@ Properties System.Windows.Forms AGauge - v4.0 + v4.7.2 512 + true @@ -22,6 +23,7 @@ prompt 4 false + false pdbonly @@ -30,6 +32,7 @@ TRACE prompt 4 + false From b07c0f07eeb9ca7524abbe9b4eb7a47a16868eea Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 15:42:53 -0700 Subject: [PATCH 06/54] Relocate ToastPopups class back into GUI program This is a bit unusual. Toasts only work on Windows 10+, so this shouldn't even be compiled then. --- .../{WinNUT-Client_Common => WinNUT_GUI}/ToastPopup.vb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename WinNUT_V2/{WinNUT-Client_Common => WinNUT_GUI}/ToastPopup.vb (92%) diff --git a/WinNUT_V2/WinNUT-Client_Common/ToastPopup.vb b/WinNUT_V2/WinNUT_GUI/ToastPopup.vb similarity index 92% rename from WinNUT_V2/WinNUT-Client_Common/ToastPopup.vb rename to WinNUT_V2/WinNUT_GUI/ToastPopup.vb index fe8ae74..b95e237 100644 --- a/WinNUT_V2/WinNUT-Client_Common/ToastPopup.vb +++ b/WinNUT_V2/WinNUT_GUI/ToastPopup.vb @@ -7,6 +7,8 @@ ' ' This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY +Imports System.Xml + Public Class ToastPopup Private Header As String = "" Public WriteOnly Property ToastHeader() As String @@ -43,10 +45,10 @@ Public Class ToastPopup TemplateToast = Windows.UI.Notifications.ToastTemplateType.ToastText02 End If - Dim toastXml As Windows.Data.Xml.Dom.XmlDocument = Windows.UI.Notifications.ToastNotificationManager.GetTemplateContent(TemplateToast) + Dim toastXml As XmlDocument = Windows.UI.Notifications.ToastNotificationManager.GetTemplateContent(TemplateToast) 'Fill in the text elements - Dim stringElements As Windows.Data.Xml.Dom.XmlNodeList = toastXml.GetElementsByTagName("text") + Dim stringElements As XmlNodeList = toastXml.GetElementsByTagName("text") For i = 0 To ((ToastParts.Count - 1) And (stringElements.Count - 1)) Step 1 stringElements.Item(i).InnerText = ToastParts.ElementAt(i) Next From fa4ced332912f0d892c43e2c60f681684ae7cd17 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 15:45:32 -0700 Subject: [PATCH 07/54] Remove specific references to Windows 10-only classes, add WIN10 build target Trying to split builds between systems. --- .../WinNUT-Client_Common.vbproj | 22 +++++++++---------- WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj | 15 ++++++++++--- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj b/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj index 4b00238..c2ffa3d 100644 --- a/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj +++ b/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj @@ -43,6 +43,17 @@ On + + true + true + true + bin\Dbg-Win10\ + WinNUT-Client_Common.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + full + AnyCPU + WIN10 + @@ -54,16 +65,6 @@ - - ..\..\..\..\..\..\..\..\Windows\System32\WinMetadata\Windows.Data.winmd - - - False - ..\..\..\..\..\..\..\..\Windows\System32\WinMetadata\Windows.Foundation.winmd - - - ..\..\..\..\..\..\..\..\Windows\System32\WinMetadata\Windows.UI.winmd - @@ -101,7 +102,6 @@ Settings.settings True - diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj b/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj index 19623c6..34dee84 100644 --- a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj +++ b/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj @@ -95,6 +95,17 @@ My Project\app.manifest + + true + true + true + bin\Dbg-Win10\ + WinNUT-Client.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + full + AnyCPU + true + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -110,9 +121,6 @@ - - - @@ -147,6 +155,7 @@ Component + Update_Gui.vb From 577fd763b32e2f51638a0797cc2b6bfd28f18fca Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 15:58:27 -0700 Subject: [PATCH 08/54] Migrate to new package definition type And making settings for compiler-defined build for Windows 10 and up. --- WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj | 11 ++++++----- WinNUT_V2/WinNUT_GUI/packages.config | 4 ---- 2 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 WinNUT_V2/WinNUT_GUI/packages.config diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj b/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj index 34dee84..cde1855 100644 --- a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj +++ b/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj @@ -107,9 +107,6 @@ true - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - @@ -155,7 +152,7 @@ Component - + Update_Gui.vb @@ -315,7 +312,6 @@ Settings.Designer.vb - @@ -389,6 +385,11 @@ WinNUT-Client_Common + + + 13.0.1 + + diff --git a/WinNUT_V2/WinNUT_GUI/packages.config b/WinNUT_V2/WinNUT_GUI/packages.config deleted file mode 100644 index 284cc55..0000000 --- a/WinNUT_V2/WinNUT_GUI/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From 509518513280e8e733f09b5f18b966ed6614461f Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 15:59:11 -0700 Subject: [PATCH 09/54] Add compiler def for toast usage --- WinNUT_V2/WinNUT_GUI/WinNUT.vb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.vb b/WinNUT_V2/WinNUT_GUI/WinNUT.vb index c0d929e..47e0cf5 100644 --- a/WinNUT_V2/WinNUT_GUI/WinNUT.vb +++ b/WinNUT_V2/WinNUT_GUI/WinNUT.vb @@ -169,20 +169,20 @@ Public Class WinNUT LogFile.LogTracing("NotifyIcons Initialised", LogLvl.LOG_DEBUG, Me) 'Verify If Toast Compatible - - If MinOsVersionToast.CompareTo(WindowsVersion) < 0 Then - AllowToast = True - ToastPopup.ToastHeader = ProgramName & " - " & ShortProgramVersion - LogFile.LogTracing("Windows 10 Toast Notification Available", LogLvl.LOG_DEBUG, Me) - 'Dim ico As Icon = Me.Icon - 'Dim file As System.IO.FileStream = New System.IO.FileStream(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico", System.IO.FileMode.OpenOrCreate) - 'ico.Save(file) - 'file.Close() - 'ico.Dispose() - 'ToastPopup.CreateToastCollection(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico") - Else +#If CONFIG = "Dbg-Win10" Then + ' If MinOsVersionToast.CompareTo(WindowsVersion) < 0 Then + AllowToast = True + ToastPopup.ToastHeader = ProgramName & " - " & ShortProgramVersion + LogFile.LogTracing("Windows 10 Toast Notification Available", LogLvl.LOG_DEBUG, Me) + 'Dim ico As Icon = Me.Icon + 'Dim file As System.IO.FileStream = New System.IO.FileStream(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico", System.IO.FileMode.OpenOrCreate) + 'ico.Save(file) + 'file.Close() + 'ico.Dispose() + 'ToastPopup.CreateToastCollection(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico") +#Else LogFile.LogTracing("Windows 10 Toast Notification Not Available. Too Old Windows Version", LogLvl.LOG_DEBUG, Me) - End If +#End If 'UPS_Device.Battery_Limit = WinNUT_Params.Arr_Reg_Key.Item("ShutdownLimitBatteryCharge") 'UPS_Device.Backup_Limit = WinNUT_Params.Arr_Reg_Key.Item("ShutdownLimitUPSRemainTime") From be2609943aa68e750542c2d34a0077da1682d82a Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 25 Sep 2022 17:12:06 -0700 Subject: [PATCH 10/54] Adding remaining build configs --- WinNUT_V2/AGauge_mod/AGauge.csproj | 9 ++++++ WinNUT_V2/Setup/Setup.vdproj | 50 ++++++++++++++++++++++++------ WinNUT_V2/WinNUT_V2.sln | 44 ++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 9 deletions(-) diff --git a/WinNUT_V2/AGauge_mod/AGauge.csproj b/WinNUT_V2/AGauge_mod/AGauge.csproj index adf3d38..ff01416 100644 --- a/WinNUT_V2/AGauge_mod/AGauge.csproj +++ b/WinNUT_V2/AGauge_mod/AGauge.csproj @@ -34,6 +34,15 @@ 4 false + + true + bin\Dbg-Win10\ + DEBUG;TRACE + full + AnyCPU + 7.3 + prompt + diff --git a/WinNUT_V2/Setup/Setup.vdproj b/WinNUT_V2/Setup/Setup.vdproj index 4bd334e..86901bc 100644 --- a/WinNUT_V2/Setup/Setup.vdproj +++ b/WinNUT_V2/Setup/Setup.vdproj @@ -1648,6 +1648,43 @@ } "Configurations" { + "Dbg-Win10" + { + "DisplayName" = "8:Dbg-Win10" + "IsDebugOnly" = "11:FALSE" + "IsReleaseOnly" = "11:FALSE" + "OutputFilename" = "8:Dbg-Win10\\Setup.msi" + "PackageFilesAs" = "3:1" + "PackageFileSize" = "3:-2147483648" + "CabType" = "3:1" + "Compression" = "3:2" + "SignOutput" = "11:FALSE" + "CertificateFile" = "8:" + "PrivateKeyFile" = "8:" + "TimeStampServer" = "8:" + "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + "Items" + { + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.5.2" + { + "Name" = "8:Microsoft .NET Framework 4.5.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.5.2" + } + "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2" + { + "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)" + "ProductCode" = "8:.NETFramework,Version=v4.7.2" + } + } + } + } "Debug" { "DisplayName" = "8:Debug" @@ -1873,7 +1910,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.8253.28719, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.8303.24134, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { } @@ -2796,7 +2833,7 @@ { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.2.8253.28731, Culture=neutral, processorArchitecture=MSIL" + "AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.2.8303.24134, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { } @@ -5128,11 +5165,6 @@ "AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" "ScatterAssemblies" { - "_DCF566685AE6F7520AB676CC882EB40F" - { - "Name" = "8:Newtonsoft.Json.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:Newtonsoft.Json.dll" "TargetName" = "8:" @@ -6216,7 +6248,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_314CE5030A4040E69371869B1C94AA16" { - "SourcePath" = "8:..\\AGauge_mod\\obj\\Release\\AGauge.dll" + "SourcePath" = "8:..\\AGauge_mod\\obj\\Dbg-Win10\\AGauge.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48" @@ -6244,7 +6276,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_70DBA11C2BF449198BA594449914C1BC" { - "SourcePath" = "8:..\\WInNUT_GUI\\obj\\Release\\WinNUT-Client.exe" + "SourcePath" = "8:..\\WInNUT_GUI\\obj\\Dbg-Win10\\WinNUT-Client.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48" diff --git a/WinNUT_V2/WinNUT_V2.sln b/WinNUT_V2/WinNUT_V2.sln index dd4db48..f5eec2c 100644 --- a/WinNUT_V2/WinNUT_V2.sln +++ b/WinNUT_V2/WinNUT_V2.sln @@ -19,6 +19,11 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WinNUT-Client_Common", "Win EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Dbg-Win10|Any CPU = Dbg-Win10|Any CPU + Dbg-Win10|ARM = Dbg-Win10|ARM + Dbg-Win10|ARM64 = Dbg-Win10|ARM64 + Dbg-Win10|x64 = Dbg-Win10|x64 + Dbg-Win10|x86 = Dbg-Win10|x86 Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 @@ -31,6 +36,16 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|Any CPU.ActiveCfg = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|Any CPU.Build.0 = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|ARM.ActiveCfg = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|ARM.Build.0 = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|ARM64.ActiveCfg = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|ARM64.Build.0 = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|x64.ActiveCfg = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|x64.Build.0 = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|x86.ActiveCfg = Dbg-Win10|Any CPU + {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|x86.Build.0 = Dbg-Win10|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -51,6 +66,15 @@ Global {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Release|x64.Build.0 = Release|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Release|x86.ActiveCfg = Release|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Release|x86.Build.0 = Release|Any CPU + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|Any CPU.ActiveCfg = Dbg-Win10 + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|ARM.ActiveCfg = Dbg-Win10 + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|ARM.Build.0 = Dbg-Win10 + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|ARM64.ActiveCfg = Dbg-Win10 + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|ARM64.Build.0 = Dbg-Win10 + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|x64.ActiveCfg = Dbg-Win10 + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|x64.Build.0 = Dbg-Win10 + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|x86.ActiveCfg = Dbg-Win10 + {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|x86.Build.0 = Dbg-Win10 {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Debug|Any CPU.ActiveCfg = Debug {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Debug|ARM.ActiveCfg = Debug {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Debug|ARM64.ActiveCfg = Debug @@ -64,6 +88,16 @@ Global {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Release|x64.Build.0 = Release {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Release|x86.ActiveCfg = Release {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Release|x86.Build.0 = Release + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|Any CPU.ActiveCfg = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|Any CPU.Build.0 = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|ARM.ActiveCfg = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|ARM.Build.0 = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|ARM64.ActiveCfg = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|ARM64.Build.0 = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|x64.ActiveCfg = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|x64.Build.0 = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|x86.ActiveCfg = Dbg-Win10|Any CPU + {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|x86.Build.0 = Dbg-Win10|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -84,6 +118,16 @@ Global {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Release|x64.Build.0 = Release|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Release|x86.ActiveCfg = Release|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Release|x86.Build.0 = Release|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|Any CPU.ActiveCfg = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|Any CPU.Build.0 = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|ARM.ActiveCfg = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|ARM.Build.0 = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|ARM64.ActiveCfg = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|ARM64.Build.0 = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|x64.ActiveCfg = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|x64.Build.0 = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|x86.ActiveCfg = Dbg-Win10|Any CPU + {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|x86.Build.0 = Dbg-Win10|Any CPU {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|Any CPU.Build.0 = Debug|Any CPU {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|ARM.ActiveCfg = Debug|Any CPU From 5c3d81c4bcf2c43310db4fd116ba128870d88fce Mon Sep 17 00:00:00 2001 From: gbakeman Date: Tue, 27 Sep 2022 18:47:50 -0700 Subject: [PATCH 11/54] Adding official MS community toolkit package Feels less hacky than trying to compile in references to random libraries in system folders. Also hoping this means we won't need separate builds for +''' Class to send a Toast Notification on Windows 10 and up. Made possible thanks to Microsoft.Toolkit.Uwp.Notifications +''' package and https://learn.microsoft.com/en-us/windows/apps/design/shell/tiles-and-notifications/send-local-toast?tabs=desktop +''' Public Class ToastPopup - Private Header As String = "" - Public WriteOnly Property ToastHeader() As String - Set(ByVal Value As String) - Me.Header = Value - End Set - End Property + 'Private Header As String = "" + 'Public WriteOnly Property ToastHeader() As String + ' Set(ByVal Value As String) + ' Me.Header = Value + ' End Set + 'End Property 'Public toastCollectionId As String = "WinNUTToastCollection" 'Create a toast collection 'Public Async Sub CreateToastCollection(ByVal IconUri As String) @@ -36,21 +40,25 @@ Public Class ToastPopup 'Windows.UI.Notifications.ToastNotificationManager.GetDefault().GetToastCollectionManager().SaveToastCollectionAsync(WinNutToastCollection) ' End Sub - Public Sub SendToast(ByVal ToastParts As String()) + Public Sub SendToast(ToastParts As String()) 'Get a toast XML template - Dim TemplateToast As Windows.UI.Notifications.ToastTemplateType - If ToastParts.Count >= 3 Then - TemplateToast = Windows.UI.Notifications.ToastTemplateType.ToastText04 - Else - TemplateToast = Windows.UI.Notifications.ToastTemplateType.ToastText02 - End If + 'Dim TemplateToast As Windows.UI.Notifications.ToastTemplateType + 'If ToastParts.Count >= 3 Then + ' TemplateToast = Windows.UI.Notifications.ToastTemplateType.ToastText04 + 'Else + ' TemplateToast = Windows.UI.Notifications.ToastTemplateType.ToastText02 + 'End If - Dim toastXml As XmlDocument = Windows.UI.Notifications.ToastNotificationManager.GetTemplateContent(TemplateToast) + 'Dim toastXml As XmlDocument = Windows.UI.Notifications.ToastNotificationManager.GetTemplateContent(TemplateToast) 'Fill in the text elements - Dim stringElements As XmlNodeList = toastXml.GetElementsByTagName("text") - For i = 0 To ((ToastParts.Count - 1) And (stringElements.Count - 1)) Step 1 - stringElements.Item(i).InnerText = ToastParts.ElementAt(i) + 'Dim stringElements As XmlNodeList = toastXml.GetElementsByTagName("text") + 'For i = 0 To ((ToastParts.Count - 1) And (stringElements.Count - 1)) Step 1 + ' stringElements.Item(i).InnerText = ToastParts.ElementAt(i) + 'Next + Dim toastBuilder = New ToastContentBuilder() + For i = 0 To ToastParts.Count - 1 + toastBuilder.AddText(ToastParts(i)) Next 'Specify the absolute path to an image @@ -59,12 +67,13 @@ Public Class ToastPopup 'imageElements.Item(0).Attributes.GetNamedItem("src").NodeValue = imagePath 'Create the toast And attach event listeners - Dim toast As Windows.UI.Notifications.ToastNotification = New Windows.UI.Notifications.ToastNotification(toastXml) + ' Dim toast As Windows.UI.Notifications.ToastNotification = New Windows.UI.Notifications.ToastNotification(toastXml) 'toast.Activated += ToastActivated 'toast.Dismissed += ToastDismissed 'toast.Failed += ToastFailed 'Show the toast. Be sure to specify the AppUserModelId on your application's shortcut! - Windows.UI.Notifications.ToastNotificationManager.CreateToastNotifier(Me.Header).Show(toast) + ' Windows.UI.Notifications.ToastNotificationManager.CreateToastNotifier(Me.Header).Show(toast) + toastBuilder.Show() End Sub End Class diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj b/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj index cde1855..9fec69e 100644 --- a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj +++ b/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj @@ -386,6 +386,9 @@ + + 7.1.2 + 13.0.1 diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.vb b/WinNUT_V2/WinNUT_GUI/WinNUT.vb index 47e0cf5..812002e 100644 --- a/WinNUT_V2/WinNUT_GUI/WinNUT.vb +++ b/WinNUT_V2/WinNUT_GUI/WinNUT.vb @@ -169,20 +169,23 @@ Public Class WinNUT LogFile.LogTracing("NotifyIcons Initialised", LogLvl.LOG_DEBUG, Me) 'Verify If Toast Compatible -#If CONFIG = "Dbg-Win10" Then - ' If MinOsVersionToast.CompareTo(WindowsVersion) < 0 Then - AllowToast = True - ToastPopup.ToastHeader = ProgramName & " - " & ShortProgramVersion - LogFile.LogTracing("Windows 10 Toast Notification Available", LogLvl.LOG_DEBUG, Me) - 'Dim ico As Icon = Me.Icon - 'Dim file As System.IO.FileStream = New System.IO.FileStream(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico", System.IO.FileMode.OpenOrCreate) - 'ico.Save(file) - 'file.Close() - 'ico.Dispose() - 'ToastPopup.CreateToastCollection(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico") -#Else + ' #If CONFIG = "Dbg-Win10" Then + If MinOsVersionToast.CompareTo(WindowsVersion) < 0 Then + AllowToast = True + ' ToastPopup.ToastHeader = ProgramName & " - " & ShortProgramVersion + LogFile.LogTracing("Windows 10 Toast Notification Available", LogLvl.LOG_DEBUG, Me) + 'Dim ico As Icon = Me.Icon + 'Dim file As System.IO.FileStream = New System.IO.FileStream(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico", System.IO.FileMode.OpenOrCreate) + 'ico.Save(file) + 'file.Close() + 'ico.Dispose() + 'ToastPopup.CreateToastCollection(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico") + ' #Else + Else + LogFile.LogTracing("Windows 10 Toast Notification Not Available. Too Old Windows Version", LogLvl.LOG_DEBUG, Me) -#End If + End If + ' #End If 'UPS_Device.Battery_Limit = WinNUT_Params.Arr_Reg_Key.Item("ShutdownLimitBatteryCharge") 'UPS_Device.Backup_Limit = WinNUT_Params.Arr_Reg_Key.Item("ShutdownLimitUPSRemainTime") From 04201ffded707af7861c08baa9dc1333aa70f4ec Mon Sep 17 00:00:00 2001 From: gbakeman Date: Tue, 27 Sep 2022 18:50:40 -0700 Subject: [PATCH 12/54] Build workflow restores NuGet packages --- .github/workflows/build-validate.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index c82e76a..229b89b 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -28,6 +28,14 @@ jobs: - name: Checkout Code uses: actions/checkout@v3 + - name: Setup Nuget + uses: NuGet/setup-nuget@v1.0.2 + env: + # ACTIONS_ALLOW_UNSECURE_COMMANDS: true + + - name: Restore NuGet Packages + run: nuget restore WinNUT_V2/WinNUT_V2.sln + - name: Build solution run: msbuild WinNUT_V2/WinNUT_V2.sln /p:Configuration=Release From dc92e2959b66dd0b2c6935af1f563b7eda1c04d2 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Tue, 27 Sep 2022 18:51:43 -0700 Subject: [PATCH 13/54] Forgot a comment --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 229b89b..1d5374c 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -30,7 +30,7 @@ jobs: - name: Setup Nuget uses: NuGet/setup-nuget@v1.0.2 - env: + # env: # ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Restore NuGet Packages From aa92bbc29a8f9ed301a63b48e6a2fef51224b18f Mon Sep 17 00:00:00 2001 From: gbakeman Date: Tue, 27 Sep 2022 18:56:59 -0700 Subject: [PATCH 14/54] Upgrading setup-nuget version Work around for a set-env deprecated error https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/ --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 1d5374c..1a38bae 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -29,7 +29,7 @@ jobs: uses: actions/checkout@v3 - name: Setup Nuget - uses: NuGet/setup-nuget@v1.0.2 + uses: nuget/setup-nuget@v1 # env: # ACTIONS_ALLOW_UNSECURE_COMMANDS: true From 8e29c5f4e202ce241c75548521c1b5954e0ae316 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 15:44:51 -0700 Subject: [PATCH 15/54] Change build action to devenv Setup project apparently requires building with devenv. I've no idea if this'll work. Also added an environment variable for the solution file. --- .github/workflows/build-validate.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 1a38bae..3146364 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -11,6 +11,7 @@ on: env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use + SLN_PATH: WinNUT_V2/WinNUT_V2.sln jobs: build: @@ -19,25 +20,23 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest] # Only building for Windows. Should have MSBuild. + os: [windows-latest] # Only building for Windows. steps: - # Make MSBuild available from $PATH. - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1.1 + # Make devenv available so .vdproj can be built. + - name: Setup devenv + uses: seanmiddleditch/gha-setup-vsdevenv@v4 - name: Checkout Code uses: actions/checkout@v3 - name: Setup Nuget uses: nuget/setup-nuget@v1 - # env: - # ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Restore NuGet Packages - run: nuget restore WinNUT_V2/WinNUT_V2.sln + run: nuget restore "%SLN_PATH" - name: Build solution - run: msbuild WinNUT_V2/WinNUT_V2.sln /p:Configuration=Release + run: devenv "%SLN_PATH" /build release - name: Upload Artifact uses: actions/upload-artifact@v3 From e31b43ccf8240b7c136fbd11761c6b95fd7409a8 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 15:55:10 -0700 Subject: [PATCH 16/54] Replaced 3rd party action w/ environment var Might be able to get away with just specifying the path to the devenv executable. Also forcing build runner to match visual studio version that I'm using. --- .github/workflows/build-validate.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 3146364..470a437 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -11,6 +11,9 @@ on: env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use + # Below is copied from https://github.com/actions/runner-images/issues/128#issuecomment-565227772 + # and https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md + DEV_EXE: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.com" SLN_PATH: WinNUT_V2/WinNUT_V2.sln jobs: @@ -20,11 +23,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest] # Only building for Windows. + os: [windows-2019] # Only building for Windows, set to our current development environment. steps: # Make devenv available so .vdproj can be built. - - name: Setup devenv - uses: seanmiddleditch/gha-setup-vsdevenv@v4 + # - name: Setup devenv + # uses: seanmiddleditch/gha-setup-vsdevenv@v4 - name: Checkout Code uses: actions/checkout@v3 @@ -36,7 +39,7 @@ jobs: run: nuget restore "%SLN_PATH" - name: Build solution - run: devenv "%SLN_PATH" /build release + run: "%DEV_EXE" "%SLN_PATH" /build release - name: Upload Artifact uses: actions/upload-artifact@v3 From c0c872f7376227be547a126be130636e4a3ac7bb Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 15:56:43 -0700 Subject: [PATCH 17/54] Fixing unescaped backslashes According to the sample, you don't need quotes for environment variables. --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 470a437..0231983 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -13,7 +13,7 @@ env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use # Below is copied from https://github.com/actions/runner-images/issues/128#issuecomment-565227772 # and https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md - DEV_EXE: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.com" + DEV_EXE: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.com SLN_PATH: WinNUT_V2/WinNUT_V2.sln jobs: From 5ec70ab01c33b3e9fb88c57d0e124087d169a7b9 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 15:58:21 -0700 Subject: [PATCH 18/54] Fix env var syntax --- .github/workflows/build-validate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 0231983..334d104 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -36,10 +36,10 @@ jobs: uses: nuget/setup-nuget@v1 - name: Restore NuGet Packages - run: nuget restore "%SLN_PATH" + run: nuget restore "%SLN_PATH%" - name: Build solution - run: "%DEV_EXE" "%SLN_PATH" /build release + run: "%DEV_EXE%" "%SLN_PATH%" /build release - name: Upload Artifact uses: actions/upload-artifact@v3 From 19f2d7ca1c639dab969dc4abec1e4912672622c0 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 16:07:41 -0700 Subject: [PATCH 19/54] Use powershell env syntax Probably why I was having syntax errors: powershell is the default shell on Windows runners. --- .github/workflows/build-validate.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 334d104..7d1adc2 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -36,10 +36,11 @@ jobs: uses: nuget/setup-nuget@v1 - name: Restore NuGet Packages - run: nuget restore "%SLN_PATH%" + run: nuget restore $env:SLN_PATH - name: Build solution - run: "%DEV_EXE%" "%SLN_PATH%" /build release + shell: cmd + run: $env:DEV_EXE $env:SLN_PATH /build release - name: Upload Artifact uses: actions/upload-artifact@v3 From 6f8c5ca4f8e022843ad387d1f15f36089c43ca98 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 16:33:37 -0700 Subject: [PATCH 20/54] Reverting changes back to msbuild It looks like getting the installer to build is more of a headache than I need right now. Reverting all changes back to when I was using msbuild (excluding the environment variable and using the 2019 builder), and building in Debug configuration for now. --- .github/workflows/build-validate.yaml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 7d1adc2..bae482d 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -11,10 +11,7 @@ on: env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use - # Below is copied from https://github.com/actions/runner-images/issues/128#issuecomment-565227772 - # and https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md - DEV_EXE: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.com - SLN_PATH: WinNUT_V2/WinNUT_V2.sln + SLN_FILE: WinNUT_V2/WinNUT_V2.sln jobs: build: @@ -23,11 +20,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-2019] # Only building for Windows, set to our current development environment. + os: [windows-2019] # Should have MSBuild. steps: - # Make devenv available so .vdproj can be built. - # - name: Setup devenv - # uses: seanmiddleditch/gha-setup-vsdevenv@v4 + # Make MSBuild available from $PATH. + - name: setup-msbuild + uses: microsoft/setup-msbuild@v1.1 - name: Checkout Code uses: actions/checkout@v3 @@ -36,11 +33,11 @@ jobs: uses: nuget/setup-nuget@v1 - name: Restore NuGet Packages - run: nuget restore $env:SLN_PATH + run: nuget restore $env:SLN_FILE + # msbuild cannot handle .vdproj Installer projects, so only build debug for now. - name: Build solution - shell: cmd - run: $env:DEV_EXE $env:SLN_PATH /build release + run: msbuild $env:SLN_FILE /p:Configuration=Debug - name: Upload Artifact uses: actions/upload-artifact@v3 @@ -48,5 +45,5 @@ jobs: name: build-winnut if-no-files-found: error path: | - WinNUT_V2/WinNUT_GUI/bin/Release - WinNUT_V2/Setup/Release + WinNUT_V2/WinNUT_GUI/bin/Debug + WinNUT_V2/Setup/Debug From 17a1992b9fc8f7da85dae609ab4e736c84f9febc Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 16:53:44 -0700 Subject: [PATCH 21/54] Removing Win10 build target Doesn't seem necessary anymore. --- WinNUT_V2/AGauge_mod/AGauge.csproj | 9 ---- .../WinNUT-Client_Common.vbproj | 11 ----- WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj | 11 ----- WinNUT_V2/WinNUT_V2.sln | 44 ------------------- 4 files changed, 75 deletions(-) diff --git a/WinNUT_V2/AGauge_mod/AGauge.csproj b/WinNUT_V2/AGauge_mod/AGauge.csproj index ff01416..adf3d38 100644 --- a/WinNUT_V2/AGauge_mod/AGauge.csproj +++ b/WinNUT_V2/AGauge_mod/AGauge.csproj @@ -34,15 +34,6 @@ 4 false - - true - bin\Dbg-Win10\ - DEBUG;TRACE - full - AnyCPU - 7.3 - prompt - diff --git a/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj b/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj index c2ffa3d..881f7b6 100644 --- a/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj +++ b/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj @@ -43,17 +43,6 @@ On - - true - true - true - bin\Dbg-Win10\ - WinNUT-Client_Common.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - AnyCPU - WIN10 - diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj b/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj index 9fec69e..291dc2f 100644 --- a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj +++ b/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj @@ -95,17 +95,6 @@ My Project\app.manifest - - true - true - true - bin\Dbg-Win10\ - WinNUT-Client.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - full - AnyCPU - true - diff --git a/WinNUT_V2/WinNUT_V2.sln b/WinNUT_V2/WinNUT_V2.sln index f5eec2c..dd4db48 100644 --- a/WinNUT_V2/WinNUT_V2.sln +++ b/WinNUT_V2/WinNUT_V2.sln @@ -19,11 +19,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WinNUT-Client_Common", "Win EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Dbg-Win10|Any CPU = Dbg-Win10|Any CPU - Dbg-Win10|ARM = Dbg-Win10|ARM - Dbg-Win10|ARM64 = Dbg-Win10|ARM64 - Dbg-Win10|x64 = Dbg-Win10|x64 - Dbg-Win10|x86 = Dbg-Win10|x86 Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 @@ -36,16 +31,6 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|Any CPU.ActiveCfg = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|Any CPU.Build.0 = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|ARM.ActiveCfg = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|ARM.Build.0 = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|ARM64.ActiveCfg = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|ARM64.Build.0 = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|x64.ActiveCfg = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|x64.Build.0 = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|x86.ActiveCfg = Dbg-Win10|Any CPU - {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Dbg-Win10|x86.Build.0 = Dbg-Win10|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -66,15 +51,6 @@ Global {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Release|x64.Build.0 = Release|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Release|x86.ActiveCfg = Release|Any CPU {194AB29D-1F80-497B-86BE-4F35DACBA6BC}.Release|x86.Build.0 = Release|Any CPU - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|Any CPU.ActiveCfg = Dbg-Win10 - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|ARM.ActiveCfg = Dbg-Win10 - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|ARM.Build.0 = Dbg-Win10 - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|ARM64.ActiveCfg = Dbg-Win10 - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|ARM64.Build.0 = Dbg-Win10 - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|x64.ActiveCfg = Dbg-Win10 - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|x64.Build.0 = Dbg-Win10 - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|x86.ActiveCfg = Dbg-Win10 - {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Dbg-Win10|x86.Build.0 = Dbg-Win10 {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Debug|Any CPU.ActiveCfg = Debug {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Debug|ARM.ActiveCfg = Debug {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Debug|ARM64.ActiveCfg = Debug @@ -88,16 +64,6 @@ Global {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Release|x64.Build.0 = Release {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Release|x86.ActiveCfg = Release {FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}.Release|x86.Build.0 = Release - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|Any CPU.ActiveCfg = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|Any CPU.Build.0 = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|ARM.ActiveCfg = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|ARM.Build.0 = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|ARM64.ActiveCfg = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|ARM64.Build.0 = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|x64.ActiveCfg = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|x64.Build.0 = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|x86.ActiveCfg = Dbg-Win10|Any CPU - {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Dbg-Win10|x86.Build.0 = Dbg-Win10|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -118,16 +84,6 @@ Global {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Release|x64.Build.0 = Release|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Release|x86.ActiveCfg = Release|Any CPU {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Release|x86.Build.0 = Release|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|Any CPU.ActiveCfg = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|Any CPU.Build.0 = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|ARM.ActiveCfg = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|ARM.Build.0 = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|ARM64.ActiveCfg = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|ARM64.Build.0 = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|x64.ActiveCfg = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|x64.Build.0 = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|x86.ActiveCfg = Dbg-Win10|Any CPU - {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Dbg-Win10|x86.Build.0 = Dbg-Win10|Any CPU {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|Any CPU.Build.0 = Debug|Any CPU {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|ARM.ActiveCfg = Debug|Any CPU From 33423184f68da12ab7e88f4db85e895c01d4ce3d Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 16:55:08 -0700 Subject: [PATCH 22/54] Switching to msbuild package restore MSBuild supports package restoration, let's try that and see if it won't error on the Setup project. Also setting working directory for commands, and removing Setup artifact packaging. --- .github/workflows/build-validate.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index bae482d..73d3798 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -1,5 +1,9 @@ name: build +defaults: + run: + working-directory: WinNUT_V2 + on: push: workflow_dispatch: @@ -11,7 +15,7 @@ on: env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use - SLN_FILE: WinNUT_V2/WinNUT_V2.sln + SLN_FILE: WinNUT_V2.sln jobs: build: @@ -29,11 +33,13 @@ jobs: - name: Checkout Code uses: actions/checkout@v3 - - name: Setup Nuget - uses: nuget/setup-nuget@v1 + # - name: Setup Nuget + # uses: nuget/setup-nuget@v1 - - name: Restore NuGet Packages - run: nuget restore $env:SLN_FILE + # - name: Restore NuGet Packages + # run: nuget restore $env:SLN_FILE + - name: Restore Packages + run: msbuild -t:restore # msbuild cannot handle .vdproj Installer projects, so only build debug for now. - name: Build solution @@ -45,5 +51,5 @@ jobs: name: build-winnut if-no-files-found: error path: | - WinNUT_V2/WinNUT_GUI/bin/Debug - WinNUT_V2/Setup/Debug + WinNUT_GUI/bin/Debug + From 27815c42461bb9dc1a94f1673c8ccd3b1133957b Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 17:22:22 -0700 Subject: [PATCH 23/54] Renaming main client project folder Renaming (git mv'ing) main GUI client project folder for consistency purposes. --- .../{WinNUT_GUI => WinNUT-Client}/.editorconfig | 0 .../About_Gui.Designer.vb | 0 .../About_Gui.de-DE.resx | 0 .../About_Gui.fr-FR.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/About_Gui.resx | 0 .../About_Gui.ru-RU.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/About_Gui.vb | 0 .../About_Gui.zh-CN.resx | 0 WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/App.config | 0 .../ApplicationEvents.vb | 0 .../{WinNUT_GUI => WinNUT-Client}/CProgressBar.vb | 0 .../List_Var_Gui.Designer.vb | 0 .../List_Var_Gui.de-DE.resx | 0 .../List_Var_Gui.fr-FR.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.resx | 0 .../List_Var_Gui.ru-RU.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.vb | 0 .../List_Var_Gui.zh-CN.resx | 0 .../MultilingualResources/WinNUT-client.de-DE.xlf | 0 .../MultilingualResources/WinNUT-client.fr-FR.xlf | 0 .../MultilingualResources/WinNUT-client.ru-RU.xlf | 0 .../MultilingualResources/WinNUT-client.zh-CN.xlf | 0 .../My Project/Application.Designer.vb | 0 .../My Project/Application.myapp | 0 .../My Project/AssemblyInfo.vb | 0 .../My Project/Resources.Designer.vb | 0 .../My Project/Resources.de-DE.resx | 0 .../My Project/Resources.fr-FR.resx | 0 .../My Project/Resources.resx | 0 .../My Project/Resources.ru-RU.resx | 0 .../My Project/Resources.zh-CN.resx | 0 .../My Project/Settings.Designer.vb | 0 .../My Project/Settings.settings | 0 .../My Project/app.manifest | 0 .../Pref_Gui.Designer.vb | 0 .../Pref_Gui.de-DE.resx | 0 .../Pref_Gui.fr-FR.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/Pref_Gui.resx | 0 .../Pref_Gui.ru-RU.resx | 0 WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Pref_Gui.vb | 0 .../Pref_Gui.zh-CN.resx | 0 .../Resources/1025.ico | Bin .../Resources/1026.ico | Bin .../Resources/1028.ico | Bin .../Resources/1032.ico | Bin .../Resources/1040.ico | Bin .../Resources/1057.ico | Bin .../Resources/1058.ico | Bin .../Resources/1060.ico | Bin .../Resources/1064.ico | Bin .../Resources/1072.ico | Bin .../Resources/1079.ico | Bin .../Resources/1080.ico | Bin .../Resources/1092.ico | Bin .../Resources/1096.ico | Bin .../Resources/1104.ico | Bin .../Resources/1121.ico | Bin .../Resources/1122.ico | Bin .../Resources/1124.ico | Bin .../Resources/1128.ico | Bin .../Resources/1136.ico | Bin .../Resources/1152.ico | Bin .../Resources/1216.ico | Bin .../Resources/1280.ico | Bin .../Resources/1344.ico | Bin .../Resources/2001_ViewLogFile.ico | Bin .../Resources/2001_ViewLogFile.png | Bin .../Resources/2002_Delete_LogFile.ico | Bin .../Resources/2002_Delete_LogFile.png | Bin .../Resources/Battery_Charged.png | Bin .../Resources/Battery_Charging.png | Bin .../Resources/Battery_Discharging.png | Bin .../Resources/Delete_LogFile_24x24.png | Bin .../Resources/Delete_LogFile_32x32.png | Bin .../Resources/ViewLogFile_24x24.png | Bin .../Resources/ViewLogFile_32x32.png | Bin .../Resources/WinNUT-Updater.ico | Bin .../Resources/WinNut.ico | Bin .../{WinNUT_GUI => WinNUT-Client}/Resources/ups.png | Bin .../Resources/ups_104x104.bmp | Bin .../Resources/ups_104x104.png | Bin .../Shutdown_Gui.Designer.vb | 0 .../Shutdown_Gui.de-DE.resx | 0 .../Shutdown_Gui.fr-FR.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.resx | 0 .../Shutdown_Gui.ru-RU.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.vb | 0 .../Shutdown_Gui.zh-CN.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/ToastPopup.vb | 0 .../Update_Gui.Designer.vb | 0 .../Update_Gui.de-DE.resx | 0 .../Update_Gui.fr-FR.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/Update_Gui.resx | 0 .../Update_Gui.ru-RU.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/Update_Gui.vb | 0 .../Update_Gui.zh-CN.resx | 0 .../WinNUT-client.vbproj | 0 .../WinNUT-client_TemporaryKey.pfx | Bin .../WinNUT.Designer.vb | 0 .../{WinNUT_GUI => WinNUT-Client}/WinNUT.de-DE.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/WinNUT.fr-FR.resx | 0 WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.resx | 0 .../{WinNUT_GUI => WinNUT-Client}/WinNUT.ru-RU.resx | 0 WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.vb | 0 .../{WinNUT_GUI => WinNUT-Client}/WinNUT.zh-CN.resx | 0 WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNut.ico | Bin 106 files changed, 0 insertions(+), 0 deletions(-) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/.editorconfig (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/About_Gui.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/About_Gui.de-DE.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/About_Gui.fr-FR.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/About_Gui.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/About_Gui.ru-RU.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/About_Gui.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/About_Gui.zh-CN.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/App.config (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/ApplicationEvents.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/CProgressBar.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.de-DE.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.fr-FR.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.ru-RU.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/List_Var_Gui.zh-CN.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/MultilingualResources/WinNUT-client.de-DE.xlf (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/MultilingualResources/WinNUT-client.fr-FR.xlf (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/MultilingualResources/WinNUT-client.ru-RU.xlf (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/MultilingualResources/WinNUT-client.zh-CN.xlf (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Application.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Application.myapp (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/AssemblyInfo.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Resources.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Resources.de-DE.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Resources.fr-FR.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Resources.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Resources.ru-RU.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Resources.zh-CN.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Settings.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/Settings.settings (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/My Project/app.manifest (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Pref_Gui.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Pref_Gui.de-DE.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Pref_Gui.fr-FR.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Pref_Gui.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Pref_Gui.ru-RU.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Pref_Gui.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Pref_Gui.zh-CN.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1025.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1026.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1028.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1032.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1040.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1057.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1058.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1060.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1064.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1072.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1079.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1080.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1092.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1096.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1104.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1121.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1122.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1124.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1128.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1136.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1152.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1216.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1280.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/1344.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/2001_ViewLogFile.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/2001_ViewLogFile.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/2002_Delete_LogFile.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/2002_Delete_LogFile.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/Battery_Charged.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/Battery_Charging.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/Battery_Discharging.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/Delete_LogFile_24x24.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/Delete_LogFile_32x32.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/ViewLogFile_24x24.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/ViewLogFile_32x32.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/WinNUT-Updater.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/WinNut.ico (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/ups.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/ups_104x104.bmp (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Resources/ups_104x104.png (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.de-DE.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.fr-FR.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.ru-RU.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Shutdown_Gui.zh-CN.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/ToastPopup.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Update_Gui.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Update_Gui.de-DE.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Update_Gui.fr-FR.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Update_Gui.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Update_Gui.ru-RU.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Update_Gui.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/Update_Gui.zh-CN.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT-client.vbproj (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT-client_TemporaryKey.pfx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.Designer.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.de-DE.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.fr-FR.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.ru-RU.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.vb (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNUT.zh-CN.resx (100%) rename WinNUT_V2/{WinNUT_GUI => WinNUT-Client}/WinNut.ico (100%) diff --git a/WinNUT_V2/WinNUT_GUI/.editorconfig b/WinNUT_V2/WinNUT-Client/.editorconfig similarity index 100% rename from WinNUT_V2/WinNUT_GUI/.editorconfig rename to WinNUT_V2/WinNUT-Client/.editorconfig diff --git a/WinNUT_V2/WinNUT_GUI/About_Gui.Designer.vb b/WinNUT_V2/WinNUT-Client/About_Gui.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/About_Gui.Designer.vb rename to WinNUT_V2/WinNUT-Client/About_Gui.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/About_Gui.de-DE.resx b/WinNUT_V2/WinNUT-Client/About_Gui.de-DE.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/About_Gui.de-DE.resx rename to WinNUT_V2/WinNUT-Client/About_Gui.de-DE.resx diff --git a/WinNUT_V2/WinNUT_GUI/About_Gui.fr-FR.resx b/WinNUT_V2/WinNUT-Client/About_Gui.fr-FR.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/About_Gui.fr-FR.resx rename to WinNUT_V2/WinNUT-Client/About_Gui.fr-FR.resx diff --git a/WinNUT_V2/WinNUT_GUI/About_Gui.resx b/WinNUT_V2/WinNUT-Client/About_Gui.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/About_Gui.resx rename to WinNUT_V2/WinNUT-Client/About_Gui.resx diff --git a/WinNUT_V2/WinNUT_GUI/About_Gui.ru-RU.resx b/WinNUT_V2/WinNUT-Client/About_Gui.ru-RU.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/About_Gui.ru-RU.resx rename to WinNUT_V2/WinNUT-Client/About_Gui.ru-RU.resx diff --git a/WinNUT_V2/WinNUT_GUI/About_Gui.vb b/WinNUT_V2/WinNUT-Client/About_Gui.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/About_Gui.vb rename to WinNUT_V2/WinNUT-Client/About_Gui.vb diff --git a/WinNUT_V2/WinNUT_GUI/About_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/About_Gui.zh-CN.resx rename to WinNUT_V2/WinNUT-Client/About_Gui.zh-CN.resx diff --git a/WinNUT_V2/WinNUT_GUI/App.config b/WinNUT_V2/WinNUT-Client/App.config similarity index 100% rename from WinNUT_V2/WinNUT_GUI/App.config rename to WinNUT_V2/WinNUT-Client/App.config diff --git a/WinNUT_V2/WinNUT_GUI/ApplicationEvents.vb b/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/ApplicationEvents.vb rename to WinNUT_V2/WinNUT-Client/ApplicationEvents.vb diff --git a/WinNUT_V2/WinNUT_GUI/CProgressBar.vb b/WinNUT_V2/WinNUT-Client/CProgressBar.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/CProgressBar.vb rename to WinNUT_V2/WinNUT-Client/CProgressBar.vb diff --git a/WinNUT_V2/WinNUT_GUI/List_Var_Gui.Designer.vb b/WinNUT_V2/WinNUT-Client/List_Var_Gui.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/List_Var_Gui.Designer.vb rename to WinNUT_V2/WinNUT-Client/List_Var_Gui.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/List_Var_Gui.de-DE.resx b/WinNUT_V2/WinNUT-Client/List_Var_Gui.de-DE.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/List_Var_Gui.de-DE.resx rename to WinNUT_V2/WinNUT-Client/List_Var_Gui.de-DE.resx diff --git a/WinNUT_V2/WinNUT_GUI/List_Var_Gui.fr-FR.resx b/WinNUT_V2/WinNUT-Client/List_Var_Gui.fr-FR.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/List_Var_Gui.fr-FR.resx rename to WinNUT_V2/WinNUT-Client/List_Var_Gui.fr-FR.resx diff --git a/WinNUT_V2/WinNUT_GUI/List_Var_Gui.resx b/WinNUT_V2/WinNUT-Client/List_Var_Gui.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/List_Var_Gui.resx rename to WinNUT_V2/WinNUT-Client/List_Var_Gui.resx diff --git a/WinNUT_V2/WinNUT_GUI/List_Var_Gui.ru-RU.resx b/WinNUT_V2/WinNUT-Client/List_Var_Gui.ru-RU.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/List_Var_Gui.ru-RU.resx rename to WinNUT_V2/WinNUT-Client/List_Var_Gui.ru-RU.resx diff --git a/WinNUT_V2/WinNUT_GUI/List_Var_Gui.vb b/WinNUT_V2/WinNUT-Client/List_Var_Gui.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/List_Var_Gui.vb rename to WinNUT_V2/WinNUT-Client/List_Var_Gui.vb diff --git a/WinNUT_V2/WinNUT_GUI/List_Var_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/List_Var_Gui.zh-CN.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/List_Var_Gui.zh-CN.resx rename to WinNUT_V2/WinNUT-Client/List_Var_Gui.zh-CN.resx diff --git a/WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.de-DE.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf similarity index 100% rename from WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.de-DE.xlf rename to WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.de-DE.xlf diff --git a/WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.fr-FR.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf similarity index 100% rename from WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.fr-FR.xlf rename to WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.fr-FR.xlf diff --git a/WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.ru-RU.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf similarity index 100% rename from WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.ru-RU.xlf rename to WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.ru-RU.xlf diff --git a/WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.zh-CN.xlf b/WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf similarity index 100% rename from WinNUT_V2/WinNUT_GUI/MultilingualResources/WinNUT-client.zh-CN.xlf rename to WinNUT_V2/WinNUT-Client/MultilingualResources/WinNUT-client.zh-CN.xlf diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Application.Designer.vb b/WinNUT_V2/WinNUT-Client/My Project/Application.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Application.Designer.vb rename to WinNUT_V2/WinNUT-Client/My Project/Application.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Application.myapp b/WinNUT_V2/WinNUT-Client/My Project/Application.myapp similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Application.myapp rename to WinNUT_V2/WinNUT-Client/My Project/Application.myapp diff --git a/WinNUT_V2/WinNUT_GUI/My Project/AssemblyInfo.vb b/WinNUT_V2/WinNUT-Client/My Project/AssemblyInfo.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/AssemblyInfo.vb rename to WinNUT_V2/WinNUT-Client/My Project/AssemblyInfo.vb diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Resources.Designer.vb b/WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Resources.Designer.vb rename to WinNUT_V2/WinNUT-Client/My Project/Resources.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Resources.de-DE.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Resources.de-DE.resx rename to WinNUT_V2/WinNUT-Client/My Project/Resources.de-DE.resx diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Resources.fr-FR.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Resources.fr-FR.resx rename to WinNUT_V2/WinNUT-Client/My Project/Resources.fr-FR.resx diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Resources.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Resources.resx rename to WinNUT_V2/WinNUT-Client/My Project/Resources.resx diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Resources.ru-RU.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.ru-RU.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Resources.ru-RU.resx rename to WinNUT_V2/WinNUT-Client/My Project/Resources.ru-RU.resx diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Resources.zh-CN.resx b/WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Resources.zh-CN.resx rename to WinNUT_V2/WinNUT-Client/My Project/Resources.zh-CN.resx diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Settings.Designer.vb b/WinNUT_V2/WinNUT-Client/My Project/Settings.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Settings.Designer.vb rename to WinNUT_V2/WinNUT-Client/My Project/Settings.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/My Project/Settings.settings b/WinNUT_V2/WinNUT-Client/My Project/Settings.settings similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/Settings.settings rename to WinNUT_V2/WinNUT-Client/My Project/Settings.settings diff --git a/WinNUT_V2/WinNUT_GUI/My Project/app.manifest b/WinNUT_V2/WinNUT-Client/My Project/app.manifest similarity index 100% rename from WinNUT_V2/WinNUT_GUI/My Project/app.manifest rename to WinNUT_V2/WinNUT-Client/My Project/app.manifest diff --git a/WinNUT_V2/WinNUT_GUI/Pref_Gui.Designer.vb b/WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Pref_Gui.Designer.vb rename to WinNUT_V2/WinNUT-Client/Pref_Gui.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/Pref_Gui.de-DE.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Pref_Gui.de-DE.resx rename to WinNUT_V2/WinNUT-Client/Pref_Gui.de-DE.resx diff --git a/WinNUT_V2/WinNUT_GUI/Pref_Gui.fr-FR.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Pref_Gui.fr-FR.resx rename to WinNUT_V2/WinNUT-Client/Pref_Gui.fr-FR.resx diff --git a/WinNUT_V2/WinNUT_GUI/Pref_Gui.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Pref_Gui.resx rename to WinNUT_V2/WinNUT-Client/Pref_Gui.resx diff --git a/WinNUT_V2/WinNUT_GUI/Pref_Gui.ru-RU.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.ru-RU.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Pref_Gui.ru-RU.resx rename to WinNUT_V2/WinNUT-Client/Pref_Gui.ru-RU.resx diff --git a/WinNUT_V2/WinNUT_GUI/Pref_Gui.vb b/WinNUT_V2/WinNUT-Client/Pref_Gui.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Pref_Gui.vb rename to WinNUT_V2/WinNUT-Client/Pref_Gui.vb diff --git a/WinNUT_V2/WinNUT_GUI/Pref_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Pref_Gui.zh-CN.resx rename to WinNUT_V2/WinNUT-Client/Pref_Gui.zh-CN.resx diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1025.ico b/WinNUT_V2/WinNUT-Client/Resources/1025.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1025.ico rename to WinNUT_V2/WinNUT-Client/Resources/1025.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1026.ico b/WinNUT_V2/WinNUT-Client/Resources/1026.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1026.ico rename to WinNUT_V2/WinNUT-Client/Resources/1026.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1028.ico b/WinNUT_V2/WinNUT-Client/Resources/1028.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1028.ico rename to WinNUT_V2/WinNUT-Client/Resources/1028.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1032.ico b/WinNUT_V2/WinNUT-Client/Resources/1032.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1032.ico rename to WinNUT_V2/WinNUT-Client/Resources/1032.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1040.ico b/WinNUT_V2/WinNUT-Client/Resources/1040.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1040.ico rename to WinNUT_V2/WinNUT-Client/Resources/1040.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1057.ico b/WinNUT_V2/WinNUT-Client/Resources/1057.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1057.ico rename to WinNUT_V2/WinNUT-Client/Resources/1057.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1058.ico b/WinNUT_V2/WinNUT-Client/Resources/1058.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1058.ico rename to WinNUT_V2/WinNUT-Client/Resources/1058.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1060.ico b/WinNUT_V2/WinNUT-Client/Resources/1060.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1060.ico rename to WinNUT_V2/WinNUT-Client/Resources/1060.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1064.ico b/WinNUT_V2/WinNUT-Client/Resources/1064.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1064.ico rename to WinNUT_V2/WinNUT-Client/Resources/1064.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1072.ico b/WinNUT_V2/WinNUT-Client/Resources/1072.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1072.ico rename to WinNUT_V2/WinNUT-Client/Resources/1072.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1079.ico b/WinNUT_V2/WinNUT-Client/Resources/1079.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1079.ico rename to WinNUT_V2/WinNUT-Client/Resources/1079.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1080.ico b/WinNUT_V2/WinNUT-Client/Resources/1080.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1080.ico rename to WinNUT_V2/WinNUT-Client/Resources/1080.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1092.ico b/WinNUT_V2/WinNUT-Client/Resources/1092.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1092.ico rename to WinNUT_V2/WinNUT-Client/Resources/1092.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1096.ico b/WinNUT_V2/WinNUT-Client/Resources/1096.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1096.ico rename to WinNUT_V2/WinNUT-Client/Resources/1096.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1104.ico b/WinNUT_V2/WinNUT-Client/Resources/1104.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1104.ico rename to WinNUT_V2/WinNUT-Client/Resources/1104.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1121.ico b/WinNUT_V2/WinNUT-Client/Resources/1121.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1121.ico rename to WinNUT_V2/WinNUT-Client/Resources/1121.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1122.ico b/WinNUT_V2/WinNUT-Client/Resources/1122.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1122.ico rename to WinNUT_V2/WinNUT-Client/Resources/1122.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1124.ico b/WinNUT_V2/WinNUT-Client/Resources/1124.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1124.ico rename to WinNUT_V2/WinNUT-Client/Resources/1124.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1128.ico b/WinNUT_V2/WinNUT-Client/Resources/1128.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1128.ico rename to WinNUT_V2/WinNUT-Client/Resources/1128.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1136.ico b/WinNUT_V2/WinNUT-Client/Resources/1136.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1136.ico rename to WinNUT_V2/WinNUT-Client/Resources/1136.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1152.ico b/WinNUT_V2/WinNUT-Client/Resources/1152.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1152.ico rename to WinNUT_V2/WinNUT-Client/Resources/1152.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1216.ico b/WinNUT_V2/WinNUT-Client/Resources/1216.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1216.ico rename to WinNUT_V2/WinNUT-Client/Resources/1216.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1280.ico b/WinNUT_V2/WinNUT-Client/Resources/1280.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1280.ico rename to WinNUT_V2/WinNUT-Client/Resources/1280.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/1344.ico b/WinNUT_V2/WinNUT-Client/Resources/1344.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/1344.ico rename to WinNUT_V2/WinNUT-Client/Resources/1344.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/2001_ViewLogFile.ico b/WinNUT_V2/WinNUT-Client/Resources/2001_ViewLogFile.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/2001_ViewLogFile.ico rename to WinNUT_V2/WinNUT-Client/Resources/2001_ViewLogFile.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/2001_ViewLogFile.png b/WinNUT_V2/WinNUT-Client/Resources/2001_ViewLogFile.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/2001_ViewLogFile.png rename to WinNUT_V2/WinNUT-Client/Resources/2001_ViewLogFile.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/2002_Delete_LogFile.ico b/WinNUT_V2/WinNUT-Client/Resources/2002_Delete_LogFile.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/2002_Delete_LogFile.ico rename to WinNUT_V2/WinNUT-Client/Resources/2002_Delete_LogFile.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/2002_Delete_LogFile.png b/WinNUT_V2/WinNUT-Client/Resources/2002_Delete_LogFile.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/2002_Delete_LogFile.png rename to WinNUT_V2/WinNUT-Client/Resources/2002_Delete_LogFile.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/Battery_Charged.png b/WinNUT_V2/WinNUT-Client/Resources/Battery_Charged.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/Battery_Charged.png rename to WinNUT_V2/WinNUT-Client/Resources/Battery_Charged.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/Battery_Charging.png b/WinNUT_V2/WinNUT-Client/Resources/Battery_Charging.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/Battery_Charging.png rename to WinNUT_V2/WinNUT-Client/Resources/Battery_Charging.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/Battery_Discharging.png b/WinNUT_V2/WinNUT-Client/Resources/Battery_Discharging.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/Battery_Discharging.png rename to WinNUT_V2/WinNUT-Client/Resources/Battery_Discharging.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/Delete_LogFile_24x24.png b/WinNUT_V2/WinNUT-Client/Resources/Delete_LogFile_24x24.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/Delete_LogFile_24x24.png rename to WinNUT_V2/WinNUT-Client/Resources/Delete_LogFile_24x24.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/Delete_LogFile_32x32.png b/WinNUT_V2/WinNUT-Client/Resources/Delete_LogFile_32x32.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/Delete_LogFile_32x32.png rename to WinNUT_V2/WinNUT-Client/Resources/Delete_LogFile_32x32.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/ViewLogFile_24x24.png b/WinNUT_V2/WinNUT-Client/Resources/ViewLogFile_24x24.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/ViewLogFile_24x24.png rename to WinNUT_V2/WinNUT-Client/Resources/ViewLogFile_24x24.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/ViewLogFile_32x32.png b/WinNUT_V2/WinNUT-Client/Resources/ViewLogFile_32x32.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/ViewLogFile_32x32.png rename to WinNUT_V2/WinNUT-Client/Resources/ViewLogFile_32x32.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/WinNUT-Updater.ico b/WinNUT_V2/WinNUT-Client/Resources/WinNUT-Updater.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/WinNUT-Updater.ico rename to WinNUT_V2/WinNUT-Client/Resources/WinNUT-Updater.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/WinNut.ico b/WinNUT_V2/WinNUT-Client/Resources/WinNut.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/WinNut.ico rename to WinNUT_V2/WinNUT-Client/Resources/WinNut.ico diff --git a/WinNUT_V2/WinNUT_GUI/Resources/ups.png b/WinNUT_V2/WinNUT-Client/Resources/ups.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/ups.png rename to WinNUT_V2/WinNUT-Client/Resources/ups.png diff --git a/WinNUT_V2/WinNUT_GUI/Resources/ups_104x104.bmp b/WinNUT_V2/WinNUT-Client/Resources/ups_104x104.bmp similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/ups_104x104.bmp rename to WinNUT_V2/WinNUT-Client/Resources/ups_104x104.bmp diff --git a/WinNUT_V2/WinNUT_GUI/Resources/ups_104x104.png b/WinNUT_V2/WinNUT-Client/Resources/ups_104x104.png similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Resources/ups_104x104.png rename to WinNUT_V2/WinNUT-Client/Resources/ups_104x104.png diff --git a/WinNUT_V2/WinNUT_GUI/Shutdown_Gui.Designer.vb b/WinNUT_V2/WinNUT-Client/Shutdown_Gui.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Shutdown_Gui.Designer.vb rename to WinNUT_V2/WinNUT-Client/Shutdown_Gui.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/Shutdown_Gui.de-DE.resx b/WinNUT_V2/WinNUT-Client/Shutdown_Gui.de-DE.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Shutdown_Gui.de-DE.resx rename to WinNUT_V2/WinNUT-Client/Shutdown_Gui.de-DE.resx diff --git a/WinNUT_V2/WinNUT_GUI/Shutdown_Gui.fr-FR.resx b/WinNUT_V2/WinNUT-Client/Shutdown_Gui.fr-FR.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Shutdown_Gui.fr-FR.resx rename to WinNUT_V2/WinNUT-Client/Shutdown_Gui.fr-FR.resx diff --git a/WinNUT_V2/WinNUT_GUI/Shutdown_Gui.resx b/WinNUT_V2/WinNUT-Client/Shutdown_Gui.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Shutdown_Gui.resx rename to WinNUT_V2/WinNUT-Client/Shutdown_Gui.resx diff --git a/WinNUT_V2/WinNUT_GUI/Shutdown_Gui.ru-RU.resx b/WinNUT_V2/WinNUT-Client/Shutdown_Gui.ru-RU.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Shutdown_Gui.ru-RU.resx rename to WinNUT_V2/WinNUT-Client/Shutdown_Gui.ru-RU.resx diff --git a/WinNUT_V2/WinNUT_GUI/Shutdown_Gui.vb b/WinNUT_V2/WinNUT-Client/Shutdown_Gui.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Shutdown_Gui.vb rename to WinNUT_V2/WinNUT-Client/Shutdown_Gui.vb diff --git a/WinNUT_V2/WinNUT_GUI/Shutdown_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/Shutdown_Gui.zh-CN.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Shutdown_Gui.zh-CN.resx rename to WinNUT_V2/WinNUT-Client/Shutdown_Gui.zh-CN.resx diff --git a/WinNUT_V2/WinNUT_GUI/ToastPopup.vb b/WinNUT_V2/WinNUT-Client/ToastPopup.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/ToastPopup.vb rename to WinNUT_V2/WinNUT-Client/ToastPopup.vb diff --git a/WinNUT_V2/WinNUT_GUI/Update_Gui.Designer.vb b/WinNUT_V2/WinNUT-Client/Update_Gui.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Update_Gui.Designer.vb rename to WinNUT_V2/WinNUT-Client/Update_Gui.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/Update_Gui.de-DE.resx b/WinNUT_V2/WinNUT-Client/Update_Gui.de-DE.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Update_Gui.de-DE.resx rename to WinNUT_V2/WinNUT-Client/Update_Gui.de-DE.resx diff --git a/WinNUT_V2/WinNUT_GUI/Update_Gui.fr-FR.resx b/WinNUT_V2/WinNUT-Client/Update_Gui.fr-FR.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Update_Gui.fr-FR.resx rename to WinNUT_V2/WinNUT-Client/Update_Gui.fr-FR.resx diff --git a/WinNUT_V2/WinNUT_GUI/Update_Gui.resx b/WinNUT_V2/WinNUT-Client/Update_Gui.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Update_Gui.resx rename to WinNUT_V2/WinNUT-Client/Update_Gui.resx diff --git a/WinNUT_V2/WinNUT_GUI/Update_Gui.ru-RU.resx b/WinNUT_V2/WinNUT-Client/Update_Gui.ru-RU.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Update_Gui.ru-RU.resx rename to WinNUT_V2/WinNUT-Client/Update_Gui.ru-RU.resx diff --git a/WinNUT_V2/WinNUT_GUI/Update_Gui.vb b/WinNUT_V2/WinNUT-Client/Update_Gui.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Update_Gui.vb rename to WinNUT_V2/WinNUT-Client/Update_Gui.vb diff --git a/WinNUT_V2/WinNUT_GUI/Update_Gui.zh-CN.resx b/WinNUT_V2/WinNUT-Client/Update_Gui.zh-CN.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/Update_Gui.zh-CN.resx rename to WinNUT_V2/WinNUT-Client/Update_Gui.zh-CN.resx diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT-client.vbproj rename to WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT-client_TemporaryKey.pfx b/WinNUT_V2/WinNUT-Client/WinNUT-client_TemporaryKey.pfx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT-client_TemporaryKey.pfx rename to WinNUT_V2/WinNUT-Client/WinNUT-client_TemporaryKey.pfx diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.Designer.vb b/WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT.Designer.vb rename to WinNUT_V2/WinNUT-Client/WinNUT.Designer.vb diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.de-DE.resx b/WinNUT_V2/WinNUT-Client/WinNUT.de-DE.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT.de-DE.resx rename to WinNUT_V2/WinNUT-Client/WinNUT.de-DE.resx diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.fr-FR.resx b/WinNUT_V2/WinNUT-Client/WinNUT.fr-FR.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT.fr-FR.resx rename to WinNUT_V2/WinNUT-Client/WinNUT.fr-FR.resx diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.resx b/WinNUT_V2/WinNUT-Client/WinNUT.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT.resx rename to WinNUT_V2/WinNUT-Client/WinNUT.resx diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.ru-RU.resx b/WinNUT_V2/WinNUT-Client/WinNUT.ru-RU.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT.ru-RU.resx rename to WinNUT_V2/WinNUT-Client/WinNUT.ru-RU.resx diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.vb b/WinNUT_V2/WinNUT-Client/WinNUT.vb similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT.vb rename to WinNUT_V2/WinNUT-Client/WinNUT.vb diff --git a/WinNUT_V2/WinNUT_GUI/WinNUT.zh-CN.resx b/WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNUT.zh-CN.resx rename to WinNUT_V2/WinNUT-Client/WinNUT.zh-CN.resx diff --git a/WinNUT_V2/WinNUT_GUI/WinNut.ico b/WinNUT_V2/WinNUT-Client/WinNut.ico similarity index 100% rename from WinNUT_V2/WinNUT_GUI/WinNut.ico rename to WinNUT_V2/WinNUT-Client/WinNut.ico From 74ff4a95b05a1aa78d77832effba9aa37627a17f Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 17:27:07 -0700 Subject: [PATCH 24/54] Fixing Client project name Fixing a typo in the solution file that was probably causing an error when trying to find the build output files. Also moving the .editorconfig file to the parent directory. --- WinNUT_V2/.editorconfig | 3 +- WinNUT_V2/WinNUT-Client/.editorconfig | 125 -------------------------- WinNUT_V2/WinNUT_V2.sln | 2 +- 3 files changed, 3 insertions(+), 127 deletions(-) delete mode 100644 WinNUT_V2/WinNUT-Client/.editorconfig diff --git a/WinNUT_V2/.editorconfig b/WinNUT_V2/.editorconfig index 04b8e7a..c2b72d1 100644 --- a/WinNUT_V2/.editorconfig +++ b/WinNUT_V2/.editorconfig @@ -2,10 +2,11 @@ ############################### # Core EditorConfig Options # ############################### +root = true # All files [*] indent_style = space -file_header_template = WinNUT is a NUT windows client for monitoring your ups hooked up to your favorite linux server.\nCopyright (C) 2019-2021 Gawindx (Decaux Nicolas)\n\nThis program is free software: you can redistribute it and/or modify it under the terms of the\nGNU General Public License as published by the Free Software Foundation, either version 3 of the\nLicense, or any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without\neven the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program.\nIf not, see https://www.gnu.org/licenses/.\n +file_header_template = WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server.\nCopyright (C) 2019-2021 Gawindx (Decaux Nicolas)\n\nThis program is free software: you can redistribute it and/or modify it under the terms of the\nGNU General Public License as published by the Free Software Foundation, either version 3 of the\nLicense, or any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without\neven the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program.\nIf not, see https://www.gnu.org/licenses/.\n # Code files [*.{cs,csx,vb,vbx}] indent_size = 4 diff --git a/WinNUT_V2/WinNUT-Client/.editorconfig b/WinNUT_V2/WinNUT-Client/.editorconfig deleted file mode 100644 index c2b72d1..0000000 --- a/WinNUT_V2/WinNUT-Client/.editorconfig +++ /dev/null @@ -1,125 +0,0 @@ -# Pour en savoir plus sur .editorconfig, consultez https://aka.ms/editorconfigdocs -############################### -# Core EditorConfig Options # -############################### -root = true -# All files -[*] -indent_style = space -file_header_template = WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server.\nCopyright (C) 2019-2021 Gawindx (Decaux Nicolas)\n\nThis program is free software: you can redistribute it and/or modify it under the terms of the\nGNU General Public License as published by the Free Software Foundation, either version 3 of the\nLicense, or any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without\neven the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program.\nIf not, see https://www.gnu.org/licenses/.\n -# Code files -[*.{cs,csx,vb,vbx}] -indent_size = 4 -insert_final_newline = true -charset = utf-8-bom -############################### -# .NET Coding Conventions # -############################### -[*.{cs,vb}] -# Organize usings -dotnet_sort_system_directives_first = true -# this. preferences -dotnet_style_qualification_for_field = false:silent -dotnet_style_qualification_for_property = false:silent -dotnet_style_qualification_for_method = false:silent -dotnet_style_qualification_for_event = false:silent -# Language keywords vs BCL types preferences -dotnet_style_predefined_type_for_locals_parameters_members = true:silent -dotnet_style_predefined_type_for_member_access = true:silent -# Parentheses preferences -dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent -# Modifier preferences -dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent -dotnet_style_readonly_field = true:suggestion -# Expression-level preferences -dotnet_style_object_initializer = true:suggestion -dotnet_style_collection_initializer = true:suggestion -dotnet_style_explicit_tuple_names = true:suggestion -dotnet_style_null_propagation = true:suggestion -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent -dotnet_style_prefer_inferred_tuple_names = true:suggestion -dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion -dotnet_style_prefer_auto_properties = true:silent -dotnet_style_prefer_conditional_expression_over_assignment = true:silent -dotnet_style_prefer_conditional_expression_over_return = true:silent -############################### -# Naming Conventions # -############################### -# Style Definitions -dotnet_naming_style.pascal_case_style.capitalization = pascal_case -# Use PascalCase for constant fields -dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields -dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style -dotnet_naming_symbols.constant_fields.applicable_kinds = field -dotnet_naming_symbols.constant_fields.applicable_accessibilities = * -dotnet_naming_symbols.constant_fields.required_modifiers = const -############################### -# C# Coding Conventions # -############################### -[*.cs] -# var preferences -csharp_style_var_for_built_in_types = true:silent -csharp_style_var_when_type_is_apparent = true:silent -csharp_style_var_elsewhere = true:silent -# Expression-bodied members -csharp_style_expression_bodied_methods = false:silent -csharp_style_expression_bodied_constructors = false:silent -csharp_style_expression_bodied_operators = false:silent -csharp_style_expression_bodied_properties = true:silent -csharp_style_expression_bodied_indexers = true:silent -csharp_style_expression_bodied_accessors = true:silent -# Pattern matching preferences -csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion -csharp_style_pattern_matching_over_as_with_null_check = true:suggestion -# Null-checking preferences -csharp_style_throw_expression = true:suggestion -csharp_style_conditional_delegate_call = true:suggestion -# Modifier preferences -csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion -# Expression-level preferences -csharp_prefer_braces = true:silent -csharp_style_deconstructed_variable_declaration = true:suggestion -csharp_prefer_simple_default_expression = true:suggestion -csharp_style_pattern_local_over_anonymous_function = true:suggestion -csharp_style_inlined_variable_declaration = true:suggestion -############################### -# C# Formatting Rules # -############################### -# New line preferences -csharp_new_line_before_open_brace = all -csharp_new_line_before_else = true -csharp_new_line_before_catch = true -csharp_new_line_before_finally = true -csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_members_in_anonymous_types = true -csharp_new_line_between_query_expression_clauses = true -# Indentation preferences -csharp_indent_case_contents = true -csharp_indent_switch_labels = true -csharp_indent_labels = flush_left -# Space preferences -csharp_space_after_cast = false -csharp_space_after_keywords_in_control_flow_statements = true -csharp_space_between_method_call_parameter_list_parentheses = false -csharp_space_between_method_declaration_parameter_list_parentheses = false -csharp_space_between_parentheses = false -csharp_space_before_colon_in_inheritance_clause = true -csharp_space_after_colon_in_inheritance_clause = true -csharp_space_around_binary_operators = before_and_after -csharp_space_between_method_declaration_empty_parameter_list_parentheses = false -csharp_space_between_method_call_name_and_opening_parenthesis = false -csharp_space_between_method_call_empty_parameter_list_parentheses = false -# Wrapping preferences -csharp_preserve_single_line_statements = true -csharp_preserve_single_line_blocks = true -############################### -# VB Coding Conventions # -############################### -[*.vb] -# Modifier preferences -visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion diff --git a/WinNUT_V2/WinNUT_V2.sln b/WinNUT_V2/WinNUT_V2.sln index dd4db48..8baeb92 100644 --- a/WinNUT_V2/WinNUT_V2.sln +++ b/WinNUT_V2/WinNUT_V2.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30204.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WinNUT-client", "WInNUT_GUI\WinNUT-client.vbproj", "{194AB29D-1F80-497B-86BE-4F35DACBA6BC}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "WinNUT-Client", "WinNUT-Client\WinNUT-Client.vbproj", "{194AB29D-1F80-497B-86BE-4F35DACBA6BC}" EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "WinNUT-Setup", "Setup\Setup.vdproj", "{FAFFBA8B-E9DB-419E-9669-999E8EFEFCB5}" EndProject From 6c6923867866e62a6237ef1deb5772b1428945c2 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 17:30:33 -0700 Subject: [PATCH 25/54] Updating output path in build --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 73d3798..7383f50 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -51,5 +51,5 @@ jobs: name: build-winnut if-no-files-found: error path: | - WinNUT_GUI/bin/Debug + WinNUT-Client\bin\Debug From f26f62a104826d369ead20d6e4a1166b08922fa0 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 29 Sep 2022 17:36:33 -0700 Subject: [PATCH 26/54] upload-artifact does not use working-directory Specifying path relative to where it *should* be looking now. --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 7383f50..65410b8 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -51,5 +51,5 @@ jobs: name: build-winnut if-no-files-found: error path: | - WinNUT-Client\bin\Debug + WinNUT_V2/WinNUT-Client/bin/Debug From f63b60936e67c0889c6f424c1c5a9fce15a726dd Mon Sep 17 00:00:00 2001 From: gbakeman Date: Fri, 30 Sep 2022 15:15:01 -0700 Subject: [PATCH 27/54] MSBuild versioning tests Removing some commented code from AssemblyInfo files. --- .../WinNUT-Client/My Project/AssemblyInfo.vb | 12 ------------ .../My Project/AssemblyInfo.vb | 15 --------------- 2 files changed, 27 deletions(-) diff --git a/WinNUT_V2/WinNUT-Client/My Project/AssemblyInfo.vb b/WinNUT_V2/WinNUT-Client/My Project/AssemblyInfo.vb index 9aa41dc..e05cf2a 100644 --- a/WinNUT_V2/WinNUT-Client/My Project/AssemblyInfo.vb +++ b/WinNUT_V2/WinNUT-Client/My Project/AssemblyInfo.vb @@ -23,15 +23,3 @@ Imports System.Runtime.InteropServices 'Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM - -' Les informations de version pour un assembly se composent des quatre valeurs suivantes : -' -' Version principale -' Version secondaire -' Numéro de build -' Révision -' -' Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut -' en utilisant '*', comme indiqué ci-dessous : -' - diff --git a/WinNUT_V2/WinNUT-Client_Common/My Project/AssemblyInfo.vb b/WinNUT_V2/WinNUT-Client_Common/My Project/AssemblyInfo.vb index d524ae6..0380be5 100644 --- a/WinNUT_V2/WinNUT-Client_Common/My Project/AssemblyInfo.vb +++ b/WinNUT_V2/WinNUT-Client_Common/My Project/AssemblyInfo.vb @@ -7,7 +7,6 @@ ' ' This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY -Imports System Imports System.Reflection Imports System.Runtime.InteropServices @@ -24,17 +23,3 @@ Imports System.Runtime.InteropServices 'Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM - -' Les informations de version pour un assembly se composent des quatre valeurs suivantes : -' -' Version principale -' Version secondaire -' Numéro de build -' Révision -' -' Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut -' en utilisant '*', comme indiqué ci-dessous : -' - -' -' From 94fcea9a70b7ea5df9aeadd5dca535346521bacf Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:15:25 -0700 Subject: [PATCH 28/54] Basic auto build version test Trying to tie the build number to the action run amount. --- .github/workflows/build-validate.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 65410b8..eb5a49f 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -41,14 +41,20 @@ jobs: - name: Restore Packages run: msbuild -t:restore + # Calculate the build number. Will change to a new strategy after the next minor release. + - name: Calculate Version + run: | + ($GITHUB_RUN_ATTEMPT+8303) >> $env:BUILD_NUM + Write-Output "::notice title='Build version'::Build version is 2.2.$env:BUILD_NUM" + # msbuild cannot handle .vdproj Installer projects, so only build debug for now. - name: Build solution - run: msbuild $env:SLN_FILE /p:Configuration=Debug + run: msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: build-winnut + name: WinNUT-Client-debugbuild-v2.2.$env:BUILD_NUM if-no-files-found: error path: | WinNUT_V2/WinNUT-Client/bin/Debug From ceafd78effcad38c0cdf5832be4cbd5780fe981a Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:25:57 -0700 Subject: [PATCH 29/54] Moving version calculation to beginning Also trying to learn how to output env variables. --- .github/workflows/build-validate.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index eb5a49f..87560b3 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -26,6 +26,12 @@ jobs: matrix: os: [windows-2019] # Should have MSBuild. steps: + # Calculate the build number. Will change to a new strategy after the next minor release. + - name: Calculate Version + run: | + echo ($GITHUB_RUN_ATTEMPT+8303) >> $env:BUILD_NUM + Write-Output "::notice title='Build version'::Build version is 2.2.$env:BUILD_NUM" + # Make MSBuild available from $PATH. - name: setup-msbuild uses: microsoft/setup-msbuild@v1.1 @@ -41,12 +47,6 @@ jobs: - name: Restore Packages run: msbuild -t:restore - # Calculate the build number. Will change to a new strategy after the next minor release. - - name: Calculate Version - run: | - ($GITHUB_RUN_ATTEMPT+8303) >> $env:BUILD_NUM - Write-Output "::notice title='Build version'::Build version is 2.2.$env:BUILD_NUM" - # msbuild cannot handle .vdproj Installer projects, so only build debug for now. - name: Build solution run: msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM From 379d83d6733c9c58a28b8edf377c9e3297274a40 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:28:02 -0700 Subject: [PATCH 30/54] Fix missing working directory PowerShell tries to start in the project directory (which wasn't checked out yet) --- .github/workflows/build-validate.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 87560b3..c3e2d5b 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -26,12 +26,6 @@ jobs: matrix: os: [windows-2019] # Should have MSBuild. steps: - # Calculate the build number. Will change to a new strategy after the next minor release. - - name: Calculate Version - run: | - echo ($GITHUB_RUN_ATTEMPT+8303) >> $env:BUILD_NUM - Write-Output "::notice title='Build version'::Build version is 2.2.$env:BUILD_NUM" - # Make MSBuild available from $PATH. - name: setup-msbuild uses: microsoft/setup-msbuild@v1.1 @@ -39,6 +33,12 @@ jobs: - name: Checkout Code uses: actions/checkout@v3 + # Calculate the build number. Will change to a new strategy after the next minor release. + - name: Calculate Version + run: | + echo ($GITHUB_RUN_ATTEMPT+8303) >> $env:BUILD_NUM + Write-Output "::notice title='Build version'::Build version is 2.2.$env:BUILD_NUM" + # - name: Setup Nuget # uses: nuget/setup-nuget@v1 From ea8aa3c60224cd3f65c811055bba7fce8bff7552 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:31:59 -0700 Subject: [PATCH 31/54] More environment variable testing Trying to define it in the workflow now. --- .github/workflows/build-validate.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index c3e2d5b..ed50929 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -16,6 +16,7 @@ on: env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use SLN_FILE: WinNUT_V2.sln + BUILD_NUM: jobs: build: @@ -36,8 +37,8 @@ jobs: # Calculate the build number. Will change to a new strategy after the next minor release. - name: Calculate Version run: | - echo ($GITHUB_RUN_ATTEMPT+8303) >> $env:BUILD_NUM - Write-Output "::notice title='Build version'::Build version is 2.2.$env:BUILD_NUM" + ($GITHUB_RUN_ATTEMPT+8303) >> $env:BUILD_NUM + echo "Set Build version to $env:BUILD_NUM" # - name: Setup Nuget # uses: nuget/setup-nuget@v1 From 54285eacc70a25328c99d0b7996494c2e21df314 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:38:18 -0700 Subject: [PATCH 32/54] Update build-validate.yaml --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index ed50929..4476bc8 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -37,7 +37,7 @@ jobs: # Calculate the build number. Will change to a new strategy after the next minor release. - name: Calculate Version run: | - ($GITHUB_RUN_ATTEMPT+8303) >> $env:BUILD_NUM + $env:BUILD_NUM = ($env:GITHUB_RUN_ATTEMPT+8303) echo "Set Build version to $env:BUILD_NUM" # - name: Setup Nuget From 7da1c9357ea42209c12d857e8a20dfd59f7df379 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:40:53 -0700 Subject: [PATCH 33/54] Changing number source Getting closer...? --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 4476bc8..b374837 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -37,7 +37,7 @@ jobs: # Calculate the build number. Will change to a new strategy after the next minor release. - name: Calculate Version run: | - $env:BUILD_NUM = ($env:GITHUB_RUN_ATTEMPT+8303) + $env:BUILD_NUM = ($env:GITHUB_RUN_NUMBER + 8303) echo "Set Build version to $env:BUILD_NUM" # - name: Setup Nuget From 8ec42ab3d7bb670ef341fb759007b465c629bef8 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:43:43 -0700 Subject: [PATCH 34/54] Having trouble with math --- .github/workflows/build-validate.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index b374837..ab28006 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -37,7 +37,8 @@ jobs: # Calculate the build number. Will change to a new strategy after the next minor release. - name: Calculate Version run: | - $env:BUILD_NUM = ($env:GITHUB_RUN_NUMBER + 8303) + $buildnum = ($env:GITHUB_RUN_NUMBER + 8303) + $env:BUILD_NUM = $buildnum echo "Set Build version to $env:BUILD_NUM" # - name: Setup Nuget From 55de0242d2e27b2299b0eea1f9bf5f65cb89cfa9 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:45:37 -0700 Subject: [PATCH 35/54] Force cast to int --- .github/workflows/build-validate.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index ab28006..d1d6115 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -37,8 +37,7 @@ jobs: # Calculate the build number. Will change to a new strategy after the next minor release. - name: Calculate Version run: | - $buildnum = ($env:GITHUB_RUN_NUMBER + 8303) - $env:BUILD_NUM = $buildnum + $env:BUILD_NUM = ([int]$env:GITHUB_RUN_NUMBER + 8303) echo "Set Build version to $env:BUILD_NUM" # - name: Setup Nuget From 7f589bf48f8470388cdc0baf9e253ac61678ca0f Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:50:35 -0700 Subject: [PATCH 36/54] Correct env variable syntax --- .github/workflows/build-validate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index d1d6115..fd2cfeb 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -50,12 +50,12 @@ jobs: # msbuild cannot handle .vdproj Installer projects, so only build debug for now. - name: Build solution - run: msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM + run: msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.${{ env.BUILD_NUM }} - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: WinNUT-Client-debugbuild-v2.2.$env:BUILD_NUM + name: WinNUT-Client-debugbuild-v2.2.${{ env:BUILD_NUM }} if-no-files-found: error path: | WinNUT_V2/WinNUT-Client/bin/Debug From c20c73b8a7a7503d896546e1bdea6b19264b4afb Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 17:51:25 -0700 Subject: [PATCH 37/54] Correct type --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index fd2cfeb..b7e6c17 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -55,7 +55,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: WinNUT-Client-debugbuild-v2.2.${{ env:BUILD_NUM }} + name: WinNUT-Client-debugbuild-v2.2.${{ env.BUILD_NUM }} if-no-files-found: error path: | WinNUT_V2/WinNUT-Client/bin/Debug From bd2f621892dee7bf0fc545898b90d9764322a594 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 18:03:40 -0700 Subject: [PATCH 38/54] Variable concat changes --- .github/workflows/build-validate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index b7e6c17..6df45db 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -50,12 +50,12 @@ jobs: # msbuild cannot handle .vdproj Installer projects, so only build debug for now. - name: Build solution - run: msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.${{ env.BUILD_NUM }} + run: msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: WinNUT-Client-debugbuild-v2.2.${{ env.BUILD_NUM }} + name: ${{ format('WinNUT-Client-debugbuild-v2.2.{0}', env.BUILD_NUM) }} if-no-files-found: error path: | WinNUT_V2/WinNUT-Client/bin/Debug From 5ce7bfdfe5718dc5be4e545851bd98ad5b5879af Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 18:46:51 -0700 Subject: [PATCH 39/54] More var syntax fixing Could it have been this easy?? --- .github/workflows/build-validate.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 6df45db..56a3c36 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -37,8 +37,8 @@ jobs: # Calculate the build number. Will change to a new strategy after the next minor release. - name: Calculate Version run: | - $env:BUILD_NUM = ([int]$env:GITHUB_RUN_NUMBER + 8303) - echo "Set Build version to $env:BUILD_NUM" + ${env:BUILD_NUM} = ([int]${env:GITHUB_RUN_NUMBER} + 8303) + echo "Set Build version to ${env:BUILD_NUM}" # - name: Setup Nuget # uses: nuget/setup-nuget@v1 @@ -50,7 +50,7 @@ jobs: # msbuild cannot handle .vdproj Installer projects, so only build debug for now. - name: Build solution - run: msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM + run: msbuild ${env:SLN_FILE} -p:Configuration=Debug -p:AssemblyFileVersion=2.2.${env:BUILD_NUM} - name: Upload Artifact uses: actions/upload-artifact@v3 From d0bbada3386122806a57a6e6b1d3cc484cd3a80b Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 18:51:50 -0700 Subject: [PATCH 40/54] env var debugging --- .github/workflows/build-validate.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 56a3c36..24542be 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -40,11 +40,9 @@ jobs: ${env:BUILD_NUM} = ([int]${env:GITHUB_RUN_NUMBER} + 8303) echo "Set Build version to ${env:BUILD_NUM}" - # - name: Setup Nuget - # uses: nuget/setup-nuget@v1 - - # - name: Restore NuGet Packages - # run: nuget restore $env:SLN_FILE + - name: [Debug] Output ENV vars + run: env + - name: Restore Packages run: msbuild -t:restore From 8fe02a2a4a8c427ea11ee63af2e6996b6b80e7dd Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 18:52:41 -0700 Subject: [PATCH 41/54] Didn't like the brackets? --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 24542be..1f97175 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -40,7 +40,7 @@ jobs: ${env:BUILD_NUM} = ([int]${env:GITHUB_RUN_NUMBER} + 8303) echo "Set Build version to ${env:BUILD_NUM}" - - name: [Debug] Output ENV vars + - name: \[Debug\] Output ENV vars run: env - name: Restore Packages From 1be04947b5bf6677c73961b9aa2f6b019d0aa3c9 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 19:01:55 -0700 Subject: [PATCH 42/54] More debug output, more syntax changes --- .github/workflows/build-validate.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 1f97175..06129e9 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -37,10 +37,11 @@ jobs: # Calculate the build number. Will change to a new strategy after the next minor release. - name: Calculate Version run: | - ${env:BUILD_NUM} = ([int]${env:GITHUB_RUN_NUMBER} + 8303) - echo "Set Build version to ${env:BUILD_NUM}" + Write-Output "::echo::on" + ([int]$env:GITHUB_RUN_NUMBER + 8303) >> $env:BUILD_NUM + echo "Set Build version to $env:BUILD_NUM" - - name: \[Debug\] Output ENV vars + - name: (Debug) Output ENV vars run: env - name: Restore Packages @@ -48,7 +49,9 @@ jobs: # msbuild cannot handle .vdproj Installer projects, so only build debug for now. - name: Build solution - run: msbuild ${env:SLN_FILE} -p:Configuration=Debug -p:AssemblyFileVersion=2.2.${env:BUILD_NUM} + run: | + Write-Output "::echo::on" + msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM - name: Upload Artifact uses: actions/upload-artifact@v3 From f0c4c18aef4ae7b006b8694f0727e5a40b437fcb Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 19:08:28 -0700 Subject: [PATCH 43/54] More debugging --- .github/workflows/build-validate.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 06129e9..0b309c5 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -38,7 +38,9 @@ jobs: - name: Calculate Version run: | Write-Output "::echo::on" - ([int]$env:GITHUB_RUN_NUMBER + 8303) >> $env:BUILD_NUM + $calcBuildNum = ([int]$env:GITHUB_RUN_NUMBER + 8303) + echo "Calculated number $calcBuildNum" + $calcBuildNum >> $env:BUILD_NUM echo "Set Build version to $env:BUILD_NUM" - name: (Debug) Output ENV vars From df4229f476a6afa63fc500141749a7b4937cd8de Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 19:11:48 -0700 Subject: [PATCH 44/54] Trying solution from github https://github.com/orgs/community/discussions/25713 --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 0b309c5..7ccd811 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -40,7 +40,7 @@ jobs: Write-Output "::echo::on" $calcBuildNum = ([int]$env:GITHUB_RUN_NUMBER + 8303) echo "Calculated number $calcBuildNum" - $calcBuildNum >> $env:BUILD_NUM + "BUILD_NUM=$calcBuildNum" >> $env:GITHUB_ENV echo "Set Build version to $env:BUILD_NUM" - name: (Debug) Output ENV vars From 7e2299b15ee3937a61a8bd151b6180508bbe8507 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 19:16:04 -0700 Subject: [PATCH 45/54] Trying James's version https://www.jamescroft.co.uk/setting-github-actions-environment-variables-in-powershell/ --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 7ccd811..fa2b8d8 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -40,7 +40,7 @@ jobs: Write-Output "::echo::on" $calcBuildNum = ([int]$env:GITHUB_RUN_NUMBER + 8303) echo "Calculated number $calcBuildNum" - "BUILD_NUM=$calcBuildNum" >> $env:GITHUB_ENV + echo "BUILD_NUM=$calcBuildNum" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "Set Build version to $env:BUILD_NUM" - name: (Debug) Output ENV vars From 5909054980174252197e132487fcff6714f59c9f Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 19:29:34 -0700 Subject: [PATCH 46/54] Small tweaks --- .github/workflows/build-validate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index fa2b8d8..84bcf61 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -40,7 +40,7 @@ jobs: Write-Output "::echo::on" $calcBuildNum = ([int]$env:GITHUB_RUN_NUMBER + 8303) echo "Calculated number $calcBuildNum" - echo "BUILD_NUM=$calcBuildNum" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "BUILD_NUM=$calcBuildNum" | Out-File -FilePath $env:GITHUB_ENV -Append echo "Set Build version to $env:BUILD_NUM" - name: (Debug) Output ENV vars @@ -53,7 +53,7 @@ jobs: - name: Build solution run: | Write-Output "::echo::on" - msbuild $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM + msbuild $env:SLN_FILE /p:Configuration=Debug;AssemblyFileVersion=2.2.$env:BUILD_NUM - name: Upload Artifact uses: actions/upload-artifact@v3 From 628dff8c8b1d31ecdc9c34e2a155041b1e58a786 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sun, 2 Oct 2022 19:36:01 -0700 Subject: [PATCH 47/54] Update build-validate.yaml --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 84bcf61..5fa3980 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -53,7 +53,7 @@ jobs: - name: Build solution run: | Write-Output "::echo::on" - msbuild $env:SLN_FILE /p:Configuration=Debug;AssemblyFileVersion=2.2.$env:BUILD_NUM + msbuild.exe $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM - name: Upload Artifact uses: actions/upload-artifact@v3 From 6ef604e9ea87e2de04f2eb32676cf13d5296c9b8 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 6 Oct 2022 19:40:03 -0700 Subject: [PATCH 48/54] Use berglie/assembly-version Just keep it simple. Also make env var for build output. --- .github/workflows/build-validate.yaml | 30 ++++++++++++++++----------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 5fa3980..5a142fb 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -16,7 +16,7 @@ on: env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use SLN_FILE: WinNUT_V2.sln - BUILD_NUM: + DEBUG_OUTPUT: WinNUT_V2/WinNUT-Client/bin/Debug jobs: build: @@ -35,16 +35,16 @@ jobs: uses: actions/checkout@v3 # Calculate the build number. Will change to a new strategy after the next minor release. - - name: Calculate Version - run: | - Write-Output "::echo::on" - $calcBuildNum = ([int]$env:GITHUB_RUN_NUMBER + 8303) - echo "Calculated number $calcBuildNum" - echo "BUILD_NUM=$calcBuildNum" | Out-File -FilePath $env:GITHUB_ENV -Append - echo "Set Build version to $env:BUILD_NUM" + # - name: Calculate Version + # run: | + # Write-Output "::echo::on" + # $calcBuildNum = ([int]$env:GITHUB_RUN_NUMBER + 8303) + # echo "Calculated number $calcBuildNum" + # echo "BUILD_NUM=$calcBuildNum" | Out-File -FilePath $env:GITHUB_ENV -Append + # echo "Set Build version to $env:BUILD_NUM" - - name: (Debug) Output ENV vars - run: env + # - name: (Debug) Output ENV vars + # run: env - name: Restore Packages run: msbuild -t:restore @@ -55,11 +55,17 @@ jobs: Write-Output "::echo::on" msbuild.exe $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM + - name: Get AssemblyVersion generated by msbuild + id: getversion + uses: berglie/assembly-version/get@v1 + with: + directory: ` + - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: ${{ format('WinNUT-Client-debugbuild-v2.2.{0}', env.BUILD_NUM) }} + name: ${{ format('WinNUT-Client-debugbuild-v2.2.{0}', steps.getversion.outputs.version) }} if-no-files-found: error path: | - WinNUT_V2/WinNUT-Client/bin/Debug + env.DEBUG_OUTPUT From fa5d6b4bbde8ad2a9113ddec36f157d0c27f7980 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 6 Oct 2022 19:41:25 -0700 Subject: [PATCH 49/54] Update build-validate.yaml --- .github/workflows/build-validate.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 5a142fb..45d96d8 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -59,13 +59,12 @@ jobs: id: getversion uses: berglie/assembly-version/get@v1 with: - directory: ` + directory: env.DEBUG_OUTPUT - name: Upload Artifact uses: actions/upload-artifact@v3 with: name: ${{ format('WinNUT-Client-debugbuild-v2.2.{0}', steps.getversion.outputs.version) }} if-no-files-found: error - path: | - env.DEBUG_OUTPUT + path: env.DEBUG_OUTPUT From 402c593559dafb4cc0e0a4af01a097ddb7d6b610 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Thu, 6 Oct 2022 19:54:27 -0700 Subject: [PATCH 50/54] Changing workflow name Being more descriptive, and troubleshooting --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 45d96d8..0e08527 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -1,4 +1,4 @@ -name: build +name: build-debug defaults: run: From 0b724a0a03b1df9af36a787b5a878e964cabeffe Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sat, 8 Oct 2022 13:45:36 -0700 Subject: [PATCH 51/54] Update output dir env var Make relative to working directory --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 0e08527..e56bc22 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -16,7 +16,7 @@ on: env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use SLN_FILE: WinNUT_V2.sln - DEBUG_OUTPUT: WinNUT_V2/WinNUT-Client/bin/Debug + DEBUG_OUTPUT: WinNUT-Client/bin/Debug jobs: build: From bc5a0ee02f26026cd8782e59cdf4c13e5b017d9a Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sat, 8 Oct 2022 13:50:34 -0700 Subject: [PATCH 52/54] Corrected var syntax (again) Made variable syntax correct and consistent, also updated the build name to be more descriptive. --- .github/workflows/build-validate.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index e56bc22..86b5b4d 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -21,7 +21,7 @@ env: jobs: build: - name: build-${{matrix.os}} + name: debug-build-${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: @@ -53,18 +53,18 @@ jobs: - name: Build solution run: | Write-Output "::echo::on" - msbuild.exe $env:SLN_FILE -p:Configuration=Debug -p:AssemblyFileVersion=2.2.$env:BUILD_NUM + msbuild.exe $env:SLN_FILE -p:Configuration=Debug - name: Get AssemblyVersion generated by msbuild id: getversion uses: berglie/assembly-version/get@v1 with: - directory: env.DEBUG_OUTPUT + directory: ${{ env.DEBUG_OUTPUT }} - name: Upload Artifact uses: actions/upload-artifact@v3 with: name: ${{ format('WinNUT-Client-debugbuild-v2.2.{0}', steps.getversion.outputs.version) }} if-no-files-found: error - path: env.DEBUG_OUTPUT + path: ${{ env.DEBUG_OUTPUT }} From 6bedc9828af6f03ec15f444dd4c02a2f84a48342 Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sat, 8 Oct 2022 13:54:06 -0700 Subject: [PATCH 53/54] Correcting output dir Not sure what working-directory is even doing at this point. --- .github/workflows/build-validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 86b5b4d..8e813d5 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -16,7 +16,7 @@ on: env: DOTNET_VERSION: '4.7.2' # The .NET SDK version to use SLN_FILE: WinNUT_V2.sln - DEBUG_OUTPUT: WinNUT-Client/bin/Debug + DEBUG_OUTPUT: WinNUT_V2/WinNUT-Client/bin/Debug jobs: build: From 2641633a5523cc2bb8de5d97c28d9ea430ac53fb Mon Sep 17 00:00:00 2001 From: gbakeman Date: Sat, 8 Oct 2022 13:59:22 -0700 Subject: [PATCH 54/54] Attempt to fix too many twos Removing unused steps as well. --- .github/workflows/build-validate.yaml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-validate.yaml b/.github/workflows/build-validate.yaml index 8e813d5..9c8696f 100644 --- a/.github/workflows/build-validate.yaml +++ b/.github/workflows/build-validate.yaml @@ -34,18 +34,6 @@ jobs: - name: Checkout Code uses: actions/checkout@v3 - # Calculate the build number. Will change to a new strategy after the next minor release. - # - name: Calculate Version - # run: | - # Write-Output "::echo::on" - # $calcBuildNum = ([int]$env:GITHUB_RUN_NUMBER + 8303) - # echo "Calculated number $calcBuildNum" - # echo "BUILD_NUM=$calcBuildNum" | Out-File -FilePath $env:GITHUB_ENV -Append - # echo "Set Build version to $env:BUILD_NUM" - - # - name: (Debug) Output ENV vars - # run: env - - name: Restore Packages run: msbuild -t:restore @@ -55,6 +43,7 @@ jobs: Write-Output "::echo::on" msbuild.exe $env:SLN_FILE -p:Configuration=Debug + # For now, let msbuild continue autogenerating assembly versions and base everything off of that. - name: Get AssemblyVersion generated by msbuild id: getversion uses: berglie/assembly-version/get@v1 @@ -64,7 +53,7 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v3 with: - name: ${{ format('WinNUT-Client-debugbuild-v2.2.{0}', steps.getversion.outputs.version) }} + name: ${{ format('WinNUT-Client-debugbuild-v{0}', steps.getversion.outputs.version) }} if-no-files-found: error path: ${{ env.DEBUG_OUTPUT }}