Removes _vs2019 from jenkins jobs and documentation (#5855)

Signed-off-by: Esteban Papp <[email protected]>

AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/README.txt

@@ -26,8 +26,8 @@ INSTALL
 It is recommended to set up these these tools with O3DE's CMake build commands.
 Assuming CMake is already setup on your operating system, below are some sample build commands:
     cd /path/to/od3e/
-    mkdir windows_vs2019
-    cd windows_vs2019
+    mkdir windows
+    cd windows
     cmake .. -G "Visual Studio 16 2019" -DLY_PROJECTS=AutomatedTesting
 
 To manually install the project in development mode using your own installed Python interpreter:

AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_setup_fixture.py

@@ -4,7 +4,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 
 SPDX-License-Identifier: Apache-2.0 OR MIT
 
-A fixture for Setting Up Asset Processor Batch workspace for tests in lmbr_test
+A fixture for Setting Up Asset Processor Batch workspace for tests
 """
 
 # Import builtin libraries

AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/asset_processor_fixture.py

@@ -4,7 +4,7 @@ For complete copyright and license terms please see the LICENSE at the root of t
 
 SPDX-License-Identifier: Apache-2.0 OR MIT
 
-A fixture for using the Asset Processor in lmbr_test, this will stop the asset processor after every test via
+A fixture for using the Asset Processor, this will stop the asset processor after every test via
 the teardown. Using the fixture at class level will stop the asset processor after the suite completes.
 Using the fixture at test level will stop asset processor after the test completes. Calling this fixture as a test argument will still run the teardown to stop the Asset Processor.
 """

Code/Tools/ProjectManager/Platform/Windows/ProjectManagerDefs_windows.cpp

@@ -9,7 +9,7 @@
 
 namespace O3DE::ProjectManager
 {
-    const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/windows_vs2019";
+    const QString ProjectBuildPathPostfix = ProjectBuildDirectoryName + "/windows";
     const QString GetPythonScriptPath = "python/get_python.bat";
 
 } // namespace O3DE::ProjectManager

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/synthetic_env.py

@@ -508,7 +508,7 @@ def init_ly_pyside(env_dict=_SYNTH_ENV_DICT):
     site.addsitedir(str(QTFORPYTHON_PATH))
 
     O3DE_BIN_PATH = Path.joinpath(O3DE_DEV,
-                                'windows_vs2019',
+                                'windows',
                                 'bin',
                                 'profile').resolve()
     os.environ["DYNACONF_O3DE_BIN_PATH"] = str(O3DE_BIN_PATH)

Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/config.py

@@ -532,7 +532,7 @@ if __name__ == '__main__':
     parser.add_argument('-bf', '--build-folder',
                         type=str,
                         required=False,
-                        help='The name (tag) of the o3de build folder, example build or windows_vs2019.')
+                        help='The name (tag) of the o3de build folder, example build or windows.')
     parser.add_argument('-pp', '--project-path',
                         type=pathlib.Path,
                         required=False,

Gems/EMotionFX/Code/Tests/run_EMotionFX_tests.py

@@ -1,94 +0,0 @@
-"""
-Copyright (c) Contributors to the Open 3D Engine Project.
-For complete copyright and license terms please see the LICENSE at the root of this distribution.
-
-SPDX-License-Identifier: Apache-2.0 OR MIT
-
-python run_EMotionFX_tests.py --config --vsVersion
-
-Example:
-python run_EMotionFX_tests.py --config profile --vsVersion vs2017
-python run_EMotionFX_tests.py --config debug --vsVersion vs2019
-
-
-Requirements:
-
-- Provide a single script that executes all your team's automated BAT/Regression tests
-
-- The script should run the tests successfully if killed in the middle and restarted
-
-- Provide any documentation needed along with the script so that other feature teams wanting to execute your tests can execute them locally
-
-- The documentation should also cover where the test results are reported and how to find failing tests and their logs
-
-
-"""
-
-import argparse
-import os
-import subprocess
-
-
-#Setup Parser
-def parser_setup():
-    parser = argparse.ArgumentParser(description='Sets up for and runs the specified EMotionFX tests')
-
-    # Configuration
-    parser.add_argument('--config', choices=['profile','debug'] , help='The Conrfiguration you have pre-build and want to run the tests on. Options[profile,debug]')
-
-    #Visual Studio Version
-    parser.add_argument('--vsVersion', choices=['vs2017','vs2019'], help='The version of Visual Studio you used to build your branch. Options[vs2017, vs2019]')
-    
-
-
-    return parser
-
-
-
-#Main Program
-def main():
-    # Set up CLI arguments for CLI argument parser
-    parser = parser_setup()
-
-    # Capture arguments and their values
-    args = parser.parse_args()
-
-
-    # Change directory to branch root
-    dev_path = os.path.join(os.path.dirname(__file__), '..', '..','..','..')
-    os.chdir(dev_path)
-    dirpath = os.getcwd()
-
-
-    vsVersion = args.vsVersion
-    config = args.config
-
-    if vsVersion == 'vs2017':
-        if config == 'profile':
-            #lmbr_test.cmd scan --dir Bin64vc141.Test --only Gem\.EMotionFX\..*\.dll
-            subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Test --only Gem\.EMotionFX\..*\.dll', check=True)
-
-        elif config == 'debug':
-            #lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll
-            subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll', check=True)
-
-        else:
-            print('INVALID ARGUMENT(s)... Ending')
-    elif vsVersion == 'vs2019':
-        if config == 'profile':
-            #lmbr_test.cmd scan --dir Bin64vc142.Test --only Gem\.EMotionFX\..*\.dll
-            subprocess.run('lmbr_test.cmd scan --dir Bin64vc142.Test --only Gem\.EMotionFX\..*\.dll', check=True)
-
-        elif config == 'debug':
-            #lmbr_test.cmd scan --dir Bin64vc142.Debug.Test --only Gem\.EMotionFX\..*\.dll
-            subprocess.run('lmbr_test.cmd scan --dir Bin64vc141.Debug.Test --only Gem\.EMotionFX\..*\.dll', check=True)
-
-        else:
-            print('INVALID ARGUMENT(s)... Ending')
-    else:
-        print('INVALID ARGUMENT(s)... Ending')
-        
-    
-
-if __name__ == '__main__':
-    main()

README.md

@@ -66,7 +66,7 @@ To set up a project-centric source engine, complete the following steps. For oth
     
     Example:
     ```
-    cmake -B C:\o3de\build\windows_vs2019 -S C:\o3de -G "Visual Studio 16" -DLY_3RDPARTY_PATH=C:\o3de-packages
+    cmake -B C:\o3de\build\windows -S C:\o3de -G "Visual Studio 16" -DLY_3RDPARTY_PATH=C:\o3de-packages
     ```
     
     > Note:  Do not use trailing slashes for the <3rdParty package path>.
@@ -107,7 +107,7 @@ For more details on the steps above, refer to [Setting up O3DE from GitHub](http
 
     Example:
     ```
-    cmake -B C:\my-project\build\windows_vs2019 -S C:\my-project -G "Visual Studio 16"
+    cmake -B C:\my-project\build\windows -S C:\my-project -G "Visual Studio 16"
     ```
     
     > Note:  Do not use trailing slashes for the <3rdParty cache path>.

Tools/LyTestTools/README.txt

@@ -35,8 +35,8 @@ INSTALL
 It is recommended to set up these these tools with Lumberyard's CMake build commands.
 Assuming CMake is already setup on your operating system, below are some sample build commands:
     cd /path/to/lumberyard/dev/
-    mkdir windows_vs2019
-    cd windows_vs2019
+    mkdir windows
+    cd windows
     cmake -E time cmake --build . --target ALL_BUILD --config profile
 
 To manually install the project in development mode using your own installed Python interpreter:

Tools/LyTestTools/ly_test_tools/_internal/managers/abstract_resource_locator.py

@@ -277,7 +277,7 @@ class AbstractResourceLocator(object):
     def get_shader_compiler_path(self):
         """
         Return path to shader compiler executable
-        ex. engine_root/dev/windows_vs2019/bin/profile/CrySCompileServer
+        ex. engine_root/dev/windows/bin/profile/CrySCompileServer
         :return: path to CrySCompileServer executable
         """
         return os.path.join(self.build_directory(), 'CrySCompileServer')
@@ -313,7 +313,7 @@ class AbstractResourceLocator(object):
     def shader_compiler_config_file(self):
         """
         Return path to the Shader Compiler config file
-        ex. engine_root/dev/windows_vs2019/bin/profile/config.ini
+        ex. engine_root/dev/windows/bin/profile/config.ini
         :return: path to the Shader Compiler config file
         """
         return os.path.join(self.build_directory(), 'config.ini')
@@ -321,7 +321,7 @@ class AbstractResourceLocator(object):
     def shader_cache(self):
         """
         Return path to the shader cache for the current build
-        ex. engine_root/dev/windows_vs2019/bin/profile/Cache
+        ex. engine_root/dev/windows/bin/profile/Cache
         :return: path to the shader cache for the current build
         """
         return os.path.join(self.build_directory(), 'Cache')

Tools/LyTestTools/ly_test_tools/_internal/managers/workspace.py

@@ -119,7 +119,7 @@ class AbstractWorkspaceManager:
 
     def clear_bin(self):
         """
-        Clears the relative Bin folder (i.e. engine_root/dev/windows_vs2019/bin/profile/)
+        Clears the relative Bin folder (i.e. engine_root/dev/windows/bin/profile/)
         :return: None
         """
         if os.path.exists(self.paths.build_directory()):

Tools/RemoteConsole/ly_remote_console/README.txt

@@ -22,8 +22,7 @@ installed on your system.
 
 INSTALL
 -----------
-It is recommended to set up these these tools with the lmbr_test tool Lumberyard's root directory:
-  lmbr_test pysetup install
+Installation of these tools happen automatically when get_python and cmake is run.
 
 To manually install the project in development mode:
   python -m pip install -e .

scripts/build/Platform/Android/build_config.json

@@ -92,7 +92,7 @@
     "COMMAND":"../Windows/build_asset_windows.cmd",
     "PARAMETERS": {
         "CONFIGURATION":"profile",
-        "OUTPUT_DIRECTORY":"build\\windows_vs2019",
+        "OUTPUT_DIRECTORY":"build\\windows",
         "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
         "CMAKE_LY_PROJECTS":"AutomatedTesting",
         "CMAKE_TARGET":"AssetProcessorBatch",

scripts/build/Platform/Windows/build_config.json

@@ -15,24 +15,24 @@
       "validation"
     ]
   },
-  "debug_vs2019_pipe": {
+  "debug_pipe": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean"
     ],
     "steps": [
-      "debug_vs2019",
-      "test_debug_vs2019"
+      "debug",
+      "test_debug"
     ]
   },
