Resolve source-build dotnet-format patch conflict (#12545)

dotnet · Oct 27, 2021 · 9e8b04b · 9e8b04b
1 parent 13362eb
commit 9e8b04b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch b/src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch
@@ -51,7 +51,7 @@ index b1990aa..f6ddbbd 100644
      <MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
 +    <MicrosoftExtensionsDependencyInjectionVersion>5.0.0</MicrosoftExtensionsDependencyInjectionVersion>
      <!-- Dependencies from https://github.com/dotnet/roslyn -->
-     <MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21515.3</MicrosoftNETCoreCompilersPackageVersion>
+     <MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21526.21</MicrosoftNETCoreCompilersPackageVersion>
      <!-- Dependencies from https://github.com/dotnet/command-line-api -->
 diff --git a/src/Logging/SimpleConsoleLogger.cs b/src/Logging/SimpleConsoleLogger.cs
 index c361f84..fd8015c 100644