Merge pull request #404 from AArnott/libtemplateUpdate

AArnott · web-flow · commit 683d9b018bbd · 2023-07-10T17:03:32.000-06:00
Merge latest Library.Template
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,3 +7,7 @@ updates:
   directory: /
   schedule:
     interval: weekly
+  ignore:
+    # This package has unlisted versions on nuget.org that are not supported. Avoid them.
+    - dependency-name: dotnet-format
+      versions: ["6.x", "7.x", "8.x"]
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 
-    <MicroBuildVersion>2.0.130</MicroBuildVersion>
+    <MicroBuildVersion>2.0.131</MicroBuildVersion>
     <CodeAnalysisVersionForAnalyzers>3.11.0</CodeAnalysisVersionForAnalyzers>
     <CodeAnalysisVersion>4.6.0</CodeAnalysisVersion>
     <CodefixTestingVersion>1.1.1</CodefixTestingVersion>
@@ -36,11 +36,11 @@
     <PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />
     <PackageVersion Include="System.Reflection.Metadata" Version="7.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
-    <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.extensibility.execution" Version="2.5.0" />
+    <PackageVersion Include="xunit.runner.console" Version="2.5.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
+    <PackageVersion Include="xunit" Version="2.5.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsAnalyzerProject)'=='true'">
     <!-- Analyzers need to use older references to work in existing C# compilers. -->
diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
@@ -32,7 +32,7 @@ jobs:
 
   - template: install-dependencies.yml
 
