From 21980a00be62229424d6fe898f4dce58ae910e1e Mon Sep 17 00:00:00 2001
From: grasci <86058054+grasci-arm@users.noreply.github.com>
Date: Thu, 18 Jul 2024 08:37:06 +0100
Subject: [PATCH] [projmgr, buildmgr] Shift toolchain registration enforcement
 from project to build management

---
 .github/workflows/buildmgr.yml                |  4 +++
 tools/buildmgr/cbuild/src/CbuildModel.cpp     |  7 ++--
 tools/buildmgr/cbuild/src/CbuildMsgs.cpp      |  1 +
 .../cbuildgen/config/AC6.6.16.2.cmake         | 15 ++-------
 .../cbuildgen/config/CLANG.17.0.1.cmake       | 15 ++-------
 .../cbuildgen/config/GCC.10.3.1.cmake         | 15 ++-------
 .../cbuildgen/config/IAR.9.32.1.cmake         | 15 ++-------
 .../Examples/AC6/ArmAsm/CMakeLists.txt.ref    |  2 ++
 .../Examples/AC6/Asm/CMakeLists.txt.ref       |  2 ++
 .../AC6/BranchProtection/CMakeLists.txt.ref   |  2 ++
 .../Examples/AC6/Build_AC6/CMakeLists.txt.ref |  2 ++
 .../AC6/Build_AC6PP/CMakeLists.txt.ref        |  2 ++
 .../Examples/AC6/Flags/CMakeLists.txt.ref     |  2 ++
 .../Examples/AC6/Library/CMakeLists.txt.ref   |  2 ++
 .../Examples/AC6/Minimal/CMakeLists.txt.ref   |  2 ++
 .../AC6/NestedGroups/CMakeLists.txt.ref       |  2 ++
 .../AC6/RelativePath/CMakeLists.txt.ref       |  2 ++
 .../AC6/TrustZone/CM33_ns/CMakeLists.txt.ref  |  2 ++
 .../AC6/TrustZone/CM33_s/CMakeLists.txt.ref   |  2 ++
 .../AC6/Whitespace/CMakeLists.txt.ref         |  2 ++
 .../GCC/AccessSequence/CMakeLists.txt.ref     |  2 ++
 .../Examples/GCC/Asm/CMakeLists.txt.ref       |  2 ++
 .../GCC/BranchProtection/CMakeLists.txt.ref   |  2 ++
 .../Examples/GCC/Build_GCC/CMakeLists.txt.ref |  2 ++
 .../Examples/GCC/Build_GPP/CMakeLists.txt.ref |  2 ++
 .../GCC/DupFilename/CMakeLists.txt.ref        |  2 ++
 .../Examples/GCC/FlagOrder/CMakeLists.txt.ref |  2 ++
 .../Examples/GCC/Flags/CMakeLists.txt.ref     |  2 ++
 .../Examples/GCC/Library/CMakeLists.txt.ref   |  2 ++
 .../GCC/LibraryCustom/CMakeLists.txt.ref      |  2 ++
 .../LinkerPreProcessing/CMakeLists.txt.ref    |  2 ++
 .../CMakeLists.txt.ref                        |  2 ++
 .../CMakeLists.txt.ref                        |  2 ++
 .../Examples/GCC/Minimal/CMakeLists.txt.ref   |  2 ++
 .../GCC/NestedGroups/CMakeLists.txt.ref       |  2 ++
 .../GCC/Pre Include/CMakeLists.txt.ref        |  2 ++
 .../GCC/RelativePath/CMakeLists.txt.ref       |  2 ++
 .../GCC/StandardLibrary/CMakeLists.txt.ref    |  2 ++
 .../Project1/CMakeLists.txt.ref               |  2 ++
 .../Project2/CMakeLists.txt.ref               |  2 ++
 .../Project3/CMakeLists.txt.ref               |  2 ++
 .../GCC/TrustZone/CM33_ns/CMakeLists.txt.ref  |  2 ++
 .../GCC/TrustZone/CM33_s/CMakeLists.txt.ref   |  2 ++
 .../GCC/Whitespace/CMakeLists.txt.ref         |  2 ++
 .../Mixed/Build_AC6_GCC/CMakeLists.txt.ref    |  2 ++
 .../Mixed/GpdscBundle/CMakeLists.txt.ref      |  2 ++
 .../GpdscWithoutComponents/CMakeLists.txt.ref |  2 ++
 .../Mixed/Pre Include/CMakeLists.txt.ref      |  2 ++
 .../test/unittests/src/CbuildModelTests.cpp   | 32 +++----------------
 tools/projmgr/src/ProjMgrGenerator.cpp        |  2 +-
 tools/projmgr/src/ProjMgrWorker.cpp           | 20 ++++++------
 tools/projmgr/src/ProjMgrYamlEmitter.cpp      |  3 +-
 .../core0.Debug+MultiCore.cbuild-gen.yml      |  2 +-
 .../core1.Debug+MultiCore.cbuild-gen.yml      |  2 +-
 .../single-core.Debug+Board.cbuild.yml        |  2 +-
 .../single-core.Debug+CM0.cbuild-gen.yml      |  2 +-
 .../single-core.Debug+CM0.cbuild.yml          |  2 +-
 .../ref/TrustZone/ns.Debug+CM0.cbuild-gen.yml |  2 +-
 .../ref/TrustZone/s.Debug+CM0.cbuild-gen.yml  |  2 +-
 .../project.Debug+TEST_TARGET.cbuild.yml      |  2 +-
 .../project.Release+TEST_TARGET.cbuild.yml    |  2 +-
 .../multiple-components.Debug+CM0.cbuild.yml  |  2 +-
 .../ref/test-gpdsc-layer.Debug+CM0.cbuild.yml |  2 +-
 ...c-multiple-generators.Debug+CM0.cbuild.yml |  2 +-
 ...t-gpdsc-project-files.Debug+CM0.cbuild.yml |  2 +-
 .../ref/test-gpdsc.Debug+CM0.cbuild.yml       |  2 +-
 .../project1.Debug+RteTest_ARMCM3.cbuild.yml  |  2 +-
 ...project1.Release+RteTest_ARMCM3.cbuild.yml |  2 +-
 .../project2.Debug+RteTest_ARMCM3.cbuild.yml  |  2 +-
 ...project2.Release+RteTest_ARMCM3.cbuild.yml |  2 +-
 ...ch-protection.Debug+bti-signret.cbuild.yml |  2 +-
 .../branch-protection.Debug+bti.cbuild.yml    |  2 +-
 .../branch-protection.Debug+no-bp.cbuild.yml  |  2 +-
 .../ref/dsp.Debug+dsp.cbuild.yml              |  2 +-
 .../ref/dsp.Debug+no-dsp.cbuild.yml           |  2 +-
 .../ref/endian.Debug+big.cbuild.yml           |  2 +-
 .../ref/endian.Debug+little.cbuild.yml        |  2 +-
 .../ref/fpu.Debug+fpu-dp.cbuild.yml           |  2 +-
 .../ref/fpu.Debug+fpu-sp.cbuild.yml           |  2 +-
 .../ref/fpu.Debug+no-fpu.cbuild.yml           |  2 +-
 .../ref/mve.Debug+mve-fp.cbuild.yml           |  2 +-
 .../ref/mve.Debug+mve-int.cbuild.yml          |  2 +-
 .../ref/mve.Debug+no-mve.cbuild.yml           |  2 +-
 .../ref/trustzone.Debug+non-secure.cbuild.yml |  2 +-
 .../ref/trustzone.Debug+secure.cbuild.yml     |  2 +-
 .../trustzone.Debug+tz-disabled.cbuild.yml    |  2 +-
 .../ref/trustzone.Fail+secure.cbuild.yml      |  2 +-
 .../instances.Debug+RteTest_ARMCM3.cbuild.yml |  2 +-
 ...-scope.Debug_AC6+RteTest_ARMCM3.cbuild.yml |  2 +-
 .../linker.AutoGen+RteTest_ARMCM3.cbuild.yml  |  2 +-
 .../linker.AutoGen+RteTest_Board.cbuild.yml   |  2 +-
 ...linker.Debug_AC6+RteTest_ARMCM3.cbuild.yml |  2 +-
 ...linker.Debug_GCC+RteTest_ARMCM3.cbuild.yml |  2 +-
 ...er.FromComponent+RteTest_ARMCM3.cbuild.yml |  2 +-
 ....PriorityDefines+RteTest_ARMCM3.cbuild.yml |  2 +-
 ....PriorityRegions+RteTest_ARMCM3.cbuild.yml |  2 +-
 .../metadata.Debug+RteTest_ARMCM3.cbuild.yml  |  2 +-
 .../library.Debug+RteTest_ARMCM3.cbuild.yml   |  2 +-
 ...mplate_api.Debug+RteTest_ARMCM3.cbuild.yml |  2 +-
 .../ref/project.Debug+CM0.cbuild.yml          |  2 +-
 ...st_board_and_device+TEST_TARGET.cbuild.yml |  2 +-
 .../TestProject3_1.Debug+TypeA.cbuild-gen.yml |  2 +-
 .../ref/TestProject3_1.Debug+TypeA.cbuild.yml |  2 +-
 .../ref/cbuild/test1.Debug+CM0.cbuild.yml     |  2 +-
 .../ref/cbuild/test1.Release+CM0.cbuild.yml   |  2 +-
 .../ref/cbuild/test2.Debug+CM0.cbuild.yml     |  2 +-
 .../ref/cbuild/test2.Debug+CM3.cbuild.yml     |  2 +-
 .../ref/outputFiles.Debug+Target.cbuild.yml   |  2 +-
 .../ref/outputFiles.Library+Target.cbuild.yml |  2 +-
 .../ref/pre-include+CM0.cbuild.yml            |  2 +-
 .../ref/rtedir.Debug+CM0.cbuild.yml           |  2 +-
 .../ref/rtedir.Release+CM0.cbuild.yml         |  2 +-
 .../toolchain.Debug+Target.cprj.ac6_6_16_1    |  2 +-
 .../toolchain.Debug+Target.cprj.ac6_6_20_0    |  2 +-
 .../toolchain.Debug+Target.cprj.iar           |  2 +-
 tools/projmgr/test/src/ProjMgrUnitTests.cpp   | 11 +++++--
 116 files changed, 187 insertions(+), 161 deletions(-)

