Merge branch 'master' into UpdateCopyFromMethod

OData · Nov 19, 2019 · 1345914 · 1345914
2 parents 9a786ed + 2afd3c1
commit 1345914
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Build.props b/Build.props
@@ -84,7 +84,7 @@
 
   <!-- StyleCop settings -->
   <PropertyGroup>
-    <StyleCopTargets>$(NuGetPack)\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets</StyleCopTargets>
+    <StyleCopTargets>$(NuGetPack)\StyleCop.MSBuild.5.0.0\build\StyleCop.MSBuild.Targets</StyleCopTargets>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/sln/.nuget/packages.config b/sln/.nuget/packages.config
@@ -15,7 +15,7 @@
   <package id="Microsoft.OData.StyleCop" version="1.0.0" />
   <package id="Newtonsoft.Json" version="6.0.5" />
   <package id="System.Text.Encoding.Extensions" version="4.0.11" />
-  <package id="StyleCop.MSBuild" version="4.7.49" />
+  <package id="StyleCop.MSBuild" version="5.0.0" />
   <package id="xunit" version="2.1.0" />
   <package id="xunit.abstractions" version="2.0.0" />
   <package id="xunit.assert" version="2.1.0" />