From 2f7d7bbfeb71067d3dbadd2313998cc857d6794b Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 8 Apr 2022 18:29:50 +0000 Subject: [PATCH] Resolve source-build patch conflict --- ...1-Eliminate-pre-built-assets-during-source-build-for-r.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index 972048de5..6840a5bb9 100644 --- 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