Skip to content

Commit f997115

Browse files
committed
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
1 parent 71a8d9c commit f997115

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

WinNUT_V2/WinNUT-Client/WinNUT-client.vbproj

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1515
<IsWebBootstrapper>false</IsWebBootstrapper>
1616
<TargetFrameworkProfile />
17-
<PublishUrl>publish\</PublishUrl>
1817
<Install>true</Install>
1918
<InstallFrom>Disk</InstallFrom>
2019
<UpdateEnabled>false</UpdateEnabled>

WinNUT_V2/WinNUT-Client_Common/Logger.vb

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ Public Class Logger
1818
Private Const LOG_FILE_CREATION_SCHEDULE = LogFileCreationScheduleOption.Daily
1919

2020
' Set TEST_RELEASE_DIRS in the custom compiler constants dialog for file storage to behave like release.
21-
#If DEBUG And Not TEST_RELEASE_DIRS Then
21+
#If DEBUG AndAlso Not TEST_RELEASE_DIRS Then
2222
Private Shared ReadOnly DEFAULT_DATETIMEFORMAT = DateTimeFormatInfo.InvariantInfo
23-
Private Shared ReadOnly DEFAULT_LOCATION = LogFileLocation.ExecutableDirectory
23+
Private Shared ReadOnly DEFAULT_LOCATION = Application.StartupPath
2424
#Else
2525
Private Shared ReadOnly DEFAULT_DATETIMEFORMAT = DateTimeFormatInfo.CurrentInfo
2626
Private Shared ReadOnly DEFAULT_LOCATION = Application.LocalUserAppDataPath

WinNUT_V2/WinNUT-Client_Common/WinNUT-Client_Common.vbproj

+5-4
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@
6161
<Optimize>true</Optimize>
6262
</PropertyGroup>
6363
<ItemGroup>
64-
<Reference Include="Octokit, Version=13.0.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
65-
<HintPath>..\packages\Octokit.13.0.1\lib\netstandard2.0\Octokit.dll</HintPath>
66-
</Reference>
6764
<Reference Include="System" />
6865
<Reference Include="System.Data" />
6966
<Reference Include="System.Deployment" />
@@ -131,7 +128,11 @@
131128
<Generator>MyApplicationCodeGenerator</Generator>
132129
<LastGenOutput>Application.Designer.vb</LastGenOutput>
133130
</None>
134-
<None Include="packages.config" />
131+
</ItemGroup>
132+
<ItemGroup>
133+
<PackageReference Include="Octokit">
134+
<Version>13.0.1</Version>
135+
</PackageReference>
135136
</ItemGroup>
136137
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
137138
</Project>

WinNUT_V2/WinNUT-Client_Common/packages.config

-4
This file was deleted.

0 commit comments

Comments
 (0)