Annotate most of Microsoft.VisualStudio.ProjectSystem.Managed

build/Versions.props

@@ -19,7 +19,7 @@
     <VSWhereVersion>2.3.2</VSWhereVersion>
     <TRXUnitVersion>1.0.0-beta1</TRXUnitVersion>
     <MicrosoftDotNetIBCMergeVersion>4.7.1-alpha-00001</MicrosoftDotNetIBCMergeVersion>
-    <MicrosoftNetCompilersVersion>3.3.0-beta1-19327-04</MicrosoftNetCompilersVersion>
+    <MicrosoftNetCompilersVersion>3.3.0-beta2-19357-02</MicrosoftNetCompilersVersion>
     <MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta1-62624-01</MicrosoftDiaSymReaderPdb2PdbVersion>
     <RoslynAnalyzersPackagesVersion>2.9.3</RoslynAnalyzersPackagesVersion>
     <RoslynAnalyzersOldPackagesVersion>2.6.3-beta1.19059.2</RoslynAnalyzersOldPackagesVersion>

src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Waiting/VisualStudioWaitIndicator.Instance.cs

@@ -98,11 +98,17 @@ public WaitIndicatorResult WaitWithResult(string title, string message, bool all
                 }
                 catch (OperationCanceledException)
                 {
+                    // TODO track https://github.com/dotnet/roslyn/issues/37069 regarding these suppressions
+#pragma warning disable CS8653
                     return (WaitIndicatorResult.Canceled, default);
+#pragma warning restore CS8653
                 }
                 catch (AggregateException aggregate) when (aggregate.InnerExceptions.All(e => e is OperationCanceledException))
                 {
+                    // TODO track https://github.com/dotnet/roslyn/issues/37069 regarding these suppressions
+#pragma warning disable CS8653
                     return (WaitIndicatorResult.Canceled, default);
+#pragma warning restore CS8653
                 }
             }
 

src/Microsoft.VisualStudio.ProjectSystem.Managed/ComparableExtensions.cs

@@ -2,8 +2,6 @@
 
 using System;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio
 {
     /// <summary>
@@ -91,4 +89,4 @@ public static bool IsEarlierThanOrEqualTo(this IComparable source, IComparable c
             return source.CompareTo(comparable) <= 0;
         }
     }
-}
+}

src/Microsoft.VisualStudio.ProjectSystem.Managed/Delimiter.cs

@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#nullable disable
-
 namespace Microsoft.VisualStudio
 {
     /// <summary>

src/Microsoft.VisualStudio.ProjectSystem.Managed/ImmutableCollectionLinqExtensions.cs

@@ -3,8 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-
-#nullable disable
+using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.VisualStudio
 {
@@ -41,6 +40,7 @@ internal static class ImmutableCollectionLinqExtensions
             return false;
         }
 
+        [return: MaybeNull]
         public static T FirstOrDefault<T, TArg>(this ImmutableArray<T> immutableArray, Func<T, TArg, bool> predicate, TArg arg)
         {
             foreach (T obj in immutableArray)
@@ -49,7 +49,7 @@ internal static class ImmutableCollectionLinqExtensions
                     return obj;
             }
 
-            return default;
+            return default!;
         }
     }
 }

src/Microsoft.VisualStudio.ProjectSystem.Managed/LinqExtensions.cs

@@ -2,15 +2,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio
 {
     internal static class LinqExtensions
     {
         [Pure]
+        [return: MaybeNull]
         public static T FirstOrDefault<T, TArg>(this IEnumerable<T> source, Func<T, TArg, bool> predicate, TArg arg)
         {
             foreach (T obj in source)
@@ -19,10 +19,11 @@ internal static class LinqExtensions
                     return obj;
             }
 
-            return default;
+            return default!;
         }
 
         [Pure]
+        [return: MaybeNull]
         public static T SingleOrDefault<T, TArg>(this IEnumerable<T> source, Func<T, TArg, bool> predicate, TArg arg)
         {
             using (IEnumerator<T> enumerator = source.GetEnumerator())
@@ -47,7 +48,7 @@ internal static class LinqExtensions
                 }
             }
 
-            return default;
+            return default!;
         }
     }
 }

src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj

@@ -416,4 +416,9 @@
     <AdditionalFiles Include="PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="PublicAPI.Unshipped.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <None Update="ProjectSystem\Rules\AdditionalDesignTimeBuildInput.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+  </ItemGroup>
 </Project>

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/AbstractMultiLifetimeComponent.cs

@@ -6,8 +6,6 @@
 
 using Microsoft.VisualStudio.Threading;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     /// <summary>