-  "profile_vs2019_pipe": {
+  "profile_pipe": {
     "TAGS": [
       "default"
     ],
     "steps": [
-      "profile_vs2019",
-      "asset_profile_vs2019",
-      "test_cpu_profile_vs2019"
+      "profile",
+      "asset_profile",
+      "test_cpu_profile"
     ]
   },
   "scrubbing": {
@@ -79,40 +79,40 @@
       "SCRIPT_PARAMETERS": "--platform 3rdParty --type 3rdParty_all"
     }
   },
-  "test_impact_analysis_profile_vs2019": {
+  "test_impact_analysis_profile": {
     "TAGS": [
     ],
     "COMMAND": "python_windows.cmd",
     "PARAMETERS": {
-      "OUTPUT_DIRECTORY": "build/windows_vs2019",
+      "OUTPUT_DIRECTORY": "build/windows",
       "CONFIGURATION": "profile",
       "SCRIPT_PATH": "scripts/build/TestImpactAnalysis/tiaf_driver.py",
       "SCRIPT_PARAMETERS": 
       "--config=\"%OUTPUT_DIRECTORY%/bin/TestImpactFramework/profile/Persistent/tiaf.json\" --src-branch=%BRANCH_NAME% --dst-branch=%CHANGE_TARGET% --commit=%CHANGE_ID% --s3-bucket=%TEST_IMPACT_S3_BUCKET% --mars-index-prefix=jonawals --s3-top-level-dir=%REPOSITORY_NAME% --build-number=%BUILD_NUMBER% --suite=main --test-failure-policy=continue"
     }
   },
-  "debug_vs2019": {
+  "debug": {
     "TAGS": [
         "weekly-build-metrics"
     ],
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "debug",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "test_debug_vs2019": {
+  "test_debug": {
     "TAGS": [
         "weekly-build-metrics"
     ],
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "debug",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
@@ -122,7 +122,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "profile_vs2019": {
+  "profile": {
     "TAGS": [
       "daily-pipeline-metrics",
       "weekly-build-metrics"
@@ -130,14 +130,14 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_TEST_IMPACT_INSTRUMENTATION_BIN=%TEST_IMPACT_WIN_BINARY%",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "profile_vs2019_nounity": {
+  "profile_nounity": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean",
@@ -146,14 +146,14 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_UNITY_BUILD=FALSE",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "test_cpu_profile_vs2019": {
+  "test_cpu_profile": {
     "TAGS": [
         "daily-pipeline-metrics",
         "weekly-build-metrics"
@@ -161,7 +161,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
@@ -171,7 +171,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "test_gpu_profile_vs2019": {
+  "test_gpu_profile": {
     "TAGS":[
       "nightly-incremental",
       "nightly-clean"
@@ -182,7 +182,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_smoke TEST_SUITE_main",
@@ -193,7 +193,7 @@
       "TEST_SCREENSHOTS": "True"
     }
   },
-  "asset_profile_vs2019": {
+  "asset_profile": {
     "TAGS": [
       "weekly-build-metrics",
       "nightly-incremental",
@@ -202,7 +202,7 @@
     "COMMAND": "build_asset_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "AssetProcessorBatch",
@@ -212,18 +212,18 @@
       "ASSET_PROCESSOR_PLATFORMS": "pc,server"
     }
   },
-  "awsi_test_profile_vs2019_pipe": {
+  "awsi_test_profile_pipe": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean"
     ],
     "steps": [
       "awsi_deployment",
-      "awsi_test_profile_vs2019",
+      "awsi_test_profile",
       "awsi_destruction"
     ]
   },
-  "awsi_test_profile_vs2019": {
+  "awsi_test_profile": {
     "TAGS": [
         "weekly-build-metrics"
     ],
@@ -233,7 +233,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_awsi",
@@ -243,7 +243,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "periodic_test_profile_vs2019": {
+  "periodic_test_profile": {
     "TAGS": [
         "nightly-incremental",
         "nightly-clean",
@@ -252,7 +252,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_periodic",
@@ -262,7 +262,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "sandbox_test_profile_vs2019": {
+  "sandbox_test_profile": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean",
@@ -274,7 +274,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_sandbox",
@@ -284,7 +284,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "benchmark_test_profile_vs2019": {
+  "benchmark_test_profile": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean",
@@ -293,7 +293,7 @@
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "TEST_SUITE_benchmark",
@@ -303,7 +303,7 @@
       "TEST_RESULTS": "True"
     }
   },
-  "release_vs2019": {
+  "release": {
     "TAGS": [
       "default",
       "nightly-incremental",
@@ -313,14 +313,14 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "release",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "monolithic_release_vs2019": {
+  "monolithic_release": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean",
@@ -329,25 +329,25 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "release",
-      "OUTPUT_DIRECTORY": "build\\mono_windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\mono_windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_MONOLITHIC_GAME=TRUE",
       "CMAKE_LY_PROJECTS": "AutomatedTesting",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "install_profile_vs2019": {
+  "install_profile": {
     "TAGS": [],
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
         "CONFIGURATION": "profile",
-        "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+        "OUTPUT_DIRECTORY": "build\\windows",
         "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE",
         "CMAKE_TARGET": "INSTALL",
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "installer_vs2019": {
+  "installer": {
     "TAGS": [
       "nightly-clean",
       "nightly-installer"
@@ -358,7 +358,7 @@
     "COMMAND": "build_installer_windows.cmd",
     "PARAMETERS": {
         "CONFIGURATION": "profile",
-        "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+        "OUTPUT_DIRECTORY": "build\\windows",
         "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DLY_DISABLE_TEST_MODULES=TRUE -DLY_VERSION_ENGINE_NAME=o3de-sdk -DLY_INSTALLER_WIX_ROOT=\"!WIX! \"",
         "EXTRA_CMAKE_OPTIONS": "-DLY_INSTALLER_AUTO_GEN_TAG=TRUE -DLY_INSTALLER_DOWNLOAD_URL=!INSTALLER_DOWNLOAD_URL! -DLY_INSTALLER_LICENSE_URL=!INSTALLER_DOWNLOAD_URL!/license",
         "CMAKE_TARGET": "ALL_BUILD",
@@ -366,7 +366,7 @@
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "install_profile_vs2019_pipe": {
+  "install_profile_pipe": {
     "TAGS": [
       "nightly-incremental",
       "nightly-clean"
@@ -375,9 +375,9 @@
       "PROJECT_REPOSITORY_NAME": "TestProject"
     },
     "steps": [
-      "install_profile_vs2019",
+      "install_profile",
       "project_generate",
-      "project_engineinstall_profile_vs2019"
+      "project_engineinstall_profile"
     ]
   },
   "project_generate": {
@@ -388,7 +388,7 @@
       "SCRIPT_PARAMETERS": "create-project -pp %WORKSPACE%\\%PROJECT_REPOSITORY_NAME% --force"
     }
   },
-  "project_enginesource_profile_vs2019": {
+  "project_enginesource_profile": {
     "TAGS": [
       "project"
     ],
@@ -398,13 +398,13 @@
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_MODULE_PATH=%WORKSPACE%/o3de/cmake",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "project_engineinstall_profile_vs2019": {
+  "project_engineinstall_profile": {
     "TAGS": [],
     "PIPELINE_ENV": {
       "EXECUTE_FROM_PROJECT": "1"
@@ -413,19 +413,19 @@
     "PARAMETERS": {
       "COMMAND_CWD": "%WORKSPACE%\\%PROJECT_REPOSITORY_NAME%",
       "CONFIGURATION": "profile",
-      "OUTPUT_DIRECTORY": "build\\windows_vs2019",
+      "OUTPUT_DIRECTORY": "build\\windows",
       "CMAKE_OPTIONS": "-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_MODULE_PATH=%WORKSPACE%/o3de/install/cmake",
       "CMAKE_TARGET": "ALL_BUILD",
       "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo"
     }
   },
-  "project_engineinstall_profile_vs2019_pipe": {
+  "project_engineinstall_profile_pipe": {
     "TAGS": [
       "project"
     ],
     "steps": [
-      "install_profile_vs2019",
-      "project_engineinstall_profile_vs2019"
+      "install_profile",
+      "project_engineinstall_profile"
     ]
   },
   "awsi_deployment": {

scripts/build/Platform/Windows/package_build_config.json

@@ -1,9 +1,9 @@
 {
-  "profile_vs2019_atom": {
+  "profile_atom": {
     "COMMAND":"build_windows.cmd",
     "PARAMETERS": {
       "CONFIGURATION":"profile",
-      "OUTPUT_DIRECTORY":"windows_vs2019",
+      "OUTPUT_DIRECTORY":"windows",
       "CMAKE_OPTIONS":"-G \"Visual Studio 16 2019\" -DCMAKE_SYSTEM_VERSION=10.0",
       "CMAKE_LY_PROJECTS":"AtomTest;AtomSampleViewer",
       "CMAKE_TARGET":"ALL_BUILD",

scripts/build/package/Platform/Windows/package_env.json

@@ -27,7 +27,7 @@
                 {
                     "BUILD_CONFIG_FILENAME": "build_config.json",
                     "PLATFORM": "Windows",
-                    "TYPE": "profile_vs2019"
+                    "TYPE": "profile"
                 }
             ]
         }

scripts/o3de/README.txt

@@ -23,7 +23,7 @@ INSTALL
 It is recommended to set up these these tools with O3DE's CMake build commands.
 Assuming CMake is already setup on your operating system, below are some sample build commands:
     cd /path/to/od3e/
-    cmake -B windows_vs2019 -S . -G"Visual Studio 16"
+    cmake -B windows -S . -G"Visual Studio 16"
 
 To manually install the project in development mode using your own installed Python interpreter:
     cd /path/to/od3e/o3de