Bump xunit to 2.8.0

drewnoakes · drewnoakes · commit 30ef502b573c · 2024-05-01T14:41:54.000+10:00
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -108,14 +108,14 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk"                                                 Version="17.5.0-preview-20221003-04" />
     <PackageVersion Include="Moq"                                                                    Version="4.16.1" />
     <PackageVersion Include="Verify.Xunit"                                                           Version="14.2.0" />
-    <PackageVersion Include="xunit"                                                                  Version="2.4.2" />
-    <PackageVersion Include="xunit.analyzers"                                                        Version="1.0.0"/>
-    <PackageVersion Include="xunit.assert"                                                           Version="2.4.2" />
-    <PackageVersion Include="xunit.combinatorial"                                                    Version="1.5.25" />
-    <PackageVersion Include="xunit.extensibility.core"                                               Version="2.4.2" />
-    <PackageVersion Include="xunit.extensibility.execution"                                          Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.console"                                                   Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio"                                              Version="2.4.5" />
+    <PackageVersion Include="xunit"                                                                  Version="2.8.0" />
+    <PackageVersion Include="xunit.analyzers"                                                        Version="1.13.0"/>
+    <PackageVersion Include="xunit.assert"                                                           Version="2.8.0" />
+    <PackageVersion Include="xunit.combinatorial"                                                    Version="1.6.24" />
+    <PackageVersion Include="xunit.extensibility.core"                                               Version="2.8.0" />
+    <PackageVersion Include="xunit.extensibility.execution"                                          Version="2.8.0" />
+    <PackageVersion Include="xunit.runner.console"                                                   Version="2.8.0" />
+    <PackageVersion Include="xunit.runner.visualstudio"                                              Version="2.8.0" />
 
     <!-- Integration Tests -->
     <PackageVersion Include="Microsoft.DotNet.Common.ProjectTemplates.1.x"                           Version="1.0.0-beta2-20170629-269" />
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/AssertEx.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/AssertEx.cs
@@ -9,12 +9,7 @@ internal static class AssertEx
     {
         public static void CollectionLength<T>(IEnumerable<T> collection, int expectedCount)
         {
-            int actualCount = collection.Count();
-
-            if (actualCount != expectedCount)
-            {
-                throw new CollectionException(collection, expectedCount, actualCount);
-            }
+            throw CollectionException.ForMismatchedItemCount(expectedCount, collection.Count(), "Collection lengths not equal.");
         }
 
         public static void CollectionLength(IEnumerable collection, int expectedCount)
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Mocks/IProjectPropertiesFactory.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Mocks/IProjectPropertiesFactory.cs
@@ -21,7 +21,7 @@ public static Mock<IProjectProperties> MockWithProperties(IEnumerable<string> pr
             return mock;
         }
 
-        public static Mock<IProjectProperties> MockWithPropertyAndValue(string propertyName, string setValue)
+        public static Mock<IProjectProperties> MockWithPropertyAndValue(string propertyName, string? setValue)
         {
             return MockWithPropertiesAndValues(new Dictionary<string, string?>() { { propertyName, setValue } });
         }
@@ -72,7 +72,7 @@ public static Mock<IProjectProperties> MockWithPropertiesAndValues(IDictionary<s
         public static IProjectProperties CreateWithProperty(string propertyName)
             => MockWithProperty(propertyName).Object;
 
-        public static IProjectProperties CreateWithPropertyAndValue(string propertyName, string setValue)
+        public static IProjectProperties CreateWithPropertyAndValue(string propertyName, string? setValue)
             => MockWithPropertyAndValue(propertyName, setValue).Object;
 
         public static IProjectProperties CreateWithPropertiesAndValues(IDictionary<string, string?> propertyNameAndValues, HashSet<string>? inheritedPropertyNames = null)
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Build/StartupProjectSingleTargetGlobalBuildPropertyProviderTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Build/StartupProjectSingleTargetGlobalBuildPropertyProviderTests.cs
@@ -58,7 +58,7 @@ public async Task VerifyExpectedBehaviors(string projectPath, bool crossTargetin
 
             if (expectTargetFrameworkSet)
             {
-                Assert.Equal(expected: 1, actual: globalProperties.Count);
+                Assert.Single(globalProperties);
                 Assert.Equal(expected: "myFramework1.0", actual: globalProperties[ConfigurationGeneral.TargetFrameworkProperty]);
             }
             else
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Build/TargetFrameworkGlobalBuildPropertyProviderTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Build/TargetFrameworkGlobalBuildPropertyProviderTests.cs
@@ -36,7 +36,7 @@ public async Task VerifyNoTargetFrameworkOverrideForRegularBuild()
             var provider = new TargetFrameworkGlobalBuildPropertyProvider(projectService, configuredProject);
 
             var properties = await provider.GetGlobalPropertiesAsync(CancellationToken.None);
-            Assert.Equal(0, properties.Count);
+            Assert.Empty(properties);
         }
     }
 }
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Debug/DebugTokenReplacerTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Debug/DebugTokenReplacerTests.cs
@@ -68,12 +68,12 @@ public async Task ReplaceTokensInProfileTests()
         [InlineData("this is msbuild: %env3% $(msbuildProperty2) $(msbuildProperty3)",  "this is msbuild: Property6 Property2 Property3", true)]
         [InlineData(null, null, true)]
         [InlineData(" ", " ", true)]