diff --git a/.github/workflows/buildmgr.yml b/.github/workflows/buildmgr.yml
index 5ecf7f147..d05e66026 100644
--- a/.github/workflows/buildmgr.yml
+++ b/.github/workflows/buildmgr.yml
@@ -308,6 +308,8 @@ jobs:
       CI_CBUILD_INSTALLER: ${{ github.workspace }}/cbuild_install.sh
       CMSIS_PACK_ROOT: ${{ github.workspace }}/packs
       GCC_TOOLCHAIN_ROOT: ${{ github.workspace }}/${{ matrix.toolchain_root }}
+      GCC_TOOLCHAIN_10_3_1: ${{ github.workspace }}/${{ matrix.toolchain_root }}
+      AC6_TOOLCHAIN_6_18_0: ${{ github.workspace }}/${{ matrix.toolchain_root }}
       CI_ARCH: ${{ matrix.arch }}
     strategy:
       #fail-fast: true
@@ -460,6 +462,8 @@ jobs:
         lcov_installer: lcov-1.15.tar.gz
         CMSIS_PACK_ROOT: ${{ github.workspace }}/packs
         GCC_TOOLCHAIN_ROOT: ${{ github.workspace }}/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi/bin
+        GCC_TOOLCHAIN_10_3_1: ${{ github.workspace }}/${{ matrix.toolchain_root }}
+        AC6_TOOLCHAIN_6_18_0: ${{ github.workspace }}/${{ matrix.toolchain_root }}
     runs-on: ubuntu-22.04
     timeout-minutes: 15
     strategy:
