diff --git a/Directory.Packages.props b/Directory.Packages.props index da1e624248..4de7f06b05 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,7 +13,7 @@ - + diff --git a/src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs b/src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs index bbf662f44f..066c399874 100644 --- a/src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs +++ b/src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs @@ -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")] diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs index 0cb2b097ce..cfbc8cdcff 100644 --- a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs +++ b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs @@ -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 { diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj index e448549980..b18cdd74e6 100644 --- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj +++ b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj @@ -30,7 +30,8 @@ - + +