@@ -86,7 +84,7 @@ public async Task LoadCoreAsync()
 
         public Task UnloadAsync()
         {
-            T instance = null;
+            T? instance = null;
             lock (_lock)
             {
                 if (_instanceTaskSource.Task.IsCompleted)

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/ActiveConfiguredObjects.cs

@@ -4,8 +4,6 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     /// <summary>
@@ -42,6 +40,7 @@ public ActiveConfiguredObjects(IReadOnlyList<T> objects, IImmutableSet<string> d
         {
             Requires.NotNull(dimensionNames, nameof(dimensionNames));
             Requires.NotNull(objects, nameof(objects));
+
             if (objects.Count == 0)
                 throw new ArgumentException(null, nameof(objects));
 

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/ActiveConfiguredProjectsLoader.cs

@@ -5,8 +5,6 @@
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     /// <summary>
@@ -19,7 +17,7 @@ internal class ActiveConfiguredProjectsLoader : OnceInitializedOnceDisposed
         private readonly IActiveConfigurationGroupService _activeConfigurationGroupService;
         private readonly IUnconfiguredProjectTasksService _tasksService;
         private readonly ITargetBlock<IProjectVersionedValue<IConfigurationGroup<ProjectConfiguration>>> _targetBlock;
-        private IDisposable _subscription;
+        private IDisposable? _subscription;
 
         [ImportingConstructor]
         public ActiveConfiguredProjectsLoader(UnconfiguredProject project, IActiveConfigurationGroupService activeConfigurationGroupService, IUnconfiguredProjectTasksService tasksService)
@@ -67,7 +65,6 @@ private async Task OnActiveConfigurationsChanged(IProjectVersionedValue<IConfigu
                 await _tasksService.LoadedProjectAsync(() =>
                 {
                     return _project.LoadConfiguredProjectAsync(configuration);
-
                 });
             }
         }

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/ConfiguredProjectImplicitActivationTracking.cs

@@ -10,8 +10,6 @@
 
 using Microsoft.VisualStudio.Threading.Tasks;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     /// <summary>
@@ -25,8 +23,8 @@ internal class ConfiguredProjectImplicitActivationTracking : OnceInitializedOnce
         private readonly IProjectAsynchronousTasksService _tasksService;
         private readonly IActiveConfigurationGroupService _activeConfigurationGroupService;
         private readonly ITargetBlock<IProjectVersionedValue<IConfigurationGroup<ProjectConfiguration>>> _targetBlock;
-        private TaskCompletionSource<object> _isImplicitlyActiveSource = new TaskCompletionSource<object>();
-        private IDisposable _subscription;
+        private TaskCompletionSource<object?> _isImplicitlyActiveSource = new TaskCompletionSource<object?>();
+        private IDisposable? _subscription;
 
         [ImportingConstructor]
         public ConfiguredProjectImplicitActivationTracking(ConfiguredProject project, IActiveConfigurationGroupService activeConfigurationGroupService, [Import(ExportContractNames.Scopes.ConfiguredProject)]IProjectAsynchronousTasksService tasksService)
@@ -133,7 +131,7 @@ private Task OnImplicitlyActivated()
 
         private Task OnImplicitlyDeactivated()
         {
-            var source = new TaskCompletionSource<object>();
+            var source = new TaskCompletionSource<object?>();
 
             // Make sure the writes in constructor don't 
             // move to after we publish the value

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/ContractNames.cs

@@ -1,7 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     /// <summary>

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DataFlowUtilities.cs

@@ -6,8 +6,6 @@
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     /// <summary>
@@ -40,7 +38,11 @@ internal static class DataflowUtilities
         ///     </para>
         ///     <paramref name="target"/> is <see langword="null"/>.
         /// </exception>
-        public static IDisposable LinkToAction(this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source, Action<IProjectVersionedValue<IProjectSubscriptionUpdate>> target, bool suppressVersionOnlyUpdates = true, params string[] ruleNames)
+        public static IDisposable LinkToAction(
+            this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source,
+            Action<IProjectVersionedValue<IProjectSubscriptionUpdate>> target,
+            bool suppressVersionOnlyUpdates = true,
+            params string[] ruleNames)
         {
             Requires.NotNull(source, nameof(source));
             Requires.NotNull(target, nameof(target));
@@ -77,7 +79,11 @@ public static IDisposable LinkToAction(this ISourceBlock<IProjectVersionedValue<
         ///     </para>
         ///     <paramref name="target"/> is <see langword="null"/>.
         /// </exception>
-        public static IDisposable LinkToAction(this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source, Action<IProjectVersionedValue<IProjectSubscriptionUpdate>> target, bool suppressVersionOnlyUpdates = true, IEnumerable<string> ruleNames = null)
+        public static IDisposable LinkToAction(
+            this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source,
+            Action<IProjectVersionedValue<IProjectSubscriptionUpdate>> target,
+            bool suppressVersionOnlyUpdates = true,
+            IEnumerable<string>? ruleNames = null)
         {
             Requires.NotNull(source, nameof(source));
             Requires.NotNull(target, nameof(target));
@@ -114,7 +120,11 @@ public static IDisposable LinkToAction(this ISourceBlock<IProjectVersionedValue<
         ///     </para>
         ///     <paramref name="target"/> is <see langword="null"/>.
         /// </exception>
-        public static IDisposable LinkToAsyncAction(this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source, Func<IProjectVersionedValue<IProjectSubscriptionUpdate>, Task> target, bool suppressVersionOnlyUpdates = true, params string[] ruleNames)
+        public static IDisposable LinkToAsyncAction(
+            this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source,
+            Func<IProjectVersionedValue<IProjectSubscriptionUpdate>, Task> target,
+            bool suppressVersionOnlyUpdates = true,
+            params string[] ruleNames)
         {
             Requires.NotNull(source, nameof(source));
             Requires.NotNull(target, nameof(target));
@@ -151,7 +161,11 @@ public static IDisposable LinkToAsyncAction(this ISourceBlock<IProjectVersionedV
         ///     </para>
         ///     <paramref name="target"/> is <see langword="null"/>.
         /// </exception>
-        public static IDisposable LinkToAsyncAction(this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source, Func<IProjectVersionedValue<IProjectSubscriptionUpdate>, Task> target, bool suppressVersionOnlyUpdates = true, IEnumerable<string> ruleNames = null)
+        public static IDisposable LinkToAsyncAction(
+            this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source,
+            Func<IProjectVersionedValue<IProjectSubscriptionUpdate>, Task> target,
+            bool suppressVersionOnlyUpdates = true,
+            IEnumerable<string>? ruleNames = null)
         {
             Requires.NotNull(source, nameof(source));
             Requires.NotNull(target, nameof(target));
@@ -232,7 +246,9 @@ public static IDisposable LinkToAsyncAction<T>(this ISourceBlock<T> source, Func
         ///     </para>
         ///     <paramref name="transform"/> is <see langword="null"/>.
         /// </exception>
-        public static DisposableValue<ISourceBlock<TOut>> Transform<TInput, TOut>(this ISourceBlock<IProjectVersionedValue<TInput>> source, Func<IProjectVersionedValue<TInput>, TOut> transform)
+        public static DisposableValue<ISourceBlock<TOut>> Transform<TInput, TOut>(
+            this ISourceBlock<IProjectVersionedValue<TInput>> source,
+            Func<IProjectVersionedValue<TInput>, TOut> transform)
         {
             Requires.NotNull(source, nameof(source));
             Requires.NotNull(transform, nameof(transform));
@@ -271,7 +287,9 @@ public static IDisposable LinkToAsyncAction<T>(this ISourceBlock<T> source, Func
         ///     </para>
         ///     <paramref name="transform"/> is <see langword="null"/>.
         /// </exception>
-        public static DisposableValue<ISourceBlock<TOut>> TransformWithNoDelta<TInput, TOut>(this ISourceBlock<IProjectVersionedValue<TInput>> source, Func<IProjectVersionedValue<TInput>, TOut> transform)
+        public static DisposableValue<ISourceBlock<TOut>> TransformWithNoDelta<TInput, TOut>(
+            this ISourceBlock<IProjectVersionedValue<TInput>> source,
+            Func<IProjectVersionedValue<TInput>, TOut> transform)
         {
             Requires.NotNull(source, nameof(source));
             Requires.NotNull(transform, nameof(transform));
@@ -314,7 +332,11 @@ public static IDisposable LinkToAsyncAction<T>(this ISourceBlock<T> source, Func
         ///     </para>
         ///     <paramref name="transform"/> is <see langword="null"/>.
         /// </exception>
-        public static DisposableValue<ISourceBlock<TOut>> TransformWithNoDelta<TOut>(this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source, Func<IProjectVersionedValue<IProjectSubscriptionUpdate>, TOut> transform, bool suppressVersionOnlyUpdates, IEnumerable<string> ruleNames = null)
+        public static DisposableValue<ISourceBlock<TOut>> TransformWithNoDelta<TOut>(
+            this ISourceBlock<IProjectVersionedValue<IProjectSubscriptionUpdate>> source,
+            Func<IProjectVersionedValue<IProjectSubscriptionUpdate>, TOut> transform,
+            bool suppressVersionOnlyUpdates,
+            IEnumerable<string>? ruleNames = null)
         {
             Requires.NotNull(source, nameof(source));
             Requires.NotNull(transform, nameof(transform));
@@ -351,7 +373,7 @@ public static DisposableValue<ISourceBlock<TOut>> TransformWithNoDelta<TOut>(thi
             {
                 SynchronizationContext currentSynchronizationContext = SynchronizationContext.Current;
                 using ExecutionContext copy = context.CreateCopy();
-                Task result = null;
+                Task? result = null;
                 ExecutionContext.Run(
                     copy,
                     state =>
@@ -360,7 +382,7 @@ public static DisposableValue<ISourceBlock<TOut>> TransformWithNoDelta<TOut>(thi
                         result = function(input);
                     },
                     null);
-                return result;
+                return result!;
             };
         }
     }

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DataflowOption.cs

@@ -6,8 +6,6 @@
 
 using Microsoft.VisualStudio.ProjectSystem.Properties;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     /// <summary>

src/Microsoft.VisualStudio.ProjectSystem.Managed/ProjectSystem/DropConfiguredProjectVersionDataSource.cs

@@ -3,8 +3,6 @@
 using System;
 using System.Threading.Tasks.Dataflow;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.ProjectSystem
 {
     /// <summary>