dotnet · marcpopMSFT · Apr 3, 2025 · Mar 13, 2025 · Mar 14, 2025 · Mar 18, 2025
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-    <PackageVersion Include="FluentAssertions.Json" Version="$(FluentAssertionsJsonVersion)" />
+    <PackageVersion Include="AwesomeAssertions" Version="$(AwesomeAssertionsVersion)" />
+    <PackageVersion Include="AwesomeAssertions.Json" Version="$(AwesomeAssertionsJsonVersion)" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="$(MicrosoftApplicationInsightsPackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion)" />

diff --git a/eng/Signing.props b/eng/Signing.props
@@ -46,23 +46,14 @@
   </ItemGroup>
 
   <!--
-    These are third party libraries that we use in Arcade. We need to sign them even if they
-    are already signed. However, they must be signed with a 3rd party certificate.
+    Arcade is no longer signed so we don't have to sign test assemblies.
+    ReSign 3rd party files that we use in the product
   -->
   <ItemGroup>
     <FileSignInfo Include="MessagePack.Annotations.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="MessagePack.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Nerdbank.Streams.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="CommandLine.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="FluentAssertions.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="FluentAssertions.Core.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="FluentAssertions.Json.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="Microsoft.3rdpartytools.MarkdownLog.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="xunit.performance.api.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="xunit.performance.core.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="xunit.performance.execution.dll" CertificateName="$(ExternalCertificateId)" />
-    <FileSignInfo Include="xunit.performance.metrics.dll" CertificateName="$(ExternalCertificateId)" />
     <FileSignInfo Include="Valleysoft.DockerCredsProvider.dll" CertificateName="$(ExternalCertificateId)" />
   </ItemGroup>
 

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -292,8 +292,8 @@
   </PropertyGroup>
   <!-- Test Dependencies -->
   <PropertyGroup>
-    <FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
-    <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
+    <AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
+    <AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <MSTestVersion>3.9.0-preview.25181.5</MSTestVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>

diff --git a/...ET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj b/...ET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions.Json" />
+    <PackageReference Include="AwesomeAssertions.Json" />
     <PackageReference Include="Microsoft.Build.Framework" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" />

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions.Json" />
+    <PackageReference Include="AwesomeAssertions.Json" />
     <PackageReference Include="Microsoft.Build" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" />

diff --git a/test/ArgumentsReflector/ArgumentsReflector.csproj b/test/ArgumentsReflector/ArgumentsReflector.csproj
@@ -8,7 +8,7 @@
   <!-- Global usings removal -->
   <!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
   <ItemGroup>
-    <Using Remove="FluentAssertions" />
+    <Using Remove="AwesomeAssertions" />
     <Using Remove="Microsoft.NET.TestFramework" />
     <Using Remove="Microsoft.NET.TestFramework.Assertions" />
     <Using Remove="Microsoft.NET.TestFramework.Commands" />

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -24,6 +24,10 @@
     <IncludeSymbols>false</IncludeSymbols>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" />
+  </ItemGroup>
+
   <!-- Global usings -->
   <!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
   <ItemGroup>

diff --git a/test/HelixTasks/HelixTasks.csproj b/test/HelixTasks/HelixTasks.csproj
@@ -23,7 +23,7 @@
   <!-- Global usings removal -->
   <!-- See: https://learn.microsoft.com/dotnet/core/project-sdk/msbuild-props#using -->
   <ItemGroup>
-    <Using Remove="FluentAssertions" />
+    <Using Remove="AwesomeAssertions" />
     <Using Remove="Microsoft.NET.TestFramework" />
     <Using Remove="Microsoft.NET.TestFramework.Assertions" />
     <Using Remove="Microsoft.NET.TestFramework.Commands" />

@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <PackageReference Include="FakeItEasy"  />
-    <PackageReference Include="FluentAssertions" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs
@@ -102,7 +102,7 @@ public void The_RuntimeFrameworkVersion_can_float()
             //  we know about, so that when a new runtime patch is released the test doesn't
             //  immediately start failing
             var minimumExpectedVersion = new NuGetVersion(TestContext.LatestRuntimePatchForNetCoreApp2_0);
-            netCoreAppLibrary.Version.CompareTo(minimumExpectedVersion).Should().BeGreaterOrEqualTo(0,
+            netCoreAppLibrary.Version.CompareTo(minimumExpectedVersion).Should().BeGreaterThanOrEqualTo(0,
                 "the version resolved from a RuntimeFrameworkVersion of '{0}' should be at least {1}",
                 testProject.RuntimeFrameworkVersion, TestContext.LatestRuntimePatchForNetCoreApp2_0);
         }

diff --git a/test/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs b/test/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs
@@ -737,7 +737,7 @@ public static void Test()
 
             var newtonsoftReferences = packageReferences.Where(pr => pr.value == "Newtonsoft.Json");
 