-  - script: dotnet tool run nbgv cloud -ca
+  - script: dotnet nbgv cloud -ca
     displayName: ⚙ Set build number
 
   - ${{ if eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9') }}:
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/AttributedPartDiscoveryTestBase.cs b/test/Microsoft.VisualStudio.Composition.Tests/AttributedPartDiscoveryTestBase.cs
@@ -24,7 +24,7 @@ public void NonSharedPartProduction()
         {
             ComposablePartDefinition? result = this.DiscoveryService.CreatePart(typeof(NonSharedPart));
             Assert.NotNull(result);
-            Assert.Equal(1, result!.ExportedTypes.Count);
+            Assert.Single(result!.ExportedTypes);
             Assert.Empty(result.ImportingMembers);
             Assert.False(result.IsShared);
         }
@@ -34,7 +34,7 @@ public void SharedPartProduction()
         {
             ComposablePartDefinition? result = this.DiscoveryService.CreatePart(typeof(SharedPart));
             Assert.NotNull(result);
-            Assert.Equal(1, result!.ExportedTypes.Count);
+            Assert.Single(result!.ExportedTypes);
             Assert.Empty(result.ImportingMembers);
             Assert.True(result.IsShared);
         }
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/ComposableCatalogTests2.cs b/test/Microsoft.VisualStudio.Composition.Tests/ComposableCatalogTests2.cs
@@ -50,7 +50,7 @@ public async Task CreateFromTypesOmitsNonParts(PartDiscovery discovery)
         {
             var catalog = ComposableCatalog.Create(discovery.Resolver).AddParts(
                 await discovery.CreatePartsAsync(typeof(NonExportingType), typeof(ExportingType)));
-            Assert.Equal(1, catalog.Parts.Count);
+            Assert.Single(catalog.Parts);
             Assert.Equal(typeof(ExportingType), catalog.Parts.Single().Type);
         }
 
@@ -63,7 +63,7 @@ public void AddPartNullThrows()
         [Fact]
         public void GetAssemblyInputs_Empty()
         {
-            Assert.Equal(0, TestUtilities.EmptyCatalog.GetInputAssemblies().Count);
+            Assert.Empty(TestUtilities.EmptyCatalog.GetInputAssemblies());
         }
 
         [Theory]
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/CompositionFailedExceptionTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/CompositionFailedExceptionTests.cs
@@ -26,7 +26,7 @@ public void ExceptionIsSerializable()
             try
             {
                 configuration.ThrowOnErrors();
-                Assert.True(false, "Expected exception not thrown.");
+                Assert.Fail("Expected exception not thrown.");
             }
             catch (CompositionFailedException ex)
             {
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/DisposablePartsTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/DisposablePartsTests.cs
@@ -147,7 +147,7 @@ public class UninstantiatedNonSharedPart : IDisposable
         {
             public UninstantiatedNonSharedPart()
             {
-                Assert.False(true, "This should never be instantiated.");
+                Assert.Fail("This should never be instantiated.");
             }
 
             public void Dispose()
@@ -176,7 +176,7 @@ public void PartDisposedWhenThrows(IContainer container)
             try
             {
                 container.GetExportedValue<ThrowingPart>();
-                Assert.False(true, "An exception should have been thrown.");
+                Assert.Fail("An exception should have been thrown.");
             }
             catch { }
 
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/ExportingMembersTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/ExportingMembersTests.cs
@@ -150,7 +150,7 @@ public void ExportedMethodFuncOf2WrongTypeArgs(IContainer container)
             try
             {
                 container.GetExportedValue<Func<string, string, bool>>("Method");
-                Assert.False(true, "Expected exception not thrown.");
+                Assert.Fail("Expected exception not thrown.");
             }
             catch (MefV1.ImportCardinalityMismatchException) { }
             catch (Microsoft.VisualStudio.Composition.CompositionFailedException) { } // V2/V3
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/FaultyPartsTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/FaultyPartsTests.cs
@@ -310,7 +310,7 @@ private static void AssertThrowsV1(Func<object?> action)
             try
             {
                 action();
-                Assert.False(true, "Expected exception not thrown.");
+                Assert.Fail("Expected exception not thrown.");
             }
             catch (CompositionFailedException ex)
             {
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/ImportManyTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/ImportManyTests.cs
@@ -103,7 +103,7 @@ public void ImportManyIListWithNone(IContainer container)
             var extendable = container.GetExportedValue<ExtendableIList>();
             Assert.NotNull(extendable);
             Assert.NotNull(extendable.Extensions);
-            Assert.Equal(0, extendable.Extensions.Count);
+            Assert.Empty(extendable.Extensions);
         }
 
         [MefFact(CompositionEngines.V2Compat, typeof(ExtendableIList), typeof(ExtensionOne))]
@@ -112,7 +112,7 @@ public void ImportManyIListWithOne(IContainer container)
             var extendable = container.GetExportedValue<ExtendableIList>();
             Assert.NotNull(extendable);
             Assert.NotNull(extendable.Extensions);
-            Assert.Equal(1, extendable.Extensions.Count);
+            Assert.Single(extendable.Extensions);
             Assert.IsAssignableFrom<ExtensionOne>(extendable.Extensions.Single());
         }
 
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/InvalidGraphTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/InvalidGraphTests.cs
@@ -135,7 +135,7 @@ public void UncreatableLazyImportedPartV1(IContainer container)
             try
             {
                 var throws = part.ImportOfUncreatablePart.Value;
-                Assert.False(true, "Expected exception not thrown.");
+                Assert.Fail("Expected exception not thrown.");
             }
             catch (CompositionFailedException) { }
             catch (MefV1.CompositionException) { }
@@ -187,7 +187,7 @@ public void UncreatableLazyImportedPartWithImportingPropertyV1(IContainer contai
             try
             {
                 var throws = part.LazyImportOfUncreatablePart.Value;
-                Assert.False(true, "Expected exception not thrown.");
+                Assert.Fail("Expected exception not thrown.");
             }
             catch (CompositionFailedException) { }
             catch (MefV1.CompositionException) { }
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/LazyImportTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/LazyImportTests.cs
@@ -72,7 +72,7 @@ public class ExportWithLazyImportOfBaseType
         public void LazyImportMany(IContainer container)
         {
             var lazyImport = container.GetExportedValue<ExportWithListOfLazyImport>();
-            Assert.Equal(1, lazyImport.AnotherExports.Count);
+            Assert.Single(lazyImport.AnotherExports);
             Assert.Equal(0, AnotherExport.ConstructionCount);
             Assert.False(lazyImport.AnotherExports[0].IsValueCreated);
             AnotherExport anotherExport = lazyImport.AnotherExports[0].Value;
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/RejectionTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/RejectionTests.cs
@@ -75,7 +75,7 @@ public void LazyImportOfPartWithMissingImportingConstructor(IContainer container
             try
             {
                 var expectFailure = exports[0].ImportOfBrokenPart.Value;
-                Assert.False(true, "Some type of composition exception was expected here.");
+                Assert.Fail("Some type of composition exception was expected here.");
             }
             catch (CompositionFailedException)
             {
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/SharingBoundaryInvalidTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/SharingBoundaryInvalidTests.cs
@@ -33,7 +33,7 @@ public void InvalidImportAcrossSharingBoundary(IContainer container)
                 // But that's not really a tenable prospect and it's harder to reason over anyway.
                 // It makes sense that MEFv2 didn't allow this.
                 root.Factory.CreateExport();
-                Assert.False(true, "Expected exception not thrown.");
+                Assert.Fail("Expected exception not thrown.");
             }
             catch (CompositionFailedException) { }
             catch (System.Composition.Hosting.CompositionFailedException) { }
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/SharingBoundaryWithSharedTests.cs b/test/Microsoft.VisualStudio.Composition.Tests/SharingBoundaryWithSharedTests.cs
@@ -171,7 +171,7 @@ public class SharedRootPartOnlyImportedFromChildScope
         {
             public SharedRootPartOnlyImportedFromChildScope()
             {
-                Assert.False(true, "This type should ever be constructed. It should be imported lazily and never constructed as part of a GC test.");
+                Assert.Fail("This type should ever be constructed. It should be imported lazily and never constructed as part of a GC test.");
             }
         }
 
diff --git a/test/Microsoft.VisualStudio.Composition.Tests/XunitExtensions/LegacyMefTestCaseRunner.cs b/test/Microsoft.VisualStudio.Composition.Tests/XunitExtensions/LegacyMefTestCaseRunner.cs
@@ -126,7 +126,7 @@ public bool QueueMessage(IMessageSinkMessage message)
                     else if (message is TestPassed)
                     {
                         var passedMessage = (TestPassed)message;
-                        message = new TestFailed(passedMessage.Test, passedMessage.ExecutionTime, passedMessage.Output, new AssertActualExpectedException(false, true, "Expected invalid configuration but no exception thrown."));
+                        message = new TestFailed(passedMessage.Test, passedMessage.ExecutionTime, passedMessage.Output, new XunitException("Expected invalid configuration but no exception thrown."));
                         this.InvertedSuccesses++;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void NonSharedPartProduction()`
`24`	`24`	`{`
`25`	`25`	`ComposablePartDefinition? result = this.DiscoveryService.CreatePart(typeof(NonSharedPart));`
`26`	`26`	`Assert.NotNull(result);`
`27`		`- Assert.Equal(1, result!.ExportedTypes.Count);`
	`27`	`+ Assert.Single(result!.ExportedTypes);`
`28`	`28`	`Assert.Empty(result.ImportingMembers);`
`29`	`29`	`Assert.False(result.IsShared);`
`30`	`30`	`}`
`@@ -34,7 +34,7 @@ public void SharedPartProduction()`
`34`	`34`	`{`
`35`	`35`	`ComposablePartDefinition? result = this.DiscoveryService.CreatePart(typeof(SharedPart));`
`36`	`36`	`Assert.NotNull(result);`
`37`		`- Assert.Equal(1, result!.ExportedTypes.Count);`
	`37`	`+ Assert.Single(result!.ExportedTypes);`
`38`	`38`	`Assert.Empty(result.ImportingMembers);`
`39`	`39`	`Assert.True(result.IsShared);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public async Task CreateFromTypesOmitsNonParts(PartDiscovery discovery)`
`50`	`50`	`{`
`51`	`51`	`var catalog = ComposableCatalog.Create(discovery.Resolver).AddParts(`
`52`	`52`	`await discovery.CreatePartsAsync(typeof(NonExportingType), typeof(ExportingType)));`
`53`		`- Assert.Equal(1, catalog.Parts.Count);`
	`53`	`+ Assert.Single(catalog.Parts);`
`54`	`54`	`Assert.Equal(typeof(ExportingType), catalog.Parts.Single().Type);`
`55`	`55`	`}`
`56`	`56`
`@@ -63,7 +63,7 @@ public void AddPartNullThrows()`
`63`	`63`	`[Fact]`
`64`	`64`	`public void GetAssemblyInputs_Empty()`
`65`	`65`	`{`
`66`		`- Assert.Equal(0, TestUtilities.EmptyCatalog.GetInputAssemblies().Count);`
	`66`	`+ Assert.Empty(TestUtilities.EmptyCatalog.GetInputAssemblies());`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`[Theory]`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void ExceptionIsSerializable()`
`26`	`26`	`try`
`27`	`27`	`{`
`28`	`28`	`configuration.ThrowOnErrors();`
`29`		`- Assert.True(false, "Expected exception not thrown.");`
	`29`	`+ Assert.Fail("Expected exception not thrown.");`
`30`	`30`	`}`
`31`	`31`	`catch (CompositionFailedException ex)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public class UninstantiatedNonSharedPart : IDisposable`
`147`	`147`	`{`
`148`	`148`	`public UninstantiatedNonSharedPart()`
`149`	`149`	`{`
`150`		`- Assert.False(true, "This should never be instantiated.");`
	`150`	`+ Assert.Fail("This should never be instantiated.");`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`public void Dispose()`
`@@ -176,7 +176,7 @@ public void PartDisposedWhenThrows(IContainer container)`
`176`	`176`	`try`
`177`	`177`	`{`
`178`	`178`	`container.GetExportedValue<ThrowingPart>();`
`179`		`- Assert.False(true, "An exception should have been thrown.");`
	`179`	`+ Assert.Fail("An exception should have been thrown.");`
`180`	`180`	`}`
`181`	`181`	`catch { }`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public void ExportedMethodFuncOf2WrongTypeArgs(IContainer container)`
`150`	`150`	`try`
`151`	`151`	`{`
`152`	`152`	`container.GetExportedValue<Func<string, string, bool>>("Method");`
`153`		`- Assert.False(true, "Expected exception not thrown.");`
	`153`	`+ Assert.Fail("Expected exception not thrown.");`
`154`	`154`	`}`
`155`	`155`	`catch (MefV1.ImportCardinalityMismatchException) { }`
`156`	`156`	`catch (Microsoft.VisualStudio.Composition.CompositionFailedException) { } // V2/V3`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ private static void AssertThrowsV1(Func<object?> action)`
`310`	`310`	`try`
`311`	`311`	`{`
`312`	`312`	`action();`
`313`		`- Assert.False(true, "Expected exception not thrown.");`
	`313`	`+ Assert.Fail("Expected exception not thrown.");`
`314`	`314`	`}`
`315`	`315`	`catch (CompositionFailedException ex)`
`316`	`316`	`{`