From c3b8bca411a76b25906f30b1a777b72d50ba0c33 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:50:41 +0000
Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade
 build 20231016.5

Microsoft.DotNet.Arcade.Sdk
 From Version 8.0.0-beta.23463.1 -> To Version 9.0.0-beta.23516.5

Dependency coherency updates

Microsoft.DotNet.XliffTasks
 From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23509.1 (parent: Microsoft.DotNet.Arcade.Sdk
---
 eng/Version.Details.xml                    |  4 ++--
 eng/common/build.sh                        |  2 +-
 eng/common/cross/build-rootfs.sh           |  2 +-
 eng/common/cross/riscv64/tizen/tizen.patch |  9 +++++++++
 eng/common/cross/tizen-build-rootfs.sh     | 21 +++++++++++++++++++++
 eng/common/cross/tizen-fetch.sh            | 17 ++++++++++++++---
 eng/common/cross/toolchain.cmake           | 19 +++++++++++++------
 eng/common/sdk-task.ps1                    |  2 +-
 eng/common/templates/job/job.yml           |  2 +-
 eng/common/tools.ps1                       |  4 ++--
 global.json                                |  4 ++--
 11 files changed, 67 insertions(+), 19 deletions(-)
 create mode 100644 eng/common/cross/riscv64/tizen/tizen.patch

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ed899324b8..2008c022df 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -29,9 +29,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23510.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23516.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>0e89c8d7ddbb54510d9d0a757fda5126021b79f0</Sha>
+      <Sha>a672b7bba499394acf218dc59171e2d53e754237</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23509.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 50af40cdd2..2c17ba529b 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
     -binarylog|-bl)
       binary_log=true
       ;;
-    -excludeCIBinarylog|-nobl)
+    -excludecibinarylog|-nobl)
       exclude_ci_binary_log=true
       ;;
     -pipelineslog|-pl)
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 9caf9b021d..4228f202e5 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/eng/common/cross/build-rootfs.sh
@@ -487,7 +487,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
             -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
             -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
             -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \
-            search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')"
+            search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')"
     fi
 
     # install all packages in one go
diff --git a/eng/common/cross/riscv64/tizen/tizen.patch b/eng/common/cross/riscv64/tizen/tizen.patch
new file mode 100644
index 0000000000..eb6d1c0747
--- /dev/null
+++ b/eng/common/cross/riscv64/tizen/tizen.patch
@@ -0,0 +1,9 @@
+diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
+--- a/usr/lib64/libc.so	2016-12-30 23:00:08.284951863 +0900
++++ b/usr/lib64/libc.so	2016-12-30 23:00:32.140951815 +0900
+@@ -2,4 +2,4 @@
+    Use the shared library, but some functions are only in
+    the static library, so try that secondarily.  */
+ OUTPUT_FORMAT(elf64-littleriscv)
+-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a  AS_NEEDED ( /lib64/ld-linux-riscv64-lp64d.so.1 ) )
++GROUP ( libc.so.6 libc_nonshared.a  AS_NEEDED ( ld-linux-riscv64-lp64d.so.1 ) )
diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh
index ac84173d44..ba31c93285 100644
--- a/eng/common/cross/tizen-build-rootfs.sh
+++ b/eng/common/cross/tizen-build-rootfs.sh
@@ -22,6 +22,10 @@ case "$ARCH" in
         TIZEN_ARCH="x86_64"
         LINK_ARCH="x86"
         ;;
+    riscv64)
+        TIZEN_ARCH="riscv64"
+        LINK_ARCH="riscv"
+        ;;
     *)
         echo "Unsupported architecture for tizen: $ARCH"
         exit 1
@@ -58,4 +62,21 @@ rm -rf $TIZEN_TMP_DIR
 echo ">>Start configuring Tizen rootfs"
 ln -sfn asm-${LINK_ARCH} ./usr/include/asm
 patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
+if [[ "$TIZEN_ARCH" == "riscv64" ]]; then
+    echo "Fixing broken symlinks in $PWD"
+    rm ./usr/lib64/libresolv.so
+    ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so
+    rm ./usr/lib64/libpthread.so
+    ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so
+    rm ./usr/lib64/libdl.so
+    ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so
+    rm ./usr/lib64/libutil.so
+    ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so
+    rm ./usr/lib64/libm.so
+    ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so
+    rm ./usr/lib64/librt.so
+    ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so
+    rm ./lib/ld-linux-riscv64-lp64d.so.1
+    ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1
+fi
 echo "<<Finish configuring Tizen rootfs"
diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh
index c18de68d3e..c15c506695 100644
--- a/eng/common/cross/tizen-fetch.sh
+++ b/eng/common/cross/tizen-fetch.sh
@@ -156,17 +156,28 @@ fetch_tizen_pkgs()
     done
 }
 
+if [ "$TIZEN_ARCH" == "riscv64" ]; then
+    BASE="Tizen-Base-RISCV"
+    UNIFIED="Tizen-Unified-RISCV"
+else
+    BASE="Tizen-Base"
+    UNIFIED="Tizen-Unified"
+fi
+
 Inform "Initialize ${TIZEN_ARCH} base"
-fetch_tizen_pkgs_init standard Tizen-Base
+fetch_tizen_pkgs_init standard $BASE
 Inform "fetch common packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
 Inform "fetch coreclr packages"
-fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
+fetch_tizen_pkgs ${TIZEN_ARCH} libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
+if [ "$TIZEN_ARCH" != "riscv64" ]; then
+    fetch_tizen_pkgs ${TIZEN_ARCH} lldb lldb-devel
+fi
 Inform "fetch corefx packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
 
 Inform "Initialize standard unified"
-fetch_tizen_pkgs_init standard Tizen-Unified
+fetch_tizen_pkgs_init standard $UNIFIED
 Inform "fetch corefx packages"
 fetch_tizen_pkgs ${TIZEN_ARCH} gssdp gssdp-devel tizen-release
 
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 0998e875e5..38e96724f5 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm")
     set(TOOLCHAIN "arm-linux-gnueabihf")
   endif()
   if(TIZEN)
-    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0")
+    set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   set(CMAKE_SYSTEM_PROCESSOR aarch64)
@@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
   elseif(LINUX)
     set(TOOLCHAIN "aarch64-linux-gnu")
     if(TIZEN)
-      set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0")
+      set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0")
     endif()
   elseif(FREEBSD)
     set(triple "aarch64-unknown-freebsd12")
@@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
   set(TOOLCHAIN "arm-linux-gnueabi")
   if(TIZEN)
-    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
+    set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/13.1.0")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "armv6")
   set(CMAKE_SYSTEM_PROCESSOR armv6l)
@@ -80,6 +80,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "riscv64")
     set(TOOLCHAIN "riscv64-alpine-linux-musl")
   else()
     set(TOOLCHAIN "riscv64-linux-gnu")
