Changes from master

.editorconfig

@@ -236,3 +236,87 @@ dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style
 dotnet_naming_style.prefix_private_field_with_underscore.capitalization           = camel_case
 dotnet_naming_style.prefix_private_field_with_underscore.required_prefix          = _
 
+# Code files
+[*.{cs,vb}]
+
+# Migrate back from old Toolkit.ruleset
+dotnet_diagnostic.CA1001.severity = warning
+dotnet_diagnostic.CA1009.severity = warning
+dotnet_diagnostic.CA1016.severity = warning
+dotnet_diagnostic.CA1033.severity = warning
+dotnet_diagnostic.CA1049.severity = warning
+dotnet_diagnostic.CA1060.severity = warning
+dotnet_diagnostic.CA1061.severity = warning
+dotnet_diagnostic.CA1063.severity = warning
+dotnet_diagnostic.CA1065.severity = warning
+dotnet_diagnostic.CA1301.severity = warning
+dotnet_diagnostic.CA1400.severity = warning
+dotnet_diagnostic.CA1401.severity = warning
+dotnet_diagnostic.CA1403.severity = warning
+dotnet_diagnostic.CA1404.severity = warning
+dotnet_diagnostic.CA1405.severity = warning
+dotnet_diagnostic.CA1410.severity = warning
+dotnet_diagnostic.CA1415.severity = warning
+dotnet_diagnostic.CA1821.severity = warning
+dotnet_diagnostic.CA1900.severity = warning
+dotnet_diagnostic.CA1901.severity = warning
+dotnet_diagnostic.CA2002.severity = warning
+dotnet_diagnostic.CA2100.severity = warning
+dotnet_diagnostic.CA2101.severity = warning
+dotnet_diagnostic.CA2108.severity = warning
+dotnet_diagnostic.CA2111.severity = warning
+dotnet_diagnostic.CA2112.severity = warning
+dotnet_diagnostic.CA2114.severity = warning
+dotnet_diagnostic.CA2116.severity = warning
+dotnet_diagnostic.CA2117.severity = warning
+dotnet_diagnostic.CA2122.severity = warning
+dotnet_diagnostic.CA2123.severity = warning
+dotnet_diagnostic.CA2124.severity = warning
+dotnet_diagnostic.CA2126.severity = warning
+dotnet_diagnostic.CA2131.severity = warning
+dotnet_diagnostic.CA2132.severity = warning
+dotnet_diagnostic.CA2133.severity = warning
+dotnet_diagnostic.CA2134.severity = warning
+dotnet_diagnostic.CA2137.severity = warning
+dotnet_diagnostic.CA2138.severity = warning
+dotnet_diagnostic.CA2140.severity = warning
+dotnet_diagnostic.CA2141.severity = warning
+dotnet_diagnostic.CA2146.severity = warning
+dotnet_diagnostic.CA2147.severity = warning
+dotnet_diagnostic.CA2149.severity = warning
+dotnet_diagnostic.CA2200.severity = warning
+dotnet_diagnostic.CA2202.severity = warning
+dotnet_diagnostic.CA2207.severity = warning
+dotnet_diagnostic.CA2212.severity = warning
+dotnet_diagnostic.CA2213.severity = warning
+dotnet_diagnostic.CA2214.severity = warning
+dotnet_diagnostic.CA2216.severity = warning
+dotnet_diagnostic.CA2220.severity = warning
+dotnet_diagnostic.CA2229.severity = warning
+dotnet_diagnostic.CA2231.severity = warning
+dotnet_diagnostic.CA2232.severity = warning
+dotnet_diagnostic.CA2235.severity = warning
+dotnet_diagnostic.CA2236.severity = warning
+dotnet_diagnostic.CA2237.severity = warning
+dotnet_diagnostic.CA2238.severity = warning
+dotnet_diagnostic.CA2240.severity = warning
+dotnet_diagnostic.CA2241.severity = warning
+dotnet_diagnostic.CA2242.severity = warning
+dotnet_diagnostic.SA1011.severity = none
+dotnet_diagnostic.SA1101.severity = none
+dotnet_diagnostic.SA1118.severity = none
+dotnet_diagnostic.SA1200.severity = none
+dotnet_diagnostic.SA1201.severity = none
+dotnet_diagnostic.SA1202.severity = none
+dotnet_diagnostic.SA1309.severity = none
+dotnet_diagnostic.SA1310.severity = none
+dotnet_diagnostic.SA1600.severity = none
+dotnet_diagnostic.SA1602.severity = none
+dotnet_diagnostic.SA1611.severity = none
+dotnet_diagnostic.SA1633.severity = none
+dotnet_diagnostic.SA1634.severity = none
+dotnet_diagnostic.SA1652.severity = none
+
+dotnet_diagnostic.SA1629.severity = none # DocumentationTextMustEndWithAPeriod: Let's enable this rule back when we shift to WinUI3 (v8.x). If we do it now, it would mean more than 400 file changes.
+dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline intializers. It's also debatable if we want this or not.
+dotnet_diagnostic.SA1314.severity = none # TypeParameterNamesMustBeginWithT: We do have a few templates that don't start with T. We need to double check that changing this is not a breaking change. If not, we can re-enable this.

