Skip to content

Revert "Update ApprovalTests to 7.0.0 and revert workaround" #2610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2025
Merged

Revert "Update ApprovalTests to 7.0.0 and revert workaround" #2610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<!-- Runtime dependencies -->
<PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.6" />
<!-- external dependencies -->
<PackageVersion Include="ApprovalTests" Version="7.0.0" />
<PackageVersion Include="ApprovalTests" Version="7.0.0-beta.3" />
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
<PackageVersion Include="AwesomeAssertions" Version="8.1.0" />
<PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
Expand Down
10 changes: 7 additions & 3 deletions src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
using ApprovalTests.Reporters;
using ApprovalTests.Reporters.TestFrameworks;
// Alias workaround for https://github.com/approvals/ApprovalTests.Net/issues/768
extern alias ApprovalTests;

using ApprovalTests.ApprovalTests.Reporters;
using ApprovalTests.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.Namers.UseApprovalSubdirectory("Approvals")]

[assembly: ApprovalTests.ApprovalTests.Namers.UseApprovalSubdirectory("Approvals")]
7 changes: 5 additions & 2 deletions src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
// 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;
using ApprovalTests.Reporters;
using ApprovalTests.ApprovalTests;
using ApprovalTests.ApprovalTests.Reporters;

namespace System.CommandLine.Tests.Help
{
Expand Down
3 changes: 2 additions & 1 deletion src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ApprovalTests" />
<!-- Alias workaround for https://github.com/approvals/ApprovalTests.Net/issues/768 -->
<PackageReference Include="ApprovalTests" Aliases="ApprovalTests" />
<PackageReference Include="AwesomeAssertions" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
Expand Down
Loading