+    if(TIZEN)
+      set(TIZEN_TOOLCHAIN "riscv64-tizen-linux-gnu/13.1.0")
+    endif()
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "s390x")
   set(CMAKE_SYSTEM_PROCESSOR s390x)
@@ -95,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64")
   elseif(LINUX)
     set(TOOLCHAIN "x86_64-linux-gnu")
     if(TIZEN)
-      set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0")
+      set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0")
     endif()
   elseif(FREEBSD)
     set(triple "x86_64-unknown-freebsd12")
@@ -112,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
     set(TOOLCHAIN "i686-linux-gnu")
   endif()
   if(TIZEN)
-    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
+    set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0")
   endif()
 else()
   message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!")
@@ -144,6 +147,10 @@ if(TIZEN)
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
     include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu)
   endif()
+  if(TARGET_ARCH_NAME STREQUAL "riscv64")
+    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
+    include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/riscv64-tizen-linux-gnu)
+  endif()
 endif()
 
 if(ANDROID)
@@ -270,7 +277,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
   endif()
-elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
+elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
   if(TIZEN)
     add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
     add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 91f8196cc8..73828dd30d 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
       $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
     }
     if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
         $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index e20ee3a983..0b01531357 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -154,7 +154,7 @@ jobs:
       displayName: RichCodeNav Upload
       inputs:
         languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }}
-        environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }}
+        environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }}
         richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
         uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }}
       continueOnError: true
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 84cfe7cd9c..fdd0cbb91f 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
 
   # If the version of msbuild is going to be xcopied,
   # use this version. Version matches a package here:
-  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1
-  $defaultXCopyMSBuildVersion = '17.7.2-1'
+  # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
+  $defaultXCopyMSBuildVersion = '17.8.1-2'
 
   if (!$vsRequirements) {
     if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
diff --git a/global.json b/global.json
index 756910b663..df742efda3 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "8.0.100-rc.1.23455.8",
+    "dotnet": "8.0.100-rtm.23506.1",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -8,6 +8,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.4"
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23516.5"
   }
 }

From b9e016892fcb8ccfa7904c89c0b523bafb0a6e12 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Tue, 17 Oct 2023 18:18:52 -0700
Subject: [PATCH 2/4] Fix dotnet_diagnostic.xUnit2020.severity errors.

---
 .editorconfig                                                | 5 ++---
 test/Microsoft.TemplateEngine.Core.UnitTests/TestBase.cs     | 2 +-
 .../ValueFormTests/TemplateJsonDefinedFormsTests.cs          | 4 ++--
 .../NuGetTests.cs                                            | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 67136b82ee..ae68ddadb7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -204,6 +204,8 @@ dotnet_diagnostic.IDE0290.severity = suggestion
 dotnet_diagnostic.IDE0300.severity = suggestion
 #Collection initialization can be simplified
 dotnet_diagnostic.IDE0301.severity = suggestion
+#Collection initialization can be simplified
+dotnet_diagnostic.IDE0305.severity = suggestion
 
 # License header
 file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
@@ -593,9 +595,6 @@ dotnet_diagnostic.xUnit2013.severity = suggestion
 # Do not use obsolete throws check to check for asynchronously thrown exception
 dotnet_diagnostic.xUnit2019.severity = warning
 
-# Do not use Assert.True(false, message) to fail a test. Use Assert.Fail(message) instead.
-dotnet_diagnostic.xUnit2020.severity = suggestion
-
 # test code files
 [test/**/*.{cs,vb}]
 # Use literals where appropriate
diff --git a/test/Microsoft.TemplateEngine.Core.UnitTests/TestBase.cs b/test/Microsoft.TemplateEngine.Core.UnitTests/TestBase.cs
index 6343cb267f..43fe88da60 100644
--- a/test/Microsoft.TemplateEngine.Core.UnitTests/TestBase.cs
+++ b/test/Microsoft.TemplateEngine.Core.UnitTests/TestBase.cs
@@ -70,7 +70,7 @@ protected static void Verify(Encoding encoding, Stream output, bool changed, str
             string modifier = expectedChange ? string.Empty : "not ";
             if (expectedChange ^ changed)
             {
-                Assert.False(true, $"Expected value to {modifier} be changed");
+                Assert.Fail($"Expected value to {modifier} be changed");
             }
         }
     }
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValueFormTests/TemplateJsonDefinedFormsTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValueFormTests/TemplateJsonDefinedFormsTests.cs
index 4b18294b67..1ebb94acf0 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValueFormTests/TemplateJsonDefinedFormsTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/ValueFormTests/TemplateJsonDefinedFormsTests.cs
@@ -50,7 +50,7 @@ public void UnknownFormNameOnParameterSymbolDoesNotThrow()
             }
             catch
             {
-                Assert.True(false, "Should not throw on unknown value form name");
+                Assert.Fail("Should not throw on unknown value form name");
             }
 
             Assert.NotNull(runConfig);
@@ -94,7 +94,7 @@ public void UnknownFormNameForDerivedSymbolValueDoesThrow()
             }
             catch
             {
-                Assert.True(false, "Should not throw on unknown value form name");
+                Assert.Fail("Should not throw on unknown value form name");
             }
 
             Assert.NotNull(runConfig);
diff --git a/test/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/NuGetTests.cs b/test/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/NuGetTests.cs
index a233ec85be..1096a22487 100644
--- a/test/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/NuGetTests.cs
+++ b/test/Microsoft.TemplateSearch.TemplateDiscovery.IntegrationTests/NuGetTests.cs
@@ -44,7 +44,7 @@ public async Task CanReadPackageInfo()
                 }
                 else
                 {
-                    Assert.True(false, "HTTP request failed.");
+                    Assert.Fail("HTTP request failed.");
                 }
             }
         }

From c8d5b57920af8a76a35373925122c56af73fe3c5 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Tue, 17 Oct 2023 18:44:04 -0700
Subject: [PATCH 3/4] Fix dotnet_diagnostic.xUnit2013.severity errors.

---
 .editorconfig                                 |  3 -
 .../ScannerTests.cs                           | 12 ++--
 .../TemplateConstraintManagerTests.cs         |  2 +-
 .../TemplatePackageManagerTests.cs            |  4 +-
 .../ConfigurationTests.cs                     |  2 +-
 .../TemplatePackagesTests.cs                  | 68 +++++++++----------
 .../MacroTests/GeneratePortMacroTests.cs      | 10 +--
 .../MacroTests/NowMacroTests.cs               |  4 +-
 .../MacroTests/RandomMacroTests.cs            |  4 +-
 .../CustomConditionalTests.cs                 | 18 ++---
 .../TemplateConfigTests/FileRenameTests.cs    |  2 +-
 .../TemplateConfigTests/PostActionTests.cs    |  4 +-
 .../TemplateConfigTests/SourceConfigTests.cs  |  8 +--
 .../TemplateConfigTests/SymbolConfigTests.cs  |  2 +-
 .../NuGetMetadataSearchProviderTests.cs       | 20 +++---
 .../TemplateSearchCacheReaderTests.cs         |  6 +-
 16 files changed, 83 insertions(+), 86 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index ae68ddadb7..e4814101db 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -589,9 +589,6 @@ dotnet_diagnostic.xUnit1031.severity = suggestion
 # Do not use invalid equality check
 dotnet_diagnostic.xUnit2001.severity = warning
 
