Skip to content

Commit 125de72

Browse files
committed
ver bump -> 3.1.4. Also disabled external log interval flushing.
1 parent 1a0fd0c commit 125de72

File tree

8 files changed

+15
-14
lines changed

8 files changed

+15
-14
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputPath_Global>__UNDEFINED__</OutputPath_Global>
44
<OutputPath_Global Condition="Exists('$(SolutionDir)OutputPath.vsmacro')">"$([System.IO.File]::ReadAllText('$(SolutionDir)OutputPath.vsmacro').trim())"</OutputPath_Global>
5-
<VersionPrefix>3.1.3.0</VersionPrefix>
5+
<VersionPrefix>3.1.4.0</VersionPrefix>
66
</PropertyGroup>
77
</Project>
88

HCMExternal/App.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public App()
3030
#if HCM_DEBUG
3131
.MinimumLevel.Verbose().WriteTo.Debug()
3232
#endif
33-
.MinimumLevel.Verbose().WriteTo.File($"HCMExternal_Logging_{timestamp}.txt",
34-
flushToDiskInterval: TimeSpan.FromSeconds(3))
33+
.MinimumLevel.Verbose().WriteTo.File($"HCMExternal_Logging_{timestamp}.txt")
3534
.CreateLogger();
3635
Log.Information("Logging started");
3736

HCMInternal/GUIElementConstructor.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -792,8 +792,10 @@ class GUIElementConstructor::GUIElementConstructorImpl {
792792
createNestedElement(GUIElementEnum::triggerOverlaySettings),
793793
createNestedElement(GUIElementEnum::softCeilingOverlayToggle),
794794
createNestedElement(GUIElementEnum::softCeilingOverlaySettings),
795-
//createNestedElement(GUIElementEnum::shieldInputPrinterToggle),
796-
//createNestedElement(GUIElementEnum::sensDriftDetectorToggle),
795+
#ifdef HCM_DEBUG
796+
createNestedElement(GUIElementEnum::shieldInputPrinterToggle),
797+
createNestedElement(GUIElementEnum::sensDriftDetectorToggle),
798+
#endif
797799
createNestedElement(GUIElementEnum::abilityMeterOverlayToggle),
798800
createNestedElement(GUIElementEnum::abilityMeterOverlaySettings),
799801
}));

HCMInternal/HCMInternal.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ END
5151
//
5252

5353
VS_VERSION_INFO VERSIONINFO
54-
FILEVERSION 3,1,3,0
55-
PRODUCTVERSION 3,1,3,0
54+
FILEVERSION 3,1,4,0
55+
PRODUCTVERSION 3,1,4,0
5656
FILEFLAGSMASK 0x3fL
5757
#ifdef _DEBUG
5858
FILEFLAGS 0x1L

HCMInternal/VersionInfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ struct VersionInfo
5757
operator std::string() const noexcept
5858
{
5959
std::stringstream ss;
60-
ss << *this;
61-
return ss.str(); // Need to make copy of the string- implicit conversion will return junk data
60+
ss << *this; // dereference or you'll just output the memory address of this
61+
return ss.str();
6262
}
6363

6464
};

HCMInterproc/HCMInterproc.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ END
5050
//
5151

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 3,1,3,0
54-
PRODUCTVERSION 3,1,3,0
53+
FILEVERSION 3,1,4,0
54+
PRODUCTVERSION 3,1,4,0
5555
FILEFLAGSMASK 0x3fL
5656
#ifdef _DEBUG
5757
FILEFLAGS 0x1L

HCMSpeedhack/HCMSpeedhack.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ END
5050
//
5151

5252
VS_VERSION_INFO VERSIONINFO
53-
FILEVERSION 3,1,3,0
54-
PRODUCTVERSION 3,1,3,0
53+
FILEVERSION 3,1,4,0
54+
PRODUCTVERSION 3,1,4,0
5555
FILEFLAGSMASK 0x3fL
5656
#ifdef _DEBUG
5757
FILEFLAGS 0x1L

OutputPath.vsmacro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
C:\\Users\\mauri\\source\\repos\\HaloCheckpointManager4\\HCMExternal\\bin\\x64\\Debug\\net7.0-windows
1+
C:\\Users\\mauri\\source\\repos\\HaloCheckpointManager4\\HCMExternal\\bin\\x64\\Release\\net7.0-windows

0 commit comments

Comments
 (0)