From c073221943a91cbdd4e464eb2648f3d4c74ea4f8 Mon Sep 17 00:00:00 2001
From: Timothy Mothra <tilee@microsoft.com>
Date: Wed, 5 May 2021 11:00:34 -0700
Subject: [PATCH] update analyzers (#2198)

* update analyzers

* remove default case, tests should pass

* fxcop

* cleanup

* testing fix
---
 .props/Product.props                          | 19 ++++++++++++++++---
 .rulesets/ApplicationInsightsSDKRules.ruleset |  2 ++
 .../Tracing/HeartbeatProvider.cs              |  6 +-----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.props/Product.props b/.props/Product.props
index 9f5902e87f..da6f6ec38f 100644
--- a/.props/Product.props
+++ b/.props/Product.props
@@ -13,17 +13,20 @@
 
   <ItemGroup Condition=" $(OS) == 'Windows_NT'">
     <!--Analyzers-->
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.0">	
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">	
       <PrivateAssets>all</PrivateAssets>	
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>	
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.2">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
@@ -40,6 +43,16 @@
   </ItemGroup>
   
   <PropertyGroup>
+    <!-- Enable all the latest CA rules from 'Microsoft.CodeAnalysis.NetAnalyzers' as build warnings by default -->
+    
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    
+    <!-- This appears to create a conflict between using built-in analyzers and the NuGetPackage. -->
+    <!--<EnableNETAnalyzers>true</EnableNETAnalyzers>--> 
+    
+    
+
     <!--Removing the SRC folder from the output directory-->
     <CorePath>$(RelativeOutputPathBase)</CorePath>
     <OutputPath>$(BinRoot)\$(Configuration)\$(CorePath)</OutputPath>
diff --git a/.rulesets/ApplicationInsightsSDKRules.ruleset b/.rulesets/ApplicationInsightsSDKRules.ruleset
index c9845014d5..07fd28a30d 100644
--- a/.rulesets/ApplicationInsightsSDKRules.ruleset
+++ b/.rulesets/ApplicationInsightsSDKRules.ruleset
@@ -105,6 +105,8 @@
     <Rule Id="CA2241" Action="Warning" />
     <Rule Id="CA2242" Action="Warning" />
     <Rule Id="CA5122" Action="Warning" />
+    <!-- Suppressing Message "FxCopAnalyzers package has been deprecated in favor of 'Microsoft.CodeAnalysis.NetAnalyzers" because NetAnalyzers does not yet cover as many cases as FxCop -->
+    <Rule Id="CA9998" Action="None" />
   </Rules>
   <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
     <Rule Id="C26100" Action="Warning" />
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/HeartbeatProvider.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/HeartbeatProvider.cs
index d963d2e451..2dfef202d3 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/HeartbeatProvider.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/HeartbeatProvider.cs
@@ -77,11 +77,7 @@ public TimeSpan HeartbeatInterval
             get => this.interval;
             set
             {
-                if (value == null)
-                {
-                    this.interval = DefaultHeartbeatInterval;
-                }
-                else if (value <= MinimumHeartbeatInterval)
+                if (value <= MinimumHeartbeatInterval)
                 {
                     this.interval = MinimumHeartbeatInterval;
                 }