-# Do not use Assert.Equal() to check for collection size. Use Assert.Single instead.
-dotnet_diagnostic.xUnit2013.severity = suggestion
-
 # Do not use obsolete throws check to check for asynchronously thrown exception
 dotnet_diagnostic.xUnit2019.severity = warning
 
diff --git a/test/Microsoft.TemplateEngine.Edge.UnitTests/ScannerTests.cs b/test/Microsoft.TemplateEngine.Edge.UnitTests/ScannerTests.cs
index 8cf326cca2..7140516d2b 100644
--- a/test/Microsoft.TemplateEngine.Edge.UnitTests/ScannerTests.cs
+++ b/test/Microsoft.TemplateEngine.Edge.UnitTests/ScannerTests.cs
@@ -33,9 +33,9 @@ public async Task CanLogValidationMessagesOnInstall_MissingIdentity()
 
             ScanResult result = await scanner.ScanAsync(templatesLocation, default).ConfigureAwait(false);
 
-            Assert.Equal(0, result.Templates.Count);
+            Assert.Empty(result.Templates);
 #pragma warning disable CS0618 // Type or member is obsolete
-            Assert.Equal(0, result.Localizations.Count);
+            Assert.Empty(result.Localizations);
 #pragma warning restore CS0618 // Type or member is obsolete
 
             string errorMessage = Assert.Single(loggedMessages, l => l.Level is LogLevel.Error).Message;
@@ -56,9 +56,9 @@ public async Task CanLogValidationMessagesOnInstall_ErrorsInTemplateConfig()
 
             ScanResult result = await scanner.ScanAsync(templatesLocation, default).ConfigureAwait(false);
 
-            Assert.Equal(0, result.Templates.Count);
+            Assert.Empty(result.Templates);
 #pragma warning disable CS0618 // Type or member is obsolete
-            Assert.Equal(0, result.Localizations.Count);
+            Assert.Empty(result.Localizations);
 #pragma warning restore CS0618 // Type or member is obsolete
 
             List<string> errorMessages = loggedMessages.Where(lm => lm.Level == LogLevel.Error).Select(e => e.Message).ToList();
@@ -108,9 +108,9 @@ public async Task CanLogValidationMessagesOnInstall_Localization()
 
             ScanResult result = await scanner.ScanAsync(templatesLocation, default).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Templates.Count);
+            Assert.Single(result.Templates);
 #pragma warning disable CS0618 // Type or member is obsolete
-            Assert.Equal(0, result.Localizations.Count);
+            Assert.Empty(result.Localizations);
 #pragma warning restore CS0618 // Type or member is obsolete
 
             List<string> errorMessages = loggedMessages.Where(lm => lm.Level == LogLevel.Error).Select(e => e.Message).OrderBy(em => em).ToList();
diff --git a/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateConstraintManagerTests.cs b/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateConstraintManagerTests.cs
index 7054f071c9..d398b3bf21 100644
--- a/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateConstraintManagerTests.cs
+++ b/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateConstraintManagerTests.cs
@@ -81,7 +81,7 @@ public async Task CanGetConstraints_Filter()
 
             var constraints = await constraintManager.GetConstraintsAsync(new[] { templateInfo }, default).ConfigureAwait(false);
 
-            Assert.Equal(1, constraints.Count);
+            Assert.Single(constraints);
             Assert.Equal("test-1", constraints.Single().Type);
         }
 
diff --git a/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplatePackageManagerTests.cs b/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplatePackageManagerTests.cs
index e9051ce781..60fc11584f 100644
--- a/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplatePackageManagerTests.cs
+++ b/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplatePackageManagerTests.cs
@@ -47,7 +47,7 @@ public async Task OrderOfScanningIsCorrect()
             var templates = await new TemplatePackageManager(engineEnvironmentSettings).GetTemplatesAsync(default)
                 .ConfigureAwait(false);
 
-            Assert.Equal(1, templates.Count);
+            Assert.Single(templates);
             Assert.Equal("sample99", templates.Single().ShortNameList[0]);
         }
 
@@ -78,7 +78,7 @@ public async Task OrderOfScanningIsCorrectWithPriority()
             var templates = await new TemplatePackageManager(engineEnvironmentSettings).GetTemplatesAsync(default)
                 .ConfigureAwait(false);
 
-            Assert.Equal(1, templates.Count);
+            Assert.Single(templates);
             Assert.Equal("sample49", templates.Single().ShortNameList[0]);
         }
 
diff --git a/test/Microsoft.TemplateEngine.IDE.IntegrationTests/ConfigurationTests.cs b/test/Microsoft.TemplateEngine.IDE.IntegrationTests/ConfigurationTests.cs
index 40d3f0cf2e..ef403a90c8 100644
--- a/test/Microsoft.TemplateEngine.IDE.IntegrationTests/ConfigurationTests.cs
+++ b/test/Microsoft.TemplateEngine.IDE.IntegrationTests/ConfigurationTests.cs
@@ -61,7 +61,7 @@ internal async Task VirtualConfigurationTest()
             InstallRequest installRequest = new InstallRequest("Microsoft.DotNet.Web.ProjectTemplates.5.0", "5.0.0");
             IReadOnlyList<InstallResult> installResult = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, installResult.Count);
+            Assert.Single(installResult);
             Assert.True(installResult[0].Success);
             bootstrapper.Dispose();
 
diff --git a/test/Microsoft.TemplateEngine.IDE.IntegrationTests/TemplatePackagesTests.cs b/test/Microsoft.TemplateEngine.IDE.IntegrationTests/TemplatePackagesTests.cs
index 1c9f251a0b..f81e6be403 100644
--- a/test/Microsoft.TemplateEngine.IDE.IntegrationTests/TemplatePackagesTests.cs
+++ b/test/Microsoft.TemplateEngine.IDE.IntegrationTests/TemplatePackagesTests.cs
@@ -59,7 +59,7 @@ internal async Task CanInstall_LocalNuGetPackage()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             result[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -75,12 +75,12 @@ internal async Task CanInstall_LocalNuGetPackage()
 
             IReadOnlyList<IManagedTemplatePackage> managedTemplatesPackages = await bootstrapper.GetManagedTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, managedTemplatesPackages.Count);
