From f9971158b2c5dcf496f5e0ea346738b412901d88 Mon Sep 17 00:00:00 2001
From: gbakeman <gbakeman@live.com>
Date: Sat, 10 Aug 2024 16:33:12 -0400
Subject: [PATCH] Upgrade Common proj. to PackageReferences

- Upgrade Common project file to PackageReferences type to try to fix the Octokit library error.
- Disable ClickOnce publishing again
- Fix Logger writing to a number '3' folder in DEBUG mode
---
 WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj             | 1 -
 WinNUT_V2/WinNUT-Client_Common/Logger.vb                 | 4 ++--
 .../WinNUT-Client_Common/WinNUT-Client_Common.vbproj     | 9 +++++----
 WinNUT_V2/WinNUT-Client_Common/packages.config           | 4 ----
 4 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 WinNUT_V2/WinNUT-Client_Common/packages.config

diff --git a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
index 92975c7..b17c9a8 100644
--- a/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
+++ b/WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
@@ -14,7 +14,6 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
diff --git a/WinNUT_V2/WinNUT-Client_Common/Logger.vb b/WinNUT_V2/WinNUT-Client_Common/Logger.vb
index da5aaa8..2cf31bd 100644
--- a/WinNUT_V2/WinNUT-Client_Common/Logger.vb
+++ b/WinNUT_V2/WinNUT-Client_Common/Logger.vb
@@ -18,9 +18,9 @@ Public Class Logger
     Private Const LOG_FILE_CREATION_SCHEDULE = LogFileCreationScheduleOption.Daily
 
     ' 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
+#If DEBUG AndAlso Not TEST_RELEASE_DIRS Then
     Private Shared ReadOnly DEFAULT_DATETIMEFORMAT = DateTimeFormatInfo.InvariantInfo
-    Private Shared ReadOnly DEFAULT_LOCATION = LogFileLocation.ExecutableDirectory
+    Private Shared ReadOnly DEFAULT_LOCATION = Application.StartupPath
 #Else
     Private Shared ReadOnly DEFAULT_DATETIMEFORMAT = DateTimeFormatInfo.CurrentInfo
     Private Shared ReadOnly DEFAULT_LOCATION = Application.LocalUserAppDataPath
diff --git a/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj b/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj
index dff0c09..3747b60 100644
--- a/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj
+++ b/WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj
@@ -61,9 +61,6 @@
     <Optimize>true</Optimize>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Octokit, Version=13.0.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
-      <HintPath>..\packages\Octokit.13.0.1\lib\netstandard2.0\Octokit.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
@@ -131,7 +128,11 @@
       <Generator>MyApplicationCodeGenerator</Generator>
       <LastGenOutput>Application.Designer.vb</LastGenOutput>
     </None>
-    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Octokit">
+      <Version>13.0.1</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>
\ No newline at end of file
diff --git a/WinNUT_V2/WinNUT-Client_Common/packages.config b/WinNUT_V2/WinNUT-Client_Common/packages.config
deleted file mode 100644
index e6bb536..0000000
--- a/WinNUT_V2/WinNUT-Client_Common/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Octokit" version="13.0.1" targetFramework="net48" />
-</packages>
\ No newline at end of file