Resolve msbuild source-build patch conflict

2022-01-10 15:07:03 +00:00 · 2022-01-10 15:07:03 +00:00 · 4b41693115
commit 4b41693115
parent 2ce908597d
1 changed files with 2 additions and 2 deletions
--- a/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
+++ b/src/SourceBuild/tarball/patches/msbuild/0004-Remove-dependency-on-MS.VS.Setup.Configuration.Inter.patch
@ -21,9 +21,9 @@ index a1f21de26..ff74d6e7f 100644
 --- a/eng/dependabot/Packages.props
 +++ b/eng/dependabot/Packages.props
@@ -22,9 +22,6 @@
- 
-   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
+   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true' AND $(ProjectIsDeprecated) != 'true'">
     <GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.3" />
+     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all"/>
 -  </ItemGroup>
 -
 -  <ItemGroup>