+            Assert.Single(managedTemplatesPackages);
             managedTemplatesPackages[0].Should().BeEquivalentTo(source);
 
             IReadOnlyList<ITemplatePackage> templatePackages = await bootstrapper.GetTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, templatePackages.Count);
+            Assert.Single(templatePackages);
             Assert.IsAssignableFrom<IManagedTemplatePackage>(templatePackages[0]);
             templatePackages[0].Should().BeEquivalentTo((ITemplatePackage)source);
         }
@@ -99,7 +99,7 @@ internal async Task CanInstall_RemoteNuGetPackage()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             Assert.True(string.IsNullOrEmpty(result[0].ErrorMessage));
@@ -116,12 +116,12 @@ internal async Task CanInstall_RemoteNuGetPackage()
 
             IReadOnlyList<IManagedTemplatePackage> managedTemplatesPackages = await bootstrapper.GetManagedTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, managedTemplatesPackages.Count);
+            Assert.Single(managedTemplatesPackages);
             managedTemplatesPackages[0].Should().BeEquivalentTo(source);
 
             IReadOnlyList<ITemplatePackage> templatePackages = await bootstrapper.GetTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, templatePackages.Count);
+            Assert.Single(templatePackages);
             Assert.IsAssignableFrom<IManagedTemplatePackage>(templatePackages[0]);
             templatePackages[0].Should().BeEquivalentTo((ITemplatePackage)source);
         }
@@ -136,7 +136,7 @@ internal async Task CanInstall_Folder()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             result[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -151,12 +151,12 @@ internal async Task CanInstall_Folder()
 
             IReadOnlyList<IManagedTemplatePackage> managedTemplatesPackages = await bootstrapper.GetManagedTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, managedTemplatesPackages.Count);
+            Assert.Single(managedTemplatesPackages);
             managedTemplatesPackages[0].Should().BeEquivalentTo(source);
 
             IReadOnlyList<ITemplatePackage> templatePackages = await bootstrapper.GetTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, templatePackages.Count);
+            Assert.Single(templatePackages);
             Assert.IsAssignableFrom<IManagedTemplatePackage>(templatePackages[0]);
             templatePackages[0].Should().BeEquivalentTo((ITemplatePackage)source);
         }
@@ -169,13 +169,13 @@ internal async Task CanCheckForLatestVersion_NuGetPackage()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
             IReadOnlyList<CheckUpdateResult> checkUpdateResults = await bootstrapper.GetLatestVersionsAsync(new[] { source! }, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, checkUpdateResults.Count);
+            Assert.Single(checkUpdateResults);
             Assert.True(checkUpdateResults[0].Success);
             Assert.Equal(InstallerErrorCode.Success, checkUpdateResults[0].Error);
             Assert.True(string.IsNullOrEmpty(checkUpdateResults[0].ErrorMessage));
@@ -194,13 +194,13 @@ internal async Task CanCheckForLatestVersion_Folder()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
             IReadOnlyList<CheckUpdateResult> checkUpdateResults = await bootstrapper.GetLatestVersionsAsync(new[] { source! }, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, checkUpdateResults.Count);
+            Assert.Single(checkUpdateResults);
             Assert.True(checkUpdateResults[0].Success);
             Assert.Equal(InstallerErrorCode.Success, checkUpdateResults[0].Error);
             Assert.True(string.IsNullOrEmpty(checkUpdateResults[0].ErrorMessage));
@@ -265,7 +265,7 @@ internal async Task CanUpdate_NuGetPackage()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
@@ -273,7 +273,7 @@ internal async Task CanUpdate_NuGetPackage()
 
             IReadOnlyList<UpdateResult> updateResults = await bootstrapper.UpdateTemplatePackagesAsync(new[] { updateRequest }, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, updateResults.Count);
+            Assert.Single(updateResults);
             Assert.True(updateResults[0].Success);
             Assert.Equal(InstallerErrorCode.Success, updateResults[0].Error);
             Assert.True(string.IsNullOrEmpty(updateResults[0].ErrorMessage));
@@ -287,12 +287,12 @@ internal async Task CanUpdate_NuGetPackage()
 
             IReadOnlyList<IManagedTemplatePackage> managedTemplatesPackages = await bootstrapper.GetManagedTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, managedTemplatesPackages.Count);
+            Assert.Single(managedTemplatesPackages);
             managedTemplatesPackages[0].Should().BeEquivalentTo(updatedSource);
 
             IReadOnlyList<ITemplatePackage> templatePackages = await bootstrapper.GetTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, templatePackages.Count);
+            Assert.Single(templatePackages);
             Assert.IsAssignableFrom<IManagedTemplatePackage>(templatePackages[0]);
             templatePackages[0].Should().BeEquivalentTo((ITemplatePackage)updatedSource);
         }
@@ -305,18 +305,18 @@ internal async Task CanUninstall_NuGetPackage()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
             IReadOnlyList<IManagedTemplatePackage> managedTemplatesPackages = await bootstrapper.GetManagedTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, managedTemplatesPackages.Count);
+            Assert.Single(managedTemplatesPackages);
             managedTemplatesPackages[0].Should().BeEquivalentTo(source);
 
             IReadOnlyList<UninstallResult> uninstallResults = await bootstrapper.UninstallTemplatePackagesAsync(new[] { source! }, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, uninstallResults.Count);
+            Assert.Single(uninstallResults);
             Assert.True(uninstallResults[0].Success);
             Assert.Equal(InstallerErrorCode.Success, uninstallResults[0].Error);
             uninstallResults[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -324,7 +324,7 @@ internal async Task CanUninstall_NuGetPackage()
 
             IReadOnlyList<ITemplatePackage> templatePackages = await bootstrapper.GetTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(0, templatePackages.Count);
+            Assert.Empty(templatePackages);
         }
 
         [Fact]
@@ -337,7 +337,7 @@ internal async Task CanUninstall_Folder()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
@@ -345,12 +345,12 @@ internal async Task CanUninstall_Folder()
 
             IReadOnlyList<IManagedTemplatePackage> managedTemplatesPackages = await bootstrapper.GetManagedTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, managedTemplatesPackages.Count);
+            Assert.Single(managedTemplatesPackages);
             managedTemplatesPackages[0].Should().BeEquivalentTo(source);
 
             IReadOnlyList<UninstallResult> uninstallResults = await bootstrapper.UninstallTemplatePackagesAsync(new[] { source }, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, uninstallResults.Count);
