Look for CancellationToken properties in base types too

Parse xs:boolean values for 0 and 1

Include readme in NuGet package

Author: menees

src/Directory.Build.props

@@ -21,7 +21,7 @@
 		<AssemblyOriginatorKeyFile>../Analyzers.snk</AssemblyOriginatorKeyFile>
 
 		<!-- NOTE: Change the version in Vsix\source.extension.vsixmanifest to match this! -->
-		<Version>3.3.0</Version>
+		<Version>3.3.1</Version>
 
 		<RoslynVersion>3.11.0</RoslynVersion>
 	</PropertyGroup>

src/Menees.Analyzers.CodeFixes/Menees.Analyzers.nuspec

@@ -17,6 +17,7 @@
 		<license type="expression">MIT</license>
 		<projectUrl>https://github.com/menees/Analyzers</projectUrl>
 		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<readme>docs\README.md</readme>
 		<description>Provides analyzers for validating that:
 		* Tabs are used for indentation.
 		* Lengths of lines, methods, properties, and files are acceptable.
@@ -31,7 +32,6 @@
 		* TryGetValue is used instead of ContainsKey and this[key].
 		* Preferred terms are used in identifiers.
 		</description>
-		<!-- <releaseNotes></releaseNotes> -->
 		<copyright>$copyright$</copyright>
 		<tags>Analyzers, DotNetAnalyzers, Roslyn</tags>
 		<frameworkAssemblies>
@@ -48,5 +48,8 @@
 		<!-- Scripts -->
 		<file src="tools\install.ps1" target="tools\" />
 		<file src="tools\uninstall.ps1" target="tools\" />
+
+		<!-- Docs -->
+		<file src="..\..\README.md" target="docs\" />
 	</files>
 </package>

src/Menees.Analyzers/Men019SupportAsyncCancellationToken.cs

@@ -293,8 +293,9 @@ private bool ParameterHasCancellationTokenProperty(IParameterSymbol parameterSym
 				&& typeHasCancellationTokenProperty.GetOrAdd(parameterSymbol.Type, type =>
 				{
 					bool hasCancellationTokenProperty = false;
+					ITypeSymbol[] typeHierarchy = [.. GetTypeAndBaseTypes(type)];
 					IEnumerable<IPropertySymbol> publicCancellationProperties = propertyNamesToCheck
-						.SelectMany(propertyName => type.GetMembers(propertyName))
+						.SelectMany(propertyName => typeHierarchy.SelectMany(t => t.GetMembers(propertyName)))
 						.Where(m => m.Kind == SymbolKind.Property && m.DeclaredAccessibility == Accessibility.Public)
 						.Cast<IPropertySymbol>();
 					foreach (IPropertySymbol propertySymbol in publicCancellationProperties)

src/Menees.Analyzers/Settings.cs

@@ -140,7 +140,7 @@ private Settings(XElement xml)
 		XElement? supportAsyncCancellationToken = xml.Element("SupportAsyncCancellationToken");
 		if (supportAsyncCancellationToken != null)
 		{
-			if (bool.TryParse(supportAsyncCancellationToken.Attribute("CheckPrivateMethods")?.Value, out bool value))
+			if (TryParseXsBoolean(supportAsyncCancellationToken.Attribute("CheckPrivateMethods")?.Value, out bool value))
 			{
 				this.CheckPrivateMethodsForCancellation = value;
 			}
@@ -373,7 +373,7 @@ private static int GetSetting(XElement xml, string elementName, int defaultValue
 		=> GetSetting(xml, elementName, defaultValue, (string text, out int value) => int.TryParse(text, out value) && value > 0);
 
 	private static bool GetSetting(XElement xml, string elementName, bool defaultValue)
-		=> GetSetting(xml, elementName, defaultValue, bool.TryParse);
+		=> GetSetting(xml, elementName, defaultValue, TryParseXsBoolean);
 
 	private static T GetSetting<T>(XElement xml, string elementName, T defaultValue, TryParse<T> tryParse)
 	{
@@ -391,6 +391,25 @@ private static T GetSetting<T>(XElement xml, string elementName, T defaultValue,
 		return result;
 	}
 
+	/// <summary>
+	/// Tries to parse an xs:boolean value, which allows true, false, 1, or 0.
+	/// </summary>
+	private static bool TryParseXsBoolean(string? text, out bool value)
+	{
+		bool result = bool.TryParse(text, out value);
+		if (!result)
+		{
+			result = int.TryParse(text, out int number);
+			if (result)
+			{
+				value = number != 0;
+			}
+		}
+
+		return result;
+	}
+
+
 	private static Predicate<string> CreateFileRegexPredicate(string fileRegex)
 		=> value => Regex.IsMatch(value, fileRegex, RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture);
 

tests/Menees.Analyzers.Test/Men019UnitTests.cs

@@ -95,7 +95,9 @@ public interface IThink1 { Task Think1(); }
 public interface IThink2 { Task Think2(); }
 #pragma warning restore MEN019
 
-public sealed class Cancellable { public CancellationToken Cancel {get;}}
+public class Cancellable { public CancellationToken Cancel {get;}}
+public sealed class DerivedCancellable : Cancellable { public bool IsDerived {get;} = true; }
+
 public class TestBase : IThink1
 {
 	public virtual Task Think1() => Task.CompletedTask;
@@ -129,6 +131,7 @@ public class Test : TestBase, IFormattable, IThink2
 	public Task UnitTest() => Task.CompletedTask;
 
 	public Task GetsCancelProperty(Cancellable cancellable) => Task.CompletedTask;
+	public Task GetsInheritedCancelProperty(DerivedCancellable cancellable) => Task.CompletedTask;
 
 	// Normal methods
 	public override string ToString() => nameof(Test);