diff --git a/tools/buildmgr/cbuild/src/CbuildModel.cpp b/tools/buildmgr/cbuild/src/CbuildModel.cpp
index 159727ffc..233ec5656 100644
--- a/tools/buildmgr/cbuild/src/CbuildModel.cpp
+++ b/tools/buildmgr/cbuild/src/CbuildModel.cpp
@@ -473,10 +473,9 @@ bool CbuildModel::GetCompatibleToolchain(const string& name, const string& versi
   }
 
   if (selectedVersion.empty()) {
-    // no compatible registered toolchain was found, search for a suitable config file
-    if (GetToolchainConfig(toolchainConfigFiles, name, versionRange)) {
-      return true;
-    }
+    // no compatible registered toolchain was found
+    LogMsg("M616", VAL("NAME", name));
+    return false;
   } else {
     // registered toolchain was found
     m_toolchainRegisteredVersion = selectedVersion;
diff --git a/tools/buildmgr/cbuild/src/CbuildMsgs.cpp b/tools/buildmgr/cbuild/src/CbuildMsgs.cpp
index c60c85ee2..4a398471b 100644
--- a/tools/buildmgr/cbuild/src/CbuildMsgs.cpp
+++ b/tools/buildmgr/cbuild/src/CbuildMsgs.cpp
@@ -82,6 +82,7 @@ void InitMessageTable()
   table["M613"] = MessageEntry(MsgLevel::LEVEL_ERROR,    CRLF_B,   "File '%PATH%' has unexpected format!"                                        );
   table["M614"] = MessageEntry(MsgLevel::LEVEL_ERROR,    CRLF_B,   "Missing access sequence delimiter: '%ACCSEQDELIM%'!"                         );
   table["M615"] = MessageEntry(MsgLevel::LEVEL_ERROR,    CRLF_B,   "%PROP% '%VAL%' was not found in the loaded packs!"                           );
+  table["M616"] = MessageEntry(MsgLevel::LEVEL_ERROR,    CRLF_B,   "compiler registration environment variable missing, format: %NAME%_TOOLCHAIN_<major>_<minor>_<patch>");
 
   table["M630"] = MessageEntry(MsgLevel::LEVEL_WARNING,  CRLF_B,   "Device '%DEV%' is substituted with variant '%VAR%'."                         );
   table["M631"] = MessageEntry(MsgLevel::LEVEL_WARNING,  CRLF_B,   "Project must have exactly one target element!"                               );
diff --git a/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake b/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
index d0dd0c6c5..46fdf79b7 100644
--- a/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
+++ b/tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
@@ -2,13 +2,6 @@
 #
 #   - Applies to toolchain: ARM Compiler 6.16.2 and greater
 
-############### EDIT BELOW ###############
-# Set base directory of toolchain
-set(TOOLCHAIN_ROOT)
-set(TOOLCHAIN_VERSION "6.16.2")
-
-############ DO NOT EDIT BELOW ###########
-
 set(AS "armasm")
 set(CC "armclang")
 set(CXX "armclang")
@@ -17,12 +10,8 @@ set(LD "armlink")
 set(AR "armar")
 set(OC "fromelf")
 
-if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
-  set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
-endif()
-if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
-  set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
-endif()
+set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
+set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
 
 if(DEFINED TOOLCHAIN_ROOT AND NOT TOOLCHAIN_ROOT STREQUAL "")
   set(EXT)
diff --git a/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake b/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
index 638e477d0..298ce2db4 100644
--- a/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
+++ b/tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
@@ -2,25 +2,14 @@
 #
 #   - Applies to toolchain: LLVM/Clang Bare Metal Toolchain for the Arm Architecture 16.0.0 and greater
 
-############### EDIT BELOW ###############
-# Set base directory of toolchain
-set(TOOLCHAIN_ROOT)
-set(TOOLCHAIN_VERSION "17.0.1")
-
-############ DO NOT EDIT BELOW ###########
-
 set(AS "clang")
 set(CC "clang")
 set(CXX "clang++")
 set(CPP "clang")
 set(OC "llvm-objcopy")
 
-if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
-  set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
-endif()
-if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
-  set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
-endif()
+set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
+set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
 
 if(DEFINED TOOLCHAIN_ROOT)
   set(PREFIX)
diff --git a/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake b/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
index 0b8d2ec1f..1859db152 100644
--- a/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
+++ b/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
@@ -2,25 +2,14 @@
 #
 #   - Applies to toolchain: GNU Toolchain for the Arm Architecture 10.3.1 and greater
 
-############### EDIT BELOW ###############
-# Set base directory of toolchain
-set(TOOLCHAIN_ROOT)
-set(TOOLCHAIN_VERSION "10.3.1")
-
-############ DO NOT EDIT BELOW ###########
-
 set(AS "as")
 set(CC "gcc")
 set(CXX "g++")
 set(CPP "gcc")
 set(OC "objcopy")
 
-if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
-  set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
-endif()
-if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
-  set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
-endif()
+set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
+set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
 
 if(DEFINED TOOLCHAIN_ROOT)
   set(PREFIX arm-none-eabi-)
diff --git a/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake b/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
index fe15cfcd2..4795650a8 100644
--- a/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
+++ b/tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
@@ -5,13 +5,6 @@
 #    V1: Initial support
 #    V2: Support for 32-bit Cortex M,A and R
 
-############### EDIT BELOW ###############
-# Set base directory of toolchain
-set(TOOLCHAIN_ROOT)
-set(TOOLCHAIN_VERSION "9.32.1")
-
-############ DO NOT EDIT BELOW ###########
-
 set(AS "iasmarm")
 set(CC "iccarm")
 set(CXX "iccarm")
@@ -20,12 +13,8 @@ set(AR "iarchive")
 set(CPP "iccarm")
 set(OC "ielftool")
 
-if(DEFINED REGISTERED_TOOLCHAIN_ROOT)
-  set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
-endif()
-if(DEFINED REGISTERED_TOOLCHAIN_VERSION)
-  set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
-endif()
+set(TOOLCHAIN_ROOT "${REGISTERED_TOOLCHAIN_ROOT}")
+set(TOOLCHAIN_VERSION "${REGISTERED_TOOLCHAIN_VERSION}")
 
 if(DEFINED TOOLCHAIN_ROOT)
   set(EXT)
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/ArmAsm/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/ArmAsm/CMakeLists.txt.ref
index 8ee83d36c..30622e157 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/ArmAsm/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/ArmAsm/CMakeLists.txt.ref
@@ -35,6 +35,8 @@ set(AS_ARM_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Asm/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Asm/CMakeLists.txt.ref
index 2eb68da4f..f389cc461 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/Asm/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/Asm/CMakeLists.txt.ref
@@ -78,6 +78,8 @@ set(AS_FLAGS_C:/sandbox/devtools/build/TestOutput/TestData/Examples/AC6/Asm/AsmA
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/BranchProtection/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/BranchProtection/CMakeLists.txt.ref
index 6b36d595a..65cc6a084 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/BranchProtection/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/BranchProtection/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.18.0")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6/CMakeLists.txt.ref
index 587a12994..bed5bb038 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6PP/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6PP/CMakeLists.txt.ref
index e18c95980..3a1c265ae 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6PP/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/Build_AC6PP/CMakeLists.txt.ref
@@ -52,6 +52,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Flags/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Flags/CMakeLists.txt.ref
index 4f5d535f5..2c5c24056 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/Flags/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/Flags/CMakeLists.txt.ref
@@ -55,6 +55,8 @@ set(CC_FLAGS_C:/Users/Test/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/RTOS2/R
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Library/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Library/CMakeLists.txt.ref
index 923983f7b..4c965cfd6 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/Library/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/Library/CMakeLists.txt.ref
@@ -35,6 +35,8 @@ set(CXX_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Minimal/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Minimal/CMakeLists.txt.ref
index 5d82fd30f..1b9f0c0b8 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/Minimal/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/Minimal/CMakeLists.txt.ref
@@ -30,6 +30,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/NestedGroups/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/NestedGroups/CMakeLists.txt.ref
index fd7e45241..847242daf 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/NestedGroups/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/NestedGroups/CMakeLists.txt.ref
@@ -62,6 +62,8 @@ set(CC_FLAGS_C:/sandbox/devtools/build/TestOutput/TestData/Examples/AC6/NestedGr
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/RelativePath/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/RelativePath/CMakeLists.txt.ref
index 5f0daa403..f769d19e1 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/RelativePath/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/RelativePath/CMakeLists.txt.ref
@@ -34,6 +34,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_ns/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_ns/CMakeLists.txt.ref
index d438c3de6..048b251b0 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_ns/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_ns/CMakeLists.txt.ref
@@ -49,6 +49,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_s/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_s/CMakeLists.txt.ref
index 6a797358c..1112d8db0 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_s/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/TrustZone/CM33_s/CMakeLists.txt.ref
@@ -42,6 +42,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/AC6/Whitespace/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/AC6/Whitespace/CMakeLists.txt.ref
index 670636571..95db96adb 100644
--- a/tools/buildmgr/test/testinput/Examples/AC6/Whitespace/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/AC6/Whitespace/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/AccessSequence/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/AccessSequence/CMakeLists.txt.ref
index c5c418b48..bce7200ba 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/AccessSequence/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/AccessSequence/CMakeLists.txt.ref
@@ -128,6 +128,8 @@ set(CXX_FLAGS_C:/Temp/devtools/tools/buildmgr/test/testinput/Examples/GCC/Access
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Asm/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Asm/CMakeLists.txt.ref
index d71d1e226..cc0008533 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/Asm/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/Asm/CMakeLists.txt.ref
@@ -125,6 +125,8 @@ set(AS_FLAGS_C:/sandbox/devtools/build/TestOutput/TestData/Examples/GCC/Asm/GAS.
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/BranchProtection/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/BranchProtection/CMakeLists.txt.ref
index 59fb28a5c..5babc7e73 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/BranchProtection/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/BranchProtection/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Build_GCC/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Build_GCC/CMakeLists.txt.ref
index 20b794d70..a64f0b3b5 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/Build_GCC/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/Build_GCC/CMakeLists.txt.ref
@@ -51,6 +51,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Build_GPP/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Build_GPP/CMakeLists.txt.ref
index 01b5306f5..2c5992eac 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/Build_GPP/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/Build_GPP/CMakeLists.txt.ref
@@ -55,6 +55,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/DupFilename/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/DupFilename/CMakeLists.txt.ref
index 73e841408..a2c739818 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/DupFilename/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/DupFilename/CMakeLists.txt.ref
@@ -32,6 +32,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/FlagOrder/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/FlagOrder/CMakeLists.txt.ref
index 84e43bfe2..588b3d560 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/FlagOrder/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/FlagOrder/CMakeLists.txt.ref
@@ -38,6 +38,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Flags/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Flags/CMakeLists.txt.ref
index 4e489fec0..9e6c6f35e 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/Flags/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/Flags/CMakeLists.txt.ref
@@ -55,6 +55,8 @@ set(CC_FLAGS_C:/Users/Test/AppData/Local/Arm/Packs/ARM/CMSIS/5.8.0/CMSIS/RTOS2/R
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Library/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Library/CMakeLists.txt.ref
index aad8ba2a5..4bf51fd1f 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/Library/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/Library/CMakeLists.txt.ref
@@ -35,6 +35,8 @@ set(CXX_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/LibraryCustom/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/LibraryCustom/CMakeLists.txt.ref
index 7fbdaa13d..ef8b072d3 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/LibraryCustom/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/LibraryCustom/CMakeLists.txt.ref
@@ -35,6 +35,8 @@ set(CXX_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessing/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessing/CMakeLists.txt.ref
index dc08aae58..58e5185c9 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessing/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessing/CMakeLists.txt.ref
@@ -45,6 +45,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingDefines/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingDefines/CMakeLists.txt.ref
index c60f56998..3bc4efbc2 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingDefines/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingDefines/CMakeLists.txt.ref
@@ -62,6 +62,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingSrcFile/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingSrcFile/CMakeLists.txt.ref
index 67d4e16ec..a594b8ddb 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingSrcFile/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/LinkerPreProcessingSrcFile/CMakeLists.txt.ref
@@ -39,6 +39,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Minimal/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Minimal/CMakeLists.txt.ref
index b7e832e7e..a264c126e 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/Minimal/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/Minimal/CMakeLists.txt.ref
@@ -40,6 +40,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/NestedGroups/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/NestedGroups/CMakeLists.txt.ref
index c555e4a1e..062e10ceb 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/NestedGroups/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/NestedGroups/CMakeLists.txt.ref
@@ -70,6 +70,8 @@ set(CC_FLAGS_C:/sandbox/devtools/build/TestOutput/TestData/Examples/GCC/NestedGr
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Pre Include/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Pre Include/CMakeLists.txt.ref
index 0f38920e7..9a11b3ff6 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/Pre Include/CMakeLists.txt.ref	
+++ b/tools/buildmgr/test/testinput/Examples/GCC/Pre Include/CMakeLists.txt.ref	
@@ -62,6 +62,8 @@ set(PRE_INC_LOCAL_C:/Users/Test/AppData/Local/Arm/Packs/Keil/PreIncludeTestPack/
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/RelativePath/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/RelativePath/CMakeLists.txt.ref
index 78e5832d9..40c29168d 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/RelativePath/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/RelativePath/CMakeLists.txt.ref
@@ -42,6 +42,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/StandardLibrary/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/StandardLibrary/CMakeLists.txt.ref
index 2303f80bc..92d72760a 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/StandardLibrary/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/StandardLibrary/CMakeLists.txt.ref
@@ -39,6 +39,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/devtools/tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake")
 include ("C:/sandbox/devtools/tools/buildmgr/cbuildgen/config/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project1/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project1/CMakeLists.txt.ref
index 7f2daf316..8f8e1bdad 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project1/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project1/CMakeLists.txt.ref
@@ -102,6 +102,8 @@ set(CXX_FLAGS_C:/Sandbox/devtools-external/build/testoutput/GCC/TranslationContr
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project2/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project2/CMakeLists.txt.ref
index 10d16d6cd..fac806402 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project2/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project2/CMakeLists.txt.ref
@@ -124,6 +124,8 @@ set(CXX_FLAGS_C:/Sandbox/devtools-external/build/testoutput/GCC/TranslationContr
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project3/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project3/CMakeLists.txt.ref
index a5eaf1a94..1800c1328 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project3/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/TranslationControl/Project3/CMakeLists.txt.ref
@@ -68,6 +68,8 @@ set(CXX_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/TrustZone/CM33_ns/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/TrustZone/CM33_ns/CMakeLists.txt.ref
index 0685f81ab..21f4a95ca 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/TrustZone/CM33_ns/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/TrustZone/CM33_ns/CMakeLists.txt.ref
@@ -49,6 +49,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/TrustZone/CM33_s/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/TrustZone/CM33_s/CMakeLists.txt.ref
index 422ea29ec..8d8a33088 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/TrustZone/CM33_s/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/TrustZone/CM33_s/CMakeLists.txt.ref
@@ -43,6 +43,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/GCC/Whitespace/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/GCC/Whitespace/CMakeLists.txt.ref
index 82a5bc506..1083bd85d 100644
--- a/tools/buildmgr/test/testinput/Examples/GCC/Whitespace/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/GCC/Whitespace/CMakeLists.txt.ref
@@ -48,6 +48,8 @@ set(LIB_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "10.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.2.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/Mixed/Build_AC6_GCC/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/Mixed/Build_AC6_GCC/CMakeLists.txt.ref
index 370f52422..5bdf8d2fa 100644
--- a/tools/buildmgr/test/testinput/Examples/Mixed/Build_AC6_GCC/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/Mixed/Build_AC6_GCC/CMakeLists.txt.ref
@@ -61,6 +61,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/GCC/10.3.1/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "10.3.1")
 set(TOOLCHAIN_VERSION_MIN "9.2.1")
 include ("C:/sandbox/cbuild/etc/GCC.10.3.1.cmake")
 include ("C:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/Mixed/GpdscBundle/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/Mixed/GpdscBundle/CMakeLists.txt.ref
index 40805be74..ad736fcc3 100644
--- a/tools/buildmgr/test/testinput/Examples/Mixed/GpdscBundle/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/Mixed/GpdscBundle/CMakeLists.txt.ref
@@ -25,6 +25,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.18.0")
 include ("D:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("D:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/Mixed/GpdscWithoutComponents/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/Mixed/GpdscWithoutComponents/CMakeLists.txt.ref
index 0d6be9268..99cd2ce1f 100644
--- a/tools/buildmgr/test/testinput/Examples/Mixed/GpdscWithoutComponents/CMakeLists.txt.ref
+++ b/tools/buildmgr/test/testinput/Examples/Mixed/GpdscWithoutComponents/CMakeLists.txt.ref
@@ -24,6 +24,8 @@ set(CC_SRC_FILES
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.18.0")
 include ("D:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
 include ("D:/sandbox/cbuild/etc/CMSIS-Build-Utils.cmake")
diff --git a/tools/buildmgr/test/testinput/Examples/Mixed/Pre Include/CMakeLists.txt.ref b/tools/buildmgr/test/testinput/Examples/Mixed/Pre Include/CMakeLists.txt.ref
index 7c5787c4b..b4c17b36e 100644
--- a/tools/buildmgr/test/testinput/Examples/Mixed/Pre Include/CMakeLists.txt.ref	
+++ b/tools/buildmgr/test/testinput/Examples/Mixed/Pre Include/CMakeLists.txt.ref	
@@ -63,6 +63,8 @@ set(PRE_INC_LOCAL_C:/Users/Test/AppData/Local/Arm/Packs/Keil/PreIncludeTestPack/
 
 # Toolchain config map
 
+set(REGISTERED_TOOLCHAIN_ROOT "C:/Compilers/AC6/6.18.0/bin")
+set(REGISTERED_TOOLCHAIN_VERSION "6.18.0")
 set(TOOLCHAIN_VERSION_MIN "6.0.0")
 set(TOOLCHAIN_VERSION_MAX "6.99.99")
 include ("C:/sandbox/cbuild/etc/AC6.6.18.0.cmake")
diff --git a/tools/buildmgr/test/unittests/src/CbuildModelTests.cpp b/tools/buildmgr/test/unittests/src/CbuildModelTests.cpp
index 6550e6606..f5abbf57d 100644
--- a/tools/buildmgr/test/unittests/src/CbuildModelTests.cpp
+++ b/tools/buildmgr/test/unittests/src/CbuildModelTests.cpp
@@ -14,22 +14,19 @@ class CbuildModelTests : public CbuildModel, public ::testing::Test {
 };
 
 
-TEST_F(CbuildModelTests, GetCompatibleToolchain_Select_Latest) {
+TEST_F(CbuildModelTests, GetCompatibleToolchain_NotRegistered) {
   string name = "AC6", versionRange = "6.5.0:6.18.0", dir;
   string toolchainDir = testinput_folder + "/toolchain";
-  string expectedToolchainVersion = "6.16.0";
-  string expectedToolchainConfig = toolchainDir + "/AC6.6.16.0.cmake";
-  RteFsUtils::NormalizePath(expectedToolchainConfig);
   vector<string> envVars;
 
-  // Select latest compatible toolchain
+  // Check not registered toolchains
   ASSERT_TRUE(RteFsUtils::CreateDirectories(toolchainDir));
   ASSERT_TRUE(RteFsUtils::CreateTextFile(toolchainDir + "/AC6.6.6.4.cmake", ""));
   ASSERT_TRUE(RteFsUtils::CreateTextFile(toolchainDir + "/AC6.6.16.0.cmake", ""));
   ASSERT_TRUE(RteFsUtils::CreateTextFile(toolchainDir + "/GCC.6.19.0.cmake", ""));
-  EXPECT_TRUE(GetCompatibleToolchain(name, versionRange, toolchainDir, envVars));
-  EXPECT_EQ(m_toolchainConfigVersion, expectedToolchainVersion);
-  EXPECT_EQ(m_toolchainConfig, expectedToolchainConfig);
+  EXPECT_FALSE(GetCompatibleToolchain(name, versionRange, toolchainDir, envVars));
+  EXPECT_TRUE(m_toolchainConfigVersion.empty());
+  EXPECT_TRUE(m_toolchainConfig.empty());
   ASSERT_TRUE(RteFsUtils::RemoveDir(toolchainDir));
 }
 
@@ -61,25 +58,6 @@ TEST_F(CbuildModelTests, GetCompatibleToolchain_Invalid_Files) {
   ASSERT_TRUE(RteFsUtils::RemoveDir(toolchainDir));
 }
 
-TEST_F(CbuildModelTests, GetCompatibleToolchain_Select_Latest_recursively) {
-  string name = "AC6", versionRange = "6.5.0:6.18.0", dir;
-  string toolchainDir = testinput_folder + "/toolchain";
-  string expectedToolchainVersion = "6.16.0";
-  string expectedToolchainConfig = toolchainDir + "/Test/AC6.6.16.0.cmake";
-  RteFsUtils::NormalizePath(expectedToolchainConfig);
-  vector<string> envVars;
-
-  // Select latest compatible toolchain
-  ASSERT_TRUE(RteFsUtils::CreateDirectories(toolchainDir+"/Test"));
-  ASSERT_TRUE(RteFsUtils::CreateTextFile(toolchainDir + "/Test/AC6.6.6.4.cmake", ""));
-  ASSERT_TRUE(RteFsUtils::CreateTextFile(toolchainDir + "/Test/AC6.6.16.0.cmake", ""));
-  ASSERT_TRUE(RteFsUtils::CreateTextFile(toolchainDir + "/Test/GCC.6.19.0.cmake", ""));
-  EXPECT_TRUE(GetCompatibleToolchain(name, versionRange, toolchainDir, envVars));
-  EXPECT_EQ(m_toolchainConfigVersion, expectedToolchainVersion);
-  EXPECT_EQ(m_toolchainConfig, expectedToolchainConfig);
-  ASSERT_TRUE(RteFsUtils::RemoveDir(toolchainDir));
-}
-
 TEST_F(CbuildModelTests, GetCompatibleToolchain_Registered) {
   string name = "AC6", versionRange = "6.17.0:6.18.0", dir;
   string toolchainDir = testinput_folder + "/toolchain";
diff --git a/tools/projmgr/src/ProjMgrGenerator.cpp b/tools/projmgr/src/ProjMgrGenerator.cpp
index bbed083e3..5f4cc0c89 100644
--- a/tools/projmgr/src/ProjMgrGenerator.cpp
+++ b/tools/projmgr/src/ProjMgrGenerator.cpp
@@ -150,7 +150,7 @@ void ProjMgrGenerator::GenerateCprjCompilers(XMLTreeElement* element, const Cont
   XMLTreeElement* compilerElement = element->CreateElement("compiler");
   if (compilerElement) {
     compilerElement->AddAttribute("name", context.toolchain.name);
-    // set minimum version according to registered/supported toolchain
+    // set minimum version according to supported toolchain
     string versionRange = context.toolchain.version;
     // set maximum version according to solution requirements
     string name, minVer, maxVer;
diff --git a/tools/projmgr/src/ProjMgrWorker.cpp b/tools/projmgr/src/ProjMgrWorker.cpp
index ec2068a7b..412868cbe 100644
--- a/tools/projmgr/src/ProjMgrWorker.cpp
+++ b/tools/projmgr/src/ProjMgrWorker.cpp
@@ -1690,16 +1690,10 @@ bool ProjMgrWorker::ProcessToolchain(ContextItem& context) {
 
   context.toolchain = GetToolchain(context.compiler);
 
-  // get compatible registered toolchain
-  if (!GetLatestToolchain(context.toolchain)) {
-    string errMsg(RteUtils::EMPTY_STRING);
-    // get compatible supported toolchain
-    if (!GetToolchainConfig(context.toolchain.name, context.toolchain.range, context.toolchain.config, context.toolchain.version)) {
-      errMsg = "cmake configuration file and ";
-      context.toolchain.version = RteUtils::GetPrefix(context.toolchain.range);
-    }
-    errMsg += "compiler registration environment variable missing, format: " + context.toolchain.name + "_TOOLCHAIN_<major>_<minor>_<patch>";
-    m_toolchainErrors.insert(errMsg);
+  // get compatible supported toolchain
+  if (!GetToolchainConfig(context.toolchain.name, context.toolchain.range, context.toolchain.config, context.toolchain.version)) {
+    m_toolchainErrors.insert("cmake configuration file missing for compiler '" + context.compiler + "'");
+    context.toolchain.version = RteUtils::GetPrefix(context.toolchain.range);
   }
 
   if (context.toolchain.name == "AC6") {
@@ -4276,6 +4270,10 @@ bool ProjMgrWorker::ListToolchains(vector<ToolchainItem>& toolchains) {
     if (selectedContext.empty()) {
       // list registered toolchains
       GetRegisteredToolchains();
+      if (m_toolchains.empty()) {
+        ProjMgrLogger::Error("compiler registration environment variable missing, format: <GCC|CLANG|AC6|IAR>_TOOLCHAIN_<major>_<minor>_<patch>");
+        return false;
+      }
       toolchains = m_toolchains;
       return true;
     }
@@ -4289,7 +4287,7 @@ bool ProjMgrWorker::ListToolchains(vector<ToolchainItem>& toolchains) {
     if (!context.toolchain.name.empty()) {
       PushBackUniquely(toolchains, context.toolchain);
     }
-    if (context.toolchain.config.empty() || context.toolchain.root.empty()) {
+    if (context.toolchain.config.empty()) {
       allSupported = false;
     }
   }
diff --git a/tools/projmgr/src/ProjMgrYamlEmitter.cpp b/tools/projmgr/src/ProjMgrYamlEmitter.cpp
index 4e0206af3..80bbb0d39 100644
--- a/tools/projmgr/src/ProjMgrYamlEmitter.cpp
+++ b/tools/projmgr/src/ProjMgrYamlEmitter.cpp
@@ -422,7 +422,8 @@ void ProjMgrYamlCbuild::SetContextNode(YAML::Node contextNode, const ContextItem
   SetNodeValue(contextNode[YAML_SOLUTION], FormatPath(context->csolution->path, context->directories.cbuild));
   SetNodeValue(contextNode[YAML_PROJECT], FormatPath(context->cproject->path, context->directories.cbuild));
   SetNodeValue(contextNode[YAML_CONTEXT], context->name);
-  SetNodeValue(contextNode[YAML_COMPILER], context->toolchain.name + (context->toolchain.version.empty() ? "" : '@' + context->toolchain.version));
+  SetNodeValue(contextNode[YAML_COMPILER], context->toolchain.name +
+    (context->toolchain.required.empty() || context->toolchain.required == ">=0.0.0" ? "" : '@' + context->toolchain.required));
   if (!context->board.empty()) {
     SetNodeValue(contextNode[YAML_BOARD], context->board);
     if (context->boardPack != nullptr) {
diff --git a/tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core0.Debug+MultiCore.cbuild-gen.yml b/tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core0.Debug+MultiCore.cbuild-gen.yml
index 72b409443..afaf03fe7 100644
--- a/tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core0.Debug+MultiCore.cbuild-gen.yml
+++ b/tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core0.Debug+MultiCore.cbuild-gen.yml
@@ -5,7 +5,7 @@ build-gen:
   solution: ${DEVTOOLS(data)}/ExternalGenerator/extgen.csolution.yml
   project: ${DEVTOOLS(data)}/ExternalGenerator/multi_0/core0.cproject.yml
   context: core0.Debug+MultiCore
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0_Dual:cm0_core0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core1.Debug+MultiCore.cbuild-gen.yml b/tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core1.Debug+MultiCore.cbuild-gen.yml
index 161ffb0b2..62b6f5c6d 100644
--- a/tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core1.Debug+MultiCore.cbuild-gen.yml
+++ b/tools/projmgr/test/data/ExternalGenerator/ref/MultiCore/core1.Debug+MultiCore.cbuild-gen.yml
@@ -5,7 +5,7 @@ build-gen:
   solution: ${DEVTOOLS(data)}/ExternalGenerator/extgen.csolution.yml
   project: ${DEVTOOLS(data)}/ExternalGenerator/multi_1/core1.cproject.yml
   context: core1.Debug+MultiCore
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0_Dual:cm0_core1
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+Board.cbuild.yml b/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+Board.cbuild.yml
index 3396fae4c..4846b23de 100644
--- a/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+Board.cbuild.yml
+++ b/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+Board.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../board.csolution.yml
   project: single-core.cproject.yml
   context: single-core.Debug+Board
-  compiler: AC6@6.18.0
+  compiler: AC6
   board: RteTest CM4 board
   board-pack: ARM::RteTestBoard@0.1.0
   device: RteTest_ARMCM4_FP
diff --git a/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild-gen.yml b/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild-gen.yml
index 5a1797690..bde922c57 100644
--- a/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild-gen.yml
+++ b/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild-gen.yml
@@ -5,7 +5,7 @@ build-gen:
   solution: ${DEVTOOLS(data)}/ExternalGenerator/extgen.csolution.yml
   project: ${DEVTOOLS(data)}/ExternalGenerator/single/single-core.cproject.yml
   context: single-core.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild.yml
index 554e43e9c..26a3bf60f 100644
--- a/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/ExternalGenerator/ref/SingleCore/single-core.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../extgen.csolution.yml
   project: single-core.cproject.yml
   context: single-core.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/ns.Debug+CM0.cbuild-gen.yml b/tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/ns.Debug+CM0.cbuild-gen.yml
index 5d1d956de..ea97c6c58 100644
--- a/tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/ns.Debug+CM0.cbuild-gen.yml
+++ b/tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/ns.Debug+CM0.cbuild-gen.yml
@@ -5,7 +5,7 @@ build-gen:
   solution: ${DEVTOOLS(data)}/ExternalGenerator/extgen.csolution.yml
   project: ${DEVTOOLS(data)}/ExternalGenerator/tz_ns/ns.cproject.yml
   context: ns.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/s.Debug+CM0.cbuild-gen.yml b/tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/s.Debug+CM0.cbuild-gen.yml
index 89e7f1ed9..3e7d6b09a 100644
--- a/tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/s.Debug+CM0.cbuild-gen.yml
+++ b/tools/projmgr/test/data/ExternalGenerator/ref/TrustZone/s.Debug+CM0.cbuild-gen.yml
@@ -5,7 +5,7 @@ build-gen:
   solution: ${DEVTOOLS(data)}/ExternalGenerator/extgen.csolution.yml
   project: ${DEVTOOLS(data)}/ExternalGenerator/tz_s/s.cproject.yml
   context: s.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml
index a1e8967e7..01e591f4b 100644
--- a/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml
+++ b/tools/projmgr/test/data/TestDefault/ref/empty/project.Debug+TEST_TARGET.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../../data/TestDefault/empty.csolution.yml
   project: ../../data/TestDefault/project.cproject.yml
   context: project.Debug+TEST_TARGET
-  compiler: GCC@11.2.1
+  compiler: GCC
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.1.1
   processor:
diff --git a/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml
index 502e270c1..5cd9f388d 100644
--- a/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml
+++ b/tools/projmgr/test/data/TestDefault/ref/empty/project.Release+TEST_TARGET.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../../data/TestDefault/empty.csolution.yml
   project: ../../data/TestDefault/project.cproject.yml
   context: project.Release+TEST_TARGET
-  compiler: GCC@11.2.1
+  compiler: GCC
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.1.1
   processor:
diff --git a/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml
index b3649e039..c75eb175e 100644
--- a/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestGenerator/ref/multiple-components.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestGenerator/multiple-components.csolution.yml
   project: ../data/TestGenerator/multiple-components.cproject.yml
   context: multiple-components.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml
index e08a6fbd8..89eb5fe37 100644
--- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-layer.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestGenerator/test-gpdsc-layer.csolution.yml
   project: ../data/TestGenerator/test-gpdsc-layer.cproject.yml
   context: test-gpdsc-layer.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml
index 1cd0a3d07..49928f131 100644
--- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-multiple-generators.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestGenerator/test-gpdsc-multiple-generators.csolution.yml
   project: ../data/TestGenerator/test-gpdsc-multiple-generators.cproject.yml
   context: test-gpdsc-multiple-generators.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml
index d85c83580..ddea39c9e 100644
--- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc-project-files.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestGenerator/test-gpdsc-project-files.csolution.yml
   project: ../data/TestGenerator/test-gpdsc-project-files.cproject.yml
   context: test-gpdsc-project-files.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml
index 5fb63a35a..3a9774db9 100644
--- a/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestGenerator/ref/test-gpdsc.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestGenerator/test-gpdsc.csolution.yml
   project: ../data/TestGenerator/test-gpdsc.cproject.yml
   context: test-gpdsc.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ContextMap/ref/project1.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ContextMap/ref/project1.Debug+RteTest_ARMCM3.cbuild.yml
index 947d17671..73db6a17d 100644
--- a/tools/projmgr/test/data/TestSolution/ContextMap/ref/project1.Debug+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ContextMap/ref/project1.Debug+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/ContextMap/context-map.csolution.yml
   project: ../data/TestSolution/ContextMap/project1.cproject.yml
   context: project1.Debug+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ContextMap/ref/project1.Release+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ContextMap/ref/project1.Release+RteTest_ARMCM3.cbuild.yml
index b9edeb25a..680532f27 100644
--- a/tools/projmgr/test/data/TestSolution/ContextMap/ref/project1.Release+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ContextMap/ref/project1.Release+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/ContextMap/context-map.csolution.yml
   project: ../data/TestSolution/ContextMap/project1.cproject.yml
   context: project1.Release+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ContextMap/ref/project2.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ContextMap/ref/project2.Debug+RteTest_ARMCM3.cbuild.yml
index eb3e75f9e..d11c11d5d 100644
--- a/tools/projmgr/test/data/TestSolution/ContextMap/ref/project2.Debug+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ContextMap/ref/project2.Debug+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/ContextMap/context-map.csolution.yml
   project: ../data/TestSolution/ContextMap/project2.cproject.yml
   context: project2.Debug+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ContextMap/ref/project2.Release+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ContextMap/ref/project2.Release+RteTest_ARMCM3.cbuild.yml
index c69c05dcd..6f797b514 100644
--- a/tools/projmgr/test/data/TestSolution/ContextMap/ref/project2.Release+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ContextMap/ref/project2.Release+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/ContextMap/context-map.csolution.yml
   project: ../data/TestSolution/ContextMap/project2.cproject.yml
   context: project2.Release+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml
index 21eb09418..a963c1038 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti-signret.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/branch-protection/branch-protection.cproject.yml
   context: branch-protection.Debug+bti-signret
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml
index e1827f9f6..75440a62c 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+bti.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/branch-protection/branch-protection.cproject.yml
   context: branch-protection.Debug+bti
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml
index 0ee5607cd..a04f6cbb7 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/branch-protection.Debug+no-bp.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/branch-protection/branch-protection.cproject.yml
   context: branch-protection.Debug+no-bp
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml
index c49dc4e6c..7f349d321 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+dsp.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/dsp/dsp.cproject.yml
   context: dsp.Debug+dsp
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml
index aed44c516..818699c71 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/dsp.Debug+no-dsp.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/dsp/dsp.cproject.yml
   context: dsp.Debug+no-dsp
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml
index cc75bb28c..f7b0a3240 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+big.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/endian/endian.cproject.yml
   context: endian.Debug+big
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml
index 818990671..d5b0288db 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/endian.Debug+little.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/endian/endian.cproject.yml
   context: endian.Debug+little
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml
index 5ad31d51f..4f88d2f20 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-dp.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/fpu/fpu.cproject.yml
   context: fpu.Debug+fpu-dp
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml
index a89c37030..5dd82bf82 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+fpu-sp.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/fpu/fpu.cproject.yml
   context: fpu.Debug+fpu-sp
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml
index 243c2c982..a8e3d352c 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/fpu.Debug+no-fpu.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/fpu/fpu.cproject.yml
   context: fpu.Debug+no-fpu
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml
index 609dd2ce3..235d7d064 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-fp.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/mve/mve.cproject.yml
   context: mve.Debug+mve-fp
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml
index bc7324338..458b90b43 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+mve-int.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/mve/mve.cproject.yml
   context: mve.Debug+mve-int
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml
index 5e1f0f55b..2b67e77ce 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/mve.Debug+no-mve.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/mve/mve.cproject.yml
   context: mve.Debug+no-mve
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml
index f7d24b1d1..4c8ca95cc 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+non-secure.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/trustzone/trustzone.cproject.yml
   context: trustzone.Debug+non-secure
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml
index 3583e2fc8..aac704863 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+secure.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/trustzone/trustzone.cproject.yml
   context: trustzone.Debug+secure
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml
index 698d25491..ca859f69a 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Debug+tz-disabled.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/trustzone/trustzone.cproject.yml
   context: trustzone.Debug+tz-disabled
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml
index 9bac7f579..bda9b6c89 100644
--- a/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/DeviceAttributes/ref/trustzone.Fail+secure.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/DeviceAttributes/solution.csolution.yml
   project: ../data/TestSolution/DeviceAttributes/trustzone/trustzone.cproject.yml
   context: trustzone.Fail+secure
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/Instances/ref/instances.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/Instances/ref/instances.Debug+RteTest_ARMCM3.cbuild.yml
index a66aeb285..8ce14d816 100644
--- a/tools/projmgr/test/data/TestSolution/Instances/ref/instances.Debug+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/Instances/ref/instances.Debug+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/Instances/instances.csolution.yml
   project: ../data/TestSolution/Instances/instances.cproject.yml
   context: instances.Debug+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/LanguageAndScope/ref/lang-scope.Debug_AC6+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LanguageAndScope/ref/lang-scope.Debug_AC6+RteTest_ARMCM3.cbuild.yml
index f9d0847df..b3d9003b8 100644
--- a/tools/projmgr/test/data/TestSolution/LanguageAndScope/ref/lang-scope.Debug_AC6+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/LanguageAndScope/ref/lang-scope.Debug_AC6+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/LanguageAndScope/lang-scope.csolution.yml
   project: ../data/TestSolution/LanguageAndScope/lang-scope.cproject.yml
   context: lang-scope.Debug_AC6+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_ARMCM3.cbuild.yml
index d481ccc07..4c618d09e 100644
--- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/LinkerOptions/linker.csolution.yml
   project: ../data/TestSolution/LinkerOptions/linker.cproject.yml
   context: linker.AutoGen+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_Board.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_Board.cbuild.yml
index bc2eccf35..ecb411820 100644
--- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_Board.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.AutoGen+RteTest_Board.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/LinkerOptions/linker.csolution.yml
   project: ../data/TestSolution/LinkerOptions/linker.cproject.yml
   context: linker.AutoGen+RteTest_Board
-  compiler: AC6@6.18.0
+  compiler: AC6
   board: RteTest-Test-board With.Memory
   board-pack: ARM::RteTest_DFP@0.2.0
   device: RteTest_ARMCM3
diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.Debug_AC6+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.Debug_AC6+RteTest_ARMCM3.cbuild.yml
index 67e2b64a1..b51c19aa3 100644
--- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.Debug_AC6+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.Debug_AC6+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/LinkerOptions/linker.csolution.yml
   project: ../data/TestSolution/LinkerOptions/linker.cproject.yml
   context: linker.Debug_AC6+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.Debug_GCC+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.Debug_GCC+RteTest_ARMCM3.cbuild.yml
index a5caf91ba..e00cef11a 100644
--- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.Debug_GCC+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.Debug_GCC+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/LinkerOptions/linker.csolution.yml
   project: ../data/TestSolution/LinkerOptions/linker.cproject.yml
   context: linker.Debug_GCC+RteTest_ARMCM3
-  compiler: GCC@11.2.1
+  compiler: GCC
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.FromComponent+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.FromComponent+RteTest_ARMCM3.cbuild.yml
index 38136073c..292ee84e1 100644
--- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.FromComponent+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.FromComponent+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/LinkerOptions/linker.csolution.yml
   project: ../data/TestSolution/LinkerOptions/linker.cproject.yml
   context: linker.FromComponent+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml
index b9c749f4b..cb81bd276 100644
--- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityDefines+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/LinkerOptions/linker.csolution.yml
   project: ../data/TestSolution/LinkerOptions/linker.cproject.yml
   context: linker.PriorityDefines+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml
index ba5eccd4f..607838b2a 100644
--- a/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/LinkerOptions/ref/linker.PriorityRegions+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/LinkerOptions/linker.csolution.yml
   project: ../data/TestSolution/LinkerOptions/linker.cproject.yml
   context: linker.PriorityRegions+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml
index 7171096b3..8162da8a8 100644
--- a/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/PackMetadata/ref/metadata.Debug+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/PackMetadata/metadata.csolution.yml
   project: ../data/TestSolution/PackMetadata/metadata.cproject.yml
   context: metadata.Debug+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.1.1
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml
index d40ddefc7..38f1a7248 100644
--- a/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/StandardLibrary/ref/library.Debug+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/StandardLibrary/library.csolution.yml
   project: ../data/TestSolution/StandardLibrary/library.cproject.yml
   context: library.Debug+RteTest_ARMCM3
-  compiler: GCC@11.2.1
+  compiler: GCC
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml
index a526062fe..6436c3c09 100644
--- a/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/TemplateAndApi/ref/template_api.Debug+RteTest_ARMCM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/TemplateAndApi/template_api.csolution.yml
   project: ../data/TestSolution/TemplateAndApi/template_api.cproject.yml
   context: template_api.Debug+RteTest_ARMCM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml
index 5d8069a7a..3e45abe42 100644
--- a/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/TestBaseUpdate/ref/project.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/TestBaseUpdate/test.csolution.yml
   project: ../data/TestSolution/TestBaseUpdate/project.cproject.yml
   context: project.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml b/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml
index 30b3bd8ea..66eb17309 100644
--- a/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/TestProject4/test_board_and_device+TEST_TARGET.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/test_validate_project.csolution.yml
   project: ../data/TestSolution/TestProject4/test_board_and_device.cproject.yml
   context: test_board_and_device+TEST_TARGET
-  compiler: AC6@6.18.0
+  compiler: AC6@>=6.18.0
   board: Keil::RteTest Dummy board
   board-pack: ARM::RteTest_DFP@0.2.0
   device: ARM::RteTest_ARMCM0_Dual:cm0_core1
diff --git a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml
index 471cf2fda..7daa4d99e 100644
--- a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild-gen.yml
@@ -6,7 +6,7 @@ build-gen:
   solution: ${DEVTOOLS(data)}/TestSolution/genfiles.csolution.yml
   project: ${DEVTOOLS(data)}/TestSolution/TestProject3_1/TestProject3_1.cproject.yml
   context: TestProject3_1.Debug+TypeA
-  compiler: GCC@11.2.1
+  compiler: GCC
   device: RteTestGen_ARMCM0
   device-pack: ARM::RteTestGenerator@0.1.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml
index d71caf6f0..884c1e9dc 100644
--- a/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/TestProject3_1.Debug+TypeA.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../genfiles.csolution.yml
   project: TestProject3_1.cproject.yml
   context: TestProject3_1.Debug+TypeA
-  compiler: GCC@11.2.1
+  compiler: GCC
   device: RteTestGen_ARMCM0
   processor:
     core: Cortex-M0
diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml
index 4bdf20268..6a847815c 100644
--- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/test.csolution.yml
   project: ../data/TestSolution/TestProject1/test1.cproject.yml
   context: test1.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml
index 57f74f829..84f995916 100644
--- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test1.Release+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/test.csolution.yml
   project: ../data/TestSolution/TestProject1/test1.cproject.yml
   context: test1.Release+CM0
-  compiler: GCC@11.2.1
+  compiler: GCC
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml
index e84a1aa4d..3f8fa7dbb 100644
--- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/test.csolution.yml
   project: ../data/TestSolution/TestProject2/test2.cproject.yml
   context: test2.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml
index 44c3e401f..97102b62f 100644
--- a/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/cbuild/test2.Debug+CM3.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/test.csolution.yml
   project: ../data/TestSolution/TestProject2/test2.cproject.yml
   context: test2.Debug+CM3
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml
index 847023a98..d8e087c21 100644
--- a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Debug+Target.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/outputFiles.csolution.yml
   project: ../data/TestSolution/outputFiles.cproject.yml
   context: outputFiles.Debug+Target
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml
index c4958e3e4..e574a5ea1 100644
--- a/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/outputFiles.Library+Target.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/outputFiles.csolution.yml
   project: ../data/TestSolution/outputFiles.cproject.yml
   context: outputFiles.Library+Target
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM3
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml
index 907edcc7b..433c1db26 100644
--- a/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/pre-include+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/pre-include.csolution.yml
   project: ../data/TestSolution/pre-include.cproject.yml
   context: pre-include+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/rtedir.Debug+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/rtedir.Debug+CM0.cbuild.yml
index 9af727bfe..6989dc8cb 100644
--- a/tools/projmgr/test/data/TestSolution/ref/rtedir.Debug+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/rtedir.Debug+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/rtedir.csolution.yml
   project: ../data/TestSolution/rtedir.cproject.yml
   context: rtedir.Debug+CM0
-  compiler: AC6@6.18.0
+  compiler: AC6
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/rtedir.Release+CM0.cbuild.yml b/tools/projmgr/test/data/TestSolution/ref/rtedir.Release+CM0.cbuild.yml
index 06c229ffd..c0e10114d 100644
--- a/tools/projmgr/test/data/TestSolution/ref/rtedir.Release+CM0.cbuild.yml
+++ b/tools/projmgr/test/data/TestSolution/ref/rtedir.Release+CM0.cbuild.yml
@@ -3,7 +3,7 @@ build:
   solution: ../data/TestSolution/rtedir.csolution.yml
   project: ../data/TestSolution/rtedir.cproject.yml
   context: rtedir.Release+CM0
-  compiler: GCC@11.2.1
+  compiler: GCC
   device: RteTest_ARMCM0
   device-pack: ARM::RteTest_DFP@0.2.0
   processor:
diff --git a/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.ac6_6_16_1 b/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.ac6_6_16_1
index 5d53b084f..e7906a146 100644
--- a/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.ac6_6_16_1
+++ b/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.ac6_6_16_1
@@ -11,7 +11,7 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.16.1:6.16.1"/>
+    <compiler name="AC6" version="6.6.5:6.16.1"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="RteTest_ARMCM3" Dvendor="ARM:82">
diff --git a/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.ac6_6_20_0 b/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.ac6_6_20_0
index 40f20836c..4f2b55ecc 100644
--- a/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.ac6_6_20_0
+++ b/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.ac6_6_20_0
@@ -11,7 +11,7 @@
   </packages>
 
   <compilers>
-    <compiler name="AC6" version="6.20.0:6.20.0"/>
+    <compiler name="AC6" version="6.18.0:6.20.0"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="RteTest_ARMCM3" Dvendor="ARM:82">
diff --git a/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.iar b/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.iar
index 6aea8472c..b82c915c8 100644
--- a/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.iar
+++ b/tools/projmgr/test/data/TestSolution/ref/toolchains/toolchain.Debug+Target.cprj.iar
@@ -11,7 +11,7 @@
   </packages>
 
   <compilers>
-    <compiler name="IAR" version="9.32.1"/>
+    <compiler name="IAR" version="8.50.6"/>
   </compilers>
 
   <target Dfpu="NO_FPU" Dname="RteTest_ARMCM3" Dvendor="ARM:82">
diff --git a/tools/projmgr/test/src/ProjMgrUnitTests.cpp b/tools/projmgr/test/src/ProjMgrUnitTests.cpp
index 4a237849c..d5c2ab262 100644
--- a/tools/projmgr/test/src/ProjMgrUnitTests.cpp
+++ b/tools/projmgr/test/src/ProjMgrUnitTests.cpp
@@ -1794,6 +1794,13 @@ IAR@9.32.5\n\
 
   const string& outStr = streamRedirect.GetOutString();
   EXPECT_TRUE(regex_match(outStr, regex(expectedOutStr)));
+
+  // Test with no registered toolchains (empty environment variables)
+  streamRedirect.ClearStringStreams();
+  EXPECT_EQ(1, RunProjMgr(3, argv, 0));
+  const string& expectedErr = "error csolution: compiler registration environment variable missing, format: <GCC|CLANG|AC6|IAR>_TOOLCHAIN_<major>_<minor>_<patch>\n";
+  const string& errStr = streamRedirect.GetErrorString();
+  EXPECT_EQ(errStr, expectedErr);
 }
 
 TEST_F(ProjMgrUnitTests, ListToolchainsVerbose) {
@@ -1856,7 +1863,7 @@ TEST_F(ProjMgrUnitTests, ListToolchainsSolution) {
 
   // Test with no registered toolchains (empty environment variables)
   streamRedirect.ClearStringStreams();
-  EXPECT_EQ(1, RunProjMgr(5, argv, 0));
+  EXPECT_EQ(0, RunProjMgr(5, argv, 0));
   const string& expected2 = "AC6@>=0.0.0\nAC6@>=6.18.0\nGCC@11.3.1\n";
   const string& outStr2 = streamRedirect.GetOutString();
   EXPECT_EQ(outStr2, expected2);
@@ -4203,7 +4210,7 @@ TEST_F(ProjMgrUnitTests, ToolchainRedefinition) {
   EXPECT_EQ(warn, expectedWarn);
 
   const YAML::Node& cbuild = YAML::LoadFile(testoutput_folder + "/toolchain.Warning+RteTest_ARMCM3.cbuild.yml");
-  EXPECT_EQ(cbuild["build"]["compiler"].as<string>(), "GCC@11.2.1");
+  EXPECT_EQ(cbuild["build"]["compiler"].as<string>(), "GCC");
 }
 
 TEST_F(ProjMgrUnitTests, RunProjMgr_LinkerOptions) {