From 5e58dcf7112a84ba4de8ff32ad498ebe6ce8af42 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Sun, 1 Dec 2019 19:44:05 +0100 Subject: [PATCH 1/3] Re-enable CoreLib analyzers CoreLib analyzers were unintentionally disabled with 6afe96cc2e950379d13a87efa1fa5a651cbce9bd. This re-enables the analyzers and conditions one which brings in external dependencies that CoreLib can't deal with. --- eng/Analyzers.props | 9 +++++---- .../System.Private.CoreLib/System.Private.CoreLib.csproj | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eng/Analyzers.props b/eng/Analyzers.props index 24d83dca9c00b5..255972c78bd1e1 100644 --- a/eng/Analyzers.props +++ b/eng/Analyzers.props @@ -3,9 +3,10 @@ $(MSBuildThisFileDirectory)CodeAnalysis.ruleset - - - - + + + + + diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 307f8847e6f11a..58b4d5fac6c028 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -63,7 +63,7 @@ <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation true $(OutputPath)$(MSBuildProjectName).xml - false + true From 7ec592fb5b1cb64d9ca33b2274879cb20bfa9612 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 2 Dec 2019 16:17:26 +0100 Subject: [PATCH 2/3] Remove Microsoft.CodeAnalysis.Common from common Microsoft.CodeAnalysis.Common shouldn't be referenced directly, therefore removing that package from the common location and only restoring and marking it as an analyzer in the libraries restore phase. --- eng/Analyzers.props | 2 -- src/libraries/restore/analyzers/analyzers.depproj | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eng/Analyzers.props b/eng/Analyzers.props index 255972c78bd1e1..e2163a76e3a96f 100644 --- a/eng/Analyzers.props +++ b/eng/Analyzers.props @@ -4,8 +4,6 @@ - - diff --git a/src/libraries/restore/analyzers/analyzers.depproj b/src/libraries/restore/analyzers/analyzers.depproj index 75547d787bc67c..5e613b2c866ad4 100644 --- a/src/libraries/restore/analyzers/analyzers.depproj +++ b/src/libraries/restore/analyzers/analyzers.depproj @@ -5,6 +5,14 @@ C# + + + + + Date: Mon, 2 Dec 2019 18:08:45 +0100 Subject: [PATCH 3/3] Add todo link --- src/libraries/restore/analyzers/analyzers.depproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/restore/analyzers/analyzers.depproj b/src/libraries/restore/analyzers/analyzers.depproj index 5e613b2c866ad4..93e179efe5ba68 100644 --- a/src/libraries/restore/analyzers/analyzers.depproj +++ b/src/libraries/restore/analyzers/analyzers.depproj @@ -8,7 +8,7 @@