+            Assert.Single(uninstallResults);
             Assert.True(uninstallResults[0].Success);
             Assert.Equal(InstallerErrorCode.Success, uninstallResults[0].Error);
             uninstallResults[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -358,7 +358,7 @@ internal async Task CanUninstall_Folder()
 
             IReadOnlyList<ITemplatePackage> templatePackages = await bootstrapper.GetTemplatePackagesAsync(CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(0, templatePackages.Count);
+            Assert.Empty(templatePackages);
 
             Directory.Exists(templateLocation);
         }
@@ -373,7 +373,7 @@ internal async Task CanReInstallPackage_WhenForceIsSpecified()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             result[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -383,7 +383,7 @@ internal async Task CanReInstallPackage_WhenForceIsSpecified()
 
             result = await bootstrapper.InstallTemplatePackagesAsync(new[] { repeatedInstallRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             result[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -393,7 +393,7 @@ internal async Task CanReInstallPackage_WhenForceIsSpecified()
 
             result = await bootstrapper.InstallTemplatePackagesAsync(new[] { repeatedInstallRequestWithoutForce }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.False(result[0].Success);
             Assert.Equal(InstallerErrorCode.DownloadFailed, result[0].Error);
         }
@@ -406,7 +406,7 @@ internal async Task CanReInstallRemotePackage_WhenForceIsSpecified()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             Assert.True(string.IsNullOrEmpty(result[0].ErrorMessage));
@@ -416,7 +416,7 @@ internal async Task CanReInstallRemotePackage_WhenForceIsSpecified()
 
             result = await bootstrapper.InstallTemplatePackagesAsync(new[] { repeatedInstallRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             result[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -426,7 +426,7 @@ internal async Task CanReInstallRemotePackage_WhenForceIsSpecified()
 
             result = await bootstrapper.InstallTemplatePackagesAsync(new[] { repeatedInstallRequestWithoutForce }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.False(result[0].Success);
             Assert.Equal(InstallerErrorCode.AlreadyInstalled, result[0].Error);
         }
@@ -441,7 +441,7 @@ internal async Task CanReInstallFolder_WhenForceIsSpecified()
 
             IReadOnlyList<InstallResult> result = await bootstrapper.InstallTemplatePackagesAsync(new[] { installRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             result[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -451,7 +451,7 @@ internal async Task CanReInstallFolder_WhenForceIsSpecified()
 
             result = await bootstrapper.InstallTemplatePackagesAsync(new[] { repeatedInstallRequest }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.True(result[0].Success);
             Assert.Equal(InstallerErrorCode.Success, result[0].Error);
             result[0].ErrorMessage.Should().BeNullOrEmpty();
@@ -461,7 +461,7 @@ internal async Task CanReInstallFolder_WhenForceIsSpecified()
 
             result = await bootstrapper.InstallTemplatePackagesAsync(new[] { repeatedInstallRequestWithoutForce }, InstallationScope.Global, CancellationToken.None).ConfigureAwait(false);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.False(result[0].Success);
             Assert.Equal(InstallerErrorCode.AlreadyInstalled, result[0].Error);
         }
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/GeneratePortMacroTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/GeneratePortMacroTests.cs
index 3a38a9396e..df5bf95727 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/GeneratePortMacroTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/GeneratePortMacroTests.cs
@@ -27,7 +27,7 @@ public void BasicMacroTest()
             GeneratePortNumberConfig config = new(macro, "test", "integer", 3000, 4000, 5000);
             macro.Evaluate(_engineEnvironmentSettings, variables, config);
 
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
 
             int result = (int)variables["test"];
 
@@ -50,7 +50,7 @@ public void GeneratedSymbolTest()
             GeneratedSymbol symbol = new("test", macro.Type, jsonParameters);
             macro.Evaluate(_engineEnvironmentSettings, variables, symbol);
 
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
 
             int result = (int)variables["test"];
 
@@ -66,7 +66,7 @@ public void TestDeterministicMode()
             GeneratePortNumberConfig config = new(macro, "test", "integer", 3000, 4000, 5000);
             macro.EvaluateDeterministically(_engineEnvironmentSettings, variables, config);
 
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
             Assert.Equal(4000, variables["test"]);
         }
 
@@ -86,7 +86,7 @@ public void TestDeterministicMode_GenSymbol()
             GeneratePortNumberMacro macro = new();
 
             macro.EvaluateDeterministically(_engineEnvironmentSettings, variables, macro.CreateConfig(_engineEnvironmentSettings, deferredConfig));
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
             Assert.Equal(4000, variables["test"]);
         }
 
@@ -102,7 +102,7 @@ public void TestDeterministicMode_GenSymbol_Default()
             GeneratePortNumberMacro macro = new();
 
             macro.EvaluateDeterministically(_engineEnvironmentSettings, variables, macro.CreateConfig(_engineEnvironmentSettings, deferredConfig));
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
             Assert.Equal(GeneratePortNumberConfig.LowPortDefault, variables["test"]);
         }
 
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/NowMacroTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/NowMacroTests.cs
index 16e6b98c5d..091f35e3a2 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/NowMacroTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/NowMacroTests.cs
@@ -101,7 +101,7 @@ public void TestDeterministicMode()
             NowMacroConfig config = new(macro, "test", "yyyy-MM-dd HH:mm:ss");
             macro.EvaluateDeterministically(_engineEnvironmentSettings, variables, config);
 
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
             Assert.Equal("1900-01-01 00:00:00", variables["test"].ToString());
         }
 
@@ -123,7 +123,7 @@ public void TestDeterministicMode_GenSymbol()
 
             macro.EvaluateDeterministically(_engineEnvironmentSettings, variables, macro.CreateConfig(_engineEnvironmentSettings, deferredConfig));
 
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
             Assert.Equal("1900-01-01 00:00:00", variables["test"].ToString());
         }
 
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/RandomMacroTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/RandomMacroTests.cs
index 3a0664f576..a668b9d07a 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/RandomMacroTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/RandomMacroTests.cs
@@ -84,7 +84,7 @@ public void TestDeterministicMode()
             RandomMacroConfig config = new(macro, "test", "integer", 10, 100);
             macro.EvaluateDeterministically(_engineEnvironmentSettings, variables, config);
 
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
             Assert.Equal(10, variables["test"]);
         }
 
@@ -104,7 +104,7 @@ public void TestDeterministicMode_GenSymbol()
 
             macro.EvaluateDeterministically(_engineEnvironmentSettings, variables, macro.CreateConfig(_engineEnvironmentSettings, deferredConfig));
 
-            Assert.Equal(1, variables.Count);
+            Assert.Single(variables);
             Assert.Equal(10, variables["test"]);
         }
 
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/CustomConditionalTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/CustomConditionalTests.cs
index ae4f6f51f7..6a8e230ed6 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/CustomConditionalTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/CustomConditionalTests.cs
@@ -87,12 +87,12 @@ public void TestCustomConditionalSetupNoStyleSpecification()
             IEnumerable<IOperationProvider> ops = new ConditionalConfig().ConfigureFromJson(CustomConditionalSetupNoStyleSpecification.ToString(), A.Fake<IDirectory>());
             IList<IOperationProvider> operations = new List<IOperationProvider>(ops);
 
-            Assert.Equal(1, operations.Count);
+            Assert.Single(operations);
             Assert.True(operations[0] is Conditional);
 
             Conditional? conditionalOp = operations[0] as Conditional;
             Assert.NotNull(conditionalOp);
-            Assert.Equal(1, conditionalOp!.Tokens.ActionableIfTokens.Count);
+            Assert.Single(conditionalOp!.Tokens.ActionableIfTokens);
             Assert.Equal("<!--#if", conditionalOp.Tokens.ActionableIfTokens[0].Value);
 
             Assert.Equal(2, conditionalOp.Tokens.ActionableElseTokens.Count);
@@ -117,12 +117,12 @@ public void TestCustomConditionalSetupExplicitStyleSpecification()
             IEnumerable<IOperationProvider> ops = new ConditionalConfig().ConfigureFromJson(CustomConditionalSetupExplicitStyleSpecification.ToString(), A.Fake<IDirectory>());
             IList<IOperationProvider> operations = new List<IOperationProvider>(ops);
 
-            Assert.Equal(1, operations.Count);
+            Assert.Single(operations);
             Assert.True(operations[0] is Conditional);
 
             Conditional? conditionalOp = operations[0] as Conditional;
             Assert.NotNull(conditionalOp);
-            Assert.Equal(1, conditionalOp!.Tokens.ActionableIfTokens.Count);
+            Assert.Single(conditionalOp!.Tokens.ActionableIfTokens);
             Assert.Equal("<!--#if", conditionalOp.Tokens.ActionableIfTokens[0].Value);
 
             Assert.Equal(2, conditionalOp.Tokens.ActionableElseTokens.Count);
@@ -153,28 +153,28 @@ public void TestLineCommentConditionalSetup()
             Conditional? conditionalOp = operations[0] as Conditional;
             Assert.NotNull(conditionalOp);
 
-            Assert.Equal(1, conditionalOp!.Tokens.IfTokens.Count);
+            Assert.Single(conditionalOp!.Tokens.IfTokens);
             Assert.Equal("//#if", conditionalOp.Tokens.IfTokens[0].Value);
 
             Assert.Equal(2, conditionalOp.Tokens.ElseIfTokens.Count);
             Assert.Contains(conditionalOp.Tokens.ElseIfTokens, x => x.Value == "//#elseif");
             Assert.Contains(conditionalOp.Tokens.ElseIfTokens, x => x.Value == "//#elif");
 
-            Assert.Equal(1, conditionalOp.Tokens.ElseTokens.Count);
+            Assert.Single(conditionalOp.Tokens.ElseTokens);
             Assert.Equal("//#else", conditionalOp.Tokens.ElseTokens[0].Value);
 
             Assert.Equal(2, conditionalOp.Tokens.EndIfTokens.Count);
             Assert.Contains(conditionalOp.Tokens.EndIfTokens, x => x.Value == "//#endif");
             Assert.Contains(conditionalOp.Tokens.EndIfTokens, x => x.Value == "////#endif");
 
-            Assert.Equal(1, conditionalOp.Tokens.ActionableIfTokens.Count);
+            Assert.Single(conditionalOp.Tokens.ActionableIfTokens);
             Assert.Equal("////#if", conditionalOp.Tokens.ActionableIfTokens[0].Value);
 
             Assert.Equal(2, conditionalOp.Tokens.ActionableElseIfTokens.Count);
             Assert.Contains(conditionalOp.Tokens.ActionableElseIfTokens, x => x.Value == "////#elseif");
             Assert.Contains(conditionalOp.Tokens.ActionableElseIfTokens, x => x.Value == "////#elif");
 
-            Assert.Equal(1, conditionalOp.Tokens.ActionableElseTokens.Count);
+            Assert.Single(conditionalOp.Tokens.ActionableElseTokens);
             Assert.Equal("////#else", conditionalOp.Tokens.ActionableElseTokens[0].Value);
 
             Assert.True(conditionalOp.WholeLine);
@@ -197,7 +197,7 @@ public void TestBlockCommentConditionalSetup()
             Assert.Contains(conditionalOp.Tokens.EndIfTokens, x => x.Value == "#endif");
             Assert.Contains(conditionalOp.Tokens.EndIfTokens, x => x.Value == "/*#endif");
 
-            Assert.Equal(1, conditionalOp.Tokens.ActionableIfTokens.Count);
+            Assert.Single(conditionalOp.Tokens.ActionableIfTokens);
             Assert.Equal("/*#if", conditionalOp.Tokens.ActionableIfTokens[0].Value);
 
             Assert.Equal(4, conditionalOp.Tokens.ActionableElseIfTokens.Count);
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/FileRenameTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/FileRenameTests.cs
index e50a9932c1..039e03fab5 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/FileRenameTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/FileRenameTests.cs
@@ -289,7 +289,7 @@ public void CanGenerateFileRenamesForSymbolBasedRenames()
                 fileRenames: new Dictionary<string, string>(),
                 symbolBasedFileRenames: symbolBasedRenames);
 
-            Assert.Equal(1, allChanges.Count);
+            Assert.Single(allChanges);
             Assert.Equal("Replace1Value_file.txt", allChanges["Replace1_file.txt"]);
         }
 
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/PostActionTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/PostActionTests.cs
index 018b500a3a..a4fd202ced 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/PostActionTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/PostActionTests.cs
@@ -319,7 +319,7 @@ public void CanReadFileRenameSettings()
 
             TemplateConfigModel configModel = TemplateConfigModel.FromJObject(JObject.Parse(configString));
 
-            Assert.Equal(1, configModel.PostActionModels.Count);
+            Assert.Single(configModel.PostActionModels);
             Assert.True(configModel.PostActionModels.Single().ApplyFileRenamesToManualInstructions);
 
             Assert.Equal("Foo", configModel.PostActionModels.Single().ApplyFileRenamesToArgs.Single());
@@ -356,7 +356,7 @@ public void CanAddWarningOnWrongFileRenameConfig()
 
             TemplateConfigModel configModel = TemplateConfigModel.FromJObject(JObject.Parse(configString));
 
-            Assert.Equal(1, configModel.PostActionModels.Count);
+            Assert.Single(configModel.PostActionModels);
             Assert.True(configModel.PostActionModels.Single().ApplyFileRenamesToManualInstructions);
 
             Assert.Equal("Baz", configModel.PostActionModels.Single().ApplyFileRenamesToArgs.Single());
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/SourceConfigTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/SourceConfigTests.cs
index 40c4b4a3a6..feeafd0aec 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/SourceConfigTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/SourceConfigTests.cs
@@ -116,7 +116,7 @@ public async Task CopyOnlyWithoutIncludeDoesntActuallyCopyFile()
             IEnumerable<IFileChange2> changes = result.FileChanges.Cast<IFileChange2>();
             Assert.All(result.FileChanges.Cast<IFileChange2>(), c => c.SourceRelativePath.StartsWith("./"));
 
-            Assert.Equal(1, result.FileChanges.Count);
+            Assert.Single(result.FileChanges);
 
             Assert.Equal(ChangeKind.Create, result.FileChanges.Single().ChangeKind);
             Assert.True(string.Equals(result.FileChanges.Single().TargetRelativePath, "./something.txt"), "didn't copy the correct file");
@@ -167,7 +167,7 @@ public async Task CopyOnlyWithParentIncludeActuallyCopiesFile()
             IEnumerable<IFileChange2> changes = result.FileChanges.Cast<IFileChange2>();
             Assert.All(result.FileChanges.Cast<IFileChange2>(), c => c.SourceRelativePath.StartsWith("./"));
 
-            Assert.Equal(1, result.FileChanges.Count);
+            Assert.Single(result.FileChanges);
             Assert.Equal(ChangeKind.Create, result.FileChanges.Single().ChangeKind);
             Assert.True(string.Equals(result.FileChanges.Single().TargetRelativePath, "./copy.me"), "didn't copy the correct file");
         }
@@ -217,7 +217,7 @@ public async Task CopyOnlyWithWildcardAndParentIncludeActuallyCopiesFile()
             IEnumerable<IFileChange2> changes = result.FileChanges.Cast<IFileChange2>();
             Assert.All(result.FileChanges.Cast<IFileChange2>(), c => c.SourceRelativePath.StartsWith("./"));
 
-            Assert.Equal(1, result.FileChanges.Count);
+            Assert.Single(result.FileChanges);
             Assert.Equal(ChangeKind.Create, result.FileChanges.Single().ChangeKind);
             Assert.True(string.Equals(result.FileChanges.Single().TargetRelativePath, "./copy.me"), "didn't copy the correct file");
         }