-        public async Task ReplaceTokensInStringTests(string input, string expected, bool expandEnvVars)
+        public async Task ReplaceTokensInStringTests(string? input, string? expected, bool expandEnvVars)
         {
             var replacer = CreateInstance();
 
-            // Test msbuild vars
-            string result = await replacer.ReplaceTokensInStringAsync(input, expandEnvVars);
+            // Test MSBuild vars
+            string? result = await replacer.ReplaceTokensInStringAsync(input!, expandEnvVars);
             Assert.Equal(expected, result);
         }
 
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/FileItemServicesTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/FileItemServicesTests.cs
@@ -75,7 +75,7 @@ public void GetLogicalFolderNames_EmptyAsFullPath_ThrowsArgument()
         [InlineData("C:\\Folder\\Project",                          "C:\\Folder\\Project\\Source.cs",        "Folder\\..\\..\\Source.cs",                    null)]
         [InlineData("C:\\Folder\\Project",                          "C:\\Folder\\Project\\Source.cs",        "D:\\Folder\\Source.cs",                        null)]
         [InlineData("C:\\Folder\\Project",                          "C:\\Folder\\Project\\Source.cs",        "C:\\Folder\\Project\\Source.cs",               null)]
-        public void GetLogicalFolderNames_Returns(string basePath, string fullPath, string link, params string[] expected)
+        public void GetLogicalFolderNames_Returns(string basePath, string fullPath, string? link, params string?[] expected)
         {
             var metadata = ImmutableDictionary<string, string>.Empty;
             if (link is not null)
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/OnceInitializedOnceDisposedUnderLockAsyncTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/OnceInitializedOnceDisposedUnderLockAsyncTests.cs
@@ -7,22 +7,22 @@ namespace Microsoft.VisualStudio.ProjectSystem
     public class OnceInitializedOnceDisposedUnderLockAsyncTests
     {
         [Fact]
-        public void ExecuteUnderLockAsync_NullAsAction_ThrowsArgumentNullException()
+        public async Task ExecuteUnderLockAsync_NullAsAction_ThrowsArgumentNullException()
         {
             var instance = CreateInstance();
 
-            Assert.ThrowsAsync<ArgumentNullException>(() =>
+            await Assert.ThrowsAsync<ArgumentNullException>(() =>
             {
                 return instance.ExecuteUnderLockAsync(null!, CancellationToken.None);
             });
         }
 
         [Fact]
-        public void ExecuteUnderLockAsyncOfT_NullAsAction_ThrowsArgumentNullException()
+        public async Task ExecuteUnderLockAsyncOfT_NullAsAction_ThrowsArgumentNullException()
         {
             var instance = CreateInstance();
 
-            Assert.ThrowsAsync<ArgumentNullException>(() =>
+            await Assert.ThrowsAsync<ArgumentNullException>(() =>
             {
                 return instance.ExecuteUnderLockAsync<string>(null!, CancellationToken.None);
             });
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Properties/AssemblyInfoPropertiesProviderTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Properties/AssemblyInfoPropertiesProviderTests.cs
@@ -70,7 +70,7 @@ private static TestProjectFileOrAssemblyInfoPropertiesProvider CreateProviderFor
         private static TestProjectFileOrAssemblyInfoPropertiesProvider CreateProviderForProjectFileValidation(
             string code,
             string propertyName,
-            string propertyValueInProjectFile,
+            string? propertyValueInProjectFile,
             out Workspace workspace,
             Lazy<IInterceptingPropertyValueProvider, IInterceptingPropertyValueProviderMetadata2>? interceptingProvider = null,
             Dictionary<string, string?>? additionalProps = null)
@@ -151,7 +151,7 @@ public async Task SourceFileProperties_GetEvaluatedPropertyAsync(string code, st
         [InlineData("""[assembly: System.Reflection.AssemblyDescriptionAttribute(true)]""", "Description", "MyDescription", "MyDescription")]
         [InlineData("""[assembly: System.Reflection.AssemblyDescriptionAttribute("MyDescription"]""", "Description", "", "")]
         [InlineData("""[assembly: System.Reflection.AssemblyDescriptionAttribute("MyDescription"]""", "Description", null, "")]
-        public async Task ProjectFileProperties_GetEvaluatedPropertyAsync(string code, string propertyName, string propertyValueInProjectFile, string expectedValue)
+        public async Task ProjectFileProperties_GetEvaluatedPropertyAsync(string code, string propertyName, string? propertyValueInProjectFile, string expectedValue)
         {
             var provider = CreateProviderForProjectFileValidation(code, propertyName, propertyValueInProjectFile, out Workspace workspace);
             var projectFilePath = workspace.CurrentSolution.Projects.First().FilePath;
@@ -276,7 +276,7 @@ public async Task ProjectFileProperties_GetUnevaluatedPropertyAsync(string code,
         [InlineData("""[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.0")]""", "Version", "2.0.0", null)]
         [InlineData("""[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2.0.1-beta1")]""", "Version", "2.0.1-beta1", null)]
         [InlineData("""[assembly: System.Reflection.AssemblyInformationalVersionAttribute("2016.2")]""", "Version", "2016.2", null)]
-        internal async Task SourceFileProperties_DefaultValues_GetEvaluatedPropertyAsync(string code, string propertyName, string expectedValue, Type interceptingProviderType)
+        internal async Task SourceFileProperties_DefaultValues_GetEvaluatedPropertyAsync(string code, string propertyName, string expectedValue, Type? interceptingProviderType)
         {
             var interceptingProvider = interceptingProviderType is not null
                 ? new Lazy<IInterceptingPropertyValueProvider, IInterceptingPropertyValueProviderMetadata2>(
@@ -306,7 +306,7 @@ internal async Task SourceFileProperties_DefaultValues_GetEvaluatedPropertyAsync
         [InlineData("MyApp", "Product", null, "")]
         [InlineData("MyApp", "Product", "", "")]
         [InlineData("MyApp", "Product", "ExistingValue", "ExistingValue")]
-        internal async Task ProjectFileProperties_DefaultValues_GetEvaluatedPropertyAsync(string assemblyName, string propertyName, string existingPropertyValue, string expectedValue)
+        internal async Task ProjectFileProperties_DefaultValues_GetEvaluatedPropertyAsync(string assemblyName, string propertyName, string? existingPropertyValue, string expectedValue)
         {
             var additionalProps = new Dictionary<string, string?>() { { "AssemblyName", assemblyName } };
 
@@ -350,7 +350,7 @@ internal async Task ProjectFileProperties_DefaultValues_GetEvaluatedPropertyAsyn
         [InlineData("Version", "1.1.1", "1.0.0.0", "1.0.0.0", null)]
         [InlineData("Version", "1.0.0", "1.0.0.0", "1.0.0.0", null)]
         [InlineData("Version", null, "2016.2", "2016.2", null)]
-        internal async Task ProjectFileProperties_WithInterception_SetEvaluatedPropertyAsync(string propertyName, string existingPropertyValue, string propertyValueToSet, string expectedValue, Type interceptingProviderType)
+        internal async Task ProjectFileProperties_WithInterception_SetEvaluatedPropertyAsync(string propertyName, string? existingPropertyValue, string propertyValueToSet, string expectedValue, Type? interceptingProviderType)
         {
             var interceptingProvider = interceptingProviderType is not null
                 ? new Lazy<IInterceptingPropertyValueProvider, IInterceptingPropertyValueProviderMetadata2>(
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Properties/InterceptingProjectProperties/ApplicationManifestValueProviderTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/Properties/InterceptingProjectProperties/ApplicationManifestValueProviderTests.cs
@@ -11,7 +11,7 @@ public class ApplicationManifestValueProviderTests
         [InlineData("", "TRue", "NoManifest")]
         [InlineData("", "false", "DefaultManifest")]
         [InlineData("", null, "DefaultManifest")]
-        public async Task GetApplicationManifest(string appManifestPropValue, string noManifestValue, string expectedValue)
+        public async Task GetApplicationManifest(string appManifestPropValue, string? noManifestValue, string expectedValue)
         {
             var provider = new ApplicationManifestValueProvider(UnconfiguredProjectFactory.Create());
             var defaultProperties = IProjectPropertiesFactory.CreateWithPropertyAndValue("NoWin32Manifest", noManifestValue);
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/References/AlwaysAllowValidProjectReferenceCheckerTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/References/AlwaysAllowValidProjectReferenceCheckerTests.cs
@@ -5,44 +5,44 @@ namespace Microsoft.VisualStudio.ProjectSystem.References
     public class AlwaysAllowValidProjectReferenceCheckerTests
     {
         [Fact]
-        public void CanAddProjectReferenceAsync_NullAsReferencedProject_ThrowsArgumentNull()
+        public async Task CanAddProjectReferenceAsync_NullAsReferencedProject_ThrowsArgumentNull()
         {
             var checker = CreateInstance();
 
-            Assert.ThrowsAsync<ArgumentNullException>("referencedProject", () =>
+            await Assert.ThrowsAsync<ArgumentNullException>("referencedProject", () =>
             {
                 return checker.CanAddProjectReferenceAsync(null!);
             });
         }
 
         [Fact]
-        public void CanAddProjectReferencesAsync_NullAsReferencedProjects_ThrowsArgumentNull()
+        public async Task CanAddProjectReferencesAsync_NullAsReferencedProjects_ThrowsArgumentNull()
         {
             var checker = CreateInstance();
 
-            Assert.ThrowsAsync<ArgumentNullException>("referencedProjects", () =>
+            await Assert.ThrowsAsync<ArgumentNullException>("referencedProjects", () =>
             {
                 return checker.CanAddProjectReferencesAsync(null!);
             });
         }
 
         [Fact]
-        public void CanAddProjectReferencesAsync_EmptyAsReferencedProjects_ThrowsArgument()
+        public async Task CanAddProjectReferencesAsync_EmptyAsReferencedProjects_ThrowsArgument()
         {
             var checker = CreateInstance();
 
-            Assert.ThrowsAsync<ArgumentException>("referencedProjects", () =>
+            await Assert.ThrowsAsync<ArgumentException>("referencedProjects", () =>
             {
                 return checker.CanAddProjectReferencesAsync(ImmutableHashSet<object>.Empty);
             });
         }
 
         [Fact]
-        public void CanBeReferencedAsync_NullAsReferencingProject_ThrowsArgumentNull()
+        public async Task CanBeReferencedAsync_NullAsReferencingProject_ThrowsArgumentNull()
         {
             var checker = CreateInstance();
 
-            Assert.ThrowsAsync<ArgumentNullException>("referencingProject", () =>
+            await Assert.ThrowsAsync<ArgumentNullException>("referencingProject", () =>
             {
                 return checker.CanBeReferencedAsync(null!);
             });
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/SpecialFileProviders/AppDesignerFolderSpecialFileProviderTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/ProjectSystem/SpecialFileProviders/AppDesignerFolderSpecialFileProviderTests.cs
@@ -116,7 +116,7 @@ My Project (flags: {Folder AppDesignerFolder BubbleUp})
         [InlineData(@"My Project",              @"C:\Project\My Project")]
         [InlineData(@"Folder\AppDesigner",      @"C:\Project\Folder\AppDesigner")]
         [InlineData(@"",                        null)]
-        public async Task GetFile_WhenTreeWithoutAppDesignerFolder_ReturnsDefaultAppDesignerFolder(string input, string expected)
+        public async Task GetFile_WhenTreeWithoutAppDesignerFolder_ReturnsDefaultAppDesignerFolder(string input, string? expected)
         {
             var tree = ProjectTreeParser.Parse(
                 """
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Threading/Tasks/SequentialTaskExecutorTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Threading/Tasks/SequentialTaskExecutorTests.cs
@@ -73,7 +73,7 @@ async Task<int> func()
             await Task.WhenAll(tasks);
             for (int i = 0; i < NumberOfTasks; i++)
             {
-                Assert.Equal(i, tasks[i].Result);
+                Assert.Equal(i, await tasks[i]);
             }
         }
 
@@ -110,11 +110,11 @@ await sequencer.ExecuteTask(async () =>
         }
 
         [Fact]
-        public void CallToDisposedObjectShouldThrow()
+        public async Task CallToDisposedObjectShouldThrow()
         {
             var sequencer = new SequentialTaskExecutor(new(_joinableTaskContext), "UnitTests");
             sequencer.Dispose();
-            Assert.ThrowsAsync<ObjectDisposedException>(() => sequencer.ExecuteTask(() => Task.CompletedTask));
+            await Assert.ThrowsAsync<ObjectDisposedException>(() => sequencer.ExecuteTask(() => Task.CompletedTask));
         }
 
         [Fact]
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Mocks/IVsHierarchyFactory.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Mocks/IVsHierarchyFactory.cs
@@ -26,7 +26,7 @@ public static IVsHierarchy ImplementGetProperty(int hr)
             return mock.Object;
         }
 
-        public static IVsHierarchy ImplementGetProperty(object result)
+        public static IVsHierarchy ImplementGetProperty(object? result)
         {
             var mock = new Mock<IVsHierarchy>();
             mock.Setup(h => h.GetProperty(It.IsAny<uint>(), It.IsAny<int>(), out result))
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/CreateFileFromTemplateServiceTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/CreateFileFromTemplateServiceTests.cs
@@ -45,7 +45,7 @@ await Assert.ThrowsAsync<ArgumentException>("path", () =>
         [InlineData(@"C:\Path\To\TemplateFile", true)]
         [InlineData(@"C:\Path\To\TemplateFile", false)]
         [InlineData(null, false)]
-        public async Task CreateFile(string templateFilePath, bool expectedResult)
+        public async Task CreateFile(string? templateFilePath, bool expectedResult)
         {
             string templateName = "SettingsInternal.zip";
             string fileName = "Settings.settings";
@@ -54,7 +54,7 @@ public async Task CreateFile(string templateFilePath, bool expectedResult)
             var solution = (Solution)SolutionFactory.CreateWithGetProjectItemTemplate((templateFile, language) =>
             {
                 Assert.Equal(templateName, templateFile);
-                return templateFilePath;
+                return templateFilePath!;
             });
 
             var vsProject = (IVsProject4)IVsHierarchyFactory.Create();
@@ -63,7 +63,7 @@ public async Task CreateFile(string templateFilePath, bool expectedResult)
                 Assert.Equal(VSADDITEMOPERATION.VSADDITEMOP_RUNWIZARD, itemOperation);
                 Assert.Equal(fileName, itemName);
                 Assert.Equal((uint)1, cOpen);
-                Assert.Equal(new string[] { templateFilePath }, files);
+                Assert.Equal(new string?[] { templateFilePath }, files);
 
                 result[0] = expectedResult ? VSADDRESULT.ADDRESULT_Success : VSADDRESULT.ADDRESULT_Failure;
 
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Debug/ProjectLaunchTargetsProviderTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Debug/ProjectLaunchTargetsProviderTests.cs
@@ -84,7 +84,7 @@ public async Task QueryDebugTargetsAsync_ProjectProfileAsyncF5()
             Assert.Equal(@"c:\program files\dotnet\dotnet.exe", targets[0].Executable);
             Assert.Equal(DebugLaunchOperation.CreateProcess, targets[0].LaunchOperation);
             Assert.Equal(DebuggerEngines.ManagedCoreEngine, targets[0].LaunchDebugEngineGuid);
-            Assert.Equal(0, targets[0].AdditionalDebugEngines.Count);
+            Assert.Empty(targets[0].AdditionalDebugEngines);
             Assert.Equal("exec \"c:\\test\\project\\bin\\project.dll\" --someArgs", targets[0].Arguments);
         }
 
@@ -189,7 +189,7 @@ public async Task QueryDebugTargetsAsync_ExeProfileAsyncCtrlF5()
         [InlineData(@"bin\")]
         [InlineData(@"doesntExist\")]
         [InlineData(null)]
-        public async Task QueryDebugTargetsAsync_ExeProfileAsyncExeRelativeNoWorkingDir(string outdir)
+        public async Task QueryDebugTargetsAsync_ExeProfileAsyncExeRelativeNoWorkingDir(string? outdir)
         {
             var properties = new Dictionary<string, string?>
             {
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Input/Commands/AbstractAddItemCommandHandlerTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Input/Commands/AbstractAddItemCommandHandlerTests.cs
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Input/Commands/AbstractOpenProjectDesignerCommandTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Input/Commands/AbstractOpenProjectDesignerCommandTests.cs
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Properties/ProjectDesignerServiceTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Properties/ProjectDesignerServiceTests.cs
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/References/DesignTimeAssemblyResolutionTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/References/DesignTimeAssemblyResolutionTests.cs
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Rules/ExportedRuleTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/Rules/ExportedRuleTests.cs
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTrackerTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsChangeTrackerTests.cs
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsCompilerTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsCompilerTests.cs
diff --git a/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcherTests.cs b/tests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/ProjectSystem/VS/TempPE/DesignTimeInputsFileWatcherTests.cs

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,7 @@ internal static class AssertEx`
`9`	`9`	`{`
`10`	`10`	`public static void CollectionLength<T>(IEnumerable<T> collection, int expectedCount)`
`11`	`11`	`{`
`12`		`- int actualCount = collection.Count();`
`13`		`-`
`14`		`- if (actualCount != expectedCount)`
`15`		`- {`
`16`		`- throw new CollectionException(collection, expectedCount, actualCount);`
`17`		`- }`
	`12`	`+ throw CollectionException.ForMismatchedItemCount(expectedCount, collection.Count(), "Collection lengths not equal.");`
`18`	`13`	`}`
`19`	`14`
`20`	`15`	`public static void CollectionLength(IEnumerable collection, int expectedCount)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static Mock<IProjectProperties> MockWithProperties(IEnumerable<string> pr`
`21`	`21`	`return mock;`
`22`	`22`	`}`
`23`	`23`
`24`		`- public static Mock<IProjectProperties> MockWithPropertyAndValue(string propertyName, string setValue)`
	`24`	`+ public static Mock<IProjectProperties> MockWithPropertyAndValue(string propertyName, string? setValue)`
`25`	`25`	`{`
`26`	`26`	`return MockWithPropertiesAndValues(new Dictionary<string, string?>() { { propertyName, setValue } });`
`27`	`27`	`}`
`@@ -72,7 +72,7 @@ public static Mock<IProjectProperties> MockWithPropertiesAndValues(IDictionary<s`
`72`	`72`	`public static IProjectProperties CreateWithProperty(string propertyName)`
`73`	`73`	`=> MockWithProperty(propertyName).Object;`
`74`	`74`
`75`		`- public static IProjectProperties CreateWithPropertyAndValue(string propertyName, string setValue)`
	`75`	`+ public static IProjectProperties CreateWithPropertyAndValue(string propertyName, string? setValue)`
`76`	`76`	`=> MockWithPropertyAndValue(propertyName, setValue).Object;`
`77`	`77`
`78`	`78`	`public static IProjectProperties CreateWithPropertiesAndValues(IDictionary<string, string?> propertyNameAndValues, HashSet<string>? inheritedPropertyNames = null)`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public async Task VerifyExpectedBehaviors(string projectPath, bool crossTargetin`
`58`	`58`
`59`	`59`	`if (expectTargetFrameworkSet)`
`60`	`60`	`{`
`61`		`- Assert.Equal(expected: 1, actual: globalProperties.Count);`
	`61`	`+ Assert.Single(globalProperties);`
`62`	`62`	`Assert.Equal(expected: "myFramework1.0", actual: globalProperties[ConfigurationGeneral.TargetFrameworkProperty]);`
`63`	`63`	`}`
`64`	`64`	`else`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public async Task VerifyNoTargetFrameworkOverrideForRegularBuild()`
`36`	`36`	`var provider = new TargetFrameworkGlobalBuildPropertyProvider(projectService, configuredProject);`
`37`	`37`
`38`	`38`	`var properties = await provider.GetGlobalPropertiesAsync(CancellationToken.None);`
`39`		`- Assert.Equal(0, properties.Count);`
	`39`	`+ Assert.Empty(properties);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,12 @@ public async Task ReplaceTokensInProfileTests()`
`68`	`68`	`[InlineData("this is msbuild: %env3% $(msbuildProperty2) $(msbuildProperty3)", "this is msbuild: Property6 Property2 Property3", true)]`
`69`	`69`	`[InlineData(null, null, true)]`
`70`	`70`	`[InlineData(" ", " ", true)]`
`71`		`- public async Task ReplaceTokensInStringTests(string input, string expected, bool expandEnvVars)`
	`71`	`+ public async Task ReplaceTokensInStringTests(string? input, string? expected, bool expandEnvVars)`
`72`	`72`	`{`
`73`	`73`	`var replacer = CreateInstance();`
`74`	`74`
`75`		`- // Test msbuild vars`
`76`		`- string result = await replacer.ReplaceTokensInStringAsync(input, expandEnvVars);`
	`75`	`+ // Test MSBuild vars`
	`76`	`+ string? result = await replacer.ReplaceTokensInStringAsync(input!, expandEnvVars);`
`77`	`77`	`Assert.Equal(expected, result);`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public void GetLogicalFolderNames_EmptyAsFullPath_ThrowsArgument()`
`75`	`75`	`[InlineData("C:\\Folder\\Project", "C:\\Folder\\Project\\Source.cs", "Folder\\..\\..\\Source.cs", null)]`
`76`	`76`	`[InlineData("C:\\Folder\\Project", "C:\\Folder\\Project\\Source.cs", "D:\\Folder\\Source.cs", null)]`
`77`	`77`	`[InlineData("C:\\Folder\\Project", "C:\\Folder\\Project\\Source.cs", "C:\\Folder\\Project\\Source.cs", null)]`
`78`		`- public void GetLogicalFolderNames_Returns(string basePath, string fullPath, string link, params string[] expected)`
	`78`	`+ public void GetLogicalFolderNames_Returns(string basePath, string fullPath, string? link, params string?[] expected)`
`79`	`79`	`{`
`80`	`80`	`var metadata = ImmutableDictionary<string, string>.Empty;`
`81`	`81`	`if (link is not null)`
Original file line number	Diff line number	Diff line change
`@@ -7,22 +7,22 @@ namespace Microsoft.VisualStudio.ProjectSystem`
`7`	`7`	`public class OnceInitializedOnceDisposedUnderLockAsyncTests`
`8`	`8`	`{`
`9`	`9`	`[Fact]`
`10`		`- public void ExecuteUnderLockAsync_NullAsAction_ThrowsArgumentNullException()`
	`10`	`+ public async Task ExecuteUnderLockAsync_NullAsAction_ThrowsArgumentNullException()`
`11`	`11`	`{`
`12`	`12`	`var instance = CreateInstance();`
`13`	`13`
`14`		`- Assert.ThrowsAsync<ArgumentNullException>(() =>`
	`14`	`+ await Assert.ThrowsAsync<ArgumentNullException>(() =>`
`15`	`15`	`{`
`16`	`16`	`return instance.ExecuteUnderLockAsync(null!, CancellationToken.None);`
`17`	`17`	`});`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`[Fact]`
`21`		`- public void ExecuteUnderLockAsyncOfT_NullAsAction_ThrowsArgumentNullException()`
	`21`	`+ public async Task ExecuteUnderLockAsyncOfT_NullAsAction_ThrowsArgumentNullException()`
`22`	`22`	`{`
`23`	`23`	`var instance = CreateInstance();`
`24`	`24`
`25`		`- Assert.ThrowsAsync<ArgumentNullException>(() =>`
	`25`	`+ await Assert.ThrowsAsync<ArgumentNullException>(() =>`
`26`	`26`	`{`
`27`	`27`	`return instance.ExecuteUnderLockAsync<string>(null!, CancellationToken.None);`
`28`	`28`	`});`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class ApplicationManifestValueProviderTests`
`11`	`11`	`[InlineData("", "TRue", "NoManifest")]`
`12`	`12`	`[InlineData("", "false", "DefaultManifest")]`
`13`	`13`	`[InlineData("", null, "DefaultManifest")]`
`14`		`- public async Task GetApplicationManifest(string appManifestPropValue, string noManifestValue, string expectedValue)`
	`14`	`+ public async Task GetApplicationManifest(string appManifestPropValue, string? noManifestValue, string expectedValue)`
`15`	`15`	`{`
`16`	`16`	`var provider = new ApplicationManifestValueProvider(UnconfiguredProjectFactory.Create());`
`17`	`17`	`var defaultProperties = IProjectPropertiesFactory.CreateWithPropertyAndValue("NoWin32Manifest", noManifestValue);`