Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect windows version detection #51

Merged
merged 1 commit into from
Oct 31, 2022
Merged

Fix incorrect windows version detection #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 89 additions & 11 deletions WinNUT_V2/Setup/Setup.vdproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
}
"Entry"
{
"MsmKey" = "8:_0A325B8139084CA78A0244CAC82F2853"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0A861B352BC31F8043445D772FF57CB6"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -159,6 +165,12 @@
}
"Entry"
{
"MsmKey" = "8:_19385C4691E649139966B93BFCB76418"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_19A373CB2F62FEC5606DD9E5BBD06BD8"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -3441,6 +3453,12 @@
}
"Entry"
{
"MsmKey" = "8:_A17B6478098A4E61AD676107545BBEAD"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_A51E7D6EB2814770BABB461429AA4198"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
Expand Down Expand Up @@ -4942,37 +4960,37 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5C99D3FB8E4CBB81209F637E049611DF"
"OwnerKey" = "8:_E8BB0E2A241C1023B684B55FEB5B745F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
"OwnerKey" = "8:_929B73992E930343CA5B90A2038D04AB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_E8BB0E2A241C1023B684B55FEB5B745F"
"OwnerKey" = "8:_63C8A279ECA1961108679E2A93D5C62B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_929B73992E930343CA5B90A2038D04AB"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_63C8A279ECA1961108679E2A93D5C62B"
"OwnerKey" = "8:_5C99D3FB8E4CBB81209F637E049611DF"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"OwnerKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -6616,6 +6634,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A325B8139084CA78A0244CAC82F2853"
{
"SourcePath" = "8:..\\WinNUT-Client\\bin\\Release\\WinNUT-Client.exe.config"
"TargetName" = "8:WinNUT-Client.exe.config"
"Tag" = "8:"
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0A861B352BC31F8043445D772FF57CB6"
{
"AssemblyRegister" = "3:1"
Expand Down Expand Up @@ -6895,6 +6933,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_19385C4691E649139966B93BFCB76418"
{
"SourcePath" = "8:..\\WinNUT-Client\\bin\\Release\\WinNUT-Client.exe.manifest"
"TargetName" = "8:WinNUT-Client.exe.manifest"
"Tag" = "8:"
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_19A373CB2F62FEC5606DD9E5BBD06BD8"
{
"AssemblyRegister" = "3:1"
Expand Down Expand Up @@ -9795,7 +9853,7 @@
"_7F619FE6A380D79E80E85D6E6822F82A"
{
"Name" = "8:System.ObjectModel.dll"
"Attributes" = "3:512"
"Attributes" = "3:514"
}
}
"SourcePath" = "8:System.ObjectModel.dll"
Expand All @@ -9806,7 +9864,7 @@
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"Hidden" = "11:TRUE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
Expand Down Expand Up @@ -10622,6 +10680,26 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A17B6478098A4E61AD676107545BBEAD"
{
"SourcePath" = "8:..\\WinNUT-Client\\bin\\Release\\WinNUT-Client.application"
"TargetName" = "8:WinNUT-Client.application"
"Tag" = "8:"
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A51E7D6EB2814770BABB461429AA4198"
{
"AssemblyRegister" = "3:1"
Expand Down Expand Up @@ -11004,7 +11082,7 @@
"_B5EB4F25C305A58F1CAA2F30A1C745CA"
{
"Name" = "8:System.ObjectModel.dll"
"Attributes" = "3:512"
"Attributes" = "3:514"
}
}
"SourcePath" = "8:System.ObjectModel.dll"
Expand All @@ -11015,7 +11093,7 @@
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"Hidden" = "11:TRUE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
Expand Down Expand Up @@ -12818,7 +12896,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WinNUT"
"ProductCode" = "8:{4B9C8FB9-4559-40A2-93F6-A99AE67A60DA}"
"PackageCode" = "8:{A860A062-7EC6-441A-9C66-B8DDB0E3CE98}"
"PackageCode" = "8:{7B73F5A1-EB4E-40A7-8162-94A7780C50ED}"
"UpgradeCode" = "8:{7EA17151-76E7-4E29-8F6A-621C1B4144C2}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
Expand Down
5 changes: 1 addition & 4 deletions WinNUT_V2/WinNUT-Client/WinNUT.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ 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
Expand All @@ -171,12 +170,10 @@ Public Class WinNUT
'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)
LogFile.LogTracing(String.Format("Windows 10 Toast Notification Not Available. Required Version: {0}, Current: {1}", MinOsVersionToast, WindowsVersion), LogLvl.LOG_NOTICE, 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")
Expand Down