Preview release preparation (#168)

chore: enable strict mode in tsconfig.json and fix resulting compile-time null/undefined and typing errors. chore: Improvements to eventToValueObservable handling and typing of undefined. chore: Removing ancient legacy debug plugin upgrade check. fix: Ensure that language service status items are updated properly. feat: Updated welcome message with debugger upgrade info. fix: Various potential extension errors/crashes in rare circumstances. (Empty config values, etc.) feat: Update display name for Skyrim to include AE. chore: Replace decoration-ioc with inversify (actually maintained and not broken) docs: Add notes about updated debugger, Address Library requirements. chore: Add CI build version to debugger dlls. chore: Use Release build configuration for CI builds.
joelday · Jan 16, 2023 · bd8cdf1 · bd8cdf1
2 parents 236d7a8 + f0b0052
commit bd8cdf1
Show file tree

Hide file tree

Showing 45 changed files with 613 additions and 468 deletions.
diff --git a/build.cake b/build.cake
@@ -208,12 +208,14 @@ Task("copy-debug-plugin")
         {
             CreateDirectory("./src/papyrus-lang-vscode/debug-plugin");
 
+            var configuration = isRelease ? "Release" : "Debug";
+
             CopyFileToDirectory(
-                "src/DarkId.Papyrus.DebugServer/bin/DarkId.Papyrus.DebugServer.Skyrim/x64/Debug/DarkId.Papyrus.DebugServer.Skyrim.dll",
+                $"src/DarkId.Papyrus.DebugServer/bin/DarkId.Papyrus.DebugServer.Skyrim/x64/{configuration}/DarkId.Papyrus.DebugServer.Skyrim.dll",
                 "./src/papyrus-lang-vscode/debug-plugin");
 
             CopyFileToDirectory(
-                "src/DarkId.Papyrus.DebugServer/bin/DarkId.Papyrus.DebugServer.Fallout4/x64/Debug/DarkId.Papyrus.DebugServer.Fallout4.dll",
+                $"src/DarkId.Papyrus.DebugServer/bin/DarkId.Papyrus.DebugServer.Fallout4/x64/{configuration}/DarkId.Papyrus.DebugServer.Fallout4.dll",
                 "./src/papyrus-lang-vscode/debug-plugin");
         }
         catch (Exception)
@@ -239,13 +241,24 @@ Task("restore")
 
 Task("build-debugger")
     .Does(() => {
-        // TODO: How do we set the version on these? Does AssemblyVersion work?
-        // TODO: Do release builds when running CI.
+        var parsedVersion = System.Version.Parse(version);
+
+        var patch = parsedVersion.Build & 0xFFFF0000;
+        var build = parsedVersion.Build & 0x0000FFFF;
 
         MSBuild(debuggerSolution, new MSBuildSettings()
         {
             PlatformTarget = PlatformTarget.x64,
+            Configuration = isRelease ? "Release" : "Debug",
+            Properties = 
+            {
+                { "VersionMajor", new List<string>(){ parsedVersion.Major.ToString() } },
+                { "VersionMinor", new List<string>(){ parsedVersion.Minor.ToString() } },
+                { "VersionPatch", new List<string>(){ patch.ToString() } },
+                { "VersionBuild", new List<string>(){ build.ToString() } },
+            }
         });
+
     });
 
 Task("build")
@@ -337,10 +350,6 @@ Task("update-bin")
     .IsDependentOn("copy-debug-plugin");
 
 Task("build-extension")
-    .IsDependentOn("npm-clean")
-    .IsDependentOn("npm-copy-bin")
-    .IsDependentOn("npm-copy-debug-bin")
-    .IsDependentOn("copy-debug-plugin")
     .IsDependentOn("npm-build");
 
 Task("build-test")

diff --git a/src/DarkId.Papyrus.DebugServer/DarkId.Papyrus.DebugServer.Fallout4.vcxproj b/src/DarkId.Papyrus.DebugServer/DarkId.Papyrus.DebugServer.Fallout4.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -16,6 +17,10 @@
     <RootNamespace>DarkId::Papyrus::DebugServer</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <VersionMajor Condition="$(VersionMajor) == ''">0</VersionMajor>
+    <VersionMinor Condition="$(VersionMinor) == ''">0</VersionMinor>
+    <VersionPatch Condition="$(VersionPatch) == ''">0</VersionPatch>
+    <VersionBuild Condition="$(VersionBuild) == ''">0</VersionBuild>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -33,10 +38,14 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+      Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
+      Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+      Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
+      Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -59,7 +68,8 @@
     <IntDir>$(ProjectDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup>
-    <FalloutInstallPath>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Bethesda Softworks\Fallout4@installed path)</FalloutInstallPath>
+    <FalloutInstallPath>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Bethesda
+      Softworks\Fallout4@installed path)</FalloutInstallPath>
     <F4SEPluginPath Condition="$(FalloutInstallPath) != ''">$(FalloutInstallPath)Data\F4SE\Plugins</F4SEPluginPath>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