Directory.Build.props

@@ -9,7 +9,6 @@
     <PackageLicenseUrl>https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/master/license.md</PackageLicenseUrl>
     <PackageReleaseNotes>v3.0 release https://github.com/windows-toolkit/WindowsCommunityToolkit/releases</PackageReleaseNotes>
     <Copyright>(c) .NET Foundation and Contributors.  All rights reserved.</Copyright>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Toolkit.ruleset</CodeAnalysisRuleSet>
     <DefaultLanguage>en-US</DefaultLanguage>
     <IsDesignProject>$(MSBuildProjectName.Contains('.Design'))</IsDesignProject>
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
@@ -59,11 +58,16 @@
   </Choose>
 
   <Choose>
-    <When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
+    <When Condition="'$(IsDesignProject)' != 'true'">
       <ItemGroup>
-        <!--<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="15.3.83" PrivateAssets="all" />-->
-        <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
+        <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive"/>
+      </ItemGroup>
+    </When>
+  </Choose>
 
+  <Choose>
+    <When Condition="'$(IsTestProject)' != 'true' and '$(IsSampleProject)' != 'true' and '$(IsDesignProject)' != 'true'">
+      <ItemGroup>
         <EmbeddedResource Include="**\*.rd.xml" />
         <Page Include="**\*.xaml" Exclude="**\bin\**\*.xaml;**\obj\**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
         <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />

Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using Microsoft.Toolkit.Parsers.Markdown.Helpers;
 
 namespace Microsoft.Toolkit.Parsers.Markdown.Blocks
@@ -108,8 +107,6 @@ internal static YamlHeaderBlock Parse(string markdown, int start, int end, out i
             }
 
             var result = new YamlHeaderBlock();