@@ -272,7 +272,7 @@ public async Task IncludeModifierOverridesPreviousExcludeModifierTemplateTest()
             IEnumerable<IFileChange2> changes = result.FileChanges.Cast<IFileChange2>();
             Assert.All(result.FileChanges.Cast<IFileChange2>(), c => c.SourceRelativePath.StartsWith("./"));
 
-            Assert.Equal(1, result.FileChanges.Count);
+            Assert.Single(result.FileChanges);
             Assert.Equal(ChangeKind.Create, result.FileChanges.Single().ChangeKind);
             Assert.True(string.Equals(result.FileChanges.Single().TargetRelativePath, "./include.xyz"), "include modifier didn't properly override exclude modifier");
         }
diff --git a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/SymbolConfigTests.cs b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/SymbolConfigTests.cs
index fa334bcf4c..3a0a0e6cdc 100644
--- a/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/SymbolConfigTests.cs
+++ b/test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/TemplateConfigTests/SymbolConfigTests.cs
@@ -783,7 +783,7 @@ public void ParameterSymbolWithNoValueFormsGetsIdentityFormAdded()
             Assert.NotNull(paramSymbol);
             IList<string> configuredValueFormNames = paramSymbol!.Forms.GlobalForms.ToList();
 
-            Assert.Equal(1, configuredValueFormNames.Count);
+            Assert.Single(configuredValueFormNames);
             Assert.Equal(IdentityValueFormFactory.FormIdentifier, configuredValueFormNames[0]);
         }
 
