Update ApprovalTests nuget package and remove extern alias workaround (#2611)

* Reapply "Update ApprovalTests to 7.0.0 and revert workaround
" (#2610)

This reverts commit 6465818.

* Update System.Memory version in test to avoid NuGet downgrade error

Author: ViktorHofer

Directory.Packages.props

@@ -13,7 +13,7 @@
     <!-- Runtime dependencies -->
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.6" />
     <!-- external dependencies -->
-    <PackageVersion Include="ApprovalTests" Version="7.0.0-beta.3" />
+    <PackageVersion Include="ApprovalTests" Version="7.0.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageVersion Include="AwesomeAssertions" Version="8.1.0" />
     <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />

src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs

@@ -1,12 +1,8 @@
-// Alias workaround for https://github.com/approvals/ApprovalTests.Net/issues/768
-extern alias ApprovalTests;
-
-using ApprovalTests.ApprovalTests.Reporters;
-using ApprovalTests.ApprovalTests.Reporters.TestFrameworks;
+using ApprovalTests.Reporters;
+using ApprovalTests.Reporters.TestFrameworks;
 
 // Use globally defined Reporter for ApprovalTests. Please see
 // https://github.com/approvals/ApprovalTests.Net/blob/master/docs/ApprovalTests/Reporters.md
 
 [assembly: UseReporter(typeof(FrameworkAssertReporter))]
-
-[assembly: ApprovalTests.ApprovalTests.Namers.UseApprovalSubdirectory("Approvals")]
+[assembly: ApprovalTests.Namers.UseApprovalSubdirectory("Approvals")]

src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs

@@ -1,13 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-// Alias workaround for https://github.com/approvals/ApprovalTests.Net/issues/768
-extern alias ApprovalTests;
-
 using Xunit;
 using System.IO;
-using ApprovalTests.ApprovalTests;
-using ApprovalTests.ApprovalTests.Reporters;
+using ApprovalTests;
+using ApprovalTests.Reporters;
 
 namespace System.CommandLine.Tests.Help
 {

src/System.CommandLine.Tests/System.CommandLine.Tests.csproj

@@ -30,8 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Alias workaround for https://github.com/approvals/ApprovalTests.Net/issues/768 -->
-    <PackageReference Include="ApprovalTests" Aliases="ApprovalTests" />
+    <PackageReference Include="ApprovalTests" />
     <PackageReference Include="AwesomeAssertions" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
@@ -42,6 +41,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <!-- TODO: Remove System.Memory explicit package reference when the repo's version got updated to 4.6.3. -->
+    <PackageReference Include="System.Memory" VersionOverride="4.6.3" />
     <PackageReference Include="Microsoft.Bcl.Memory" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>