Skip to content

Commit a8e8a04

Browse files
gbakemangbakeman
authored
Merge pull request #51 from nutdotnet/44-winverdetect
Fix incorrect windows version detection
2 parents 2e60a49 + 7f847d3 commit a8e8a04

File tree

2 files changed

+90
-15
lines changed

2 files changed

+90
-15
lines changed

‎WinNUT_V2/Setup/Setup.vdproj‎

Lines changed: 89 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@
9999
}
100100
"Entry"
101101
{
102+
"MsmKey" = "8:_0A325B8139084CA78A0244CAC82F2853"
103+
"OwnerKey" = "8:_UNDEFINED"
104+
"MsmSig" = "8:_UNDEFINED"
105+
}
106+
"Entry"
107+
{
102108
"MsmKey" = "8:_0A861B352BC31F8043445D772FF57CB6"
103109
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
104110
"MsmSig" = "8:_UNDEFINED"
@@ -159,6 +165,12 @@
159165
}
160166
"Entry"
161167
{
168+
"MsmKey" = "8:_19385C4691E649139966B93BFCB76418"
169+
"OwnerKey" = "8:_UNDEFINED"
170+
"MsmSig" = "8:_UNDEFINED"
171+
}
172+
"Entry"
173+
{
162174
"MsmKey" = "8:_19A373CB2F62FEC5606DD9E5BBD06BD8"
163175
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
164176
"MsmSig" = "8:_UNDEFINED"
@@ -3441,6 +3453,12 @@
34413453
}
34423454
"Entry"
34433455
{
3456+
"MsmKey" = "8:_A17B6478098A4E61AD676107545BBEAD"
3457+
"OwnerKey" = "8:_UNDEFINED"
3458+
"MsmSig" = "8:_UNDEFINED"
3459+
}
3460+
"Entry"
3461+
{
34443462
"MsmKey" = "8:_A51E7D6EB2814770BABB461429AA4198"
34453463
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
34463464
"MsmSig" = "8:_UNDEFINED"
@@ -4942,37 +4960,37 @@
49424960
"Entry"
49434961
{
49444962
"MsmKey" = "8:_UNDEFINED"
4945-
"OwnerKey" = "8:_5C99D3FB8E4CBB81209F637E049611DF"
4963+
"OwnerKey" = "8:_E8BB0E2A241C1023B684B55FEB5B745F"
49464964
"MsmSig" = "8:_UNDEFINED"
49474965
}
49484966
"Entry"
49494967
{
49504968
"MsmKey" = "8:_UNDEFINED"
4951-
"OwnerKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
4969+
"OwnerKey" = "8:_929B73992E930343CA5B90A2038D04AB"
49524970
"MsmSig" = "8:_UNDEFINED"
49534971
}
49544972
"Entry"
49554973
{
49564974
"MsmKey" = "8:_UNDEFINED"
4957-
"OwnerKey" = "8:_E8BB0E2A241C1023B684B55FEB5B745F"
4975+
"OwnerKey" = "8:_63C8A279ECA1961108679E2A93D5C62B"
49584976
"MsmSig" = "8:_UNDEFINED"
49594977
}
49604978
"Entry"
49614979
{
49624980
"MsmKey" = "8:_UNDEFINED"
4963-
"OwnerKey" = "8:_929B73992E930343CA5B90A2038D04AB"
4981+
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
49644982
"MsmSig" = "8:_UNDEFINED"
49654983
}
49664984
"Entry"
49674985
{
49684986
"MsmKey" = "8:_UNDEFINED"
4969-
"OwnerKey" = "8:_63C8A279ECA1961108679E2A93D5C62B"
4987+
"OwnerKey" = "8:_5C99D3FB8E4CBB81209F637E049611DF"
49704988
"MsmSig" = "8:_UNDEFINED"
49714989
}
49724990
"Entry"
49734991
{
49744992
"MsmKey" = "8:_UNDEFINED"
4975-
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
4993+
"OwnerKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
49764994
"MsmSig" = "8:_UNDEFINED"
49774995
}
49784996
"Entry"
@@ -6616,6 +6634,26 @@
66166634
"IsDependency" = "11:TRUE"
66176635
"IsolateTo" = "8:"
66186636
}
6637+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0A325B8139084CA78A0244CAC82F2853"
6638+
{
6639+
"SourcePath" = "8:..\\WinNUT-Client\\bin\\Release\\WinNUT-Client.exe.config"
6640+
"TargetName" = "8:WinNUT-Client.exe.config"
6641+
"Tag" = "8:"
6642+
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
6643+
"Condition" = "8:"
6644+
"Transitive" = "11:FALSE"
6645+
"Vital" = "11:TRUE"
6646+
"ReadOnly" = "11:FALSE"
6647+
"Hidden" = "11:FALSE"
6648+
"System" = "11:FALSE"
6649+
"Permanent" = "11:FALSE"
6650+
"SharedLegacy" = "11:FALSE"
6651+
"PackageAs" = "3:1"
6652+
"Register" = "3:1"
6653+
"Exclude" = "11:FALSE"
6654+
"IsDependency" = "11:FALSE"
6655+
"IsolateTo" = "8:"
6656+
}
66196657
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0A861B352BC31F8043445D772FF57CB6"
66206658
{
66216659
"AssemblyRegister" = "3:1"
@@ -6895,6 +6933,26 @@
68956933
"IsDependency" = "11:TRUE"
68966934
"IsolateTo" = "8:"
68976935
}
6936+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_19385C4691E649139966B93BFCB76418"
6937+
{
6938+
"SourcePath" = "8:..\\WinNUT-Client\\bin\\Release\\WinNUT-Client.exe.manifest"
6939+
"TargetName" = "8:WinNUT-Client.exe.manifest"
6940+
"Tag" = "8:"
6941+
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
6942+
"Condition" = "8:"
6943+
"Transitive" = "11:FALSE"
6944+
"Vital" = "11:TRUE"
6945+
"ReadOnly" = "11:FALSE"
6946+
"Hidden" = "11:FALSE"
6947+
"System" = "11:FALSE"
6948+
"Permanent" = "11:FALSE"
6949+
"SharedLegacy" = "11:FALSE"
6950+
"PackageAs" = "3:1"
6951+
"Register" = "3:1"
6952+
"Exclude" = "11:FALSE"
6953+
"IsDependency" = "11:FALSE"
6954+
"IsolateTo" = "8:"
6955+
}
68986956
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_19A373CB2F62FEC5606DD9E5BBD06BD8"
68996957
{
69006958
"AssemblyRegister" = "3:1"
@@ -9795,7 +9853,7 @@
97959853
"_7F619FE6A380D79E80E85D6E6822F82A"
97969854
{
97979855
"Name" = "8:System.ObjectModel.dll"
9798-
"Attributes" = "3:512"
9856+
"Attributes" = "3:514"
97999857
}
98009858
}
98019859
"SourcePath" = "8:System.ObjectModel.dll"
@@ -9806,7 +9864,7 @@
98069864
"Transitive" = "11:FALSE"
98079865
"Vital" = "11:TRUE"
98089866
"ReadOnly" = "11:FALSE"
9809-
"Hidden" = "11:FALSE"
9867+
"Hidden" = "11:TRUE"
98109868
"System" = "11:FALSE"
98119869
"Permanent" = "11:FALSE"
98129870
"SharedLegacy" = "11:FALSE"
@@ -10622,6 +10680,26 @@
1062210680
"IsDependency" = "11:TRUE"
1062310681
"IsolateTo" = "8:"
1062410682
}
10683+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A17B6478098A4E61AD676107545BBEAD"
10684+
{
10685+
"SourcePath" = "8:..\\WinNUT-Client\\bin\\Release\\WinNUT-Client.application"
10686+
"TargetName" = "8:WinNUT-Client.application"
10687+
"Tag" = "8:"
10688+
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
10689+
"Condition" = "8:"
10690+
"Transitive" = "11:FALSE"
10691+
"Vital" = "11:TRUE"
10692+
"ReadOnly" = "11:FALSE"
10693+
"Hidden" = "11:FALSE"
10694+
"System" = "11:FALSE"
10695+
"Permanent" = "11:FALSE"
10696+
"SharedLegacy" = "11:FALSE"
10697+
"PackageAs" = "3:1"
10698+
"Register" = "3:1"
10699+
"Exclude" = "11:FALSE"
10700+
"IsDependency" = "11:FALSE"
10701+
"IsolateTo" = "8:"
10702+
}
1062510703
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A51E7D6EB2814770BABB461429AA4198"
1062610704
{
1062710705
"AssemblyRegister" = "3:1"
@@ -11004,7 +11082,7 @@
1100411082
"_B5EB4F25C305A58F1CAA2F30A1C745CA"
1100511083
{
1100611084
"Name" = "8:System.ObjectModel.dll"
11007-
"Attributes" = "3:512"
11085+
"Attributes" = "3:514"
1100811086
}
1100911087
}
1101011088
"SourcePath" = "8:System.ObjectModel.dll"
@@ -11015,7 +11093,7 @@
1101511093
"Transitive" = "11:FALSE"
1101611094
"Vital" = "11:TRUE"
1101711095
"ReadOnly" = "11:FALSE"
11018-
"Hidden" = "11:FALSE"
11096+
"Hidden" = "11:TRUE"
1101911097
"System" = "11:FALSE"
1102011098
"Permanent" = "11:FALSE"
1102111099
"SharedLegacy" = "11:FALSE"
@@ -12818,7 +12896,7 @@
1281812896
"Name" = "8:Microsoft Visual Studio"
1281912897
"ProductName" = "8:WinNUT"
1282012898
"ProductCode" = "8:{4B9C8FB9-4559-40A2-93F6-A99AE67A60DA}"
12821-
"PackageCode" = "8:{A860A062-7EC6-441A-9C66-B8DDB0E3CE98}"
12899+
"PackageCode" = "8:{7B73F5A1-EB4E-40A7-8162-94A7780C50ED}"
1282212900
"UpgradeCode" = "8:{7EA17151-76E7-4E29-8F6A-621C1B4144C2}"
1282312901
"AspNetVersion" = "8:2.0.50727.0"
1282412902
"RestartWWWService" = "11:FALSE"

