Code review fixes from birarda

cmake/macros/SetPackagingParameters.cmake

@@ -18,7 +18,7 @@ macro(SET_PACKAGING_PARAMETERS)
   set(BUILD_GLOBAL_SERVICES "DEVELOPMENT")
   set(USE_STABLE_GLOBAL_SERVICES 0)
   set(BUILD_NUMBER 0)
-  set(APP_USER_MODEL_ID "com.highfidelity.console")
+  set(APP_USER_MODEL_ID "com.highfidelity.console-dev")
 
   set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV")
   set_from_env(RELEASE_NUMBER RELEASE_NUMBER "")

cmake/templates/NSIS.template.in

@@ -412,7 +412,7 @@ Section "-Previous Install Cleanup"
   Delete "$INSTDIR\@AC_EXEC_NAME@" 
   
   ; delete interface so it's not there for server-only installs
-   Delete "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" 
+  Delete "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" 
 SectionEnd
 
 @CPACK_NSIS_INSTALLATION_TYPES@
@@ -1005,6 +1005,7 @@ Function HandlePostInstallOptions
   ${EndIf}
 
   ${If} $LaunchConsoleNowState == ${BST_CHECKED}
+  ${AndIf} @SERVER_COMPONENT_CONDITIONAL@
     !insertmacro WriteInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES
 
     ; both launches use the explorer trick in case the user has elevated permissions for the installer

server-console/CMakeLists.txt

@@ -28,7 +28,7 @@ if (BUILD_CLIENT)
 endif()
 
 if (BUILD_SERVER)
-  add_dependencies(${TARGET_NAME} assignment-client domain-server interface)
+  add_dependencies(${TARGET_NAME} assignment-client domain-server)
 endif()
 
 # set the packaged console folder depending on platform, so we can copy it
@@ -64,12 +64,6 @@ elseif (WIN32)
   install(
     DIRECTORY "${CONSOLE_DESTINATION}/"
     DESTINATION ${CONSOLE_INSTALL_DIR}
-    COMPONENT ${SERVER_COMPONENT}
-  )
-  install(
-    DIRECTORY "${CONSOLE_DESTINATION}/"
-    DESTINATION ${CONSOLE_INSTALL_DIR}
-    COMPONENT ${CLIENT_COMPONENT}
   )
 
   # sign the copied server console executable after install