From 07dcc06048004f307025e3c5a41f1cff638f1973 Mon Sep 17 00:00:00 2001
From: elachlan <2433737+elachlan@users.noreply.github.com>
Date: Thu, 30 Dec 2021 13:50:53 +1000
Subject: [PATCH 1/3] CA2016 Forward the 'CancellationToken' parameter to
 methods that take one

---
 eng/CodeAnalysis.ruleset                              | 2 +-
 src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset
index 2078c42fe6c..26b17d49a0e 100644
--- a/eng/CodeAnalysis.ruleset
+++ b/eng/CodeAnalysis.ruleset
@@ -119,7 +119,7 @@
     <Rule Id="CA2013" Action="Warning" />          <!-- Do not use ReferenceEquals with value types --> 
     <Rule Id="CA2014" Action="Warning" />          <!-- Do not use stackalloc in loops. --> 
     <Rule Id="CA2015" Action="Warning" />          <!-- Do not define finalizers for types derived from MemoryManager<T> --> 
-    <Rule Id="CA2016" Action="Info" />             <!-- Forward the 'CancellationToken' parameter to methods that take one --> 
+    <Rule Id="CA2016" Action="Warning" />          <!-- Forward the 'CancellationToken' parameter to methods that take one --> 
     <Rule Id="CA2100" Action="None" />             <!-- Review SQL queries for security vulnerabilities --> 
     <Rule Id="CA2101" Action="None" />             <!-- Specify marshaling for P/Invoke string arguments --> 
     <Rule Id="CA2109" Action="None" />             <!-- Review visible event handlers --> 
diff --git a/src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs b/src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs
index c994edab0ff..eb198cf2711 100644
--- a/src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs
+++ b/src/Build.UnitTests/ProjectCache/ProjectCacheTests.cs
@@ -306,7 +306,7 @@ public override async Task<CacheResult> GetCacheResultAsync(
 
                 if (_projectQuerySleepTime is not null)
                 {
-                    await Task.Delay(_projectQuerySleepTime.Value);
+                    await Task.Delay(_projectQuerySleepTime.Value, cancellationToken);
                 }
 
                 QueryStartStops.Enqueue(queryId);

From af77c350cddb46ae16a3538f56782ece59774700 Mon Sep 17 00:00:00 2001
From: elachlan <2433737+elachlan@users.noreply.github.com>
Date: Sat, 8 Jan 2022 15:34:16 +1000
Subject: [PATCH 2/3] Revert CodeAnalysis.ruleset

---
 eng/CodeAnalysis.ruleset | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/CodeAnalysis.ruleset b/eng/CodeAnalysis.ruleset
index 26b17d49a0e..2078c42fe6c 100644
--- a/eng/CodeAnalysis.ruleset
+++ b/eng/CodeAnalysis.ruleset
@@ -119,7 +119,7 @@
     <Rule Id="CA2013" Action="Warning" />          <!-- Do not use ReferenceEquals with value types --> 
     <Rule Id="CA2014" Action="Warning" />          <!-- Do not use stackalloc in loops. --> 
     <Rule Id="CA2015" Action="Warning" />          <!-- Do not define finalizers for types derived from MemoryManager<T> --> 
-    <Rule Id="CA2016" Action="Warning" />          <!-- Forward the 'CancellationToken' parameter to methods that take one --> 
+    <Rule Id="CA2016" Action="Info" />             <!-- Forward the 'CancellationToken' parameter to methods that take one --> 
     <Rule Id="CA2100" Action="None" />             <!-- Review SQL queries for security vulnerabilities --> 
     <Rule Id="CA2101" Action="None" />             <!-- Specify marshaling for P/Invoke string arguments --> 
     <Rule Id="CA2109" Action="None" />             <!-- Review visible event handlers --> 

From ea95d5504017a26806d54c5ebffe1b51a468c6fd Mon Sep 17 00:00:00 2001
From: elachlan <2433737+elachlan@users.noreply.github.com>
Date: Sat, 8 Jan 2022 15:38:31 +1000
Subject: [PATCH 3/3] enable warning on CA2016

---
 eng/Common.globalconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Common.globalconfig b/eng/Common.globalconfig
index fd878420d57..74146e7504b 100644
--- a/eng/Common.globalconfig
+++ b/eng/Common.globalconfig
@@ -352,7 +352,7 @@ dotnet_diagnostic.CA2014.severity = warning
 dotnet_diagnostic.CA2015.severity = warning
 
 # Forward the 'CancellationToken' parameter to methods that take one
-dotnet_diagnostic.CA2016.severity = suggestion
+dotnet_diagnostic.CA2016.severity = warning
 
 # Review SQL queries for security vulnerabilities
 dotnet_diagnostic.CA2100.severity = none