-            var keys = new List<string>();
-            var values = new List<string>();
             result.Children = new Dictionary<string, string>();
             foreach (var item in elements)
             {

Microsoft.Toolkit.Parsers/Markdown/Inlines/ImageInline.cs

@@ -73,8 +73,6 @@ internal static void AddTripChars(List<InlineTripCharHelper> tripCharHelpers)
         /// <returns> A parsed markdown image, or <c>null</c> if this is not a markdown image. </returns>
         internal static InlineParseResult Parse(string markdown, int start, int end)
         {
-            int refstart = 0;
-
             // Expect a '!' character.
             if (start >= end || markdown[start] != '!')
             {
@@ -120,7 +118,7 @@ internal static InlineParseResult Parse(string markdown, int start, int end)
 
             if (pos < end && markdown[pos] == '[')
             {
-                refstart = pos;
+                int refstart = pos;
 
                 // Find the reference ']' character
                 while (pos < end)

Microsoft.Toolkit.Parsers/Markdown/MarkdownDocument.cs

@@ -55,7 +55,7 @@ public MarkdownDocument()
         /// <param name="markdownText"> The markdown text. </param>
         public void Parse(string markdownText)
         {
-            Blocks = Parse(markdownText, 0, markdownText.Length, quoteDepth: 0, actualEnd: out int actualEnd);
+            Blocks = Parse(markdownText, 0, markdownText.Length, quoteDepth: 0, actualEnd: out _);
 
             // Remove any references from the list of blocks, and add them to a dictionary.
             for (int i = Blocks.Count - 1; i >= 0; i--)

Microsoft.Toolkit.Parsers/Rss/RssHelper.cs

@@ -311,9 +311,9 @@ public static string TimeZoneToOffset(string tz)
 
             tz = tz.ToUpper().Trim();
 
-            if (timeZones.ContainsKey(tz))
+            if (TimeZones.ContainsKey(tz))
             {
-                return timeZones[tz].First();
+                return TimeZones[tz].First();
             }
 
             return null;
@@ -337,8 +337,7 @@ private static IEnumerable<string> GetImagesInHTMLString(string htmlString)
                 if (matchHeight.Success)
                 {
                     var heightValue = matchHeight.Groups["height"].Value;
-                    int size = 0;
-                    if (int.TryParse(heightValue, out size) && size < 10)
+                    if (int.TryParse(heightValue, out var heightIntValue) && heightIntValue < 10)
                     {
                         include = false;
                     }
@@ -348,8 +347,7 @@ private static IEnumerable<string> GetImagesInHTMLString(string htmlString)
                 if (matchWidth.Success)
                 {
                     var widthValue = matchWidth.Groups["width"].Value;
-                    int size = 0;
-                    if (int.TryParse(widthValue, out size) && size < 10)
+                    if (int.TryParse(widthValue, out var widthIntValue) && widthIntValue < 10)
                     {
                         include = false;
                     }
@@ -376,7 +374,7 @@ private static IEnumerable<string> GetImagesInHTMLString(string htmlString)
         /// <summary>
         /// Dictionary of timezones.
         /// </summary>
-        private static Dictionary<string, string[]> timeZones = new Dictionary<string, string[]>
+        private static readonly Dictionary<string, string[]> TimeZones = new Dictionary<string, string[]>
         {
             { "ACDT", new[] { "-1030", "Australian Central Daylight" } },
             { "ACST", new[] { "-0930", "Australian Central Standard" } },

Microsoft.Toolkit.Services/OAuth/OAuthParameter.cs

@@ -49,7 +49,7 @@ public override string ToString()
         /// <returns>Formatted string of key / value.</returns>
         public string ToString(bool withQuotes)
         {
-            string format = null;
+            string format;
             if (withQuotes)
             {
                 format = "{0}=\"{1}\"";

Microsoft.Toolkit.Services/Services/LinkedIn/LinkedInDataProvider.cs

@@ -176,7 +176,7 @@ public async Task LogoutAsync()
             if (crendential != null)
             {
                 _passwordManager.Remove(LinkedInConstants.STORAGEKEYACCESSTOKEN);
-                 await _storageManager.SetAsync(LinkedInConstants.STORAGEKEYUSER, null);
+                await _storageManager.SetAsync(LinkedInConstants.STORAGEKEYUSER, null);
             }
 
             LoggedIn = false;

Microsoft.Toolkit.Services/Services/Weibo/WeiboDataProvider.cs

@@ -185,7 +185,7 @@ public async Task LogoutAsync()
             if (credential != null)
             {
                 _passwordManager.Remove(PasswordKey);
-               await _storageManager.SetAsync(StorageKey, null);
+                await _storageManager.SetAsync(StorageKey, null);
             }
 
             Uid = null;

Microsoft.Toolkit.Uwp.Connectivity/BluetoothLEHelper/ObservableGattDeviceService.cs

@@ -48,7 +48,7 @@ public ObservableGattDeviceService(GattDeviceService service)
             Service = service;
             Name = GattUuidsService.ConvertUuidToName(service.Uuid);
             UUID = Service.Uuid.ToString();
-            var t = GetAllCharacteristics();
+            _ = PopulateAllCharacteristicsAsync();
         }
 
         /// <summary>
@@ -147,10 +147,10 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         }
 
         /// <summary>
-        /// Gets all the characteristics of this service
+        /// Populate the characteristics in <see cref="Characteristics"/>.
         /// </summary>
         /// <returns>The status of the communication with the GATT device.</returns>
-        private async Task<GattCommunicationStatus> GetAllCharacteristics()
+        private async Task<GattCommunicationStatus> PopulateAllCharacteristicsAsync()
         {
             var tokenSource = new CancellationTokenSource(5000);
             var getCharacteristicsTask = await Task.Run(

Microsoft.Toolkit.Uwp.Notifications/DesktopNotificationManager/DesktopNotificationManagerCompat.cs

@@ -181,13 +181,13 @@ public static bool IsRunningAsUwp()
                     else
                     {
                         int length = 0;
-                        StringBuilder sb = new StringBuilder(0);
-                        int result = GetCurrentPackageFullName(ref length, sb);
+                        var sb = new StringBuilder(0);
+                        GetCurrentPackageFullName(ref length, sb);
 
                         sb = new StringBuilder(length);
-                        result = GetCurrentPackageFullName(ref length, sb);
+                        int error = GetCurrentPackageFullName(ref length, sb);
 
-                        _isRunningAsUwp = result != APPMODEL_ERROR_NO_PACKAGE;
+                        _isRunningAsUwp = error != APPMODEL_ERROR_NO_PACKAGE;
                     }
                 }
 

Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Actions.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Microsoft.Toolkit.Uwp.Notifications
 {
@@ -198,8 +197,8 @@ public ToastContentBuilder AddComboBox(string id, string title, string defaultSe
 
             for (int i = 0; i < choices.Count(); i++)
             {
-                var choice = choices.ElementAt(i);
-                box.Items.Add(new ToastSelectionBoxItem(choice.comboBoxItemId, choice.comboBoxItemContent));
+                var (comboBoxItemId, comboBoxItemContent) = choices.ElementAt(i);
+                box.Items.Add(new ToastSelectionBoxItem(comboBoxItemId, comboBoxItemContent));
             }
 
             return AddToastInput(box);
@@ -208,7 +207,7 @@ public ToastContentBuilder AddComboBox(string id, string title, string defaultSe
         /// <summary>
         /// Add an input option to the Toast.
         /// </summary>
-        /// <param name="input">An instance of a class that impmement <see cref="IToastInput"/> that will be used on the toast.</param>
+        /// <param name="input">An instance of a class that implement <see cref="IToastInput"/> that will be used on the toast.</param>
         /// <returns>The current instance of <see cref="ToastContentBuilder"/></returns>
         public ToastContentBuilder AddToastInput(IToastInput input)
         {

Microsoft.Toolkit.Uwp.Notifications/Toasts/Builder/ToastContentBuilder.Visuals.cs

@@ -82,50 +82,50 @@ private IList<IToastBindingGenericChild> VisualChildren
 
 #if WINDOWS_UWP
 
-     /// <summary>
-     /// Create an instance of NotificationData that can be used to update toast that has a progress bar.
-     /// </summary>
-     /// <param name="toast">Instance of ToastContent that contain progress bars that need to be updated</param>
-     /// <param name="index">Index of the progress bar (0-based) that this notification data is updating in the case that toast has multiple progress bars. Default to 0.</param>
-     /// <param name="title">Title of the progress bar.</param>
-     /// <param name="value">Value of the progress bar.</param>
-     /// <param name="valueStringOverride">An optional string to be displayed instead of the default percentage string. If this isn't provided, something like "70%" will be displayed.</param>
-     /// <param name="status"> A status string, which is displayed underneath the progress bar on the left. Default to empty.</param>
-     /// <param name="sequence">A sequence number to prevent out-of-order updates, or assign 0 to indicate "always update".</param>
-     /// <returns>An instance of NotificationData that can be used to update the toast.</returns>
-     public static NotificationData CreateProgressBarData(ToastContent toast, int index = 0, string title = default(string), double? value = null, string valueStringOverride = default(string), string status = default(string), uint sequence = 0)
-     {
-         var progressBar = toast.Visual.BindingGeneric.Children.Where(c => c is AdaptiveProgressBar).ElementAt(index) as AdaptiveProgressBar;
-         if (progressBar == null)
-         {
-             throw new ArgumentException(nameof(toast), "Given toast does not have any progress bar");
-         }
-
-         NotificationData data = new NotificationData();
-         data.SequenceNumber = sequence;
-
-         if (progressBar.Title is BindableString bindableTitle && title != default(string))
-         {
-             data.Values[bindableTitle.BindingName] = title;
-         }
-
-         if (progressBar.Value is BindableProgressBarValue bindableProgressValue && value != null)
-         {
-             data.Values[bindableProgressValue.BindingName] = value.ToString();
-         }
-
-         if (progressBar.ValueStringOverride is BindableString bindableValueStringOverride && valueStringOverride != default(string))
-         {
-             data.Values[bindableValueStringOverride.BindingName] = valueStringOverride;
-         }
-
-         if (progressBar.Status is BindableString bindableStatus && status != default(string))
-         {
-             data.Values[bindableStatus.BindingName] = status;
-         }
-
-         return data;
-     }
+        /// <summary>
+        /// Create an instance of NotificationData that can be used to update toast that has a progress bar.
+        /// </summary>
+        /// <param name="toast">Instance of ToastContent that contain progress bars that need to be updated</param>
+        /// <param name="index">Index of the progress bar (0-based) that this notification data is updating in the case that toast has multiple progress bars. Default to 0.</param>
+        /// <param name="title">Title of the progress bar.</param>
+        /// <param name="value">Value of the progress bar.</param>
+        /// <param name="valueStringOverride">An optional string to be displayed instead of the default percentage string. If this isn't provided, something like "70%" will be displayed.</param>
+        /// <param name="status"> A status string, which is displayed underneath the progress bar on the left. Default to empty.</param>
+        /// <param name="sequence">A sequence number to prevent out-of-order updates, or assign 0 to indicate "always update".</param>
+        /// <returns>An instance of NotificationData that can be used to update the toast.</returns>
+        public static NotificationData CreateProgressBarData(ToastContent toast, int index = 0, string title = default(string), double? value = null, string valueStringOverride = default(string), string status = default(string), uint sequence = 0)
+        {
+            var progressBar = toast.Visual.BindingGeneric.Children.Where(c => c is AdaptiveProgressBar).ElementAt(index) as AdaptiveProgressBar;
+            if (progressBar == null)
+            {
+                throw new ArgumentException(nameof(toast), "Given toast does not have any progress bar");
+            }
+
+            NotificationData data = new NotificationData();
+            data.SequenceNumber = sequence;
+
+            if (progressBar.Title is BindableString bindableTitle && title != default(string))
+            {
+                data.Values[bindableTitle.BindingName] = title;
+            }
+
+            if (progressBar.Value is BindableProgressBarValue bindableProgressValue && value != null)
+            {
+                data.Values[bindableProgressValue.BindingName] = value.ToString();
+            }
+
+            if (progressBar.ValueStringOverride is BindableString bindableValueStringOverride && valueStringOverride != default(string))
+            {
+                data.Values[bindableValueStringOverride.BindingName] = valueStringOverride;
+            }
+
+            if (progressBar.Status is BindableString bindableStatus && status != default(string))
+            {
+                data.Values[bindableStatus.BindingName] = status;
+            }
+
+            return data;
+        }
 
 #endif