diff --git a/.vscode/cspell.json b/.vscode/cspell.json
index 9128ab802..c824bd487 100644
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@@ -190,6 +190,7 @@
     "northcentralus",
     "northeurope",
     "nostd",
+    "npmjs",
     "nread",
     "NTSTATUS",
     "Oaep",
diff --git a/cmake-modules/TSPCompile.cmake b/cmake-modules/TSPCompile.cmake
index 3ea028c38..10f9217b6 100644
--- a/cmake-modules/TSPCompile.cmake
+++ b/cmake-modules/TSPCompile.cmake
@@ -3,7 +3,7 @@
 
 find_package(Git)
 
-macro(DownloadTSPFiles TSP_REPO TSP_SHA TSP_REPO_PATH TSP_DESTINATION)
+macro(DownloadTSPFiles TSP_SHA TSP_REPO_PATH TSP_DESTINATION)
     message ("Downloading TSP files using the following params  TSP_REPO=${TSP_REPO} TSP_SHA=${TSP_SHA} TSP_REPO_PATH=${TSP_REPO_PATH}  TSP_DESTINATION=${TSP_DESTINATION}")
 
     if(Git_FOUND)
@@ -12,31 +12,97 @@ macro(DownloadTSPFiles TSP_REPO TSP_SHA TSP_REPO_PATH TSP_DESTINATION)
         message(FATAL_ERROR "Git not found")
     endif()
     
-    set(DOWNLOAD_FOLDER ${CMAKE_SOURCE_DIR}/build/${TSP_DESTINATION})
-    #cleanup folder
-    file(REMOVE_RECURSE ${DOWNLOAD_FOLDER})
-    make_directory(${DOWNLOAD_FOLDER})
+    set(TSP_REPO "https://github.com/Azure/azure-rest-api-specs.git")
+    set(DOWNLOAD_TSP_FOLDER ${CMAKE_SOURCE_DIR}/build/${TSP_DESTINATION})
+    # if we have the git folder, we don't need to download it again
+    # this also saves times on incremental builds
+    if(NOT EXISTS ${DOWNLOAD_TSP_FOLDER}/.git)
+    message("First time setting up the ${TSP_DESTINATION} repo.")
+        #make folder
+        make_directory(${DOWNLOAD_TSP_FOLDER})
 
     #init git in folder
     execute_process(COMMAND ${GIT_EXECUTABLE} init
-        WORKING_DIRECTORY ${DOWNLOAD_FOLDER})
+            WORKING_DIRECTORY ${DOWNLOAD_TSP_FOLDER})
     #add remote
     execute_process(COMMAND ${GIT_EXECUTABLE} remote add origin ${TSP_REPO}
-         WORKING_DIRECTORY ${DOWNLOAD_FOLDER})
+             WORKING_DIRECTORY ${DOWNLOAD_TSP_FOLDER})
     #set sparse-checkout
     execute_process(COMMAND ${GIT_EXECUTABLE} sparse-checkout init --cone
-         WORKING_DIRECTORY ${DOWNLOAD_FOLDER})
+             WORKING_DIRECTORY ${DOWNLOAD_TSP_FOLDER})
     #set sparse-checkout folder
     execute_process(COMMAND ${GIT_EXECUTABLE} sparse-checkout set ${TSP_REPO_PATH}
-         WORKING_DIRECTORY ${DOWNLOAD_FOLDER})
+             WORKING_DIRECTORY ${DOWNLOAD_TSP_FOLDER})
+    else()
+        message("Repo detected at ${TSP_DESTINATION}. Jumping ahead to checkout.") 
+    endif()
     #fetch
     execute_process(COMMAND ${GIT_EXECUTABLE} fetch
-         WORKING_DIRECTORY ${DOWNLOAD_FOLDER})
+         WORKING_DIRECTORY ${DOWNLOAD_TSP_FOLDER})
     #switch branch
     execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${TSP_SHA}
-          WORKING_DIRECTORY ${DOWNLOAD_FOLDER})
+          WORKING_DIRECTORY ${DOWNLOAD_TSP_FOLDER})
  
-    if (NOT ${STATUS_CODE} EQUAL 0)
-        message(FATAL_ERROR "TSP download failed (Link: ${TSP_FULL_PATH}).")
+    if(NOT ${STATUS_CODE} EQUAL 0)
+        message(FATAL_ERROR "TSP download failed.")
     endif()
 endmacro()