-            newtonsoftReferences.Count().Should().BeGreaterOrEqualTo(1);
+            newtonsoftReferences.Count().Should().BeGreaterThanOrEqualTo(1);
 
             foreach (var r in newtonsoftReferences)
             {

diff --git a/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj b/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj
@@ -21,7 +21,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.Build" />
     <PackageReference Include="NuGet.ProjectModel" />
     <PackageReference Include="NuGet.LibraryModel" />

diff --git a/test/Microsoft.NET.Clean.Tests/Microsoft.NET.Clean.Tests.csproj b/test/Microsoft.NET.Clean.Tests/Microsoft.NET.Clean.Tests.csproj
@@ -17,10 +17,6 @@
     <PackageId>testSdkClean</PackageId>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
   </ItemGroup>

diff --git a/test/Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj b/test/Microsoft.NET.Pack.Tests/Microsoft.NET.Pack.Tests.csproj
@@ -16,10 +16,6 @@
     <PackageId>testSdkPack</PackageId>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
   </ItemGroup>

diff --git a/test/Microsoft.NET.Publish.Tests/Microsoft.NET.Publish.Tests.csproj b/test/Microsoft.NET.Publish.Tests/Microsoft.NET.Publish.Tests.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions.Json" />
+    <PackageReference Include="AwesomeAssertions.Json" />
     <PackageReference Include="System.Reflection.MetadataLoadContext" />
   </ItemGroup>
 

diff --git a/test/Microsoft.NET.Rebuild.Tests/Microsoft.NET.Rebuild.Tests.csproj b/test/Microsoft.NET.Rebuild.Tests/Microsoft.NET.Rebuild.Tests.csproj
@@ -18,10 +18,6 @@
     <PackageId>testSdkRebuild</PackageId>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
   </ItemGroup>

diff --git a/test/Microsoft.NET.Restore.Tests/Microsoft.NET.Restore.Tests.csproj b/test/Microsoft.NET.Restore.Tests/Microsoft.NET.Restore.Tests.csproj
@@ -19,7 +19,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
     <PackageReference Include="NuGet.Packaging" />
     <PackageReference Include="NuGet.ProjectModel" />
   </ItemGroup>

@@ -49,7 +49,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.Build.Framework" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
     <PackageReference Include="Moq" />

@@ -43,7 +43,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.Build.Framework" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
     <PackageReference Include="Moq" />

@@ -37,7 +37,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.Build.Framework" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
     <PackageReference Include="Moq" />

diff --git a/test/Microsoft.NET.Sdk.Web.Tests/Microsoft.NET.Sdk.Web.Tests.csproj b/test/Microsoft.NET.Sdk.Web.Tests/Microsoft.NET.Sdk.Web.Tests.csproj
@@ -19,7 +19,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions.Json" />
     <PackageReference Include="System.Reflection.MetadataLoadContext" />
   </ItemGroup>
 

diff --git a/test/Microsoft.NET.TestFramework/Assertions/AssemblyAssertions.cs b/test/Microsoft.NET.TestFramework/Assertions/AssemblyAssertions.cs
@@ -3,7 +3,7 @@
 
 using System.Reflection.Metadata;
 using System.Reflection.PortableExecutable;
-using FluentAssertions.Execution;
+using FluentAssertions;
 
 namespace Microsoft.NET.TestFramework.Assertions
 {
@@ -22,29 +22,23 @@ public AndConstraint<AssemblyAssertions> ContainType(string expectedType)
         {
             var types = GetDeclaredTypeNames();
 
-            Execute.Assertion
-                .ForCondition(types.Contains(expectedType))
-                .FailWith($"Expected type {expectedType} to be in assembly, but it is not.");
+            types.Should().Contain(expectedType, $"Expected type {expectedType} to be in assembly, but it is not.");
             return new AndConstraint<AssemblyAssertions>(this);
         }
 
         public AndConstraint<AssemblyAssertions> NotContainType(string expectedType)
         {
             var types = GetDeclaredTypeNames();
 
-            Execute.Assertion
-                .ForCondition(!types.Contains(expectedType))
-                .FailWith($"Expected type {expectedType} to not be in assembly, but it is.");
+            types.Should().NotContain(expectedType, $"Expected type {expectedType} to not be in assembly, but it is.");
             return new AndConstraint<AssemblyAssertions>(this);
         }
 
         public AndConstraint<AssemblyAssertions> HaveAttribute(string expectedAttribute)
         {
             var attributes = GetAssemblyAttributes();
 
-            Execute.Assertion
-                .ForCondition(attributes.Contains(expectedAttribute))
-                .FailWith($"Expected attribute {expectedAttribute} to be in assembly, but it is not.");
+            attributes.Should().Contain(expectedAttribute, $"Expected attribute {expectedAttribute} to be in assembly, but it is not.");
             return new AndConstraint<AssemblyAssertions>(this);
         }