@@ -81,7 +91,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;FALLOUT;SPDLOG_COMPILED_LIB;SPDLOG_FMT_EXTERNAL;F4SE_SUPPORT_XBYAK;_DEBUG;_WINDOWS;_USRDLL;DARKID_PAPYRUS_DEBUGSERVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>
+        WIN32;FALLOUT;SPDLOG_COMPILED_LIB;SPDLOG_FMT_EXTERNAL;F4SE_SUPPORT_XBYAK;_DEBUG;_WINDOWS;_USRDLL;DARKID_PAPYRUS_DEBUGSERVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -104,7 +115,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pdsPCH.h</PrecompiledHeaderFile>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\dependencies;$(ProjectDir)..\..\dependencies\MetaStuff\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\Champollion;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>
+        $(ProjectDir);$(ProjectDir)..\..\dependencies;$(ProjectDir)..\..\dependencies\MetaStuff\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\Champollion;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -129,14 +141,15 @@
       </Message>
     </PostBuildEvent>
     <ResourceCompile>
-      <PreprocessorDefinitions>FALLOUT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FALLOUT;DIDPDS_VERSION_MAJOR=$(VersionMajor);DIDPDS_VERSION_MINOR=$(VersionMinor);DIDPDS_VERSION_PATCH=$(VersionPatch);DIDPDS_VERSION_BUILD=$(VersionBuild);</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;FALLOUT;SPDLOG_COMPILED_LIB;SPDLOG_FMT_EXTERNAL;F4SE_SUPPORT_XBYAK;NDEBUG;_WINDOWS;_USRDLL;DARKID_PAPYRUS_DEBUGSERVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>
+        WIN32;FALLOUT;SPDLOG_COMPILED_LIB;SPDLOG_FMT_EXTERNAL;F4SE_SUPPORT_XBYAK;NDEBUG;_WINDOWS;_USRDLL;DARKID_PAPYRUS_DEBUGSERVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
@@ -157,7 +170,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pdsPCH.h</PrecompiledHeaderFile>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\dependencies;$(ProjectDir)..\..\dependencies\MetaStuff\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\Champollion;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>
+        $(ProjectDir);$(ProjectDir)..\..\dependencies;$(ProjectDir)..\..\dependencies\MetaStuff\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\Champollion;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -180,7 +194,7 @@
       </Command>
     </PostBuildEvent>
     <ResourceCompile>
-      <PreprocessorDefinitions>FALLOUT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>FALLOUT;DIDPDS_VERSION_MAJOR=$(VersionMajor);DIDPDS_VERSION_MINOR=$(VersionMinor);DIDPDS_VERSION_PATCH=$(VersionPatch);DIDPDS_VERSION_BUILD=$(VersionBuild);</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/src/DarkId.Papyrus.DebugServer/DarkId.Papyrus.DebugServer.Skyrim.vcxproj b/src/DarkId.Papyrus.DebugServer/DarkId.Papyrus.DebugServer.Skyrim.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0"
+  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -16,8 +17,10 @@
     <RootNamespace>DarkId::Papyrus::DebugServer</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <BuildNumber>$(APPVEYOR_BUILD_NUMBER)</BuildNumber>
