From bdf9005c53cc968e3dc8aefef874f58761a50794 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Tue, 14 Sep 2021 18:19:42 -0700
Subject: [PATCH] PR comments

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 cmake/Platform/Common/Clang/Configurations_clang.cmake | 2 +-
 cmake/Platform/Common/MSVC/Directory.Build.props       | 2 +-
 cmake/Platform/Common/MSVC/VisualStudio_common.cmake   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/Platform/Common/Clang/Configurations_clang.cmake b/cmake/Platform/Common/Clang/Configurations_clang.cmake
index 86f4faccfb..2a311d6079 100644
--- a/cmake/Platform/Common/Clang/Configurations_clang.cmake
+++ b/cmake/Platform/Common/Clang/Configurations_clang.cmake
@@ -20,7 +20,7 @@ ly_append_configurations_options(
         # Disabled warnings (please do not disable any others without first consulting sig-build)
         ###################
         -Wno-inconsistent-missing-override # unfortunately there is no warning in MSVC to detect missing overrides, 
-            # MSVC's static analyzer can, but that is a different run that most developers are not ware of. A pass
+            # MSVC's static analyzer can, but that is a different run that most developers are not aware of. A pass
             # was done to fix all hits. Leaving this disabled until there is a matching warning in MSVC.
 
         -Wrange-loop-analysis
diff --git a/cmake/Platform/Common/MSVC/Directory.Build.props b/cmake/Platform/Common/MSVC/Directory.Build.props
index 589e14a6cb..b8e9b716d9 100644
--- a/cmake/Platform/Common/MSVC/Directory.Build.props
+++ b/cmake/Platform/Common/MSVC/Directory.Build.props
@@ -14,7 +14,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT
 @VCPKG_CONFIGURATION_MAPPING@
         <!-- Disable vcpkg to prevent include and linking paths from being added by the vcpkg integration -->
         <VcpkgEnabled>false</VcpkgEnabled>
-        <CodeAnalysisRuleSet>@LY_ROOT_FOLDER@\cmake\Platform\Common\MSVC\CodeAnalysis.ruleset</CodeAnalysisRuleSet>
+        <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleSet>
     </PropertyGroup>
     <ItemDefinitionGroup>
         <ClCompile>
diff --git a/cmake/Platform/Common/MSVC/VisualStudio_common.cmake b/cmake/Platform/Common/MSVC/VisualStudio_common.cmake
index 9124758b18..d9e58090d9 100644
--- a/cmake/Platform/Common/MSVC/VisualStudio_common.cmake
+++ b/cmake/Platform/Common/MSVC/VisualStudio_common.cmake
@@ -15,4 +15,4 @@ foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES)
 endforeach()
   
 configure_file("${CMAKE_CURRENT_LIST_DIR}/Directory.Build.props" "${CMAKE_BINARY_DIR}/Directory.Build.props" @ONLY)
-
+file(COPY_FILE "${CMAKE_CURRENT_LIST_DIR}/CodeAnalysis.ruleset" "${CMAKE_BINARY_DIR}/CodeAnalysis.ruleset" ONLY_IF_DIFFERENT)