diff --git a/WinNUT_V2/Setup/Setup.vdproj b/WinNUT_V2/Setup/Setup.vdproj
index 12de558..3fdca7d 100644
--- a/WinNUT_V2/Setup/Setup.vdproj
+++ b/WinNUT_V2/Setup/Setup.vdproj
@@ -51,12 +51,6 @@
}
"Entry"
{
- "MsmKey" = "8:_0418C0A68EC444EE896C1D543C8AFD63"
- "OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_04BC2107644AB3257DDD15248220E634"
"OwnerKey" = "8:_CAA83D70E80C09C89E42A34FA8F23665"
"MsmSig" = "8:_UNDEFINED"
@@ -279,12 +273,6 @@
}
"Entry"
{
- "MsmKey" = "8:_2A6481F0F99C80219D875FADD7CEBCF5"
- "OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_2FE95EC14D3C411D8F0A93940FFCBCF3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -501,12 +489,6 @@
}
"Entry"
{
- "MsmKey" = "8:_4F81608AEF82517B403CCE166E5C9E7B"
- "OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_4FBF49FC0C81EBB2568861BC1E029FD1"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
@@ -1647,6 +1629,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
+ "OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_76C124487B58F9503C60B5679A43F43E"
"OwnerKey" = "8:_CAA83D70E80C09C89E42A34FA8F23665"
"MsmSig" = "8:_UNDEFINED"
@@ -3021,6 +3009,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_B8073AE507D3E3454F05FE38F157CEDD"
+ "OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_B8623759245285260351785642DF324A"
"OwnerKey" = "8:_70DBA11C2BF449198BA594449914C1BC"
"MsmSig" = "8:_UNDEFINED"
@@ -4990,13 +4984,13 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_4F81608AEF82517B403CCE166E5C9E7B"
+ "OwnerKey" = "8:_B8073AE507D3E3454F05FE38F157CEDD"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_0418C0A68EC444EE896C1D543C8AFD63"
+ "OwnerKey" = "8:_7643B2E01E55816C8BA2265FF9E9B786"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -5548,12 +5542,6 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_2A6481F0F99C80219D875FADD7CEBCF5"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_D6E439F8F358953CF705B4AFF62D3C03"
"MsmSig" = "8:_UNDEFINED"
}
@@ -6423,37 +6411,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0418C0A68EC444EE896C1D543C8AFD63"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.8688.25884, Culture=neutral, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_0418C0A68EC444EE896C1D543C8AFD63"
- {
- "Name" = "8:AGauge.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:AGauge.dll"
- "TargetName" = "8:"
- "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:TRUE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_04BC2107644AB3257DDD15248220E634"
{
"AssemblyRegister" = "3:1"
@@ -7373,37 +7330,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2A6481F0F99C80219D875FADD7CEBCF5"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
- "ScatterAssemblies"
- {
- "_2A6481F0F99C80219D875FADD7CEBCF5"
- {
- "Name" = "8:System.Net.Http.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:System.Net.Http.dll"
- "TargetName" = "8:"
- "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:TRUE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2FE95EC14D3C411D8F0A93940FFCBCF3"
{
"SourcePath" = "8:..\\WinNUT-Client\\bin\\PreRelease\\WinNUT-Client_Common.pdb"
@@ -8301,37 +8227,6 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4F81608AEF82517B403CCE166E5C9E7B"
- {
- "AssemblyRegister" = "3:1"
- "AssemblyIsInGAC" = "11:FALSE"
- "AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.2.8688.25884, Culture=neutral, processorArchitecture=MSIL"
- "ScatterAssemblies"
- {
- "_4F81608AEF82517B403CCE166E5C9E7B"
- {
- "Name" = "8:WinNUT-Client_Common.dll"
- "Attributes" = "3:512"
- }
- }
- "SourcePath" = "8:WinNUT-Client_Common.dll"
- "TargetName" = "8:"
- "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:TRUE"
- "IsolateTo" = "8:"
- }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4FBF49FC0C81EBB2568861BC1E029FD1"
{
"AssemblyRegister" = "3:1"
@@ -9530,6 +9425,32 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7643B2E01E55816C8BA2265FF9E9B786"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:AGauge, Version=2.1.8690.23867, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ }
+ "SourcePath" = "8:AGauge.dll"
+ "TargetName" = "8:"
+ "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:TRUE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_76C124487B58F9503C60B5679A43F43E"
{
"AssemblyRegister" = "3:1"
@@ -11078,6 +10999,32 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B8073AE507D3E3454F05FE38F157CEDD"
+ {
+ "AssemblyRegister" = "3:1"
+ "AssemblyIsInGAC" = "11:FALSE"
+ "AssemblyAsmDisplayName" = "8:WinNUT-Client_Common, Version=2.2.8690.23867, Culture=neutral, processorArchitecture=MSIL"
+ "ScatterAssemblies"
+ {
+ }
+ "SourcePath" = "8:WinNUT-Client_Common.dll"
+ "TargetName" = "8:"
+ "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:TRUE"
+ "IsolateTo" = "8:"
+ }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B8623759245285260351785642DF324A"
{
"AssemblyRegister" = "3:1"
@@ -12921,15 +12868,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:WinNUT"
- "ProductCode" = "8:{023BDDA5-359C-4698-A4DB-5B104D4C9340}"
- "PackageCode" = "8:{0EA7AC02-24AA-4A40-97F3-DBC77D170BE8}"
+ "ProductCode" = "8:{59FA2D2B-9A33-4889-897C-EDA8E87DE6A0}"
+ "PackageCode" = "8:{725679C7-4AF5-4AB4-9AF4-CBB753A11D56}"
"UpgradeCode" = "8:{7EA17151-76E7-4E29-8F6A-621C1B4144C2}"
"AspNetVersion" = "8:2.0.50727.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:2.2.8688"
+ "ProductVersion" = "8:2.2.8690"
"Manufacturer" = "8:NUTDotNet"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:https://github.com/nutdotnet/WinNUT-Client/issues"
@@ -13481,7 +13428,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_314CE5030A4040E69371869B1C94AA16"
{
- "SourcePath" = "8:..\\AGauge_mod\\obj\\Debug\\AGauge.dll"
+ "SourcePath" = "8:..\\AGauge_mod\\obj\\Release\\AGauge.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_7A1917372AF14D75845D775AAEB7CD48"
diff --git a/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb b/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb
index 0b1d030..b624943 100644
--- a/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb
+++ b/WinNUT_V2/WinNUT-Client/ApplicationEvents.vb
@@ -23,8 +23,8 @@ Namespace My
' NetworkAvailabilityChanged : Déclenché quand la connexion réseau est connectée ou déconnectée.
Partial Friend Class MyApplication
' Default culture for output so logs can be shared with the project.
- Private Shared DEF_CULTURE_INFO As CultureInfo = CultureInfo.InvariantCulture
-
+ Private Shared ReadOnly DEF_CULTURE_INFO As CultureInfo = CultureInfo.InvariantCulture
+ Private Shared ReadOnly CRASHBUG_OUTPUT_PATH = System.Windows.Forms.Application.LocalUserAppDataPath
Private CrashBug_Form As New Form
Private BtnClose As New Button
@@ -168,13 +168,13 @@ Namespace My
Computer.Clipboard.SetText(crashReportData)
- Directory.CreateDirectory(TEMP_DATA_PATH)
- Dim CrashLog_Report = New StreamWriter(Path.Combine(TEMP_DATA_PATH, logFileName))
+ Directory.CreateDirectory(CRASHBUG_OUTPUT_PATH)
+ Dim CrashLog_Report = New StreamWriter(Path.Combine(CRASHBUG_OUTPUT_PATH, logFileName))
CrashLog_Report.WriteLine(crashReportData)
CrashLog_Report.Close()
' Open an Explorer window to the crash log.
- Process.Start(TEMP_DATA_PATH)
+ Process.Start(CRASHBUG_OUTPUT_PATH)
End
End Sub
diff --git a/WinNUT_V2/WinNUT-Client/Pref_Gui.vb b/WinNUT_V2/WinNUT-Client/Pref_Gui.vb
index 7ae9d69..10874fb 100644
--- a/WinNUT_V2/WinNUT-Client/Pref_Gui.vb
+++ b/WinNUT_V2/WinNUT-Client/Pref_Gui.vb
@@ -343,8 +343,8 @@ Public Class Pref_Gui
Private Sub Btn_ViewLog_Click(sender As Object, e As EventArgs) Handles Btn_ViewLog.Click
LogFile.LogTracing("Show LogFile", LogLvl.LOG_DEBUG, Me)
- If File.Exists(LogFile.LogFileLocation) Then
- Process.Start(LogFile.LogFileLocation)
+ If File.Exists(LogFile.LogFilePath) Then
+ Process.Start(LogFile.LogFilePath)
Else
LogFile.LogTracing("LogFile does not exists", LogLvl.LOG_WARNING, Me)
Btn_ViewLog.Enabled = False
diff --git a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
index ed33e18..a2a0fc8 100644
--- a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
+++ b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
@@ -114,13 +114,11 @@
-
-
diff --git a/WinNUT_V2/WinNUT-Client/WinNUT.vb b/WinNUT_V2/WinNUT-Client/WinNUT.vb
index b79e679..25d0ae0 100644
--- a/WinNUT_V2/WinNUT-Client/WinNUT.vb
+++ b/WinNUT_V2/WinNUT-Client/WinNUT.vb
@@ -140,15 +140,6 @@ Public Class WinNUT
WinNUT_PrefsChanged(True)
LogFile.LogTracing("Loaded Params Complete", LogLvl.LOG_DEBUG, Me)
- ' Setup logging preferences
- ' LogFile.LogLevel = Arr_Reg_Key.Item("Log Level")
- ' LogFile.IsWritingToFile = Arr_Reg_Key.Item("UseLogFile")
- 'If Arr_Reg_Key.Item("UseLogFile") Then
- ' LogFile.InitializeLogFile()
- 'End If
-
- 'LogFile.LogTracing("Logging is configured.", LogLvl.LOG_DEBUG, Me)
-
'Init Systray
NotifyIcon.Text = LongProgramName & " - " & ShortProgramVersion
NotifyIcon.Visible = False
@@ -836,7 +827,7 @@ Public Class WinNUT
' Setup logging preferences
If Arr_Reg_Key.Item("UseLogFile") Then
LogFile.LogLevelValue = Arr_Reg_Key.Item("Log Level")
- LogFile.InitializeLogFile(ApplicationDataPath)
+ LogFile.InitializeLogFile()
ElseIf LogFile.IsWritingToFile Then
LogFile.DeleteLogFile()
End If
diff --git a/WinNUT_V2/WinNUT-Client_Common/Logger.vb b/WinNUT_V2/WinNUT-Client_Common/Logger.vb
index 03059cf..181eb43 100644
--- a/WinNUT_V2/WinNUT-Client_Common/Logger.vb
+++ b/WinNUT_V2/WinNUT-Client_Common/Logger.vb
@@ -9,28 +9,28 @@
Imports System.Globalization
Imports System.IO
+Imports Microsoft.VisualBasic.Logging
Public Class Logger
#Region "Constants/Shared"
- Private Const LOG_FILE_CREATION_SCHEDULE = Logging.LogFileCreationScheduleOption.Daily
+ Private Const LOG_FILE_CREATION_SCHEDULE = LogFileCreationScheduleOption.Daily
-#If DEBUG Then
+ ' Set TEST_RELEASE_DIRS in the custom compiler constants dialog for file storage to behave like release.
+#If DEBUG And Not TEST_RELEASE_DIRS Then
Private Shared ReadOnly DEFAULT_DATETIMEFORMAT = DateTimeFormatInfo.InvariantInfo
+ Private Shared ReadOnly DEFAULT_LOCATION = LogFileLocation.ExecutableDirectory
#Else
Private Shared ReadOnly DEFAULT_DATETIMEFORMAT = DateTimeFormatInfo.CurrentInfo
+ ' Actually goes to the Roaming folder.
+ Private Shared ReadOnly DEFAULT_LOCATION = LogFileLocation.LocalUserApplicationDirectory
#End If
-
- ' The subfolder that will contain logs.
- Public Const LOG_SUBFOLDER = "Logs"
-
- Private Shared ReadOnly BASE_FILE_NAME = ProgramName
Private ReadOnly TEventCache As New TraceEventCache()
#End Region
#Region "Private/backing values"
- Private LogFile As Logging.FileLogTraceListener
+ Private LogFile As FileLogTraceListener
Private L_CurrentLogData As String
Private LastEventsList As New List(Of Object)
Private _DateTimeFormatInfo As DateTimeFormatInfo = DEFAULT_DATETIMEFORMAT
@@ -86,7 +86,7 @@ Public Class Logger
''' Get the log file location from the object.
'''
''' The possible path to the log file. Note that this does not gaurantee it exists.
- Public ReadOnly Property LogFileLocation() As String
+ Public ReadOnly Property LogFilePath() As String
Get
Return LogFile.FullLogFileName
End Get
@@ -108,16 +108,27 @@ Public Class Logger
LogLevelValue = LogLevel
End Sub
- Public Sub InitializeLogFile(baseDataFolder As String)
- LogFile = New Logging.FileLogTraceListener(BASE_FILE_NAME) With {
+ '''
+ ''' Instantiates a new at a the desired location, and outputs the
+ ''' buffer into the file before synchronizing with write calls.
+ '''
+ ''' Desired location to initiate the log file. If unspecified,
+ ''' then a default location is used.
+ Public Sub InitializeLogFile(Optional baseDataFolder As String = Nothing)
+ LogFile = New FileLogTraceListener() With {
.TraceOutputOptions = TraceOptions.DateTime Or TraceOptions.ProcessId,
.Append = True,
.AutoFlush = True,
- .LogFileCreationSchedule = LOG_FILE_CREATION_SCHEDULE,
- .CustomLocation = Path.Combine(baseDataFolder, LOG_SUBFOLDER),
- .Location = Logging.LogFileLocation.Custom
+ .LogFileCreationSchedule = LOG_FILE_CREATION_SCHEDULE
}
+ If baseDataFolder Is Nothing Then
+ LogFile.Location = DEFAULT_LOCATION
+ Else
+ LogFile.Location = LogFileLocation.Custom
+ LogFile.CustomLocation = baseDataFolder
+ End If
+
LogTracing(String.Format("{0} {1} Log file init", LongProgramName, ProgramVersion), LogLvl.LOG_NOTICE, Me)
If LastEventsList.Count > 0 Then
diff --git a/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj b/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj
index 8872739..7c28be0 100644
--- a/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj
+++ b/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj
@@ -44,6 +44,16 @@
On
+
+ true
+ false
+ true
+ bin\test\
+ WinNUT-Client_Common.xml
+ 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
+ full
+ AnyCPU
+
@@ -55,7 +65,6 @@
-
diff --git a/WinNUT_V2/WinNUT-Client_Common/WinNUT_Globals.vb b/WinNUT_V2/WinNUT-Client_Common/WinNUT_Globals.vb
index ebea57a..a19c529 100644
--- a/WinNUT_V2/WinNUT-Client_Common/WinNUT_Globals.vb
+++ b/WinNUT_V2/WinNUT-Client_Common/WinNUT_Globals.vb
@@ -20,58 +20,12 @@ Public Module WinNUT_Globals
Public ReadOnly GitHubURL = My.Application.Info.Trademark
Public ReadOnly Copyright = My.Application.Info.Copyright
-#Region "File Directories"
-
- Private ReadOnly DATA_DIRECTORY_NAME = "WinNUT-Client"
- Private ReadOnly TEMP_FOLDER = Path.GetTempPath() + DATA_DIRECTORY_NAME
-
-#If DEBUG Then
- Public ReadOnly IsDebugBuild = True
- ' If debugging, keep any generated data next to the debug executable.
- Private ReadOnly DESIRED_DATA_PATH As String = Path.Combine(Environment.CurrentDirectory, DATA_DIRECTORY_NAME)
-#Else
- Public ReadOnly IsDebugBuild = False
- Private ReadOnly DESIRED_DATA_PATH As String = Path.Combine(Environment.GetFolderPath(
- Environment.SpecialFolder.ApplicationData), DATA_DIRECTORY_NAME)
-#End If
-
- Public ReadOnly TEMP_DATA_PATH = Path.Combine(Path.GetTempPath(), DATA_DIRECTORY_NAME)
-
-#End Region
-
- Public ApplicationDataPath = TEMP_DATA_PATH
Public WithEvents LogFile As Logger = New Logger(LogLvl.LOG_DEBUG)
Public StrLog As New List(Of String)
#End Region
Public Sub Init_Globals()
- ApplicationDataPath = GetAppDirectory(DESIRED_DATA_PATH)
- End Sub
-
- '''
- ''' Do everything possible to find a safe place to write to, with the appended to it. If
- ''' the requested option is unavailable, we fall back to the temporary directory for the current user.
- '''
- ''' The requested directory, with appended to it.
- ''' The best possible option available as a writable data directory.
- Private Function GetAppDirectory(requestedDir As String) As String
- Dim finalDir As String
-
- Try
- Directory.CreateDirectory(requestedDir)
- LogFile.LogTracing("Successfully created or opened requested data directory for WinNUT." &
- vbNewLine & "requestedDir: " & requestedDir, LogLvl.LOG_DEBUG, Nothing)
- finalDir = requestedDir
- Catch ex As Exception
- LogFile.LogTracing(ex.ToString & " encountered trying to create app data directory. Falling back to temp.",
- LogLvl.LOG_ERROR, Nothing)
-
- Directory.CreateDirectory(TEMP_DATA_PATH)
- finalDir = TEMP_DATA_PATH
- End Try
-
- Return finalDir
- End Function
+ End Sub
End Module
diff --git a/WinNUT_V2/WinNUT_V2.sln b/WinNUT_V2/WinNUT_V2.sln
index b790c8c..2d1c8be 100644
--- a/WinNUT_V2/WinNUT_V2.sln
+++ b/WinNUT_V2/WinNUT_V2.sln
@@ -99,8 +99,8 @@ Global
{CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|x64.Build.0 = Debug|Any CPU
{CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|x86.ActiveCfg = Debug|Any CPU
{CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.Debug|x86.Build.0 = Debug|Any CPU
- {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.PreRelease|Any CPU.ActiveCfg = Debug|Any CPU
- {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.PreRelease|Any CPU.Build.0 = Debug|Any CPU
+ {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.PreRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.PreRelease|Any CPU.Build.0 = Release|Any CPU
{CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.PreRelease|ARM.ActiveCfg = Release|Any CPU
{CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.PreRelease|ARM.Build.0 = Release|Any CPU
{CBDB1D25-5A95-43D4-A958-BF6AE65C6C3F}.PreRelease|ARM64.ActiveCfg = Release|Any CPU
@@ -129,8 +129,8 @@ Global
{9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|x64.Build.0 = Debug|Any CPU
{9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|x86.ActiveCfg = Debug|Any CPU
{9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.Debug|x86.Build.0 = Debug|Any CPU
- {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.PreRelease|Any CPU.ActiveCfg = Debug|Any CPU
- {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.PreRelease|Any CPU.Build.0 = Debug|Any CPU
+ {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.PreRelease|Any CPU.ActiveCfg = PreRelease|Any CPU
+ {9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.PreRelease|Any CPU.Build.0 = PreRelease|Any CPU
{9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.PreRelease|ARM.ActiveCfg = Release|Any CPU
{9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.PreRelease|ARM.Build.0 = Release|Any CPU
{9074CE60-DB9A-4BDF-B851-6EAB8A81F366}.PreRelease|ARM64.ActiveCfg = Release|Any CPU