Skip to content

Commit

Permalink
Upgrade Common proj. to PackageReferences
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
gbakeman committed Aug 10, 2024
1 parent 71a8d9c commit f997115
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
1 change: 0 additions & 1 deletion WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
Expand Down
4 changes: 2 additions & 2 deletions WinNUT_V2/WinNUT-Client_Common/Logger.vb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>
4 changes: 0 additions & 4 deletions WinNUT_V2/WinNUT-Client_Common/packages.config

This file was deleted.

0 comments on commit f997115

Please sign in to comment.