diff --git a/appveyor.yml b/appveyor.yml
index aeb4bc44e..731d78220 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,7 +21,7 @@ skip_tags: true
 #    environment configuration    #
 #---------------------------------#
 
-os: Visual Studio 2017
+os: Visual Studio 2019
 
 # scripts that are called at very beginning, before repo cloning
 init:
diff --git a/CodingStyle.ruleset b/build/CodingStyle.ruleset
similarity index 100%
rename from CodingStyle.ruleset
rename to build/CodingStyle.ruleset
diff --git a/build/common.props b/build/common.props
index 6f0b42b07..c2b67c021 100644
--- a/build/common.props
+++ b/build/common.props
@@ -14,11 +14,10 @@
 
     <CLSCompliant>true</CLSCompliant>
     <ComVisible>false</ComVisible>
-	
+
     <UseSharedCompilation>false</UseSharedCompilation>
     <SuppressNETCoreSdkPreviewMessage>True</SuppressNETCoreSdkPreviewMessage>
-
-    <CodeAnalysisRuleSet>$(SolutionDir)CodingStyle.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingStyle.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(IsVisualBasic)' != 'true' And $(TargetFramework.StartsWith('net4')) ">
@@ -66,7 +65,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup >
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -74,5 +73,4 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-
 </Project>
\ No newline at end of file