Update analyzers and various fixes to be able to build with latest RC…

…1 SDK (dotnet#40796) * Disable net analyzers from the SDK and use them from package reference instead * Fix build with new SDK and bump net analyzer version * PR Feedback
klogeaage · Aug 15, 2020 · 732ea74 · 732ea74
1 parent 12f46e4
commit 732ea74
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -84,6 +84,9 @@
 
     <!-- We don't want Private packages to be shipped to NuGet.org -->
     <IsShippingPackage Condition="($(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage>
+
+    <!-- By default the SDK produces ref assembly for 5.0 or later -->
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>
 
   <!-- Language configuration -->

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -6,6 +6,8 @@
     tell Microsoft.Common.targets not to import Directory.Build.targets again
     -->
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+
+    <EnableNETAnalyzers Condition="'$(EnableAnalyzers)' != 'true'">false</EnableNETAnalyzers>
   </PropertyGroup>
 
   <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" />

diff --git a/eng/Analyzers.props b/eng/Analyzers.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">
     <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="3.3.0-beta3.20410.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.0-rc1.20413.9" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/eng/referenceAssemblies.props b/eng/referenceAssemblies.props
@@ -4,6 +4,9 @@
                             !$(BuildTargetFramework.StartsWith('net4'))">
     <AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);netstandard2.0</AdditionalBuildTargetFrameworks>
     <AdditionalBuildTargetFrameworks Condition="!$(BuildTargetFramework.StartsWith('netcoreapp2.0'))">$(AdditionalBuildTargetFrameworks);netstandard2.1</AdditionalBuildTargetFrameworks>
+
+    <!-- Reference assemblies are special and don't initialize fields or have empty finalizers, etc. -->
+    <EnableAnalyzers>false</EnableAnalyzers>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets
@@ -6,6 +6,11 @@
     <EnableTargetingPackDownload>false</EnableTargetingPackDownload>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and ('$(_ShortFrameworkIdentifier)' == '' or '$(_ShortFrameworkVersion)' == '')">
+    <_ShortFrameworkIdentifier>$(TargetFramework.TrimEnd('.0123456789'))</_ShortFrameworkIdentifier>
+    <_ShortFrameworkVersion>$(TargetFramework.Substring($(_ShortFrameworkIdentifier.Length)))</_ShortFrameworkVersion>
+  </PropertyGroup>
+
   <!-- .NETCoreApp 2.x DisableImplicitAssemblyReferences support. -->
   <Choose>
     <When Condition="'$(DisableImplicitAssemblyReferences)' == 'true' and