diff --git a/test/Microsoft.TemplateSearch.Common.UnitTests/NuGetMetadataSearchProviderTests.cs b/test/Microsoft.TemplateSearch.Common.UnitTests/NuGetMetadataSearchProviderTests.cs
index 9435f4ae13..86fc008cf2 100644
--- a/test/Microsoft.TemplateSearch.Common.UnitTests/NuGetMetadataSearchProviderTests.cs
+++ b/test/Microsoft.TemplateSearch.Common.UnitTests/NuGetMetadataSearchProviderTests.cs
@@ -50,7 +50,7 @@ async Task<IReadOnlyList<SearchResult>> Search()
             var searchResult = await TestUtils.AttemptSearch<IReadOnlyList<SearchResult>, HttpRequestException>(3, TimeSpan.FromSeconds(10), Search);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.True(searchResult[0].Success);
             Assert.True(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count > 0);
@@ -76,7 +76,7 @@ static IReadOnlyList<ITemplateInfo> Filter(TemplatePackageSearchData templatePac
             var searchResult = await searchCoordinator.SearchAsync(p => true, Filter, default).ConfigureAwait(false);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.True(searchResult[0].Success);
             Assert.True(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count > 0);
@@ -105,7 +105,7 @@ static IReadOnlyList<ITemplateInfo> Filter(TemplatePackageSearchData templatePac
             var searchResult = await searchCoordinator.SearchAsync(p => true, Filter, default).ConfigureAwait(false);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.False(searchResult[0].Success);
             Assert.False(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count == 0);
@@ -147,7 +147,7 @@ async Task<IReadOnlyList<SearchResult>> Search()
             var searchResult = await TestUtils.AttemptSearch<IReadOnlyList<SearchResult>, HttpRequestException>(3, TimeSpan.FromSeconds(10), Search);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.False(searchResult[0].Success);
             Assert.False(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count == 0);
@@ -157,7 +157,7 @@ async Task<IReadOnlyList<SearchResult>> Search()
             searchResult = await TestUtils.AttemptSearch<IReadOnlyList<SearchResult>, HttpRequestException>(3, TimeSpan.FromSeconds(10), Search);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.True(searchResult[0].Success);
             Assert.True(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count > 0);
@@ -166,7 +166,7 @@ async Task<IReadOnlyList<SearchResult>> Search()
             searchResult = await TestUtils.AttemptSearch<IReadOnlyList<SearchResult>, HttpRequestException>(3, TimeSpan.FromSeconds(10), Search);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.True(searchResult[0].Success);
             Assert.True(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count > 0);
@@ -195,7 +195,7 @@ static IReadOnlyList<ITemplateInfo> Filter(TemplatePackageSearchData templatePac
             var searchResult = await searchCoordinator.SearchAsync(p => true, Filter, default).ConfigureAwait(false);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.False(searchResult[0].Success);
             Assert.False(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.Equal("The template search cache data is not supported.", searchResult[0].ErrorMessage);
@@ -228,7 +228,7 @@ static IReadOnlyList<ITemplateInfo> Filter(TemplatePackageSearchData templatePac
             var searchResult = await searchCoordinator.SearchAsync(p => true, Filter, default).ConfigureAwait(false);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.False(searchResult[0].Success);
             Assert.False(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count == 0);
@@ -261,7 +261,7 @@ static IReadOnlyList<ITemplateInfo> Filter(TemplatePackageSearchData templatePac
             var searchResult = await searchCoordinator.SearchAsync(p => true, Filter, default).ConfigureAwait(false);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.False(searchResult[0].Success);
             Assert.False(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count == 0);
@@ -294,7 +294,7 @@ static IReadOnlyList<ITemplateInfo> Filter(TemplatePackageSearchData templatePac
             var searchResult = await searchCoordinator.SearchAsync(p => true, Filter, default).ConfigureAwait(false);
 
             Assert.NotNull(searchResult);
-            Assert.Equal(1, searchResult.Count);
+            Assert.Single(searchResult);
             Assert.False(searchResult[0].Success);
             Assert.False(string.IsNullOrWhiteSpace(searchResult[0].ErrorMessage));
             Assert.True(searchResult[0].SearchHits.Count == 0);
diff --git a/test/Microsoft.TemplateSearch.Common.UnitTests/TemplateSearchCacheReaderTests.cs b/test/Microsoft.TemplateSearch.Common.UnitTests/TemplateSearchCacheReaderTests.cs
index 3d42d6233e..7097ea8148 100644
--- a/test/Microsoft.TemplateSearch.Common.UnitTests/TemplateSearchCacheReaderTests.cs
+++ b/test/Microsoft.TemplateSearch.Common.UnitTests/TemplateSearchCacheReaderTests.cs
@@ -31,7 +31,7 @@ public void CanReadSearchMetadata()
 
             var parsedCache = TemplateSearchCache.FromJObject(cache, environmentSettings.Host.Logger);
 
-            Assert.Equal(1, parsedCache.TemplatePackages.Count);
+            Assert.Single(parsedCache.TemplatePackages);
             Assert.Equal(2, parsedCache.TemplatePackages.Sum(p => p.Templates.Count));
 
             Assert.IsAssignableFrom<ITemplateInfo>(parsedCache.TemplatePackages[0].Templates[0]);
@@ -52,7 +52,7 @@ public void CanReadSearchMetadata_V2()
 
             var parsedCache = TemplateSearchCache.FromJObject(cache, environmentSettings.Host.Logger);
 
-            Assert.Equal(1, parsedCache.TemplatePackages.Count);
+            Assert.Single(parsedCache.TemplatePackages);
             Assert.Equal(3, parsedCache.TemplatePackages.Sum(p => p.Templates.Count));
 
             Assert.IsAssignableFrom<ITemplateInfo>(parsedCache.TemplatePackages[0].Templates[0]);
@@ -77,7 +77,7 @@ public void CanSkipInvalidEntriesSearchMetadata()
 
             var parsedCache = TemplateSearchCache.FromJObject(cache, environmentSettings.Host.Logger);
 
-            Assert.Equal(1, parsedCache.TemplatePackages.Count);
+            Assert.Single(parsedCache.TemplatePackages);
             Assert.Equal(1, parsedCache.TemplatePackages.Sum(p => p.Templates.Count));
 
             Assert.IsAssignableFrom<ITemplateInfo>(parsedCache.TemplatePackages[0].Templates[0]);

From 8f1854b519da8480db4f428b325aed66cfa87293 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Tue, 17 Oct 2023 18:51:39 -0700
Subject: [PATCH 4/4] Fix dotnet_diagnostic.xUnit1031.severity errors.

---
 .editorconfig                                                 | 3 ---
 .../GlobalSettingsTests.cs                                    | 2 +-
 .../SdkVersionConstraintTests.cs                              | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index e4814101db..4f30dd9c87 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -583,9 +583,6 @@ dotnet_diagnostic.xUnit1004.severity = warning
 # Test methods should not call ConfigureAwait(), as it may bypass parallelization limits.
 dotnet_diagnostic.xUnit1030.severity = suggestion
 
-# Test methods must not use blocking task operations, as they can cause deadlocks. Use an async test method and await instead.
-dotnet_diagnostic.xUnit1031.severity = suggestion
-
 # Do not use invalid equality check
 dotnet_diagnostic.xUnit2001.severity = warning
 
diff --git a/test/Microsoft.TemplateEngine.Edge.UnitTests/GlobalSettingsTests.cs b/test/Microsoft.TemplateEngine.Edge.UnitTests/GlobalSettingsTests.cs
index e072fffe59..a2a947bc4d 100644
--- a/test/Microsoft.TemplateEngine.Edge.UnitTests/GlobalSettingsTests.cs
+++ b/test/Microsoft.TemplateEngine.Edge.UnitTests/GlobalSettingsTests.cs
@@ -64,7 +64,7 @@ public async Task TestFileWatcher()
             var firstFinishedTask = await Task.WhenAny(timeoutTask, taskSource.Task).ConfigureAwait(false);
             Assert.Equal(taskSource.Task, firstFinishedTask);
 
-            var newData2 = taskSource.Task.Result;
+            var newData2 = await taskSource.Task;
             Assert.Equal(newData.InstallerId, newData2.InstallerId);
             Assert.Equal(newData.MountPointUri, newData2.MountPointUri);
             Assert.Equal(newData.Details?["a"], newData2.Details?["a"]);
diff --git a/test/Microsoft.TemplateEngine.Edge.UnitTests/SdkVersionConstraintTests.cs b/test/Microsoft.TemplateEngine.Edge.UnitTests/SdkVersionConstraintTests.cs
index 0454cfaae7..58345dcefa 100644
--- a/test/Microsoft.TemplateEngine.Edge.UnitTests/SdkVersionConstraintTests.cs
+++ b/test/Microsoft.TemplateEngine.Edge.UnitTests/SdkVersionConstraintTests.cs
@@ -61,7 +61,7 @@ public async Task Evaluate_ArrayOfVersions(string sdkVersion, bool allowed)
         [InlineData("4.5.3", false)]
         [InlineData("4.5.0", true)]
         [InlineData("4.4.0-dev", true)]
-        public void Evaluate_SingleVersionRange(string sdkVersion, bool allowed)
+        public async Task Evaluate_SingleVersionRange(string sdkVersion, bool allowed)
         {
             var config = new
             {
@@ -87,7 +87,7 @@ public void Evaluate_SingleVersionRange(string sdkVersion, bool allowed)
             //Workaround needed
             //A.CallTo(() => sdkInfoProvider.GetVersionAsync(A<CancellationToken>._)).Returns(t);
 
-            var evaluateResult = constraintManager.EvaluateConstraintAsync(configModel.Constraints.Single().Type, configModel.Constraints.Single().Args, default).Result;
+            var evaluateResult = await constraintManager.EvaluateConstraintAsync(configModel.Constraints.Single().Type, configModel.Constraints.Single().Args, default);
             Assert.Equal(allowed ? TemplateConstraintResult.Status.Allowed : TemplateConstraintResult.Status.Restricted, evaluateResult.EvaluationStatus);
         }