Resolve source-build patch conflict

2022-04-08 18:29:50 +00:00 · 2022-04-08 18:29:50 +00:00 · 2f7d7bbfeb
commit 2f7d7bbfeb
parent 2f01ebc8e5
1 changed files with 1 additions and 1 deletions
--- a/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch
+++ b/src/SourceBuild/tarball/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch
@ -123,7 +123,7 @@ index 738fdebf2..6d13947ce 100644
 --- a/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs
 +++ b/src/NetAnalyzers/Core/Microsoft.CodeQuality.Analyzers/ApiDesignGuidelines/DoNotDirectlyAwaitATask.Fixer.cs
@@ -82,7 +82,7 @@ private class MyCodeAction : DocumentChangeAction
-             }
+             return CustomFixAllProvider.Instance;
         }
 
 -        private sealed class CustomFixAllProvider : DocumentBasedFixAllProvider