From 7e614c14aa8a7befba33a6af006c8bf50582d5f9 Mon Sep 17 00:00:00 2001
From: fanlumaster <1730976608@qq.com>
Date: Fri, 30 May 2025 23:03:58 +0800
Subject: [PATCH] [dev]: version

---
 server/CMakeLists.txt                         | 10 +++----
 server/{FanImeUi.props => FanImeServer.props} | 30 ++++++++++++-------
 server/tests/scripts/llaunch.ps1              |  3 +-
 3 files changed, 26 insertions(+), 17 deletions(-)
 rename server/{FanImeUi.props => FanImeServer.props} (55%)

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index f0aafe9e..e76949e0 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.25.0)
 
-set(PROJECT_NAME "fanimeui")
+set(PROJECT_NAME "FanImeServer")
 
 project(${PROJECT_NAME} VERSION 1.0)
 
@@ -16,7 +16,7 @@ find_package(spdlog CONFIG REQUIRED)
 find_package(unofficial-sqlite3 CONFIG REQUIRED)
 
 set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
@@ -31,7 +31,7 @@ add_definitions(
 
 include_directories("./src/")
 
-set(MY_EXECUTABLE_NAME "fanimeui")
+set(MY_EXECUTABLE_NAME "FanImeServer")
 
 set(SRC_FILES
     "./src/defines/defines.h"
@@ -87,7 +87,7 @@ add_executable(${MY_EXECUTABLE_NAME} WIN32
 
 # WebView2
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_GLOBAL_WebView2LoaderPreference "Static")
-set_target_properties(${PROJECT_NAME} PROPERTIES VS_USER_PROPS "${CMAKE_SOURCE_DIR}/FanImeUi.props")
-set_target_properties(${PROJECT_NAME} PROPERTIES VS_PACKAGE_REFERENCES "Microsoft.Web.WebView2_1.0.3124.44;Microsoft.Windows.ImplementationLibrary_1.0.240803.1")
+set_target_properties(${PROJECT_NAME} PROPERTIES VS_USER_PROPS "${CMAKE_SOURCE_DIR}/FanImeServer.props")
+set_target_properties(${PROJECT_NAME} PROPERTIES VS_PACKAGE_REFERENCES "Microsoft.Web.WebView2_1.0.3240.44;Microsoft.Windows.ImplementationLibrary_1.0.240803.1")
 
 target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::sqlite3::sqlite3 fmt::fmt spdlog::spdlog Boost::locale Boost::json)
\ No newline at end of file
diff --git a/server/FanImeUi.props b/server/FanImeServer.props
similarity index 55%
rename from server/FanImeUi.props
rename to server/FanImeServer.props
index bb243e0e..25cd0336 100644
--- a/server/FanImeUi.props
+++ b/server/FanImeServer.props
@@ -1,29 +1,39 @@
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <ImportGroup Label="PropertySheets">     
-        <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> 
-    </ImportGroup> 
+<Project DefaultTargets="Build" ToolsVersion="4.0"
+    xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ImportGroup Label="PropertySheets">
+        <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
+            Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
+            Label="LocalAppDataPlatform" />
+    </ImportGroup>
 
     <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
         <ProjectCapability Include="PackageReferences" />
     </ItemGroup>
 
+    <ItemGroup>
+        <!-- WebView2 version-->
+        <PackageReference Update="Microsoft.Web.WebView2" Version="1.0.3240.44" />
+    </ItemGroup>
+
     <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
-        <!-- NuGet 包恢复配置 -->
+        <!-- NuGet config -->
         <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
         <NuGetPackageImportStamp>true</NuGetPackageImportStamp>
 
-        <!-- 目标平台和框架配置 -->
+        <!-- TargetPlatform x64 -->
         <Platform Condition="'$(Platform)' == ''">x64</Platform>
         <TargetFramework>native</TargetFramework>
 
-        <!-- NuGet 包路径配置 -->
+        <!-- NuGet package root -->
         <NuGetPackageRoot Condition="'$(NuGetPackageRoot)' == ''">$(UserProfile)\.nuget\packages</NuGetPackageRoot>
 
-        <!-- WebView2 配置 -->
+        <!-- WebView2 config -->
         <WebView2LoaderPreference>Static</WebView2LoaderPreference>
 
-        <!-- NuGet 目标框架配置 -->
+        <!-- NuGet target -->
         <NuGetTargetMoniker Condition="'$(NuGetTargetMoniker)' == ''">native,Version=v0.0</NuGetTargetMoniker>
-        <RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == ''">win;win-x86;win-x64;win-arm;win-arm64</RuntimeIdentifiers>
+        <RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == ''">
+            win;win-x86;win-x64;win-arm;win-arm64
+        </RuntimeIdentifiers>
     </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/server/tests/scripts/llaunch.ps1 b/server/tests/scripts/llaunch.ps1
index 8fde167b..7d3e8064 100644
--- a/server/tests/scripts/llaunch.ps1
+++ b/server/tests/scripts/llaunch.ps1
@@ -1,5 +1,5 @@
 #
-# generate, compile and run exe files
+# Generate, compile and run exe files
 #
 function getExePathFromCMakeLists() {
     $content = Get-Content -Raw -Path "./CMakeLists.txt"
@@ -31,7 +31,6 @@ if (-not (Test-Path $buildFolderPath)) {
     Write-Host "build folder created."
 }
 
-# cmake -G -A x64 -DCMAKE_TOOLCHAIN_FILE=C:/Users/SonnyCalcr/scoop/apps/vcpkg/current/scripts/buildsystems/vcpkg.cmake -S . -B ./build/
 cmake --preset=default
 
 if ($LASTEXITCODE -eq 0) {