-    <BuildNumber Condition="$(BuildNumber) == ''">0</BuildNumber>
+    <VersionMajor Condition="$(VersionMajor) == ''">0</VersionMajor>
+    <VersionMinor Condition="$(VersionMinor) == ''">0</VersionMinor>
+    <VersionPatch Condition="$(VersionPatch) == ''">0</VersionPatch>
+    <VersionBuild Condition="$(VersionBuild) == ''">0</VersionBuild>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -35,10 +38,14 @@
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+      Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
+      Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+      Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
+      Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -61,7 +68,8 @@
     <IntDir>$(ProjectDir)obj\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup>
-    <SkyrimInstallPath>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Bethesda Softworks\Skyrim Special Edition@installed path)</SkyrimInstallPath>
+    <SkyrimInstallPath>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Bethesda Softworks\Skyrim
+      Special Edition@installed path)</SkyrimInstallPath>
     <SKSEPluginPath Condition="$(SkyrimInstallPath) != ''">$(SkyrimInstallPath)Data\SKSE\Plugins</SKSEPluginPath>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
@@ -83,8 +91,10 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\dependencies;$(ProjectDir)..\..\dependencies\MetaStuff\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\Champollion;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;SKYRIM;ENABLE_SKYRIM_VR;ENABLE_SKYRIM_AE;ENABLE_SKYRIM_SE;SKSE_SUPPORT_XBYAK;_DEBUG;_WINDOWS;_USRDLL;DARKID_PAPYRUS_DEBUGSERVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>
+        $(ProjectDir);$(ProjectDir)..\..\dependencies;$(ProjectDir)..\..\dependencies\MetaStuff\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\Champollion;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>
+        WIN32;SKYRIM;ENABLE_SKYRIM_VR;ENABLE_SKYRIM_AE;ENABLE_SKYRIM_SE;SKSE_SUPPORT_XBYAK;_DEBUG;_WINDOWS;_USRDLL;DARKID_PAPYRUS_DEBUGSERVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -131,15 +141,17 @@
       </Message>
     </PostBuildEvent>
     <ResourceCompile>
-      <PreprocessorDefinitions>SKYRIM</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SKYRIM;DIDPDS_VERSION_MAJOR=$(VersionMajor);DIDPDS_VERSION_MINOR=$(VersionMinor);DIDPDS_VERSION_PATCH=$(VersionPatch);DIDPDS_VERSION_BUILD=$(VersionBuild);</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\dependencies;$(ProjectDir)..\..\dependencies\MetaStuff\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\Champollion;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;SKYRIM;ENABLE_SKYRIM_VR;ENABLE_SKYRIM_AE;ENABLE_SKYRIM_SE;SKSE_SUPPORT_XBYAK;NDEBUG;_WINDOWS;_USRDLL;DARKID_PAPYRUS_DEBUGSERVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>
+        $(ProjectDir);$(ProjectDir)..\..\dependencies;$(ProjectDir)..\..\dependencies\MetaStuff\include;$(VcpkgInstalledDir)\$(VcpkgTriplet)\include\Champollion;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>
+        WIN32;SKYRIM;ENABLE_SKYRIM_VR;ENABLE_SKYRIM_AE;ENABLE_SKYRIM_SE;SKSE_SUPPORT_XBYAK;NDEBUG;_WINDOWS;_USRDLL;DARKID_PAPYRUS_DEBUGSERVER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
@@ -182,7 +194,7 @@
       </Command>
     </PostBuildEvent>
     <ResourceCompile>
-      <PreprocessorDefinitions>SKYRIM</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SKYRIM;DIDPDS_VERSION_MAJOR=$(VersionMajor);DIDPDS_VERSION_MINOR=$(VersionMinor);DIDPDS_VERSION_PATCH=$(VersionPatch);DIDPDS_VERSION_BUILD=$(VersionBuild);</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/src/DarkId.Papyrus.DebugServer/version.h b/src/DarkId.Papyrus.DebugServer/version.h
@@ -1,4 +1,4 @@
-#ifndef	DIDPDS_VERSION_INCLUDED
+#ifndef DIDPDS_VERSION_INCLUDED
 #define DIDPDS_VERSION_INCLUDED
 
 #define MAKE_STR_HELPER(a_str) #a_str
@@ -10,21 +10,23 @@
 #define DIDPDS_DLL_NAME "DarkId.Papyrus.DebugServer.Fallout4.dll"
 #endif
 
