diff --git a/.gitignore b/.gitignore
index 51fc8f84..3e653552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,8 @@ install_manifest.txt
compile_commands.json
CTestTestfile.cmake
+/guix_studio/build/vs_2022/.vs/studiox
+/guix_studio/build/vs_2022/Debug
+/guix_studio/build/vs_2022/Release
+/guix_studio/studiox.aps
+*.user
diff --git a/common/inc/gx_api.h b/common/inc/gx_api.h
index 828b0c58..b53eaa76 100644
--- a/common/inc/gx_api.h
+++ b/common/inc/gx_api.h
@@ -117,6 +117,9 @@
/* 03-01-2024 Ting Zhu Modified comment(s), */
/* updated patch version, */
/* resulting in version 6.4.1 */
+/* 02-19-2025 Frédéric Desbiens Modified comment(s), */
+/* update version number, */
+/* resulting in version 6.4.2 */
/* */
/**************************************************************************/
@@ -140,7 +143,7 @@ extern "C" {
#define AZURE_RTOS_GUIX
#define GUIX_MAJOR_VERSION 6
#define GUIX_MINOR_VERSION 4
-#define GUIX_PATCH_VERSION 1
+#define GUIX_PATCH_VERSION 2
/* The following symbols are defined for backward compatibility reasons.*/
#define __PRODUCT_GUIX__
diff --git a/guix_studio/StudioXProject.h b/guix_studio/StudioXProject.h
index 6440155e..44378e23 100644
--- a/guix_studio/StudioXProject.h
+++ b/guix_studio/StudioXProject.h
@@ -10,7 +10,7 @@
#define PROJECT_VERSION 56
// Sequential number of studio version
-#define STUDIOX_VERSION_NUMBER 0
+#define STUDIOX_VERSION_NUMBER 461
/* This enabled checking if the project was created by a newer version of Studio.
Turn this off for testing when the Studio version number is not accurate
diff --git a/guix_studio/build/vs_2022/guix_for_studiox.vcxproj b/guix_studio/build/vs_2022/guix_for_studiox.vcxproj
new file mode 100644
index 00000000..d043acf3
--- /dev/null
+++ b/guix_studio/build/vs_2022/guix_for_studiox.vcxproj
@@ -0,0 +1,1023 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _gx_system_focus_claim=gx_system_focus_claim_standard;GX_FONT_KERNING_SUPPORT;WIN32;NDEBUG;_LIB;GX_DISABLE_ERROR_CHECKING;GX_DISABLE_THREADX_BINDING;GX_DYNAMIC_BIDI_TEXT_SUPPORT;GUIX_STUDIO;%(PreprocessorDefinitions)
+ _gx_system_focus_claim=gx_system_focus_claim_standard;WIN32;_DEBUG;_LIB;GUIX_STUDIO;GX_DISABLE_ERROR_CHECKING;_CRT_SECURE_NO_WARNINGS;GX_DISABLE_THREADX_BINDING;GX_DYNAMIC_BIDI_TEXT_SUPPORT;%(PreprocessorDefinitions)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {552478F2-F265-4837-88A2-493C6870D1FD}
+ guix_for_studiox
+ Win32Proj
+ 10.0
+
+
+
+ StaticLibrary
+ MultiByte
+ true
+ v143
+
+
+ StaticLibrary
+ MultiByte
+ Dynamic
+ v143
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(ProjectDir)$(Configuration)\
+ $(Configuration)\
+ $(ProjectDir)$(Configuration)\
+ $(Configuration)\
+
+
+
+ Disabled
+ $(ProjectDir)..\..\;$(ProjectDir)..\..\..\common\inc;$(ProjectDir)..\..\ports;$(ProjectDir)..\..\..\ports\win32\inc;$(ProjectDir)..\..\..\ports\win32\lib\vs_2019;$(ProjectDir)..\..\..\ports\win32\src\renesas;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_LIB;GUIX_STUDIO;GX_DISABLE_ERROR_CHECKING;_CRT_SECURE_NO_WARNINGS;GX_DISABLE_THREADX_BINDING;GX_DYNAMIC_BIDI_TEXT_SUPPORT;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+ false
+ false
+ true
+ true
+
+
+
+
+ GX_FONT_KERNING_SUPPORT;WIN32;NDEBUG;_LIB;GX_DISABLE_ERROR_CHECKING;GX_DISABLE_THREADX_BINDING;GX_DYNAMIC_BIDI_TEXT_SUPPORT;GUIX_STUDIO;%(PreprocessorDefinitions)
+ MultiThreadedDLL
+ NotUsing
+ Level3
+ ProgramDatabase
+ true
+ false
+ $(ProjectDir)..\..\;$(ProjectDir)..\..\..\common\inc;$(ProjectDir)..\..\ports;$(ProjectDir)..\..\..\ports\win32\inc;$(ProjectDir)..\..\..\ports\win32\src\renesas;$(ProjectDir)..\..\..\ports\win32\lib\vs_2019;%(AdditionalIncludeDirectories)
+ Sync
+ false
+ Default
+ false
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/App_tile_icon.png b/guix_studio/build/vs_2022/msix_package_project/Images/App_tile_icon.png
new file mode 100644
index 00000000..b9c6d301
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/App_tile_icon.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-100.png b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-100.png
new file mode 100644
index 00000000..a7725124
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-100.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-125.png b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-125.png
new file mode 100644
index 00000000..49a77a05
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-125.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-150.png b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-150.png
new file mode 100644
index 00000000..3547b478
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-150.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-200.png
new file mode 100644
index 00000000..2b7fc84d
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-400.png b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-400.png
new file mode 100644
index 00000000..e4c85d7c
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/BadgeLogo.scale-400.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/GUIX-icon-8-20-2020.png b/guix_studio/build/vs_2022/msix_package_project/Images/GUIX-icon-8-20-2020.png
new file mode 100644
index 00000000..5997bfd6
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/GUIX-icon-8-20-2020.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-100.png b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-100.png
new file mode 100644
index 00000000..8574d267
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-100.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-125.png b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-125.png
new file mode 100644
index 00000000..88493f81
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-125.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-150.png b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-150.png
new file mode 100644
index 00000000..7461d2a1
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-150.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-200.png
new file mode 100644
index 00000000..61d1e554
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-400.png b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-400.png
new file mode 100644
index 00000000..7d7e4ca3
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/LargeTile.scale-400.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/LockScreenLogo.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/LockScreenLogo.scale-200.png
new file mode 100644
index 00000000..2402ed34
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/LockScreenLogo.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-100.png b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-100.png
new file mode 100644
index 00000000..7d9d0f5e
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-100.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-125.png b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-125.png
new file mode 100644
index 00000000..be3a341a
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-125.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-150.png b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-150.png
new file mode 100644
index 00000000..ba1b525e
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-150.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-200.png
new file mode 100644
index 00000000..8b16f9d6
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-400.png b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-400.png
new file mode 100644
index 00000000..342161f3
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SmallTile.scale-400.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-100.png b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-100.png
new file mode 100644
index 00000000..30f09639
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-100.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-125.png b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-125.png
new file mode 100644
index 00000000..e2d3d7d8
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-125.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-150.png b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-150.png
new file mode 100644
index 00000000..9332b477
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-150.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-200.png
new file mode 100644
index 00000000..b4b1e3fc
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-400.png b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-400.png
new file mode 100644
index 00000000..8396c24f
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/SplashScreen.scale-400.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-100.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-100.png
new file mode 100644
index 00000000..f0681333
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-100.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-125.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-125.png
new file mode 100644
index 00000000..439a2407
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-125.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-150.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-150.png
new file mode 100644
index 00000000..899f97d7
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-150.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-200.png
new file mode 100644
index 00000000..aaf53ada
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-400.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-400.png
new file mode 100644
index 00000000..83053d7a
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square150x150Logo.scale-400.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png
new file mode 100644
index 00000000..f63a7d73
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png
new file mode 100644
index 00000000..09c21c69
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png
new file mode 100644
index 00000000..dd98e3a0
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png
new file mode 100644
index 00000000..f54bba64
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png
new file mode 100644
index 00000000..5fb075de
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-16.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-16.png
new file mode 100644
index 00000000..f63a7d73
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-16.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-256.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-256.png
new file mode 100644
index 00000000..dd98e3a0
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-256.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-32.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-32.png
new file mode 100644
index 00000000..f54bba64
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-32.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-48.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-48.png
new file mode 100644
index 00000000..5fb075de
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.altform-unplated_targetsize-48.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-100.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-100.png
new file mode 100644
index 00000000..f387308f
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-100.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-125.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-125.png
new file mode 100644
index 00000000..507ac71f
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-125.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-150.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-150.png
new file mode 100644
index 00000000..9f5d1032
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-150.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-200.png
new file mode 100644
index 00000000..8d007f9c
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-400.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-400.png
new file mode 100644
index 00000000..ddd55c3d
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.scale-400.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-16.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-16.png
new file mode 100644
index 00000000..f63a7d73
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-16.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-24.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-24.png
new file mode 100644
index 00000000..09c21c69
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-24.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 00000000..09c21c69
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-256.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-256.png
new file mode 100644
index 00000000..dd98e3a0
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-256.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-32.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-32.png
new file mode 100644
index 00000000..f54bba64
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-32.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-48.png b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-48.png
new file mode 100644
index 00000000..5fb075de
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Square44x44Logo.targetsize-48.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.backup.png b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.backup.png
new file mode 100644
index 00000000..dac787fd
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.backup.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-100.png b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-100.png
new file mode 100644
index 00000000..a011b0a5
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-100.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-125.png b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-125.png
new file mode 100644
index 00000000..35d12490
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-125.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-150.png b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-150.png
new file mode 100644
index 00000000..64e8662c
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-150.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-200.png
new file mode 100644
index 00000000..c03f84da
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-400.png b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-400.png
new file mode 100644
index 00000000..5e13fb54
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/StoreLogo.scale-400.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-100.png b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-100.png
new file mode 100644
index 00000000..9528d13d
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-100.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-125.png b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-125.png
new file mode 100644
index 00000000..b7fb0880
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-125.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-150.png b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-150.png
new file mode 100644
index 00000000..4d8f32f0
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-150.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-200.png b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000..a91bdbc3
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-200.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-400.png b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-400.png
new file mode 100644
index 00000000..d69e1d59
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/Wide310x150Logo.scale-400.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/box_store_logo.png b/guix_studio/build/vs_2022/msix_package_project/Images/box_store_logo.png
new file mode 100644
index 00000000..43e437cb
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/box_store_logo.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/demo_guix_smart_watch.png b/guix_studio/build/vs_2022/msix_package_project/Images/demo_guix_smart_watch.png
new file mode 100644
index 00000000..c8dd9182
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/demo_guix_smart_watch.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/demo_guix_white_goods.png b/guix_studio/build/vs_2022/msix_package_project/Images/demo_guix_white_goods.png
new file mode 100644
index 00000000..83a2b496
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/demo_guix_white_goods.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Images/guix_home_automation.png b/guix_studio/build/vs_2022/msix_package_project/Images/guix_home_automation.png
new file mode 100644
index 00000000..04eb679f
Binary files /dev/null and b/guix_studio/build/vs_2022/msix_package_project/Images/guix_home_automation.png differ
diff --git a/guix_studio/build/vs_2022/msix_package_project/Package.appxmanifest b/guix_studio/build/vs_2022/msix_package_project/Package.appxmanifest
new file mode 100644
index 00000000..7f8779f0
--- /dev/null
+++ b/guix_studio/build/vs_2022/msix_package_project/Package.appxmanifest
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+ Eclipse ThreadX GUIX Studio
+ Eclipse Foundation
+ Images\StoreLogo.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .gxp
+
+ GUIX Studio Project
+ Images\GUIX-icon-8-20-2020.png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/guix_studio/build/vs_2022/msix_package_project/Readme.txt b/guix_studio/build/vs_2022/msix_package_project/Readme.txt
new file mode 100644
index 00000000..4c635226
--- /dev/null
+++ b/guix_studio/build/vs_2022/msix_package_project/Readme.txt
@@ -0,0 +1,7 @@
+The app packaging project can be used to generate the required app package upload file (.msixupload or .appxupload) for Windows Store Submission.
+
+To generate the GUIX Studio package upload file, run "build_guix_studio_msix_package.cmd" from "scripts" folder.
+
+Additional Resources:
+For more in-depth information on packaging UWP apps for Windows Store Submission, refer to Microsoft's official documentation at:
+https://learn.microsoft.com/en-us/windows/msix/package/packaging-uwp-apps
\ No newline at end of file
diff --git a/guix_studio/build/vs_2022/msix_package_project/msix_package_project.sln b/guix_studio/build/vs_2022/msix_package_project/msix_package_project.sln
new file mode 100644
index 00000000..f18ec605
--- /dev/null
+++ b/guix_studio/build/vs_2022/msix_package_project/msix_package_project.sln
@@ -0,0 +1,87 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29009.5
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guix_for_studiox", "..\guix_for_studiox.vcxproj", "{552478F2-F265-4837-88A2-493C6870D1FD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guix_studio", "..\studiox.vcxproj", "{F9B98616-F72A-49BB-AB6A-315CD8350F9A}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "msix_package_project", "msix_package_project.wapproj", "{9614E8C3-24F4-4934-92E8-DB9D550558E5}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|ARM.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|x64.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|x86.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|x86.Build.0 = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|Any CPU.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|ARM.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|ARM64.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|x64.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|x86.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|x86.Build.0 = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|ARM.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|x64.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|x86.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|x86.Build.0 = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|ARM.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|ARM64.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|x64.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|x86.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|x86.Build.0 = Release|Win32
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|ARM.ActiveCfg = Debug|ARM
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|ARM.Build.0 = Debug|ARM
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|ARM.Deploy.0 = Debug|ARM
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|ARM64.Build.0 = Debug|ARM64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|ARM64.Deploy.0 = Debug|ARM64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|x64.ActiveCfg = Debug|x64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|x64.Build.0 = Debug|x64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|x64.Deploy.0 = Debug|x64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|x86.ActiveCfg = Debug|x86
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|x86.Build.0 = Debug|x86
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Debug|x86.Deploy.0 = Debug|x86
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|ARM.ActiveCfg = Release|ARM
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|ARM.Build.0 = Release|ARM
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|ARM.Deploy.0 = Release|ARM
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|ARM64.ActiveCfg = Release|ARM64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|ARM64.Build.0 = Release|ARM64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|ARM64.Deploy.0 = Release|ARM64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|x64.ActiveCfg = Release|x64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|x64.Build.0 = Release|x64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|x64.Deploy.0 = Release|x64
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|x86.ActiveCfg = Release|x86
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|x86.Build.0 = Release|x86
+ {9614E8C3-24F4-4934-92E8-DB9D550558E5}.Release|x86.Deploy.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {AAA1C7E3-DB0B-44B9-847F-A4EFCC2ADE2E}
+ EndGlobalSection
+EndGlobal
diff --git a/guix_studio/build/vs_2022/msix_package_project/msix_package_project.wapproj b/guix_studio/build/vs_2022/msix_package_project/msix_package_project.wapproj
new file mode 100644
index 00000000..b2fa1a9f
--- /dev/null
+++ b/guix_studio/build/vs_2022/msix_package_project/msix_package_project.wapproj
@@ -0,0 +1,168 @@
+
+
+
+ 15.0
+
+
+
+ Debug
+ x86
+
+
+ Release
+ x86
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+ Debug
+ ARM
+
+
+ Release
+ ARM
+
+
+ Debug
+ ARM64
+
+
+ Release
+ ARM64
+
+
+ Debug
+ AnyCPU
+
+
+ Release
+ AnyCPU
+
+
+
+ $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\
+
+
+
+ 9614e8c3-24f4-4934-92e8-db9d550558e5
+ 10.0.18362.0
+ 10.0.14393.0
+ en-US
+ False
+ ..\studiox.vcxproj
+ False
+ SHA256
+ False
+ True
+ x86
+ https://aka.ms/azrtos-guix-installer
+ 0
+ 98CF25D012D60A8674781D3A4CFF9DE409ACCF63
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+ Always
+
+
+
+ Designer
+
+
+
+
+ Always
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/guix_studio/build/vs_2022/studiox.sln b/guix_studio/build/vs_2022/studiox.sln
new file mode 100644
index 00000000..84ef4052
--- /dev/null
+++ b/guix_studio/build/vs_2022/studiox.sln
@@ -0,0 +1,63 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29009.5
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guix_studio", "studiox.vcxproj", "{F9B98616-F72A-49BB-AB6A-315CD8350F9A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {552478F2-F265-4837-88A2-493C6870D1FD} = {552478F2-F265-4837-88A2-493C6870D1FD}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "guix_for_studiox", "guix_for_studiox.vcxproj", "{552478F2-F265-4837-88A2-493C6870D1FD}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|Any CPU.Build.0 = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|ARM.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|x64.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|x86.ActiveCfg = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Debug|x86.Build.0 = Debug|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|Any CPU.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|Any CPU.Build.0 = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|ARM.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|ARM64.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|x64.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|x64.Build.0 = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|x86.ActiveCfg = Release|Win32
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}.Release|x86.Build.0 = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|Any CPU.Build.0 = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|ARM.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|ARM64.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|x64.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|x86.ActiveCfg = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Debug|x86.Build.0 = Debug|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|Any CPU.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|Any CPU.Build.0 = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|ARM.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|ARM64.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|x64.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|x86.ActiveCfg = Release|Win32
+ {552478F2-F265-4837-88A2-493C6870D1FD}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {AAA1C7E3-DB0B-44B9-847F-A4EFCC2ADE2E}
+ EndGlobalSection
+EndGlobal
diff --git a/guix_studio/build/vs_2022/studiox.vcxproj b/guix_studio/build/vs_2022/studiox.vcxproj
new file mode 100644
index 00000000..5a352893
--- /dev/null
+++ b/guix_studio/build/vs_2022/studiox.vcxproj
@@ -0,0 +1,523 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {F9B98616-F72A-49BB-AB6A-315CD8350F9A}
+ studiox
+ MFCProj
+ guix_studio
+ 10.0
+
+
+
+ Application
+ Dynamic
+ Unicode
+ true
+ v143
+
+
+ Application
+ Dynamic
+ Unicode
+ v143
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.30319.1
+ $(ProjectDir)$(Configuration)\
+ $(Configuration)\
+ true
+ $(ProjectDir)$(Configuration)\
+ $(Configuration)\
+ false
+ $(ProjectName)
+ guix_studio
+
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ false
+ false
+
+
+ Disabled
+ ..\..\ports;..\..\..\common\inc\;..\..\..\ports\win32\inc;..\..\..\ports\win32\lib\vs_2019;..\..\libs\freetype\include;..\..\libs\libgit2\include;..\..\libs\libjpeg\include;..\..\libs\libpng\include;%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;_DEBUG;GUIX_STUDIO;GX_DISABLE_THREADX_BINDING;GX_DISABLE_ERROR_CHECKING;GX_DYNAMIC_BIDI_TEXT_SUPPORT;%(PreprocessorDefinitions)
+ false
+ EnableFastChecks
+ MultiThreadedDebugDLL
+
+
+ Level3
+ EditAndContinue
+ 4996;%(DisableSpecificWarnings)
+ false
+ Sync
+ false
+ true
+ true
+
+
+ _DEBUG;%(PreprocessorDefinitions)
+ 0x0409
+ $(IntDir);%(AdditionalIncludeDirectories)
+
+
+ guix_for_studiox.lib;freetype_2_12_1.lib;libpng.lib;libjpeg-turbo.lib;zlib.lib;git2.lib;winhttp.lib;rpcrt4.lib;crypt32.lib;uiautomationcore.lib;%(AdditionalDependencies)
+ $(OutDir);..\..\libs\freetype;..\..\libs\libgit2;..\..\libs\libjpeg;..\..\libs\libpng;%(AdditionalLibraryDirectories)
+ true
+ Windows
+ MachineX86
+ LIBCMTD.lib
+
+
+
+
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ false
+ false
+
+
+ WIN32;_WINDOWS;NDEBUG;GX_DISABLE_THREADX_BINDING;GX_DISABLE_ERROR_CHECKING;GX_DYNAMIC_BIDI_TEXT_SUPPORT;GUIX_STUDIO;%(PreprocessorDefinitions)
+ false
+ MultiThreadedDLL
+ NotUsing
+ Level3
+ ProgramDatabase
+ true
+ ..\..\ports;..\..\..\common\inc\;..\..\..\ports\win32\inc;..\..\..\ports\win32\lib\vs_2019;..\..\libs\freetype\include;..\..\libs\libgit2\include;..\..\libs\libjpeg\include;..\..\libs\libpng\include;%(AdditionalIncludeDirectories)
+ Sync
+ false
+ Default
+ false
+ false
+ false
+ Guard
+
+
+ NDEBUG;%(PreprocessorDefinitions)
+ 0x0409
+ $(IntDir);%(AdditionalIncludeDirectories)
+
+
+ true
+ Windows
+ true
+ true
+ MachineX86
+ $(OutDir);..\..\libs\freetype;..\..\libs\libgit2;..\..\libs\libjpeg;..\..\libs\libpng;%(AdditionalLibraryDirectories)
+ guix_for_studiox.lib;freetype_2_12_1.lib;libpng.lib;libjpeg-turbo.lib;zlib.lib;git2.lib;winhttp.lib;rpcrt4.lib;crypt32.lib;uiautomationcore.lib;%(AdditionalDependencies)
+ LIBCMTD,LIBCMT
+ $(OutDir)guix_studio$(TargetExt)
+
+
+ $(IntDir)$(TargetName)$(TargetExt).embed.manifest
+ PerMonitorHighDPIAware
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/guix_studio/build/vs_2022/studiox.vcxproj.filters b/guix_studio/build/vs_2022/studiox.vcxproj.filters
new file mode 100644
index 00000000..1fa49f56
--- /dev/null
+++ b/guix_studio/build/vs_2022/studiox.vcxproj.filters
@@ -0,0 +1,1120 @@
+
+
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+ include
+
+
+
+
+
+
+
+ {ccbd3cbc-bd19-4ac8-bfeb-593be0e7880a}
+
+
+ {1e265996-d98f-45b8-baf3-9275fbece703}
+
+
+ {8ae208ea-03ae-4a7e-8245-08ff29afc79b}
+
+
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+ source
+
+
+
+
+ resources
+
+
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+ resources
+
+
+
\ No newline at end of file
diff --git a/guix_studio/installer/guix_installer_release.iss b/guix_studio/installer/guix_installer_release.iss
index 2bd5acab..d8b97d12 100644
--- a/guix_studio/installer/guix_installer_release.iss
+++ b/guix_studio/installer/guix_installer_release.iss
@@ -5,9 +5,9 @@
; NOTE: The value of AppId uniquely identifies this application.
; Do not use the same AppId value in installers for other applications.
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{1D4932BC-ACD4-4292-9530-92C8BE2E58CF}
+AppId={{E6E44DDC-2F42-4BF5-A4B2-C1577FA16933}
AppName=GUIX Studio
-AppVersion=6.4.1.0
+AppVersion=6.4.2.461
AppPublisher=Eclipse Foundation
AppPublisherURL=https://threadx.io/
AppSupportURL=https://threadx.io/
@@ -16,7 +16,7 @@ DefaultDirName={sd}\Eclipse_ThreadX\GUIX_Studio_6.4
DefaultGroupName=Eclipse_ThreadX
CloseApplications=no
;LicenseFile=
-OutputBaseFilename=guix_studio_setup_version_6.4.1.0
+OutputBaseFilename=guix_studio_setup_version_6.4.2.0
SetupIconFile=graphics\guix_1616icon.ico
Compression=lzma
SolidCompression=yes
@@ -41,7 +41,7 @@ Name: "associate"; Description: "{cm:AskAssociate}"; GroupDescription: "Other ta
[Files]
Source: "installer\vc_redist.x86.exe"; DestDir: "{tmp}"; Flags: nocompression createallsubdirs recursesubdirs deleteafterinstall
-Source: "build\vs_2019\Release\guix_studio.exe"; DestDir: "{app}\studio"; DestName: "GUIX_Studio.exe"; Flags: ignoreversion
+Source: "build\vs_2022\Release\guix_studio.exe"; DestDir: "{app}\studio"; DestName: "GUIX_Studio.exe"; Flags: ignoreversion
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
@@ -50,7 +50,7 @@ Name: "{group}\GUIX Studio 6.4\GUIX Studio"; Filename: "{app}\studio\GUIX_Studio
Name: "{group}\GUIX Studio 6.4\GUIX Studio User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs/blob/main/rtos-docs/guix/about-guix-studio.md"
Name: "{group}\GUIX Studio 6.4\GUIX User's Guide"; Filename: "https://github.com/eclipse-threadx/rtos-docs/blob/main/rtos-docs/guix/about-guix-studio.md"
Name: "{group}\GUIX Studio 6.4\{cm:UninstallProgram,GUIX Studio}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\GUIX Studio 6.4.1.0"; Filename: "{app}\studio\GUIX_Studio.exe"; Tasks: desktopicon
+Name: "{commondesktop}\GUIX Studio 6.4.2.0"; Filename: "{app}\studio\GUIX_Studio.exe"; Tasks: desktopicon
[Registry]
Root: HKCR; Subkey: ".gxp"; ValueType: string; ValueName: ""; ValueData: "GUIX_Studio_Project"; Flags: uninsdeletevalue; Tasks: associate
@@ -61,5 +61,5 @@ Root: HKCR; Subkey: "GUIX_Studio_Project\shell\open\command"; ValueType: string;
Root: HKLM; Subkey: "Software\Eclipse Foundation\GUIX\InstallDir"; ValueType: string; ValueName: ""; ValueData: "{app}";
[Run]
-Filename: "{tmp}\vc_redist.x86.exe"; StatusMsg: "Installing Visual C++ 2015-2019 Redistributable(x86)"; Parameters:"/passive"
+Filename: "{tmp}\vc_redist.x86.exe"; StatusMsg: "Installing Visual C++ 2022 Redistributable(x86)"; Parameters:"/passive"
diff --git a/guix_studio/studiox.rc b/guix_studio/studiox.rc
index c581ddb2..c66d7bdb 100644
--- a/guix_studio/studiox.rc
+++ b/guix_studio/studiox.rc
@@ -13,7 +13,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Chinese (Simplified, PRC) resources
+// Chinese (Simplified, China) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
@@ -245,7 +245,7 @@ BEGIN
ID_INSERT_LINECHART "Insert Line Chart window"
END
-#endif // Chinese (Simplified, PRC) resources
+#endif // Chinese (Simplified, China) resources
/////////////////////////////////////////////////////////////////////////////
@@ -1756,8 +1756,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 6,4,2,461
+ PRODUCTVERSION 6,4,2,461
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -1772,14 +1772,14 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "Microsoft"
+ VALUE "CompanyName", "Eclipse Foundation"
VALUE "FileDescription", "GUIX Studio Application"
- VALUE "FileVersion", "5.2"
+ VALUE "FileVersion", "6.4.2.461"
VALUE "InternalName", "studiox.exe"
- VALUE "LegalCopyright", "(c) Microsoft Corporation. All rights reserved."
+ VALUE "LegalCopyright", "(c) Eclipse ThreadX contributors"
VALUE "OriginalFilename", "studiox.exe"
- VALUE "ProductName", "Azure RTOS GUIX Studio"
- VALUE "ProductVersion", "6.0.0.0"
+ VALUE "ProductName", "Eclipse ThreadX GUIX Studio"
+ VALUE "ProductVersion", "6.4.2.461"
END
END
BLOCK "VarFileInfo"
diff --git a/scripts/build_guix_studio.cmd b/scripts/build_guix_studio.cmd
index 41725e59..67ca79bb 100644
--- a/scripts/build_guix_studio.cmd
+++ b/scripts/build_guix_studio.cmd
@@ -1,9 +1,11 @@
+@echo off
+
rem Initialize the developer environment just like a developer box. Note that 'call' keyword that ensures that the script does not exist after
rem calling the other batch file.
-call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.16299.0
+call "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.22621.0
-rem Set Python path
-SET PATH=%PATH%;"C:\Program Files\Python36";"C:\Program Files\Python36\scripts"
+rem Set Python path. Not needed if installed with WinGet.
+rem SET PATH=%PATH%;"C:\Program Files\Python36";"C:\Program Files\Python36\scripts"
rem Save working directory so that we can restore it back after building everything. This will make developers happy and then
rem switch to the folder this script resides in. Don't assume absolute paths because on the build host and on the dev host the locations may be different.
diff --git a/scripts/download_vc_redist.ps1 b/scripts/download_vc_redist.ps1
index a9c7fed4..da29e7f7 100644
--- a/scripts/download_vc_redist.ps1
+++ b/scripts/download_vc_redist.ps1
@@ -1,3 +1,3 @@
cd ../guix_studio/installer
-Invoke-WebRequest https://aka.ms/vs/16/release/vc_redist.x86.exe -O vc_redist.x86.exe
+Invoke-WebRequest https://aka.ms/vs/17/release/vc_redist.x86.exe -O vc_redist.x86.exe
dir
\ No newline at end of file
diff --git a/test/guix_studio_test/test_demo/test_main.py b/test/guix_studio_test/test_demo/test_main.py
index 35fd35cf..236e8dd5 100644
--- a/test/guix_studio_test/test_demo/test_main.py
+++ b/test/guix_studio_test/test_demo/test_main.py
@@ -630,9 +630,9 @@ def __main__():
#Change the current working directory to the path of this file.
current_path = os.path.split(os.path.realpath(__file__))[0]
os.chdir(current_path)
- studio_sln_path = "../../../guix_studio/build/vs_2019/studiox.sln"
- studio_exe_path = "../../../guix_studio/build/vs_2019/Release/guix_studio.exe"
- guix_project_path = "../../../ports/win32/build/vs_2019/guix.vcxproj"
+ studio_sln_path = "../../../guix_studio/build/vs_2022/studiox.sln"
+ studio_exe_path = "../../../guix_studio/build/vs_2022/Release/guix_studio.exe"
+ guix_project_path = "../../../ports/win32/build/vs_2022/guix.vcxproj"
gxp_projects = []