‎WinNUT_V2/WinNUT-Client/WinNUT.vb‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ Public Class WinNUT
160160
LogFile.LogTracing("NotifyIcons Initialised", LogLvl.LOG_DEBUG, Me)
161161

162162
'Verify If Toast Compatible
163-
' #If CONFIG = "Dbg-Win10" Then
164163
If MinOsVersionToast.CompareTo(WindowsVersion) < 0 Then
165164
AllowToast = True
166165
' ToastPopup.ToastHeader = ProgramName & " - " & ShortProgramVersion
@@ -171,12 +170,10 @@ Public Class WinNUT
171170
'file.Close()
172171
'ico.Dispose()
173172
'ToastPopup.CreateToastCollection(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\WinNUT-Client\WinNut.ico")
174-
' #Else
175173
Else
176174

177-
LogFile.LogTracing("Windows 10 Toast Notification Not Available. Too Old Windows Version", LogLvl.LOG_DEBUG, Me)
175+
LogFile.LogTracing(String.Format("Windows 10 Toast Notification Not Available. Required Version: {0}, Current: {1}", MinOsVersionToast, WindowsVersion), LogLvl.LOG_NOTICE, Me)
178176
End If
179-
' #End If
180177

181178
'UPS_Device.Battery_Limit = WinNUT_Params.Arr_Reg_Key.Item("ShutdownLimitBatteryCharge")
182179
'UPS_Device.Backup_Limit = WinNUT_Params.Arr_Reg_Key.Item("ShutdownLimitUPSRemainTime")

0 commit comments

Comments
 (0)