-// Manual update for now
-#define DIDPDS_VERSION_MAJOR	1
-
-#define DIDPDS_VERSION_MINOR	57
+#ifndef DIDPDS_VERSION_MAJOR
+#define DIDPDS_VERSION_MAJOR 0
+#endif
 
-#define DIDPDS_VERSION_PATCH	0
+#ifndef DIDPDS_VERSION_MINOR
+#define DIDPDS_VERSION_MINOR 0
+#endif
 
-// Just manually update DIDPDS_VERSION_BETA for now
-#define DIDPDS_VERSION_BETA   1
+#ifndef DIDPDS_VERSION_PATCH
+#define DIDPDS_VERSION_PATCH 0
+#endif
 
-#define DIDPDS_VERSION_WIN_VERSTRING	MAKE_STR(DIDPDS_VERSION_MAJOR) "." MAKE_STR(DIDPDS_VERSION_MINOR) "." MAKE_STR(DIDPDS_VERSION_PATCH) "." MAKE_STR(DIDPDS_VERSION_BETA)
-#if DIDPDS_VERSION_BETA == 0
-#define DIDPDS_VERSION_SEMVER  MAKE_STR(DIDPDS_VERSION_MAJOR) "." MAKE_STR(DIDPDS_VERSION_MINOR) "." MAKE_STR(DIDPDS_VERSION_PATCH)
-#else
-#define DIDPDS_VERSION_SEMVER  MAKE_STR(DIDPDS_VERSION_MAJOR) "." MAKE_STR(DIDPDS_VERSION_MINOR) "." MAKE_STR(DIDPDS_VERSION_PATCH) "-beta" MAKE_STR(DIDPDS_VERSION_BETA)
+#ifndef DIDPDS_VERSION_BUILD
+#define DIDPDS_VERSION_BUILD 0
 #endif
 
-#endif //DIDPDS_VERSION_INCLUDED
+#define DIDPDS_VERSION_WIN_VERSTRING MAKE_STR(DIDPDS_VERSION_MAJOR) "." MAKE_STR(DIDPDS_VERSION_MINOR) "." MAKE_STR(DIDPDS_VERSION_PATCH) "." MAKE_STR(DIDPDS_VERSION_BUILD)
+#define DIDPDS_VERSION_SEMVER MAKE_STR(DIDPDS_VERSION_MAJOR) "." MAKE_STR(DIDPDS_VERSION_MINOR) "." MAKE_STR(DIDPDS_VERSION_PATCH)
+
+#endif // DIDPDS_VERSION_INCLUDED
diff --git a/src/DarkId.Papyrus.DebugServer/version.rc b/src/DarkId.Papyrus.DebugServer/version.rc
@@ -2,8 +2,8 @@
 #include <winres.h>
 
 1 VERSIONINFO
- FILEVERSION DIDPDS_VERSION_MAJOR, DIDPDS_VERSION_MINOR, DIDPDS_VERSION_PATCH, DIDPDS_VERSION_BETA
- PRODUCTVERSION DIDPDS_VERSION_MAJOR, DIDPDS_VERSION_MINOR, DIDPDS_VERSION_PATCH, DIDPDS_VERSION_BETA
+ FILEVERSION DIDPDS_VERSION_MAJOR, DIDPDS_VERSION_MINOR, DIDPDS_VERSION_PATCH, DIDPDS_VERSION_BUILD
+ PRODUCTVERSION DIDPDS_VERSION_MAJOR, DIDPDS_VERSION_MINOR, DIDPDS_VERSION_PATCH, DIDPDS_VERSION_BUILD
  FILEFLAGSMASK 0x17L
 
 #ifndef DIDPDS_DLL_NAME
@@ -31,7 +31,7 @@ BEGIN
             VALUE "FileDescription", "Papyrus Debug Server"
 			VALUE "FileVersion", DIDPDS_VERSION_WIN_VERSTRING
             VALUE "InternalName", DIDPDS_DLL_NAME
-            VALUE "LegalCopyright", "Copyright (c) 2019 Joel Day"
+            VALUE "LegalCopyright", "Copyright (c) 2023 Joel Day"
             VALUE "ProductName", DIDPDS_DLL_NAME
 			VALUE "ProductVersion", DIDPDS_VERSION_WIN_VERSTRING
         END