+
+macro (DownloadCodeGenerator CODEGEN_SHA CODEGEN_DESTINATION)
+    message("Downloading CODEGEN files using the following params  CODEGEN_REPO=${CODEGEN_REPO} CODEGEN_SHA=${CODEGEN_SHA} CODEGEN_DESTINATION=${CODEGEN_DESTINATION}")
+
+    if(Git_FOUND)
+        message("Git found: ${GIT_EXECUTABLE}")
+    else()
+        message(FATAL_ERROR "Git not found")
+    endif()
+
+    set(CODEGEN_REPO "https://github.com/Azure/autorest.cpp.git")
+    set(DOWNLOAD_CODEGEN_FOLDER ${CMAKE_SOURCE_DIR}/build/${CODEGEN_DESTINATION})
+
+    # if we have the git folder, we don't need to download it again
+    # this also saves times on incremental builds
+    if(NOT EXISTS ${DOWNLOAD_CODEGEN_FOLDER}/.git)
+        message("First time setting up the ${CODEGEN_DESTINATION} repo.")
+        #make folder
+        make_directory(${DOWNLOAD_CODEGEN_FOLDER})
+        #init git in folder
+        execute_process(COMMAND ${GIT_EXECUTABLE} clone ${CODEGEN_REPO} ${DOWNLOAD_CODEGEN_FOLDER})
+    else()
+        message("Repo detected at  ${TSP_DESTINATION}. Jumping ahead to checkout.") 
+    endif()
+
+    #checkout SHA
+    execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${CODEGEN_SHA}
+          WORKING_DIRECTORY ${DOWNLOAD_CODEGEN_FOLDER})
+ 
+    if(NOT ${STATUS_CODE} EQUAL 0)
+        message(FATAL_ERROR "CODEGEN download failed.")
+    endif()
+endmacro()
+
+macro(GenerateCodeFromTSP TSP_DESTINATION TSP_REPO_PATH CODEGEN_DESTINATION CODEGEN_PATH)
+    message("Generating code using the following params  TSP_DESTINATION=${TSP_DESTINATION} TSP_REPO_PATH=${TSP_REPO_PATH} CODEGEN_DESTINATION=${CODEGEN_DESTINATION}")
+    message("Remember to Download the typspec-cpp emitter from npmjs.org")
+    #TODO : https://github.com/Azure/azure-sdk-for-cpp/issues/6071
+    set(DOWNLOAD_CODEGEN_FOLDER ${CMAKE_SOURCE_DIR}/build/${CODEGEN_DESTINATION}/${CODEGEN_PATH})
+    set(DOWNLOAD_TSP_FOLDER ${CMAKE_SOURCE_DIR}/build/${TSP_DESTINATION}/${TSP_REPO_PATH})
+    set(CODEGEN_CPP_FOLDER ${DOWNLOAD_CODEGEN_FOLDER}/../../../codegen.cpp)
+    set(CODEGEN_CPP_FOLDER ${DOWNLOAD_CODEGEN_FOLDER}/../../../codegen.cpp)
+    message("Will copy tsp files from ${DOWNLOAD_TSP_FOLDER} to ${DOWNLOAD_CODEGEN_FOLDER}")
+    #copy tsp files to the codegen folder
+    file(COPY ${DOWNLOAD_TSP_FOLDER} 
+    DESTINATION ${DOWNLOAD_CODEGEN_FOLDER})
+
+    execute_process(COMMAND npm install -g @azure-tools/typespec-client-generator-cli
+    WORKING_DIRECTORY ${DOWNLOAD_CODEGEN_FOLDER})
+    
+    execute_process(COMMAND npm install -g @azure-tools/typespec-azure-rulesets
+    WORKING_DIRECTORY ${DOWNLOAD_CODEGEN_FOLDER})
+    #generate code
+    execute_process(COMMAND pwsh Build-Codegen.ps1
+    WORKING_DIRECTORY ${DOWNLOAD_CODEGEN_FOLDER})
+    
+    execute_process(COMMAND pwsh Generate-Code.ps1
+    WORKING_DIRECTORY ${DOWNLOAD_CODEGEN_FOLDER})
+endmacro()
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
index 7cc62a8ce..e5acb6001 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
@@ -44,6 +44,24 @@ if(TSP_GEN)
     DownloadTSPFiles(${TSP_REPO} ${TSP_SHA} ${TSP_REPO_PATH}  ${TSP_DESTINATION})
 endif()
 
+option(AZURE_TSP_KV_SECRETS_GEN "Generate from TypeSpec" OFF)
+message("KeyVault Secrets TSP Generation ${az_TSP_KV_SECRETS_GEN}")
+if(AZURE_TSP_KV_SECRETS_GEN)
+    include(TSPCompile) 
+
+    set(TSP_REPO_PATH "specification/keyvault/data-plane/Security.KeyVault.Secrets/")
+    set(TSP_SHA "1124d1074d262dc20a010c2a9d366f8e7a452927")
+    set(TSP_DESTINATION "keyvault_secrets")
+
+    set(CODEGEN_SHA "b4107ff1b9ce83aedf1d299a63575b6c27434de0")
+    set(CODEGEN_DESTINATION "typespec-cpp")
+    set(CODEGEN_PATH "packages/typespec-cpp/samples/keyvault/secrets")
+
+    DownloadTSPFiles(${TSP_SHA} ${TSP_REPO_PATH}  ${TSP_DESTINATION})
+    DownloadCodeGenerator(${CODEGEN_SHA} ${CODEGEN_DESTINATION})
+    GenerateCodeFromTSP(${TSP_DESTINATION} ${TSP_REPO_PATH} ${CODEGEN_DESTINATION} ${CODEGEN_PATH})
+endif()
+
 if(FETCH_SOURCE_DEPS)
     GetFolderList(SECRETS)
     foreach(oneFolder IN LISTS BUILD_FOLDERS)