Add Dependabot and update many dependencies

src/.editorconfig → .editorconfig

@@ -6,6 +6,10 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.yml]
+indent_size = 2
+indent_style = space
+
 [*.{xml,targets,props}]
 indent_size = 2
 

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: /src
+  schedule:
+    interval: weekly
+  ignore:
+  - dependency-name: Microsoft.CodeAnalysis* # We intentionally target older VS versions.
+  - dependency-name: DllExport # Later versions don't offer what we want.

azure-pipelines/artifacts/coverageResults.ps1

@@ -3,7 +3,7 @@ $RepoRoot = [System.IO.Path]::GetFullPath("$PSScriptRoot\..\..")
 # Prepare code coverage reports for merging on another machine
 if ($env:SYSTEM_DEFAULTWORKINGDIRECTORY) {
     Write-Host "Substituting $env:SYSTEM_DEFAULTWORKINGDIRECTORY with `"{reporoot}`""
-    $reports = Get-ChildItem "$RepoRoot/bin/coverage.cobertura.xml" -Recurse
+    $reports = Get-ChildItem "$RepoRoot/bin/coverage.*.cobertura.xml" -Recurse
     $reports |% {
         $content = Get-Content -Path $_ |% { $_ -Replace [regex]::Escape($env:SYSTEM_DEFAULTWORKINGDIRECTORY), "{reporoot}" }
         Set-Content -Path $_ -Value $content -Encoding UTF8
@@ -16,7 +16,7 @@ if (!((Test-Path $RepoRoot\bin) -and (Test-Path $RepoRoot\obj))) { return }
 
 @{
     $RepoRoot = (
-        @(Get-ChildItem "$RepoRoot\bin\coverage.cobertura.xml" -Recurse) +
+        @(Get-ChildItem "$RepoRoot\bin\coverage.*.cobertura.xml" -Recurse) +
         (Get-ChildItem "$RepoRoot\obj\*.cs" -Recurse)
     );
 }

azure-pipelines/publish-codecoverage.yml

@@ -15,7 +15,7 @@ steps:
     dotnet tool install --tool-path obj dotnet-reportgenerator-globaltool --version 4.2.2 --configfile azure-pipelines/justnugetorg.nuget.config
     Copy-Item -Recurse $(Pipeline.Workspace)/coverageResults-Windows/obj/* $(System.DefaultWorkingDirectory)/obj
     Write-Host "Substituting {reporoot} with $(System.DefaultWorkingDirectory)"
-    $reports = Get-ChildItem -Recurse "$(Pipeline.Workspace)/coverage.cobertura.xml"
+    $reports = Get-ChildItem -Recurse "$(Pipeline.Workspace)/coverage.*.cobertura.xml"
     $reports |% {
         $content = Get-Content -Path $_ |% { $_.Replace("{reporoot}", "$(System.DefaultWorkingDirectory)") }
         Set-Content -Path $_ -Value $content -Encoding UTF8

src/Directory.Build.props

@@ -29,11 +29,11 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <ItemGroup Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' ">
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.5.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.6.0" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)PackageIcon.png" Pack="true" PackagePath="" />

src/IsolatedTestHost/IsolatedTestHost.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit.abstractions" Version="2.0.0" />
+    <PackageReference Include="xunit.abstractions" Version="2.0.3" />
   </ItemGroup>
 
 </Project>

src/Microsoft.VisualStudio.Threading.Analyzers.CodeFixes/Microsoft.VisualStudio.Threading.Analyzers.CodeFixes.csproj

@@ -38,7 +38,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.0.0" PrivateAssets="all" />
     <PackageReference Include="MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Microsoft.VisualStudio.Threading.Analyzers.Tests/Microsoft.VisualStudio.Threading.Analyzers.Tests.csproj

@@ -20,18 +20,24 @@
     <ProjectReference Include="..\Microsoft.VisualStudio.Threading\Microsoft.VisualStudio.Threading.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.6.3" />
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="MicroBuild.Nonshipping" Version="$(MicroBuildVersion)" />
     <PackageReference Include="MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing.XUnit" Version="1.0.1-beta1.20214.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.CodeFix.Testing.XUnit" Version="1.0.1-beta1.20214.2" />
     <PackageReference Include="Microsoft.CodeAnalysis" Version="2.8.2" />
-    <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6070" />
+    <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6071" />
     <PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" IncludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61030" IncludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="14.3.25407" IncludeAssets="runtime" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61031" IncludeAssets="runtime" />
+    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="14.3.26929" IncludeAssets="runtime" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="..\Microsoft.VisualStudio.Threading.Analyzers.CodeFixes\build\AdditionalFiles\**" LinkBase="BuiltIn.AdditionalFiles">

src/Microsoft.VisualStudio.Threading.Analyzers/Microsoft.VisualStudio.Threading.Analyzers.csproj

@@ -34,7 +34,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="XliffTasks" Version="1.0.0-beta.19253.2" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>

src/Microsoft.VisualStudio.Threading.Tests/Microsoft.VisualStudio.Threading.Tests.csproj

@@ -26,17 +26,20 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="2.6.3" />
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0" />
     <PackageReference Include="MicroBuild.Nonshipping" Version="$(MicroBuildVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="Nullable" Version="1.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
-    <PackageReference Include="Xunit.Combinatorial" Version="1.2.7" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0" />
+    <PackageReference Include="Xunit.Combinatorial" Version="1.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="Xunit.StaFact" Version="1.0.30-beta" />
     <PackageReference Include="xunit" Version="2.4.1" />
   </ItemGroup>

src/Microsoft.VisualStudio.Threading/AsyncQueue.cs

@@ -320,7 +320,9 @@ public bool TryDequeue([MaybeNullWhen(false)] out T value)
             bool result = this.TryDequeueInternal(null, out value);
 #pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value for a type parameter.
             this.CompleteIfNecessary();
+#pragma warning disable CS8762 // Parameter must have a non-null value when exiting in some condition.
             return result;
+#pragma warning restore CS8762 // Parameter must have a non-null value when exiting in some condition.
         }
 
         /// <inheritdoc />
@@ -353,7 +355,9 @@ protected bool TryDequeue(Predicate<T> valueCheck, [MaybeNullWhen(false)] out T
             bool result = this.TryDequeueInternal(valueCheck, out value);
 #pragma warning restore CS8717 // A member returning a [MaybeNull] value introduces a null value for a type parameter.
             this.CompleteIfNecessary();
+#pragma warning disable CS8762 // Parameter must have a non-null value when exiting in some condition.
             return result;
+#pragma warning restore CS8762 // Parameter must have a non-null value when exiting in some condition.
         }
 
         /// <summary>

src/Microsoft.VisualStudio.Threading/AsyncSemaphore.cs

@@ -347,7 +347,9 @@ internal void Cleanup()
             {
                 CancellationTokenRegistration cancellationTokenRegistration;
                 IDisposable? timerTokenSource;
+#pragma warning disable CA2002 // Do not lock on objects with weak identity
                 lock (this)
+#pragma warning restore CA2002 // Do not lock on objects with weak identity
                 {
                     cancellationTokenRegistration = this.CancellationTokenRegistration;
                     this.CancellationTokenRegistration = default;

src/Microsoft.VisualStudio.Threading/Microsoft.VisualStudio.Threading.csproj

@@ -46,9 +46,9 @@
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="15.5.31" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.6.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" PrivateAssets="all" />
     <PackageReference Include="XliffTasks" Version="1.0.0-beta.19253.2" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>

src/Microsoft.VisualStudio.Threading/ReentrantSemaphore.cs

@@ -139,7 +139,7 @@ private bool IsJoinableTaskAware([NotNullWhen(true)] out JoinableTaskFactory? jo
         /// <param name="initialCount">The initial number of concurrent operations to allow.</param>
         /// <param name="joinableTaskContext">The <see cref="JoinableTaskContext"/> to use to mitigate deadlocks.</param>
         /// <param name="mode">How to respond to a semaphore request by a caller that has already entered the semaphore.</param>
-        public static ReentrantSemaphore Create(int initialCount = 1, JoinableTaskContext? joinableTaskContext = default, ReentrancyMode mode = ReentrancyMode.NotAllowed)
+        public static ReentrantSemaphore Create(int initialCount = 1, JoinableTaskContext? joinableTaskContext = null, ReentrancyMode mode = ReentrancyMode.NotAllowed)
         {
             switch (mode)
             {
@@ -440,7 +440,7 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
                             }
                         }
 
-                        return await operation();
+                        return await operation().ConfigureAwait(true);
                     }
                     finally
                     {
@@ -619,7 +619,7 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
                         }
 
                         this.reentrancyDetection.Value = ownedBox = new StrongBox<bool>(true);
-                        return await operation();
+                        return await operation().ConfigureAwait(true);
                     }
                     finally
                     {
@@ -876,7 +876,7 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
                             pushed = true;
                         }
 
-                        return await operation();
+                        return await operation().ConfigureAwait(true);
                     }
                     finally
                     {
@@ -1118,7 +1118,7 @@ public override async ValueTask<T> ExecuteAsync<T>(Func<ValueTask<T>> operation,
                             releaser = default; // we should release whatever we pop off the stack (which ensures the last surviving nested holder actually releases).
                         }
 
-                        return await operation();
+                        return await operation().ConfigureAwait(true);
                     }
                     finally
                     {

src/Microsoft.VisualStudio.Threading/WeakKeyDictionary.cs

@@ -377,7 +377,7 @@ internal KeyEnumerator(WeakKeyDictionary<TKey, TValue> dictionary)
                 // Assign a value to Current to suppress CS8618. The Current property may have a null value at times,
                 // but the value will never be exposed to external code provided the code only accesses Current after a
                 // call to MoveNext returns true.
-                this.Current = default!;
+                this.Current = null!;
 
                 this.enumerator = dictionary.dictionary.GetEnumerator();
             }