From 2e2c21c74fa585fa12004dbb6a674d9cf9abf446 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Mon, 17 Oct 2022 22:40:07 +0200 Subject: [PATCH] (GH-3722 / GH-3991) Remove Obsolete DotNetCore aliases * fixes #3991 * fixes #3722 --- build.cake | 2 +- .../DotNetCoreMSBuildBuilderFixture.cs | 8 +- .../Build/DotNetCoreBuilderFixture.cs | 7 +- .../DotNetCoreBuildServerFixture.cs | 7 +- .../Clean/DotNetCoreCleanerFixture.cs | 7 +- .../Tools/DotNetCore/DotNetCoreFixture.cs | 2 +- .../Execute/DotNetCoreExecutorFixture.cs | 8 +- .../Delete/DotNetCoreNuGetDeleterFixture.cs | 8 +- .../Push/DotNetCoreNuGetPusherFixture.cs | 8 +- .../Source/DotNetCoreNuGetAddSourceFixture.cs | 8 +- .../DotNetCoreNuGetDisableSourceFixture.cs | 8 +- .../DotNetCoreNuGetEnableSourceFixture.cs | 8 +- .../Source/DotNetCoreNuGetHasSourceFixture.cs | 8 +- .../DotNetCoreNuGetListSourceFixture.cs | 8 +- .../DotNetCoreNuGetRemoveSourceFixture.cs | 8 +- .../Source/DotNetCoreNuGetSourcerFixture.cs | 6 +- .../DotNetCoreNuGetUpdateSourceFixture.cs | 8 +- .../Pack/DotNetCorePackerFixture.cs | 8 +- .../Publish/DotNetCorePublisherFixture.cs | 8 +- .../Restore/DotNetCoreRestorerFixture.cs | 8 +- .../DotNetCore/Run/DotNetCoreRunnerFixture.cs | 8 +- .../Test/DotNetCoreTesterFixture.cs | 8 +- .../DotNetCore/Tool/DotNetCoreToolFixture.cs | 8 +- .../VSTest/DotNetCoreVSTesterFixture.cs | 8 +- .../Build/DotNetBuilderTests.cs} | 34 +- .../BuildServer/DotNetBuildServerTests.cs} | 22 +- .../Clean/DotNetCleanTests.cs} | 30 +- .../Execute/DotNetExecutorTests.cs} | 26 +- .../MSBuild/DotNetMSBuildBuilderTests.cs} | 180 +- .../DotNetMSBuildSettingsExtensionsTests.cs} | 144 +- .../MSBuild/DotNetMSBuildSettingsTests.cs} | 78 +- .../NuGet/Delete/DotNetNuGetDeleterTests.cs} | 26 +- .../NuGet/Push/DotNetNuGetPusherTests.cs} | 24 +- .../NuGet/Source/DotNetNuGetSourcerTests.cs} | 126 +- .../Pack/DotNetPackerTests.cs} | 26 +- .../Publish/DotNetPublisherTests.cs} | 48 +- .../Restore/DotNetRestorerTests.cs} | 38 +- .../Run/DotNetRunnerTests.cs} | 25 +- .../Test/DotNetTesterTests.cs} | 24 +- .../Tool/DotNetToolTests.cs} | 24 +- .../VSTest/DotNetVSTesterTests.cs} | 78 +- src/Cake.Common/Tools/Cake/CakeRunner.cs | 8 +- .../Tools/DotNet/Build/DotNetBuildSettings.cs | 3 +- .../Build/DotNetBuilder.cs} | 13 +- .../BuildServer/DotNetBuildServer.cs} | 12 +- .../BuildServer/DotNetBuildServerSettings.cs | 4 +- .../DotNetBuildServerShutdownSettings.cs | 4 +- .../Tools/DotNet/Clean/DotNetCleanSettings.cs | 3 +- .../Clean/DotNetCleaner.cs} | 14 +- src/Cake.Common/Tools/DotNet/DotNetAliases.cs | 55 +- .../DotNet/Execute/DotNetExecuteSettings.cs | 4 +- .../Execute/DotNetExecutor.cs} | 12 +- .../MSBuild/DotNetMSBuildBuilder.cs} | 9 +- .../DotNet/MSBuild/DotNetMSBuildSettings.cs | 3 +- .../DotNetMSBuildSettingsExtensions.cs | 1 - .../MSBuildArgumentBuilderExtensions.cs | 3 +- .../MSBuild/MSBuildBinaryLoggerImports.cs | 2 +- .../MSBuild/MSBuildBinaryLoggerSettings.cs | 4 +- .../MSBuild/MSBuildConsoleColorType.cs | 2 +- .../MSBuild/MSBuildDistributedLogger.cs | 2 +- .../MSBuild/MSBuildFileLoggerSettings.cs | 2 +- .../MSBuild/MSBuildLoggerOutputLevel.cs | 2 +- .../MSBuild/MSBuildLoggerSettings.cs | 2 +- .../MSBuild/MSBuildTreatAllWarningsAs.cs | 2 +- .../NuGet/Delete/DotNetNuGetDeleteSettings.cs | 4 +- .../NuGet/Delete/DotNetNuGetDeleter.cs} | 11 +- .../NuGet/Push/DotNetNuGetPushSettings.cs | 4 +- .../NuGet/Push/DotNetNuGetPusher.cs} | 11 +- .../Source/DotNetNuGetAddSourceSettings.cs | 4 +- .../DotNetNuGetDisableSourceSettings.cs | 4 +- .../Source/DotNetNuGetEnableSourceSettings.cs | 4 +- .../Source/DotNetNuGetHasSourceSettings.cs | 4 +- .../Source/DotNetNuGetListSourceSettings.cs | 4 +- .../Source/DotNetNuGetRemoveSourceSettings.cs | 4 +- .../NuGet/Source/DotNetNuGetSourceSettings.cs | 3 +- .../NuGet/Source/DotNetNuGetSourcer.cs} | 11 +- .../Source/DotNetNuGetUpdateSourceSettings.cs | 4 +- .../Tools/DotNet/Pack/DotNetPackSettings.cs | 3 +- .../Pack/DotNetPacker.cs} | 13 +- .../DotNet/Publish/DotNetPublishSettings.cs | 3 +- .../Publish/DotNetPublisher.cs} | 13 +- .../DotNet/Restore/DotNetRestoreSettings.cs | 3 +- .../Restore/DotNetRestorer.cs} | 15 +- .../Tools/DotNet/Run/DotNetRunSettings.cs | 3 +- .../Run/DotNetRunner.cs} | 11 +- .../Tools/DotNet/Test/DotNetTestSettings.cs | 3 +- .../Test/DotNetTester.cs} | 11 +- .../Tool/DotNetToolRunner.cs} | 15 +- .../Tools/DotNet/Tool/DotNetToolSettings.cs | 4 +- .../DotNet/VSTest/DotNetVSTestSettings.cs | 3 +- .../VSTest/DotNetVSTester.cs} | 9 +- .../Build/DotNetCoreBuildSettings.cs | 15 - .../DotNetCoreBuildServerSettings.cs | 15 - .../Clean/DotNetCoreCleanSettings.cs | 15 - .../Tools/DotNetCore/DotNetCoreAliases.cs | 1496 ----------------- .../Tools/DotNetCore/DotNetCoreRollForward.cs | 308 ---- .../DotNetCoreRollForwardConverter.cs | 46 - .../Tools/DotNetCore/DotNetCoreSettings.cs | 15 - .../Tools/DotNetCore/DotNetCoreTool.cs | 35 - .../Tools/DotNetCore/DotNetCoreVerbosity.cs | 302 ---- .../DotNetCoreVerbosityConverter.cs | 46 - .../Execute/DotNetCoreExecuteSettings.cs | 15 - .../MSBuild/DotNetCoreMSBuildSettings.cs | 15 - .../DotNetCoreMSBuildSettingsExtensions.cs | 431 ----- .../Delete/DotNetCoreNuGetDeleteSettings.cs | 15 - .../NuGet/Push/DotNetCoreNuGetPushSettings.cs | 15 - .../Source/DotNetCoreNuGetSourceSettings.cs | 15 - .../DotNetCore/Pack/DotNetCorePackSettings.cs | 15 - .../Publish/DotNetCorePublishSettings.cs | 15 - .../Restore/DotNetCoreRestoreSettings.cs | 15 - .../DotNetCore/Run/DotNetCoreRunSettings.cs | 15 - .../DotNetCore/Test/DotNetCoreTestSettings.cs | 15 - .../DotNetCore/Tool/DotNetCoreToolSettings.cs | 15 - .../VSTest/DotNetCoreVSTestSettings.cs | 15 - .../Cake.Common/ArgumentAliases.cake | 16 +- .../Tools/DotNetCore/DotNetCoreAliases.cake | 268 --- .../TextTransform/TextTransformAliases.cake | 2 +- tests/integration/build.cake | 2 - 118 files changed, 703 insertions(+), 3964 deletions(-) rename src/Cake.Common.Tests/Fixtures/Tools/{DotNetCore => DotNet}/MSBuild/DotNetCoreMSBuildBuilderFixture.cs (54%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Build/DotNetCoreBuilderTests.cs => DotNet/Build/DotNetBuilderTests.cs} (83%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/BuildServer/DotNetCoreBuildServerTests.cs => DotNet/BuildServer/DotNetBuildServerTests.cs} (82%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Clean/DotNetCoreCleanTests.cs => DotNet/Clean/DotNetCleanTests.cs} (82%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Execute/DotNetCoreExecutorTests.cs => DotNet/Execute/DotNetExecutorTests.cs} (79%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/MSBuild/DotNetCoreMSBuildBuilderTests.cs => DotNet/MSBuild/DotNetMSBuildBuilderTests.cs} (87%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/MSBuild/DotNetCoreMSBuildSettingsExtensionsTests.cs => DotNet/MSBuild/DotNetMSBuildSettingsExtensionsTests.cs} (86%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/MSBuild/DotNetCoreMSBuildSettingsTests.cs => DotNet/MSBuild/DotNetMSBuildSettingsTests.cs} (82%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleterTests.cs => DotNet/NuGet/Delete/DotNetNuGetDeleterTests.cs} (82%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/NuGet/Push/DotNetCoreNuGetPusherTests.cs => DotNet/NuGet/Push/DotNetNuGetPusherTests.cs} (86%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerTests.cs => DotNet/NuGet/Source/DotNetNuGetSourcerTests.cs} (80%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Pack/DotNetCorePackerTests.cs => DotNet/Pack/DotNetPackerTests.cs} (85%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Publish/DotNetCorePublisherTests.cs => DotNet/Publish/DotNetPublisherTests.cs} (85%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Restore/DotNetCoreRestorerTests.cs => DotNet/Restore/DotNetRestorerTests.cs} (84%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Run/DotNetCoreRunnerTests.cs => DotNet/Run/DotNetRunnerTests.cs} (85%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Test/DotNetCoreTesterTests.cs => DotNet/Test/DotNetTesterTests.cs} (89%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/Tool/DotNetCoreToolTests.cs => DotNet/Tool/DotNetToolTests.cs} (80%) rename src/Cake.Common.Tests/Unit/Tools/{DotNetCore/VSTest/DotNetCoreVSTesterTests.cs => DotNet/VSTest/DotNetVSTesterTests.cs} (80%) rename src/Cake.Common/Tools/{DotNetCore/Build/DotNetCoreBuilder.cs => DotNet/Build/DotNetBuilder.cs} (91%) rename src/Cake.Common/Tools/{DotNetCore/BuildServer/DotNetCoreBuildServer.cs => DotNet/BuildServer/DotNetBuildServer.cs} (82%) rename src/Cake.Common/Tools/{DotNetCore/Clean/DotNetCoreCleaner.cs => DotNet/Clean/DotNetCleaner.cs} (88%) rename src/Cake.Common/Tools/{DotNetCore/Execute/DotNetCoreExecutor.cs => DotNet/Execute/DotNetExecutor.cs} (87%) rename src/Cake.Common/Tools/{DotNetCore/MSBuild/DotNetCoreMSBuildBuilder.cs => DotNet/MSBuild/DotNetMSBuildBuilder.cs} (87%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildArgumentBuilderExtensions.cs (99%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildBinaryLoggerImports.cs (93%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildBinaryLoggerSettings.cs (92%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildConsoleColorType.cs (94%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildDistributedLogger.cs (94%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildFileLoggerSettings.cs (95%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildLoggerOutputLevel.cs (93%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildLoggerSettings.cs (98%) rename src/Cake.Common/Tools/{DotNetCore => DotNet}/MSBuild/MSBuildTreatAllWarningsAs.cs (93%) rename src/Cake.Common/Tools/{DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleter.cs => DotNet/NuGet/Delete/DotNetNuGetDeleter.cs} (88%) rename src/Cake.Common/Tools/{DotNetCore/NuGet/Push/DotNetCoreNuGetPusher.cs => DotNet/NuGet/Push/DotNetNuGetPusher.cs} (91%) rename src/Cake.Common/Tools/{DotNetCore/NuGet/Source/DotNetCoreNuGetSourcer.cs => DotNet/NuGet/Source/DotNetNuGetSourcer.cs} (97%) rename src/Cake.Common/Tools/{DotNetCore/Pack/DotNetCorePacker.cs => DotNet/Pack/DotNetPacker.cs} (92%) rename src/Cake.Common/Tools/{DotNetCore/Publish/DotNetCorePublisher.cs => DotNet/Publish/DotNetPublisher.cs} (95%) rename src/Cake.Common/Tools/{DotNetCore/Restore/DotNetCoreRestorer.cs => DotNet/Restore/DotNetRestorer.cs} (91%) rename src/Cake.Common/Tools/{DotNetCore/Run/DotNetCoreRunner.cs => DotNet/Run/DotNetRunner.cs} (92%) rename src/Cake.Common/Tools/{DotNetCore/Test/DotNetCoreTester.cs => DotNet/Test/DotNetTester.cs} (95%) rename src/Cake.Common/Tools/{DotNetCore/Tool/DotNetCoreToolRunner.cs => DotNet/Tool/DotNetToolRunner.cs} (83%) rename src/Cake.Common/Tools/{DotNetCore/VSTest/DotNetCoreVSTester.cs => DotNet/VSTest/DotNetVSTester.cs} (94%) delete mode 100644 src/Cake.Common/Tools/DotNetCore/Build/DotNetCoreBuildSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/Clean/DotNetCoreCleanSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/DotNetCoreRollForward.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/DotNetCoreRollForwardConverter.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/DotNetCoreSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/DotNetCoreTool.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/DotNetCoreVerbosity.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/DotNetCoreVerbosityConverter.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/Execute/DotNetCoreExecuteSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsExtensions.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleteSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPushSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourceSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/Pack/DotNetCorePackSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/Publish/DotNetCorePublishSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/Restore/DotNetCoreRestoreSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/Run/DotNetCoreRunSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/Test/DotNetCoreTestSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/Tool/DotNetCoreToolSettings.cs delete mode 100644 src/Cake.Common/Tools/DotNetCore/VSTest/DotNetCoreVSTestSettings.cs delete mode 100644 tests/integration/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cake diff --git a/build.cake b/build.cake index a23babdc0b..5159d5f416 100644 --- a/build.cake +++ b/build.cake @@ -416,7 +416,7 @@ Task("Run-Integration-Tests") .AppendSwitchQuoted("--multipleargs", "=", "b") .AppendSwitchQuoted("--testAssemblyDirectoryPath", "=", cakeAssembly.GetDirectory().FullPath) .AppendSwitchQuoted("--testAssemblyFilePath", "=", cakeAssembly.FullPath) - .AppendSwitchQuoted("--testDotNetCoreVerbosity", "=", "Diagnostic") + .AppendSwitchQuoted("--testDotNetVerbosity", "=", "Diagnostic") .AppendSwitchQuoted("--testDotNetRollForward", "=", "LatestMajor") }); } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilderFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNet/MSBuild/DotNetCoreMSBuildBuilderFixture.cs similarity index 54% rename from src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilderFixture.cs rename to src/Cake.Common.Tests/Fixtures/Tools/DotNet/MSBuild/DotNetCoreMSBuildBuilderFixture.cs index 22f2222d0b..77ca55edda 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilderFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNet/MSBuild/DotNetCoreMSBuildBuilderFixture.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.MSBuild { - internal sealed class DotNetCoreMSBuildBuilderFixture : DotNetCoreFixture + internal sealed class DotNetMSBuildBuilderFixture : DotNetFixture { public string Project { get; set; } protected override void RunTool() { - var tool = new DotNetCoreMSBuildBuilder(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetMSBuildBuilder(FileSystem, Environment, ProcessRunner, Tools); tool.Build(Project, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Build/DotNetCoreBuilderFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Build/DotNetCoreBuilderFixture.cs index 44b431f3c6..48a05a95c2 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Build/DotNetCoreBuilderFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Build/DotNetCoreBuilderFixture.cs @@ -3,17 +3,16 @@ // See the LICENSE file in the project root for more information. using Cake.Common.Tools.DotNet.Build; -using Cake.Common.Tools.DotNetCore.Build; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Build +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.Build { - internal sealed class DotNetCoreBuilderFixture : DotNetCoreFixture + internal sealed class DotNetBuilderFixture : DotNetFixture { public string Project { get; set; } protected override void RunTool() { - var tool = new DotNetCoreBuilder(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetBuilder(FileSystem, Environment, ProcessRunner, Tools); tool.Build(Project, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerFixture.cs index c32030ee07..f4953279f4 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerFixture.cs @@ -3,15 +3,14 @@ // See the LICENSE file in the project root for more information. using Cake.Common.Tools.DotNet.BuildServer; -using Cake.Common.Tools.DotNetCore.BuildServer; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Build +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.Build { - internal sealed class DotNetCoreBuildServerFixture : DotNetCoreFixture + internal sealed class DotNetBuildServerFixture : DotNetFixture { protected override void RunTool() { - var tool = new DotNetCoreBuildServer(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetBuildServer(FileSystem, Environment, ProcessRunner, Tools); tool.Shutdown(Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Clean/DotNetCoreCleanerFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Clean/DotNetCoreCleanerFixture.cs index 3b6e3a25d7..25b0ceffe9 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Clean/DotNetCoreCleanerFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Clean/DotNetCoreCleanerFixture.cs @@ -3,17 +3,16 @@ // See the LICENSE file in the project root for more information. using Cake.Common.Tools.DotNet.Clean; -using Cake.Common.Tools.DotNetCore.Clean; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Clean +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.Clean { - internal sealed class DotNetCoreCleanerFixture : DotNetCoreFixture + internal sealed class DotNetCleanerFixture : DotNetFixture { public string Project { get; set; } protected override void RunTool() { - var tool = new DotNetCoreCleaner(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetCleaner(FileSystem, Environment, ProcessRunner, Tools); tool.Clean(Project, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/DotNetCoreFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/DotNetCoreFixture.cs index 84b5075b37..d766f63a47 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/DotNetCoreFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/DotNetCoreFixture.cs @@ -5,7 +5,7 @@ using Cake.Common.Tests.Fixtures.Tools.DotNet; using Cake.Common.Tools.DotNet; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore +namespace Cake.Common.Tests.Fixtures.Tools.DotNet { internal abstract class DotNetCoreFixture : DotNetFixture where TSettings : DotNetSettings, new() diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Execute/DotNetCoreExecutorFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Execute/DotNetCoreExecutorFixture.cs index 86b222121e..021490b9c0 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Execute/DotNetCoreExecutorFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Execute/DotNetCoreExecutorFixture.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.Execute; +using Cake.Common.Tools.DotNet.Execute; using Cake.Core.IO; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Execute +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.Execute { - internal sealed class DotNetCoreExecutorFixture : DotNetCoreFixture + internal sealed class DotNetExecutorFixture : DotNetFixture { public FilePath AssemblyPath { get; set; } @@ -15,7 +15,7 @@ internal sealed class DotNetCoreExecutorFixture : DotNetCoreFixture + internal sealed class DotNetNuGetDeleterFixture : DotNetFixture { public string PackageName { get; set; } public string PackageVersion { get; set; } protected override void RunTool() { - var tool = new DotNetCoreNuGetDeleter(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetDeleter(FileSystem, Environment, ProcessRunner, Tools); tool.Delete(PackageName, PackageVersion, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherFixture.cs index 89e313ad0e..d21aa0840b 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherFixture.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Push; +using Cake.Common.Tools.DotNet.NuGet.Push; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Push +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Push { - internal sealed class DotNetCoreNuGetPusherFixture : DotNetCoreFixture + internal sealed class DotNetNuGetPusherFixture : DotNetFixture { public string PackageName { get; set; } protected override void RunTool() { - var tool = new DotNetCoreNuGetPusher(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetPusher(FileSystem, Environment, ProcessRunner, Tools); tool.Push(PackageName, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetAddSourceFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetAddSourceFixture.cs index cc08b309ff..838e4952e1 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetAddSourceFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetAddSourceFixture.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source { - internal sealed class DotNetCoreNuGetAddSourceFixture : DotNetCoreNuGetSourcerFixture + internal sealed class DotNetNuGetAddSourceFixture : DotNetNuGetSourcerFixture { protected override void RunTool() { - var tool = new DotNetCoreNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); tool.AddSource(Name, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetDisableSourceFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetDisableSourceFixture.cs index c78971055d..29af1633fe 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetDisableSourceFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetDisableSourceFixture.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source { - internal sealed class DotNetCoreNuGetDisableSourceFixture : DotNetCoreNuGetSourcerFixture + internal sealed class DotNetNuGetDisableSourceFixture : DotNetNuGetSourcerFixture { protected override void RunTool() { - var tool = new DotNetCoreNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); tool.DisableSource(Name, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetEnableSourceFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetEnableSourceFixture.cs index f23057d2c9..595917b58a 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetEnableSourceFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetEnableSourceFixture.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source { - internal sealed class DotNetCoreNuGetEnableSourceFixture : DotNetCoreNuGetSourcerFixture + internal sealed class DotNetNuGetEnableSourceFixture : DotNetNuGetSourcerFixture { protected override void RunTool() { - var tool = new DotNetCoreNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); tool.EnableSource(Name, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetHasSourceFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetHasSourceFixture.cs index 307d3be992..1ae02308e7 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetHasSourceFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetHasSourceFixture.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source { - internal sealed class DotNetCoreNuGetHasSourceFixture : DotNetCoreNuGetSourcerFixture + internal sealed class DotNetNuGetHasSourceFixture : DotNetNuGetSourcerFixture { public bool HasSource { get; set; } @@ -17,7 +17,7 @@ public void GivenProcessOutput(string[] output) protected override void RunTool() { - var tool = new DotNetCoreNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); HasSource = tool.HasSource(Name, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetListSourceFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetListSourceFixture.cs index d8b34342cd..94fc2eb762 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetListSourceFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetListSourceFixture.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source { - internal sealed class DotNetCoreNuGetListSourceFixture : DotNetCoreNuGetSourcerFixture + internal sealed class DotNetNuGetListSourceFixture : DotNetNuGetSourcerFixture { public string Format { get; set; } protected override void RunTool() { - var tool = new DotNetCoreNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); tool.ListSource(Format, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetRemoveSourceFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetRemoveSourceFixture.cs index 06fc544bce..e143281f97 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetRemoveSourceFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetRemoveSourceFixture.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source { - internal sealed class DotNetCoreNuGetRemoveSourceFixture : DotNetCoreNuGetSourcerFixture + internal sealed class DotNetNuGetRemoveSourceFixture : DotNetNuGetSourcerFixture { protected override void RunTool() { - var tool = new DotNetCoreNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); tool.RemoveSource(Name, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerFixture.cs index e4c294dce3..294b7b5ba0 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerFixture.cs @@ -2,11 +2,11 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source { - internal abstract class DotNetCoreNuGetSourcerFixture : DotNetCoreFixture + internal abstract class DotNetNuGetSourcerFixture : DotNetFixture { public string Name { get; set; } = "name"; } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetUpdateSourceFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetUpdateSourceFixture.cs index 03dd71c1ba..0fe3243f98 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetUpdateSourceFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetUpdateSourceFixture.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source { - internal sealed class DotNetCoreNuGetUpdateSourceFixture : DotNetCoreNuGetSourcerFixture + internal sealed class DotNetNuGetUpdateSourceFixture : DotNetNuGetSourcerFixture { protected override void RunTool() { - var tool = new DotNetCoreNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetNuGetSourcer(FileSystem, Environment, ProcessRunner, Tools); tool.UpdateSource(Name, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Pack/DotNetCorePackerFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Pack/DotNetCorePackerFixture.cs index cacd1e853b..760d22269c 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Pack/DotNetCorePackerFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Pack/DotNetCorePackerFixture.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.Pack; +using Cake.Common.Tools.DotNet.Pack; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Pack +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.Pack { - internal sealed class DotNetCorePackFixture : DotNetCoreFixture + internal sealed class DotNetPackFixture : DotNetFixture { public string Project { get; set; } protected override void RunTool() { - var tool = new DotNetCorePacker(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetPacker(FileSystem, Environment, ProcessRunner, Tools); tool.Pack(Project, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Publish/DotNetCorePublisherFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Publish/DotNetCorePublisherFixture.cs index bd1c7726df..df8cf1103e 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Publish/DotNetCorePublisherFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Publish/DotNetCorePublisherFixture.cs @@ -2,17 +2,17 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.Publish; +using Cake.Common.Tools.DotNet.Publish; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Publish +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.Publish { - internal sealed class DotNetCorePublisherFixture : DotNetCoreFixture + internal sealed class DotNetPublisherFixture : DotNetFixture { public string Project { get; set; } protected override void RunTool() { - var tool = new DotNetCorePublisher(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetPublisher(FileSystem, Environment, ProcessRunner, Tools); tool.Publish(Project, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Restore/DotNetCoreRestorerFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Restore/DotNetCoreRestorerFixture.cs index 428d86b9be..5a834e83ab 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Restore/DotNetCoreRestorerFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Restore/DotNetCoreRestorerFixture.cs @@ -2,18 +2,18 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.Restore; +using Cake.Common.Tools.DotNet.Restore; using Cake.Testing; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Restore +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.Restore { - internal sealed class DotNetCoreRestorerFixture : DotNetCoreFixture + internal sealed class DotNetRestorerFixture : DotNetFixture { public string Root { get; set; } protected override void RunTool() { - var tool = new DotNetCoreRestorer(FileSystem, Environment, ProcessRunner, Tools, new FakeLog()); + var tool = new DotNetRestorer(FileSystem, Environment, ProcessRunner, Tools, new FakeLog()); tool.Restore(Root, Settings); } } diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Run/DotNetCoreRunnerFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Run/DotNetCoreRunnerFixture.cs index 7e238f3f27..576b995a05 100644 --- a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Run/DotNetCoreRunnerFixture.cs +++ b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Run/DotNetCoreRunnerFixture.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.Run; +using Cake.Common.Tools.DotNet.Run; using Cake.Core.IO; -namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Run +namespace Cake.Common.Tests.Fixtures.Tools.DotNet.Run { - internal sealed class DotNetCoreRunnerFixture : DotNetCoreFixture + internal sealed class DotNetRunnerFixture : DotNetFixture { public string Project { get; set; } @@ -15,7 +15,7 @@ internal sealed class DotNetCoreRunnerFixture : DotNetCoreFixture + internal sealed class DotNetTesterFixture : DotNetFixture { public string Project { get; set; } @@ -15,7 +15,7 @@ internal sealed class DotNetCoreTesterFixture : DotNetCoreFixture + internal sealed class DotNetToolFixture : DotNetFixture { public FilePath ProjectPath { get; set; } @@ -18,7 +18,7 @@ internal sealed class DotNetCoreToolFixture : DotNetCoreFixture + internal sealed class DotNetVSTesterFixture : DotNetFixture { public ICollection TestFiles { get; set; } protected override void RunTool() { - var tool = new DotNetCoreVSTester(FileSystem, Environment, ProcessRunner, Tools); + var tool = new DotNetVSTester(FileSystem, Environment, ProcessRunner, Tools); tool.Test(TestFiles, Settings); } } diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Build/DotNetCoreBuilderTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Build/DotNetBuilderTests.cs similarity index 83% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Build/DotNetCoreBuilderTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Build/DotNetBuilderTests.cs index d9abf8fe8f..9d60f32a44 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Build/DotNetCoreBuilderTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Build/DotNetBuilderTests.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Build; -using Cake.Common.Tools.DotNetCore; -using Cake.Common.Tools.DotNetCore.Build; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Build; +using Cake.Common.Tools.DotNet; +using Cake.Common.Tools.DotNet.Build; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Build +namespace Cake.Common.Tests.Unit.Tools.DotNet.Build { - public sealed class DotNetCoreBuilderTests + public sealed class DotNetBuilderTests { public sealed class TheBuildMethod { @@ -18,7 +18,7 @@ public sealed class TheBuildMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Project = "./src/*"; fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -34,8 +34,8 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Project_Is_Null() { // Given - var fixture = new DotNetCoreBuilderFixture(); - fixture.Settings = new DotNetCoreBuildSettings(); + var fixture = new DotNetBuilderFixture(); + fixture.Settings = new DotNetBuildSettings(); fixture.GivenDefaultToolDoNotExist(); // When @@ -49,7 +49,7 @@ public void Should_Throw_If_Project_Is_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Project = "./src/*"; fixture.GivenProcessCannotStart(); @@ -64,7 +64,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Project = "./src/*"; fixture.GivenProcessExitsWithCode(1); @@ -79,7 +79,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Project = "./src/*"; // When @@ -93,14 +93,14 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Additional_Arguments() { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Settings.Framework = "net451"; fixture.Settings.Runtime = "runtime1"; fixture.Settings.Configuration = "Release"; fixture.Settings.VersionSuffix = "rc1"; fixture.Settings.NoLogo = true; fixture.Project = "./src/*"; - fixture.Settings.Verbosity = DotNetCoreVerbosity.Minimal; + fixture.Settings.Verbosity = DotNetVerbosity.Minimal; fixture.Settings.Sources = new[] { "https://api.nuget.org/v3/index.json" }; // When @@ -114,7 +114,7 @@ public void Should_Add_Additional_Arguments() public void Should_Add_OutputPath_Arguments() { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Settings.OutputDirectory = "./artifacts/"; fixture.Project = "./src/*"; @@ -132,7 +132,7 @@ public void Should_Add_OutputPath_Arguments() public void Should_Quote_Project_Path(string text, string expected) { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Project = text; // When @@ -146,7 +146,7 @@ public void Should_Quote_Project_Path(string text, string expected) public void Should_Add_Build_Arguments() { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Settings.NoIncremental = true; fixture.Settings.NoDependencies = true; fixture.Settings.NoRestore = true; @@ -163,7 +163,7 @@ public void Should_Add_Build_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreBuilderFixture(); + var fixture = new DotNetBuilderFixture(); fixture.Project = "./src/*"; fixture.Settings.DiagnosticOutput = true; diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/BuildServer/DotNetBuildServerTests.cs similarity index 82% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/BuildServer/DotNetBuildServerTests.cs index 6bc2ade4da..3535da1f41 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/BuildServer/DotNetBuildServerTests.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Build; -using Cake.Common.Tools.DotNetCore; -using Cake.Common.Tools.DotNetCore.BuildServer; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Build; +using Cake.Common.Tools.DotNet; +using Cake.Common.Tools.DotNet.BuildServer; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.BuildServer +namespace Cake.Common.Tests.Unit.Tools.DotNet.BuildServer { - public sealed class DotNetCoreBuildServerTests + public sealed class DotNetBuildServerTests { public sealed class TheShutdownMethod { @@ -18,7 +18,7 @@ public sealed class TheShutdownMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreBuildServerFixture(); + var fixture = new DotNetBuildServerFixture(); fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -33,7 +33,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreBuildServerFixture(); + var fixture = new DotNetBuildServerFixture(); fixture.GivenProcessCannotStart(); // When @@ -47,7 +47,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreBuildServerFixture(); + var fixture = new DotNetBuildServerFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -61,7 +61,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreBuildServerFixture(); + var fixture = new DotNetBuildServerFixture(); // When var result = fixture.Run(); @@ -78,7 +78,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Settings_Arguments(bool? msBuild, bool? razor, bool? vbcscompiler, string expected) { // Given - var fixture = new DotNetCoreBuildServerFixture(); + var fixture = new DotNetBuildServerFixture(); fixture.Settings.MSBuild = msBuild; fixture.Settings.Razor = razor; fixture.Settings.VBCSCompiler = vbcscompiler; @@ -94,7 +94,7 @@ public void Should_Add_Settings_Arguments(bool? msBuild, bool? razor, bool? vbcs public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreBuildServerFixture(); + var fixture = new DotNetBuildServerFixture(); fixture.Settings.DiagnosticOutput = true; // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Clean/DotNetCoreCleanTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Clean/DotNetCleanTests.cs similarity index 82% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Clean/DotNetCoreCleanTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Clean/DotNetCleanTests.cs index b8f3da7fa1..4ea4227892 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Clean/DotNetCoreCleanTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Clean/DotNetCleanTests.cs @@ -2,16 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Build; -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Clean; -using Cake.Common.Tools.DotNetCore.Build; -using Cake.Common.Tools.DotNetCore.Clean; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Clean; +using Cake.Common.Tools.DotNet.Clean; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Clean +namespace Cake.Common.Tests.Unit.Tools.DotNet.Clean { - public sealed class DotNetCoreCleanTests + public sealed class DotNetCleanTests { public sealed class TheCleanMethod { @@ -19,7 +17,7 @@ public sealed class TheCleanMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreCleanerFixture(); + var fixture = new DotNetCleanerFixture(); fixture.Project = "./src/project"; fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -35,8 +33,8 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Project_Is_Null() { // Given - var fixture = new DotNetCoreCleanerFixture(); - fixture.Settings = new DotNetCoreCleanSettings(); + var fixture = new DotNetCleanerFixture(); + fixture.Settings = new DotNetCleanSettings(); fixture.GivenDefaultToolDoNotExist(); // When @@ -50,7 +48,7 @@ public void Should_Throw_If_Project_Is_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreCleanerFixture(); + var fixture = new DotNetCleanerFixture(); fixture.Project = "./src/project"; fixture.GivenProcessCannotStart(); @@ -65,7 +63,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreCleanerFixture(); + var fixture = new DotNetCleanerFixture(); fixture.Project = "./src/project"; fixture.GivenProcessExitsWithCode(1); @@ -80,7 +78,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreCleanerFixture(); + var fixture = new DotNetCleanerFixture(); fixture.Project = "./src/project"; // When @@ -94,7 +92,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Additional_Arguments() { // Given - var fixture = new DotNetCoreCleanerFixture(); + var fixture = new DotNetCleanerFixture(); fixture.Settings.Framework = "net451"; fixture.Settings.Configuration = "Release"; fixture.Settings.Runtime = "win7-x86"; @@ -112,7 +110,7 @@ public void Should_Add_Additional_Arguments() public void Should_Add_OutputPath_Arguments() { // Given - var fixture = new DotNetCoreCleanerFixture(); + var fixture = new DotNetCleanerFixture(); fixture.Settings.OutputDirectory = "./artifacts/"; fixture.Project = "./src/project"; @@ -130,7 +128,7 @@ public void Should_Add_OutputPath_Arguments() public void Should_Quote_Project_Path(string text, string expected) { // Given - var fixture = new DotNetCoreCleanerFixture(); + var fixture = new DotNetCleanerFixture(); fixture.Project = text; // When @@ -144,7 +142,7 @@ public void Should_Quote_Project_Path(string text, string expected) public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreCleanerFixture(); + var fixture = new DotNetCleanerFixture(); fixture.Project = "./src/project"; fixture.Settings.DiagnosticOutput = true; diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Execute/DotNetCoreExecutorTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Execute/DotNetExecutorTests.cs similarity index 79% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Execute/DotNetCoreExecutorTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Execute/DotNetExecutorTests.cs index c557748f71..17117aa950 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Execute/DotNetCoreExecutorTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Execute/DotNetExecutorTests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Execute; -using Cake.Common.Tools.DotNetCore.Execute; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Execute; +using Cake.Common.Tools.DotNet.Execute; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Execute +namespace Cake.Common.Tests.Unit.Tools.DotNet.Execute { - public sealed class DotNetCoreExecutorTests + public sealed class DotNetExecutorTests { public sealed class TheExecuteMethod { @@ -17,7 +17,7 @@ public sealed class TheExecuteMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreExecutorFixture(); + var fixture = new DotNetExecutorFixture(); fixture.AssemblyPath = "./bin/Debug/app.dll"; fixture.Arguments = "--args"; fixture.Settings = null; @@ -34,10 +34,10 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreExecutorFixture(); + var fixture = new DotNetExecutorFixture(); fixture.AssemblyPath = "./bin/Debug/app.dll"; fixture.Arguments = "--args"; - fixture.Settings = new DotNetCoreExecuteSettings(); + fixture.Settings = new DotNetExecuteSettings(); fixture.GivenProcessCannotStart(); // When @@ -51,10 +51,10 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreExecutorFixture(); + var fixture = new DotNetExecutorFixture(); fixture.AssemblyPath = "./bin/Debug/app.dll"; fixture.Arguments = "--args"; - fixture.Settings = new DotNetCoreExecuteSettings(); + fixture.Settings = new DotNetExecuteSettings(); fixture.GivenProcessExitsWithCode(1); // When @@ -68,9 +68,9 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreExecutorFixture(); + var fixture = new DotNetExecutorFixture(); fixture.AssemblyPath = "./bin/Debug/app.dll"; - fixture.Settings = new DotNetCoreExecuteSettings(); + fixture.Settings = new DotNetExecuteSettings(); // When var result = fixture.Run(); @@ -83,7 +83,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Famework_Version() { // Given - var fixture = new DotNetCoreExecutorFixture(); + var fixture = new DotNetExecutorFixture(); fixture.AssemblyPath = "./Some Folder/Debug/app.dll"; fixture.Settings.FrameworkVersion = "1.0.3"; @@ -98,7 +98,7 @@ public void Should_Add_Famework_Version() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreExecutorFixture(); + var fixture = new DotNetExecutorFixture(); fixture.AssemblyPath = "./bin/Debug/app.dll"; fixture.Settings.DiagnosticOutput = true; diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilderTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildBuilderTests.cs similarity index 87% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilderTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildBuilderTests.cs index 73f2823d07..59490fa515 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilderTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildBuilderTests.cs @@ -3,18 +3,16 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.MSBuild; +using Cake.Common.Tests.Fixtures.Tools.DotNet.MSBuild; using Cake.Common.Tools.DotNet; -using Cake.Common.Tools.DotNetCore; -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; using Cake.Common.Tools.MSBuild; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tests.Unit.Tools.DotNet.MSBuild { - public sealed class DotNetCoreMSBuildBuilderTests + public sealed class DotNetMSBuildBuilderTests { public sealed class TheBuildMethod { @@ -22,7 +20,7 @@ public sealed class TheBuildMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Project = "./src/*"; fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -38,9 +36,9 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Not_Throw_If_Project_Is_Null() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture() + var fixture = new DotNetMSBuildBuilderFixture() { - Settings = new DotNetCoreMSBuildSettings() + Settings = new DotNetMSBuildSettings() }; // When @@ -54,10 +52,10 @@ public void Should_Not_Throw_If_Project_Is_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture() + var fixture = new DotNetMSBuildBuilderFixture() { Project = "./src/*", - Settings = new DotNetCoreMSBuildSettings() + Settings = new DotNetMSBuildSettings() }; fixture.GivenProcessCannotStart(); @@ -72,7 +70,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture() + var fixture = new DotNetMSBuildBuilderFixture() { Project = "./src/*" }; @@ -89,7 +87,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Use_Project_Path_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Project = "./src/foo/foo.csproj"; // When @@ -103,7 +101,7 @@ public void Should_Use_Project_Path_If_Specified() public void Should_Use_Directory_Path_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Project = "./src/"; // When @@ -117,7 +115,7 @@ public void Should_Use_Directory_Path_If_Specified() public void Should_Add_Target_Argument() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Targets.Add("A"); // When @@ -131,7 +129,7 @@ public void Should_Add_Target_Argument() public void Should_Append_Target_Argument_When_Multiple_Values() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Targets.Add("A"); fixture.Settings.Targets.Add("B"); @@ -149,7 +147,7 @@ public void Should_Append_Target_Argument_When_Multiple_Values() public void Should_Throw_If_Target_Has_No_Value(string targetValue) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Targets.Add(targetValue); // When @@ -163,7 +161,7 @@ public void Should_Throw_If_Target_Has_No_Value(string targetValue) public void Should_Add_Property_Argument() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Properties.Add("A", new[] { "B" }); // When @@ -177,7 +175,7 @@ public void Should_Add_Property_Argument() public void Should_Add_Multiple_Property_Arguments_When_Multiple_Values() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Properties.Add("A", new[] { "B", "E" }); fixture.Settings.Properties.Add("C", new[] { "D" }); @@ -196,7 +194,7 @@ public void Should_Add_Multiple_Property_Arguments_When_Multiple_Values() public void Should_Throw_If_Property_Has_No_Value(string[] propertyValues) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Properties.Add("F", propertyValues); // When @@ -212,7 +210,7 @@ public void Should_Throw_If_Property_Has_No_Value(string[] propertyValues) public void Should_Use_As_Many_Processors_As_Possible_If_MaxCpuCount_Is_Zero_Or_Less(int maxCpuCount) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.MaxCpuCount = maxCpuCount; // When @@ -226,7 +224,7 @@ public void Should_Use_As_Many_Processors_As_Possible_If_MaxCpuCount_Is_Zero_Or_ public void Should_Use_Specified_Number_Of_Max_Processors() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.MaxCpuCount = 4; // When @@ -246,7 +244,7 @@ public void Should_Use_Specified_Number_Of_Max_Processors() public void Should_Add_ToolVersion_Argument_If_Specified(MSBuildVersion toolVersion, string expectedToolVersion) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ToolVersion = toolVersion; // When @@ -263,7 +261,7 @@ public void Should_Add_ToolVersion_Argument_If_Specified(MSBuildVersion toolVers public void Should_Throw_If_ToolVersion_Is_Invalid(int toolVersion) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ToolVersion = (MSBuildVersion)toolVersion; // When @@ -279,7 +277,7 @@ public void Should_Throw_If_ToolVersion_Is_Invalid(int toolVersion) public void Should_Add_NoConsoleLogger_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.DisableConsoleLogger = true; // When @@ -293,7 +291,7 @@ public void Should_Add_NoConsoleLogger_If_Specified() public void Should_Ignore_Console_Logger_Settings_If_No_Console_Logger_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.DisableConsoleLogger = true; fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings(); @@ -308,12 +306,12 @@ public void Should_Ignore_Console_Logger_Settings_If_No_Console_Logger_Specified public void Should_Add_ConsoleLoggerParameters_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { PerformanceSummary = true, SummaryOutputLevel = MSBuildLoggerOutputLevel.ErrorsOnly, - Verbosity = DotNetCoreVerbosity.Diagnostic + Verbosity = DotNetVerbosity.Diagnostic }; // When @@ -327,8 +325,8 @@ public void Should_Add_ConsoleLoggerParameters_If_Specified() public void Should_Add_FileLogger_Arguments() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); - fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { AppendToLogFile = false, PerformanceSummary = true, Verbosity = DotNetCoreVerbosity.Diagnostic }); + var fixture = new DotNetMSBuildBuilderFixture(); + fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { AppendToLogFile = false, PerformanceSummary = true, Verbosity = DotNetVerbosity.Diagnostic }); // When var result = fixture.Run(); @@ -341,7 +339,7 @@ public void Should_Add_FileLogger_Arguments() public void Should_Throw_Exception_For_Too_Many_FileLoggers() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings()); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings()); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings()); @@ -365,7 +363,7 @@ public void Should_Throw_Exception_For_Too_Many_FileLoggers() public void Should_Add_DistributedLogger_Argument() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.DistributedLoggers.Add(new MSBuildDistributedLogger { CentralLogger = new MSBuildLogger { Assembly = "A" }, @@ -383,7 +381,7 @@ public void Should_Add_DistributedLogger_Argument() public void Should_Add_Multiple_DistributedLogger_Arguments_When_Multiple_Values() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.DistributedLoggers.Add(new MSBuildDistributedLogger { CentralLogger = new MSBuildLogger { Assembly = "A" }, @@ -416,7 +414,7 @@ public void Should_Add_Multiple_DistributedLogger_Arguments_When_Multiple_Values public void Should_Throw_If_DistributedLogger_Has_No_Assembly_Value(string centralLoggerAssembly, string forwardingLoggerAssembly) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.DistributedLoggers.Add(new MSBuildDistributedLogger { CentralLogger = new MSBuildLogger { Assembly = centralLoggerAssembly }, @@ -434,7 +432,7 @@ public void Should_Throw_If_DistributedLogger_Has_No_Assembly_Value(string centr public void Should_Add_DistributedFileLogger_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.DistributedFileLogger = true; // When @@ -448,7 +446,7 @@ public void Should_Add_DistributedFileLogger_If_Specified() public void Should_Add_Logger_Argument() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Loggers.Add(new MSBuildLogger { Assembly = "A" }); // When @@ -462,7 +460,7 @@ public void Should_Add_Logger_Argument() public void Should_Add_Multiple_Logger_Arguments_When_Multiple_Values() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Loggers.Add(new MSBuildLogger { Assembly = "A" }); fixture.Settings.Loggers.Add(new MSBuildLogger { Class = "C", Assembly = "B" }); fixture.Settings.Loggers.Add(new MSBuildLogger { Class = "E", Assembly = "F", Parameters = "g" }); @@ -481,7 +479,7 @@ public void Should_Add_Multiple_Logger_Arguments_When_Multiple_Values() public void Should_Throw_If_Logger_Has_No_Assembly_Value(string loggerAssembly) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Loggers.Add(new MSBuildLogger { Assembly = loggerAssembly }); // When @@ -499,7 +497,7 @@ public void Should_Throw_If_Logger_Has_No_Assembly_Value(string loggerAssembly) public void Should_Add_WarnAsError_Argument(MSBuildTreatAllWarningsAs treatAllWarningsAs, string[] errorCodes, string expectedValue) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.TreatAllWarningsAs = treatAllWarningsAs; foreach (var errorCode in errorCodes) @@ -522,7 +520,7 @@ public void Should_Add_WarnAsError_Argument(MSBuildTreatAllWarningsAs treatAllWa public void Should_Add_WarnAsMessage_Argument(MSBuildTreatAllWarningsAs treatAllWarningsAs, string[] errorCodes, string expectedValue) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.TreatAllWarningsAs = treatAllWarningsAs; foreach (var errorCode in errorCodes) @@ -541,7 +539,7 @@ public void Should_Add_WarnAsMessage_Argument(MSBuildTreatAllWarningsAs treatAll public void Should_Add_IgnoreProjectExtensions_Argument() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.IgnoreProjectExtensions.Add(".sln"); // When @@ -555,7 +553,7 @@ public void Should_Add_IgnoreProjectExtensions_Argument() public void Should_Append_IgnoreProjectExtensions_Argument_When_Multiple_Values() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.IgnoreProjectExtensions.Add(".vcproj"); fixture.Settings.IgnoreProjectExtensions.Add(".sln"); @@ -570,7 +568,7 @@ public void Should_Append_IgnoreProjectExtensions_Argument_When_Multiple_Values( public void Should_Add_DetailedSummary_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.DetailedSummary = true; // When @@ -584,7 +582,7 @@ public void Should_Add_DetailedSummary_If_Specified() public void Should_Add_NoAutoResponse_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ExcludeAutoResponseFiles = true; // When @@ -598,7 +596,7 @@ public void Should_Add_NoAutoResponse_If_Specified() public void Should_Add_NoLogo_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.NoLogo = true; // When @@ -612,7 +610,7 @@ public void Should_Add_NoLogo_If_Specified() public void Should_Add_Version_If_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.Version = "1.0.0-test"; // When @@ -626,7 +624,7 @@ public void Should_Add_Version_If_Set() public void Should_Add_VersionPrefix_If_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.VersionPrefix = "1.0.0"; // When @@ -640,7 +638,7 @@ public void Should_Add_VersionPrefix_If_Set() public void Should_Add_VersionSuffix_If_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.VersionSuffix = "test"; // When @@ -654,7 +652,7 @@ public void Should_Add_VersionSuffix_If_Set() public void Should_Add_FileVersion_If_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileVersion = "1.0.0.0"; // When @@ -668,7 +666,7 @@ public void Should_Add_FileVersion_If_Set() public void Should_Add_AssemblyVersion_If_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.AssemblyVersion = "1.0.0.0"; // When @@ -682,7 +680,7 @@ public void Should_Add_AssemblyVersion_If_Set() public void Should_Add_InformationalVersion_If_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.InformationalVersion = "1.0.0-test+7ad03d0"; // When @@ -696,7 +694,7 @@ public void Should_Add_InformationalVersion_If_Set() public void Should_Add_PackageVersion_If_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.PackageVersion = "1.0.0-test"; // When @@ -710,7 +708,7 @@ public void Should_Add_PackageVersion_If_Set() public void Should_Add_PackageReleaseNotes_If_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.PackageReleaseNotes = "https://"; // When @@ -724,7 +722,7 @@ public void Should_Add_PackageReleaseNotes_If_Set() public void Should_Add_ContinuousIntegrationBuild_If_Set_To_True() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ContinuousIntegrationBuild = true; // When @@ -738,7 +736,7 @@ public void Should_Add_ContinuousIntegrationBuild_If_Set_To_True() public void Should_Add_ContinuousIntegrationBuild_If_Set_To_False() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ContinuousIntegrationBuild = false; // When @@ -752,7 +750,7 @@ public void Should_Add_ContinuousIntegrationBuild_If_Set_To_False() public void Should_Not_Add_ContinuousIntegrationBuild_If_Not_Set() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); // When var result = fixture.Run(); @@ -765,7 +763,7 @@ public void Should_Not_Add_ContinuousIntegrationBuild_If_Not_Set() public void Should_Add_ResponseFile_Argument() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ResponseFiles.Add("/src/inputs.rsp"); // When @@ -779,7 +777,7 @@ public void Should_Add_ResponseFile_Argument() public void Should_Append_ResponseFile_Argument_When_Multiple_Values() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ResponseFiles.Add("/src/inputs1.rsp"); fixture.Settings.ResponseFiles.Add("/src/inputs_2.rsp"); @@ -794,7 +792,7 @@ public void Should_Append_ResponseFile_Argument_When_Multiple_Values() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.DiagnosticOutput = true; // When @@ -811,7 +809,7 @@ public class TheConsoleLoggerSettingsProperty public void Should_Append_PerformanceSummary_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { PerformanceSummary = true @@ -828,7 +826,7 @@ public void Should_Append_PerformanceSummary_If_Specified() public void Should_Append_NoSummary_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { NoSummary = true @@ -847,7 +845,7 @@ public void Should_Append_NoSummary_If_Specified() public void Should_Append_SummaryOutputLevel_If_Specified(MSBuildLoggerOutputLevel outputLevel) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { SummaryOutputLevel = outputLevel @@ -864,7 +862,7 @@ public void Should_Append_SummaryOutputLevel_If_Specified(MSBuildLoggerOutputLev public void Should_Not_Append_SummaryOutputLevel_If_Default() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { SummaryOutputLevel = MSBuildLoggerOutputLevel.Default @@ -881,7 +879,7 @@ public void Should_Not_Append_SummaryOutputLevel_If_Default() public void Should_Append_HideItemAndPropertyList_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { HideItemAndPropertyList = true @@ -898,7 +896,7 @@ public void Should_Append_HideItemAndPropertyList_If_Specified() public void Should_Append_ShowCommandLine_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { ShowCommandLine = true @@ -915,7 +913,7 @@ public void Should_Append_ShowCommandLine_If_Specified() public void Should_Append_ShowTimestamp_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { ShowTimestamp = true @@ -932,7 +930,7 @@ public void Should_Append_ShowTimestamp_If_Specified() public void Should_Append_ForceNoAlign_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { ForceNoAlign = true @@ -949,7 +947,7 @@ public void Should_Append_ForceNoAlign_If_Specified() public void Should_Append_ShowEventId_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { ShowEventId = true @@ -966,7 +964,7 @@ public void Should_Append_ShowEventId_If_Specified() public void Should_Append_DisableConsoleColor_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { ConsoleColorType = MSBuildConsoleColorType.Disabled @@ -983,7 +981,7 @@ public void Should_Append_DisableConsoleColor_If_Specified() public void Should_Append_ForceConsoleColor_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { ConsoleColorType = MSBuildConsoleColorType.ForceAnsi @@ -1000,7 +998,7 @@ public void Should_Append_ForceConsoleColor_If_Specified() public void Should_Append_DisableMultiprocessorLogging_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { DisableMultiprocessorLogging = true @@ -1022,7 +1020,7 @@ public void Should_Append_DisableMultiprocessorLogging_If_Specified() public void Should_Append_Verbosity_If_Specified(DotNetVerbosity verbosity) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.ConsoleLoggerSettings = new MSBuildLoggerSettings { Verbosity = verbosity @@ -1044,7 +1042,7 @@ public sealed class TheFileLoggerSettingsProperty public void Should_Append_LogFile_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { LogFile = "msbuild.log" @@ -1061,7 +1059,7 @@ public void Should_Append_LogFile_If_Specified() public void Should_Append_LogFile_If_Empty() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { LogFile = string.Empty }); // When @@ -1075,7 +1073,7 @@ public void Should_Append_LogFile_If_Empty() public void Should_Append_AppendToLogFile_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { AppendToLogFile = true }); // When @@ -1090,7 +1088,7 @@ public void Should_Append_FileEncoding_If_Specified() { // Given const string fileEncoding = "UTF8"; - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { FileEncoding = fileEncoding }); // When @@ -1104,7 +1102,7 @@ public void Should_Append_FileEncoding_If_Specified() public void Should_Append_PerformanceSummary_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { PerformanceSummary = true }); // When @@ -1118,7 +1116,7 @@ public void Should_Append_PerformanceSummary_If_Specified() public void Should_Append_NoSummary_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { NoSummary = true }); // When @@ -1134,7 +1132,7 @@ public void Should_Append_NoSummary_If_Specified() public void Should_Append_SummaryOutputLevel_If_Specified(MSBuildLoggerOutputLevel outputLevel) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { SummaryOutputLevel = outputLevel }); // When @@ -1148,7 +1146,7 @@ public void Should_Append_SummaryOutputLevel_If_Specified(MSBuildLoggerOutputLev public void Should_Not_Append_SummaryOutputLevel_If_Default() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { SummaryOutputLevel = MSBuildLoggerOutputLevel.Default }); // When @@ -1162,7 +1160,7 @@ public void Should_Not_Append_SummaryOutputLevel_If_Default() public void Should_Append_HideItemAndPropertyList_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { HideItemAndPropertyList = true }); // When @@ -1176,7 +1174,7 @@ public void Should_Append_HideItemAndPropertyList_If_Specified() public void Should_Append_ShowCommandLine_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { ShowCommandLine = true }); // When @@ -1190,7 +1188,7 @@ public void Should_Append_ShowCommandLine_If_Specified() public void Should_Append_ShowTimestamp_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { ShowTimestamp = true }); // When @@ -1204,7 +1202,7 @@ public void Should_Append_ShowTimestamp_If_Specified() public void Should_Append_ForceNoAlign_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { ForceNoAlign = true }); // When @@ -1218,7 +1216,7 @@ public void Should_Append_ForceNoAlign_If_Specified() public void Should_Append_ShowEventId_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { ShowEventId = true }); // When @@ -1232,7 +1230,7 @@ public void Should_Append_ShowEventId_If_Specified() public void Should_Append_DisableConsoleColor_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { ConsoleColorType = MSBuildConsoleColorType.Disabled }); // When @@ -1246,7 +1244,7 @@ public void Should_Append_DisableConsoleColor_If_Specified() public void Should_Append_ForceConsoleColor_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { ConsoleColorType = MSBuildConsoleColorType.ForceAnsi }); // When @@ -1260,7 +1258,7 @@ public void Should_Append_ForceConsoleColor_If_Specified() public void Should_Append_DisableMultiprocessorLogging_If_Specified() { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { DisableMultiprocessorLogging = true }); // When @@ -1279,7 +1277,7 @@ public void Should_Append_DisableMultiprocessorLogging_If_Specified() public void Should_Append_Verbosity_If_Specified(DotNetVerbosity verbosity) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.FileLoggers.Add(new MSBuildFileLoggerSettings { Verbosity = verbosity }); // When @@ -1301,7 +1299,7 @@ public class TheBinaryLoggerProperty public void Should_Append_Binary_Logging_If_Specified(bool enabled, string fileName, MSBuildBinaryLoggerImports imports, string args) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.BinaryLogger = new MSBuildBinaryLoggerSettings { Enabled = enabled, @@ -1324,7 +1322,7 @@ public void Should_Append_Binary_Logging_If_Specified(bool enabled, string fileN public void Should_Append_Binary_Logging_If_Enabled(string fileName, MSBuildBinaryLoggerImports imports, string args) { // Given - var fixture = new DotNetCoreMSBuildBuilderFixture(); + var fixture = new DotNetMSBuildBuilderFixture(); fixture.Settings.EnableBinaryLogger(fileName, imports); // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsExtensionsTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildSettingsExtensionsTests.cs similarity index 86% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsExtensionsTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildSettingsExtensionsTests.cs index 5e445c62ad..6bb2d53b12 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsExtensionsTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildSettingsExtensionsTests.cs @@ -3,14 +3,14 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; using Cake.Common.Tools.MSBuild; using Cake.Core.IO; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tests.Unit.Tools.DotNet.MSBuild { - public sealed class DotNetCoreMSBuildSettingsExtensionsTests + public sealed class DotNetMSBuildSettingsExtensionsTests { public sealed class TheWithTargetMethod { @@ -18,7 +18,7 @@ public sealed class TheWithTargetMethod public void Should_Add_Target_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.WithTarget("Target"); @@ -31,7 +31,7 @@ public void Should_Add_Target_To_Configuration() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.WithTarget("Target"); @@ -47,7 +47,7 @@ public sealed class TheWithPropertyMethod public void Should_Add_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.WithProperty("PropertyName", "Value"); @@ -60,7 +60,7 @@ public void Should_Add_Property_To_Configuration() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.WithProperty("PropertyName", "Value"); @@ -76,7 +76,7 @@ public sealed class TheDetailedSummaryMethod public void Should_Set_Detailed_Summary() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.ShowDetailedSummary(); @@ -89,7 +89,7 @@ public void Should_Set_Detailed_Summary() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.ShowDetailedSummary(); @@ -105,7 +105,7 @@ public sealed class TheWithIgnoredProjectExtensionMethod public void Should_Add_Ignored_Extension_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.WithIgnoredProjectExtension(".sln"); @@ -118,7 +118,7 @@ public void Should_Add_Ignored_Extension_To_Configuration() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.WithIgnoredProjectExtension(".sln"); @@ -134,7 +134,7 @@ public sealed class TheSetMaxCpuCountMethod public void Should_Set_MaxCpuCount() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.SetMaxCpuCount(4); @@ -147,7 +147,7 @@ public void Should_Set_MaxCpuCount() public void Should_Set_MaxCpuCount_To_Zero_If_Negative_Value() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.SetMaxCpuCount(-1); @@ -160,7 +160,7 @@ public void Should_Set_MaxCpuCount_To_Zero_If_Negative_Value() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetMaxCpuCount(4); @@ -176,7 +176,7 @@ public sealed class TheExcludeAutoResponseFilesMethod public void Should_Set_Exclude_Auto_Response_Files() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.ExcludeAutoResponseFiles(); @@ -189,7 +189,7 @@ public void Should_Set_Exclude_Auto_Response_Files() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.ExcludeAutoResponseFiles(); @@ -205,7 +205,7 @@ public sealed class TheHideLogoMethod public void Should_Set_No_Logo() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.HideLogo(); @@ -218,7 +218,7 @@ public void Should_Set_No_Logo() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.HideLogo(); @@ -237,7 +237,7 @@ public sealed class TheSetContinuousIntegrationBuildMethod public void Should_Set_ContinuousIntegrationBuild(bool? continuousIntegrationBuild) { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.SetContinuousIntegrationBuild(continuousIntegrationBuild); @@ -250,7 +250,7 @@ public void Should_Set_ContinuousIntegrationBuild(bool? continuousIntegrationBui public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetContinuousIntegrationBuild(); @@ -266,7 +266,7 @@ public sealed class TheUseToolVersionMethod public void Should_Set_Tool_Version() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.UseToolVersion(MSBuildVersion.MSBuild35); @@ -279,7 +279,7 @@ public void Should_Set_Tool_Version() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.UseToolVersion(MSBuildVersion.MSBuild35); @@ -295,7 +295,7 @@ public sealed class TheValidateProjectFileMethod public void Should_Set_Validate_Project_File() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.ValidateProjectFile(); @@ -308,7 +308,7 @@ public void Should_Set_Validate_Project_File() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.ValidateProjectFile(); @@ -324,7 +324,7 @@ public sealed class TheWithResponseFileMethod public void Should_Add_Response_File_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); var filePath = FilePath.FromString(".sln"); // When @@ -338,7 +338,7 @@ public void Should_Add_Response_File_To_Configuration() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.WithResponseFile(".sln"); @@ -354,7 +354,7 @@ public sealed class TheUseDistributedFileLoggerMethod public void Should_Set_Distributed_File_Logger() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.UseDistributedFileLogger(); @@ -367,7 +367,7 @@ public void Should_Set_Distributed_File_Logger() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.UseDistributedFileLogger(); @@ -383,7 +383,7 @@ public sealed class TheWithDistributedLoggerMethod public void Should_Add_Distributed_Logger_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); var distributedLogger = new MSBuildDistributedLogger { CentralLogger = new MSBuildLogger @@ -411,7 +411,7 @@ public void Should_Add_Distributed_Logger_To_Configuration() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.WithDistributedLogger(new MSBuildDistributedLogger()); @@ -427,7 +427,7 @@ public sealed class TheSetConsoleLoggerSettingsMethod public void Should_Set_Console_Logger_Settings() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); var consoleLoggerParameters = new MSBuildLoggerSettings { PerformanceSummary = true, @@ -445,7 +445,7 @@ public void Should_Set_Console_Logger_Settings() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetConsoleLoggerSettings(new MSBuildLoggerSettings()); @@ -461,7 +461,7 @@ public sealed class TheAddFileLoggerMethod public void Should_Add_Logger() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); var fileLogger = new MSBuildFileLoggerSettings(); var fileLogger2 = new MSBuildFileLoggerSettings() { LogFile = "A" }; @@ -481,7 +481,7 @@ public void Should_Add_Logger() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.AddFileLogger(new MSBuildFileLoggerSettings()); @@ -499,7 +499,7 @@ public sealed class TheEnableBinaryLoggerMethod public void Should_Enable_BinaryLogger() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.EnableBinaryLogger(); @@ -515,7 +515,7 @@ public void Should_Enable_BinaryLogger() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.EnableBinaryLogger(); @@ -531,7 +531,7 @@ public sealed class TheWithLoggerMethod public void Should_Add_Logger() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.WithLogger("LoggerAssembly1", "LoggerClass1", "LoggerParameters1"); @@ -552,7 +552,7 @@ public void Should_Add_Logger() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.WithLogger("Logger"); @@ -568,7 +568,7 @@ public sealed class TheDisableConsoleLoggerMethod public void Should_Set_Disable_Console_Logger() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.DisableConsoleLogger(); @@ -581,7 +581,7 @@ public void Should_Set_Disable_Console_Logger() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.DisableConsoleLogger(); @@ -597,7 +597,7 @@ public sealed class TheSetWarningCodeAsErrorMethod public void Should_Add_Warning_Code_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.SetWarningCodeAsError("ERR1"); @@ -610,7 +610,7 @@ public void Should_Add_Warning_Code_To_Configuration() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetWarningCodeAsError("ERR1"); @@ -626,7 +626,7 @@ public void Should_Return_The_Same_Configuration() public void Should_Throw_Exception_If_Null_Or_Whitespace(string warningCode) { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = Record.Exception(() => settings.SetWarningCodeAsError(warningCode)); @@ -642,7 +642,7 @@ public sealed class TheSetWarningCodeAsMessageMethod public void Should_Add_Warning_Code_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.SetWarningCodeAsMessage("ERR1"); @@ -655,7 +655,7 @@ public void Should_Add_Warning_Code_To_Configuration() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetWarningCodeAsMessage("ERR1"); @@ -671,7 +671,7 @@ public void Should_Return_The_Same_Configuration() public void Should_Throw_Exception_If_Null_Or_Whitespace(string warningCode) { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = Record.Exception(() => settings.SetWarningCodeAsMessage(warningCode)); @@ -689,7 +689,7 @@ public sealed class TheTreatAllWarningsAsMethod public void Should_Set_Warning_Code_Behaviour(MSBuildTreatAllWarningsAs treatAllAs) { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.TreatAllWarningsAs(treatAllAs); @@ -702,7 +702,7 @@ public void Should_Set_Warning_Code_Behaviour(MSBuildTreatAllWarningsAs treatAll public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error); @@ -720,7 +720,7 @@ public sealed class TheSetConfigurationMethod public void Should_Set_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "Configuration"; // When @@ -735,7 +735,7 @@ public void Should_Set_Configuration() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetConfiguration(Configuration); @@ -753,7 +753,7 @@ public sealed class TheSetVersionMethod public void Should_Set_Version() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "Version"; // When @@ -769,7 +769,7 @@ public void Should_Set_Version() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetVersion(Version); @@ -787,7 +787,7 @@ public sealed class TheSetFileVersionMethod public void Should_Set_FileVersion() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "FileVersion"; // When @@ -802,7 +802,7 @@ public void Should_Set_FileVersion() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetFileVersion(FileVersion); @@ -820,7 +820,7 @@ public sealed class TheSetAssemblyVersionMethod public void Should_Set_AssemblyVersion() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "AssemblyVersion"; // When @@ -835,7 +835,7 @@ public void Should_Set_AssemblyVersion() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetAssemblyVersion(AssemblyVersion); @@ -853,7 +853,7 @@ public sealed class TheSetInformationalVersionMethod public void Should_Set_InformationalVersion() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "InformationalVersion"; // When @@ -868,7 +868,7 @@ public void Should_Set_InformationalVersion() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetInformationalVersion(InformationalVersion); @@ -886,7 +886,7 @@ public sealed class TheSetPackageVersionMethod public void Should_Set_PackageVersion() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "PackageVersion"; // When @@ -901,7 +901,7 @@ public void Should_Set_PackageVersion() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetPackageVersion(PackageVersion); @@ -919,7 +919,7 @@ public sealed class TheSetPackageReleaseNotesMethod public void Should_Set_PackageReleaseNotes() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "PackageReleaseNotes"; // When @@ -934,7 +934,7 @@ public void Should_Set_PackageReleaseNotes() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetPackageReleaseNotes(PackageReleaseNotes); @@ -950,7 +950,7 @@ public sealed class TheSuppressVersionRecommendedFormatWarningMethod public void Should_Set_NoWarn7035() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "nowarn"; // When @@ -965,7 +965,7 @@ public void Should_Set_NoWarn7035() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SuppressVersionRecommendedFormatWarning(); @@ -983,7 +983,7 @@ public sealed class TheSetVersionPrefixMethod public void Should_Set_Version_Prefix() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "VersionPrefix"; // When @@ -998,7 +998,7 @@ public void Should_Set_Version_Prefix() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetVersionPrefix(VersionPrefix); @@ -1016,7 +1016,7 @@ public sealed class TheSetVersionSuffixMethod public void Should_Set_Version_Suffix() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "VersionSuffix"; // When @@ -1031,7 +1031,7 @@ public void Should_Set_Version_Suffix() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetVersionSuffix(VersionSuffix); @@ -1049,7 +1049,7 @@ public sealed class TheSetTargetFrameworkMethod public void Should_Set_Target_Framework() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "TargetFrameworks"; // When @@ -1064,7 +1064,7 @@ public void Should_Set_Target_Framework() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetTargetFramework(TargetFramework); @@ -1082,7 +1082,7 @@ public sealed class TheSetRuntimeMethod public void Should_Set_Runtime() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); const string key = "RuntimeIdentifiers"; // When @@ -1097,7 +1097,7 @@ public void Should_Set_Runtime() public void Should_Return_The_Same_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When var result = settings.SetRuntime(Runtime); diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildSettingsTests.cs similarity index 82% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildSettingsTests.cs index 00fff0a273..ce42825bb0 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/MSBuild/DotNetMSBuildSettingsTests.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tests.Unit.Tools.DotNet.MSBuild { - public sealed class DotNetCoreMSBuildSettingsTests + public sealed class DotNetMSBuildSettingsTests { public sealed class TheVersionProperty { @@ -15,7 +15,7 @@ public sealed class TheVersionProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.Version); @@ -25,7 +25,7 @@ public void Should_Be_Null_By_Default() public void Should_Add_Version_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.Version = "1.0.0-test"; @@ -42,7 +42,7 @@ public sealed class TheVersionPrefixProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.VersionPrefix); @@ -52,7 +52,7 @@ public void Should_Be_Null_By_Default() public void Should_Add_VersionPrefix_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.VersionPrefix = "1.0.0"; @@ -69,7 +69,7 @@ public sealed class TheVersionSuffixProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.VersionSuffix); @@ -79,7 +79,7 @@ public void Should_Be_Null_By_Default() public void Should_Add_VersionSuffix_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.VersionSuffix = "test"; @@ -96,7 +96,7 @@ public sealed class TheFileVersionProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.FileVersion); @@ -106,7 +106,7 @@ public void Should_Be_Null_By_Default() public void Should_Add_FileVersion_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.FileVersion = "1.0.0.0"; @@ -123,7 +123,7 @@ public sealed class TheAssemblyVersionProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.AssemblyVersion); @@ -133,7 +133,7 @@ public void Should_Be_Null_By_Default() public void Should_Add_AssemblyVersion_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.AssemblyVersion = "1.0.0.0"; @@ -150,7 +150,7 @@ public sealed class TheInformationalVersionProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.InformationalVersion); @@ -160,7 +160,7 @@ public void Should_Be_Null_By_Default() public void Should_Add_InformationalVersion_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.InformationalVersion = "1.0.0-test+7ad03d0"; @@ -177,7 +177,7 @@ public sealed class ThePackageVersionProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.PackageVersion); @@ -187,7 +187,7 @@ public void Should_Be_Null_By_Default() public void Should_Add_PackageVersion_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.PackageVersion = "1.0.0-test"; @@ -204,7 +204,7 @@ public sealed class ThePackageReleaseNotesProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.PackageReleaseNotes); @@ -214,7 +214,7 @@ public void Should_Be_Null_By_Default() public void Should_Add_PackageReleaseNotes_Property_To_Configuration() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.PackageReleaseNotes = "https://..."; @@ -231,7 +231,7 @@ public sealed class TheDistributedFileLoggerProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.False(settings.DistributedFileLogger); @@ -244,7 +244,7 @@ public sealed class TheValidateProjectFileProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.False(settings.ValidateProjectFile); @@ -257,7 +257,7 @@ public sealed class TheExcludeAutoResponseFilesProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.False(settings.ExcludeAutoResponseFiles); @@ -270,7 +270,7 @@ public sealed class TheTreatAllWarningsAsProperty public void Should_Be_Default_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Equal(MSBuildTreatAllWarningsAs.Default, settings.TreatAllWarningsAs); @@ -283,7 +283,7 @@ public sealed class TheWarningCodesAsErrorProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.WarningCodesAsError); @@ -296,7 +296,7 @@ public sealed class TheWarningCodesAsMessageProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.WarningCodesAsMessage); @@ -309,7 +309,7 @@ public sealed class TheConsoleLoggerSettingsProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.ConsoleLoggerSettings); @@ -322,7 +322,7 @@ public sealed class TheVerbosityProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.Verbosity); @@ -335,7 +335,7 @@ public sealed class TheToolVersionProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.ToolVersion); @@ -348,7 +348,7 @@ public sealed class TheTargetsProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.Targets); @@ -361,7 +361,7 @@ public sealed class ThePropertiesProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.Properties); @@ -371,7 +371,7 @@ public void Should_Be_Empty_By_Default() public void Should_Return_A_Dictionary_That_Is_Case_Insensitive() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // When settings.Properties.Add("THEKEY", new[] { "THEVALUE" }); @@ -387,7 +387,7 @@ public sealed class TheMaxCpuCountProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Null(settings.MaxCpuCount); @@ -400,7 +400,7 @@ public sealed class TheDetailedSummaryProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.False(settings.DetailedSummary); @@ -413,7 +413,7 @@ public sealed class TheDisableConsoleLoggerProperty public void Should_Be_Null_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.False(settings.DisableConsoleLogger); @@ -426,7 +426,7 @@ public sealed class TheLoggersProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.Loggers); @@ -439,7 +439,7 @@ public sealed class TheFileLoggersProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.FileLoggers); @@ -452,7 +452,7 @@ public sealed class TheIgnoreProjectExtensionsProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.IgnoreProjectExtensions); @@ -465,7 +465,7 @@ public sealed class TheResponseFilesProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.ResponseFiles); @@ -478,7 +478,7 @@ public sealed class TheDistributedLoggersProperty public void Should_Be_Empty_By_Default() { // Given - var settings = new DotNetCoreMSBuildSettings(); + var settings = new DotNetMSBuildSettings(); // Then Assert.Empty(settings.DistributedLoggers); diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleterTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleterTests.cs similarity index 82% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleterTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleterTests.cs index b013f82e74..3576f74653 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleterTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleterTests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Delete; -using Cake.Common.Tools.DotNetCore.NuGet.Delete; +using Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Delete; +using Cake.Common.Tools.DotNet.NuGet.Delete; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.NuGet.Delete +namespace Cake.Common.Tests.Unit.Tools.DotNet.NuGet.Delete { - public sealed class DotNetCoreNuGetDeleterTests + public sealed class DotNetNuGetDeleterTests { public sealed class TheDeleteMethod { @@ -17,7 +17,7 @@ public sealed class TheDeleteMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetDeleterFixture(); + var fixture = new DotNetNuGetDeleterFixture(); fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -35,9 +35,9 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Not_Throw_If_PackageName_Is_Empty(string packageName) { // Given - var fixture = new DotNetCoreNuGetDeleterFixture(); + var fixture = new DotNetNuGetDeleterFixture(); fixture.PackageName = packageName; - fixture.Settings = new DotNetCoreNuGetDeleteSettings(); + fixture.Settings = new DotNetNuGetDeleteSettings(); // When var result = fixture.Run(); @@ -53,10 +53,10 @@ public void Should_Not_Throw_If_PackageName_Is_Empty(string packageName) public void Should_Not_Throw_If_PackageVersion_Is_Empty(string packageVersion) { // Given - var fixture = new DotNetCoreNuGetDeleterFixture(); + var fixture = new DotNetNuGetDeleterFixture(); fixture.PackageName = "name"; fixture.PackageVersion = packageVersion; - fixture.Settings = new DotNetCoreNuGetDeleteSettings(); + fixture.Settings = new DotNetNuGetDeleteSettings(); // When var result = fixture.Run(); @@ -69,7 +69,7 @@ public void Should_Not_Throw_If_PackageVersion_Is_Empty(string packageVersion) public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetDeleterFixture(); + var fixture = new DotNetNuGetDeleterFixture(); fixture.GivenProcessCannotStart(); // When @@ -83,7 +83,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetDeleterFixture(); + var fixture = new DotNetNuGetDeleterFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -102,7 +102,7 @@ public void Should_Add_Additional_Arguments() const string source = "http://www.nuget.org/api/v2/package"; const string apiKey = "key1234"; - var fixture = new DotNetCoreNuGetDeleterFixture(); + var fixture = new DotNetNuGetDeleterFixture(); fixture.Settings.Source = source; fixture.Settings.NoServiceEndpoint = true; fixture.Settings.Interactive = true; @@ -123,7 +123,7 @@ public void Should_Add_Additional_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreNuGetDeleterFixture(); + var fixture = new DotNetNuGetDeleterFixture(); fixture.Settings.DiagnosticOutput = true; // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Push/DotNetNuGetPusherTests.cs similarity index 86% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Push/DotNetNuGetPusherTests.cs index 2686e4b72f..6052c2ffd9 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Push/DotNetNuGetPusherTests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Push; -using Cake.Common.Tools.DotNetCore.NuGet.Push; +using Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Push; +using Cake.Common.Tools.DotNet.NuGet.Push; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.NuGet.Push +namespace Cake.Common.Tests.Unit.Tools.DotNet.NuGet.Push { - public sealed class DotNetCoreNuGetPusherTests + public sealed class DotNetNuGetPusherTests { public sealed class ThePushMethod { @@ -17,7 +17,7 @@ public sealed class ThePushMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetPusherFixture(); + var fixture = new DotNetNuGetPusherFixture(); fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -35,9 +35,9 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_PackageName_Is_Empty(string packageName) { // Given - var fixture = new DotNetCoreNuGetPusherFixture(); + var fixture = new DotNetNuGetPusherFixture(); fixture.PackageName = packageName; - fixture.Settings = new DotNetCoreNuGetPushSettings(); + fixture.Settings = new DotNetNuGetPushSettings(); // When var result = Record.Exception(() => fixture.Run()); @@ -50,7 +50,7 @@ public void Should_Throw_If_PackageName_Is_Empty(string packageName) public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetPusherFixture(); + var fixture = new DotNetNuGetPusherFixture(); fixture.PackageName = "foo.nupkg"; fixture.GivenProcessCannotStart(); @@ -65,7 +65,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetPusherFixture(); + var fixture = new DotNetNuGetPusherFixture(); fixture.PackageName = "foo.nupkg"; fixture.GivenProcessExitsWithCode(1); @@ -82,7 +82,7 @@ public void Should_Add_Mandatory_Arguments() // Given const string packageName = "foo.nupkg"; - var fixture = new DotNetCoreNuGetPusherFixture(); + var fixture = new DotNetNuGetPusherFixture(); fixture.PackageName = packageName; // When @@ -103,7 +103,7 @@ public void Should_Add_Additional_Arguments() const string symbolSource = "http://www.symbolserver.org/"; const string symbolApiKey = "key5678"; - var fixture = new DotNetCoreNuGetPusherFixture(); + var fixture = new DotNetNuGetPusherFixture(); fixture.Settings.Source = source; fixture.Settings.ApiKey = apiKey; fixture.Settings.SymbolSource = symbolSource; @@ -130,7 +130,7 @@ public void Should_Add_Host_Arguments() // Given const string packageName = "foo.nupkg"; - var fixture = new DotNetCoreNuGetPusherFixture(); + var fixture = new DotNetNuGetPusherFixture(); fixture.Settings.DiagnosticOutput = true; fixture.PackageName = packageName; diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Source/DotNetNuGetSourcerTests.cs similarity index 80% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Source/DotNetNuGetSourcerTests.cs index aee207d3f5..f1d8965b29 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/NuGet/Source/DotNetNuGetSourcerTests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Source; -using Cake.Common.Tools.DotNetCore.NuGet.Source; +using Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Source; +using Cake.Common.Tools.DotNet.NuGet.Source; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tests.Unit.Tools.DotNet.NuGet.Source { - public sealed class DotNetCoreNuGetSourcerTests + public sealed class DotNetNuGetSourcerTests { public sealed class TheAddSourceMethod { @@ -20,7 +20,7 @@ public sealed class TheAddSourceMethod public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) { // Given - var fixture = new DotNetCoreNuGetAddSourceFixture(); + var fixture = new DotNetNuGetAddSourceFixture(); fixture.Name = name; // When @@ -34,7 +34,7 @@ public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetAddSourceFixture(); + var fixture = new DotNetNuGetAddSourceFixture(); fixture.Settings = null; // When @@ -51,8 +51,8 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Settings_Source_Is_Null_Or_WhiteSpace(string source) { // Given - var fixture = new DotNetCoreNuGetAddSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { Source = source }; + var fixture = new DotNetNuGetAddSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { Source = source }; // When var result = Record.Exception(() => fixture.Run()); @@ -65,8 +65,8 @@ public void Should_Throw_If_Settings_Source_Is_Null_Or_WhiteSpace(string source) public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetAddSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { Source = "source" }; + var fixture = new DotNetNuGetAddSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { Source = "source" }; fixture.GivenProcessCannotStart(); // When @@ -80,8 +80,8 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetAddSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { Source = "source" }; + var fixture = new DotNetNuGetAddSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { Source = "source" }; fixture.GivenProcessExitsWithCode(1); // When @@ -95,8 +95,8 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreNuGetAddSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { Source = "source" }; + var fixture = new DotNetNuGetAddSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { Source = "source" }; // When var result = fixture.Run(); @@ -109,8 +109,8 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Additional_Arguments() { // Given - var fixture = new DotNetCoreNuGetAddSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings + var fixture = new DotNetNuGetAddSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { Source = "source", UserName = "username", @@ -130,8 +130,8 @@ public void Should_Add_Additional_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreNuGetAddSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { DiagnosticOutput = true, Source = "source" }; + var fixture = new DotNetNuGetAddSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { DiagnosticOutput = true, Source = "source" }; // When var result = fixture.Run(); @@ -150,7 +150,7 @@ public sealed class TheDisableSourceMethod public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) { // Given - var fixture = new DotNetCoreNuGetDisableSourceFixture(); + var fixture = new DotNetNuGetDisableSourceFixture(); fixture.Name = name; // When @@ -164,7 +164,7 @@ public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetDisableSourceFixture(); + var fixture = new DotNetNuGetDisableSourceFixture(); fixture.Settings = null; // When @@ -178,7 +178,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetDisableSourceFixture(); + var fixture = new DotNetNuGetDisableSourceFixture(); fixture.GivenProcessCannotStart(); // When @@ -192,7 +192,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetDisableSourceFixture(); + var fixture = new DotNetNuGetDisableSourceFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -206,7 +206,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreNuGetDisableSourceFixture(); + var fixture = new DotNetNuGetDisableSourceFixture(); // When var result = fixture.Run(); @@ -219,8 +219,8 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreNuGetDisableSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { DiagnosticOutput = true }; + var fixture = new DotNetNuGetDisableSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { DiagnosticOutput = true }; // When var result = fixture.Run(); @@ -239,7 +239,7 @@ public sealed class TheEnableSourceMethod public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) { // Given - var fixture = new DotNetCoreNuGetEnableSourceFixture(); + var fixture = new DotNetNuGetEnableSourceFixture(); fixture.Name = name; // When @@ -253,7 +253,7 @@ public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetEnableSourceFixture(); + var fixture = new DotNetNuGetEnableSourceFixture(); fixture.Settings = null; // When @@ -267,7 +267,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetEnableSourceFixture(); + var fixture = new DotNetNuGetEnableSourceFixture(); fixture.GivenProcessCannotStart(); // When @@ -281,7 +281,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetEnableSourceFixture(); + var fixture = new DotNetNuGetEnableSourceFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -295,7 +295,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreNuGetEnableSourceFixture(); + var fixture = new DotNetNuGetEnableSourceFixture(); // When var result = fixture.Run(); @@ -308,8 +308,8 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreNuGetEnableSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { DiagnosticOutput = true }; + var fixture = new DotNetNuGetEnableSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { DiagnosticOutput = true }; // When var result = fixture.Run(); @@ -328,7 +328,7 @@ public sealed class TheHasSourceMethod public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) { // Given - var fixture = new DotNetCoreNuGetHasSourceFixture(); + var fixture = new DotNetNuGetHasSourceFixture(); fixture.Name = name; // When @@ -342,7 +342,7 @@ public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetHasSourceFixture(); + var fixture = new DotNetNuGetHasSourceFixture(); fixture.Settings = null; // When @@ -356,7 +356,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetHasSourceFixture(); + var fixture = new DotNetNuGetHasSourceFixture(); fixture.GivenProcessCannotStart(); // When @@ -370,7 +370,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetHasSourceFixture(); + var fixture = new DotNetNuGetHasSourceFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -384,7 +384,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreNuGetHasSourceFixture(); + var fixture = new DotNetNuGetHasSourceFixture(); // When var result = fixture.Run(); @@ -397,8 +397,8 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreNuGetHasSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { DiagnosticOutput = true }; + var fixture = new DotNetNuGetHasSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { DiagnosticOutput = true }; // When var result = fixture.Run(); @@ -415,7 +415,7 @@ public void Should_Add_Host_Arguments() public void Should_Return_True_For_Configured_Source(string name, string status) { // Given - var fixture = new DotNetCoreNuGetHasSourceFixture(); + var fixture = new DotNetNuGetHasSourceFixture(); fixture.Name = name; fixture.GivenProcessOutput(new[] { @@ -438,7 +438,7 @@ public sealed class TheListSourceMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetListSourceFixture(); + var fixture = new DotNetNuGetListSourceFixture(); fixture.Settings = null; // When @@ -452,7 +452,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetListSourceFixture(); + var fixture = new DotNetNuGetListSourceFixture(); fixture.GivenProcessCannotStart(); // When @@ -466,7 +466,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetListSourceFixture(); + var fixture = new DotNetNuGetListSourceFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -480,7 +480,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreNuGetListSourceFixture(); + var fixture = new DotNetNuGetListSourceFixture(); // When var result = fixture.Run(); @@ -493,7 +493,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Additional_Arguments() { // Given - var fixture = new DotNetCoreNuGetListSourceFixture(); + var fixture = new DotNetNuGetListSourceFixture(); fixture.Format = "detailed"; // When @@ -507,8 +507,8 @@ public void Should_Add_Additional_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreNuGetListSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { DiagnosticOutput = true }; + var fixture = new DotNetNuGetListSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { DiagnosticOutput = true }; // When var result = fixture.Run(); @@ -527,7 +527,7 @@ public sealed class TheRemoveSourceMethod public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) { // Given - var fixture = new DotNetCoreNuGetRemoveSourceFixture(); + var fixture = new DotNetNuGetRemoveSourceFixture(); fixture.Name = name; // When @@ -541,7 +541,7 @@ public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetRemoveSourceFixture(); + var fixture = new DotNetNuGetRemoveSourceFixture(); fixture.Settings = null; // When @@ -555,7 +555,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetRemoveSourceFixture(); + var fixture = new DotNetNuGetRemoveSourceFixture(); fixture.GivenProcessCannotStart(); // When @@ -569,7 +569,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetRemoveSourceFixture(); + var fixture = new DotNetNuGetRemoveSourceFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -583,7 +583,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreNuGetRemoveSourceFixture(); + var fixture = new DotNetNuGetRemoveSourceFixture(); // When var result = fixture.Run(); @@ -596,8 +596,8 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreNuGetRemoveSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { DiagnosticOutput = true }; + var fixture = new DotNetNuGetRemoveSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { DiagnosticOutput = true }; // When var result = fixture.Run(); @@ -616,7 +616,7 @@ public sealed class TheUpdateSourceMethod public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) { // Given - var fixture = new DotNetCoreNuGetUpdateSourceFixture(); + var fixture = new DotNetNuGetUpdateSourceFixture(); fixture.Name = name; // When @@ -630,7 +630,7 @@ public void Should_Throw_If_Name_Is_Null_Or_WhiteSpace(string name) public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreNuGetUpdateSourceFixture(); + var fixture = new DotNetNuGetUpdateSourceFixture(); fixture.Settings = null; // When @@ -644,7 +644,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreNuGetUpdateSourceFixture(); + var fixture = new DotNetNuGetUpdateSourceFixture(); fixture.GivenProcessCannotStart(); // When @@ -658,7 +658,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreNuGetUpdateSourceFixture(); + var fixture = new DotNetNuGetUpdateSourceFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -672,7 +672,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreNuGetUpdateSourceFixture(); + var fixture = new DotNetNuGetUpdateSourceFixture(); // When var result = fixture.Run(); @@ -685,8 +685,8 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Additional_Arguments() { // Given - var fixture = new DotNetCoreNuGetUpdateSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings + var fixture = new DotNetNuGetUpdateSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { Source = "source", UserName = "username", @@ -706,8 +706,8 @@ public void Should_Add_Additional_Arguments() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreNuGetUpdateSourceFixture(); - fixture.Settings = new DotNetCoreNuGetSourceSettings { DiagnosticOutput = true }; + var fixture = new DotNetNuGetUpdateSourceFixture(); + fixture.Settings = new DotNetNuGetSourceSettings { DiagnosticOutput = true }; // When var result = fixture.Run(); diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Pack/DotNetCorePackerTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Pack/DotNetPackerTests.cs similarity index 85% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Pack/DotNetCorePackerTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Pack/DotNetPackerTests.cs index 878886bbda..a8a7016e11 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Pack/DotNetCorePackerTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Pack/DotNetPackerTests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Pack; -using Cake.Common.Tools.DotNetCore; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Pack; +using Cake.Common.Tools.DotNet; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Pack +namespace Cake.Common.Tests.Unit.Tools.DotNet.Pack { - public sealed class DotNetCorePackerTests + public sealed class DotNetPackerTests { public sealed class ThePackMethod { @@ -17,7 +17,7 @@ public sealed class ThePackMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCorePackFixture(); + var fixture = new DotNetPackFixture(); fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -32,7 +32,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCorePackFixture(); + var fixture = new DotNetPackFixture(); fixture.GivenProcessCannotStart(); // When @@ -46,7 +46,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCorePackFixture(); + var fixture = new DotNetPackFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -60,7 +60,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCorePackFixture(); + var fixture = new DotNetPackFixture(); // When var result = fixture.Run(); @@ -73,7 +73,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Project() { // Given - var fixture = new DotNetCorePackFixture(); + var fixture = new DotNetPackFixture(); fixture.Project = "./src/*"; // When @@ -90,7 +90,7 @@ public void Should_Add_Project() public void Should_Quote_Project_Path(string text, string expected) { // Given - var fixture = new DotNetCorePackFixture(); + var fixture = new DotNetPackFixture(); fixture.Project = text; // When @@ -104,7 +104,7 @@ public void Should_Quote_Project_Path(string text, string expected) public void Should_Add_Settings() { // Given - var fixture = new DotNetCorePackFixture(); + var fixture = new DotNetPackFixture(); fixture.Settings.NoBuild = true; fixture.Settings.NoDependencies = true; fixture.Settings.NoRestore = true; @@ -117,7 +117,7 @@ public void Should_Add_Settings() fixture.Settings.SymbolPackageFormat = "snupkg"; fixture.Settings.Serviceable = true; fixture.Settings.Runtime = "win7-x86"; - fixture.Settings.Verbosity = DotNetCoreVerbosity.Minimal; + fixture.Settings.Verbosity = DotNetVerbosity.Minimal; fixture.Settings.Sources = new[] { "https://api.nuget.org/v3/index.json" }; // When @@ -131,7 +131,7 @@ public void Should_Add_Settings() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCorePackFixture(); + var fixture = new DotNetPackFixture(); fixture.Settings.DiagnosticOutput = true; // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Publish/DotNetCorePublisherTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Publish/DotNetPublisherTests.cs similarity index 85% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Publish/DotNetCorePublisherTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Publish/DotNetPublisherTests.cs index 0752b251f1..4b445cd243 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Publish/DotNetCorePublisherTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Publish/DotNetPublisherTests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Publish; -using Cake.Common.Tools.DotNetCore; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Publish; +using Cake.Common.Tools.DotNet; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Publish +namespace Cake.Common.Tests.Unit.Tools.DotNet.Publish { - public sealed class DotNetCorePublisherTests + public sealed class DotNetPublisherTests { public sealed class ThePublishMethod { @@ -17,7 +17,7 @@ public sealed class ThePublishMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -32,7 +32,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.GivenProcessCannotStart(); // When @@ -46,7 +46,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -60,7 +60,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); // When var result = fixture.Run(); @@ -73,7 +73,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Path() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Project = "./src/*"; // When @@ -90,7 +90,7 @@ public void Should_Add_Path() public void Should_Quote_Project_Path(string text, string expected) { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Project = text; // When @@ -104,7 +104,7 @@ public void Should_Quote_Project_Path(string text, string expected) public void Should_Add_Settings() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.NoBuild = true; fixture.Settings.NoDependencies = true; fixture.Settings.NoRestore = true; @@ -114,7 +114,7 @@ public void Should_Add_Settings() fixture.Settings.Runtime = "runtime1"; fixture.Settings.OutputDirectory = "./artifacts/"; fixture.Settings.VersionSuffix = "rc1"; - fixture.Settings.Verbosity = DotNetCoreVerbosity.Minimal; + fixture.Settings.Verbosity = DotNetVerbosity.Minimal; fixture.Settings.Force = true; fixture.Settings.SelfContained = true; fixture.Settings.Sources = new[] { "https://api.nuget.org/v3/index.json" }; @@ -130,7 +130,7 @@ public void Should_Add_Settings() public void Should_Add_SelfContained_False_Settings() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.NoDependencies = true; fixture.Settings.NoRestore = true; fixture.Settings.Framework = "dnxcore50"; @@ -138,7 +138,7 @@ public void Should_Add_SelfContained_False_Settings() fixture.Settings.Runtime = "runtime1"; fixture.Settings.OutputDirectory = "./artifacts/"; fixture.Settings.VersionSuffix = "rc1"; - fixture.Settings.Verbosity = DotNetCoreVerbosity.Minimal; + fixture.Settings.Verbosity = DotNetVerbosity.Minimal; fixture.Settings.Force = true; fixture.Settings.SelfContained = false; fixture.Settings.Sources = new[] { "https://api.nuget.org/v3/index.json" }; @@ -154,7 +154,7 @@ public void Should_Add_SelfContained_False_Settings() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.DiagnosticOutput = true; // When @@ -168,7 +168,7 @@ public void Should_Add_Host_Arguments() public void Should_Add_PublishSingleFile() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.PublishSingleFile = true; // When @@ -182,7 +182,7 @@ public void Should_Add_PublishSingleFile() public void Should_Add_PublishTrimmed() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.PublishTrimmed = true; // When @@ -196,7 +196,7 @@ public void Should_Add_PublishTrimmed() public void Should_Add_TieredCompilationQuickJit() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.TieredCompilationQuickJit = false; // When @@ -210,7 +210,7 @@ public void Should_Add_TieredCompilationQuickJit() public void Should_Add_TieredCompilation() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.TieredCompilation = false; // When @@ -224,7 +224,7 @@ public void Should_Add_TieredCompilation() public void Should_Add_PublishReadyToRun() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.PublishReadyToRun = true; // When @@ -238,7 +238,7 @@ public void Should_Add_PublishReadyToRun() public void Should_Add_PublishReadyToRunShowWarnings() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.PublishReadyToRunShowWarnings = true; // When @@ -252,7 +252,7 @@ public void Should_Add_PublishReadyToRunShowWarnings() public void Should_Add_IncludeNativeLibrariesForSelfExtract() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.IncludeNativeLibrariesForSelfExtract = true; // When @@ -266,7 +266,7 @@ public void Should_Add_IncludeNativeLibrariesForSelfExtract() public void Should_Add_IncludeAllContentForSelfExtract() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.IncludeAllContentForSelfExtract = true; // When @@ -280,7 +280,7 @@ public void Should_Add_IncludeAllContentForSelfExtract() public void Should_Add_EnableCompressionInSingleFile() { // Given - var fixture = new DotNetCorePublisherFixture(); + var fixture = new DotNetPublisherFixture(); fixture.Settings.EnableCompressionInSingleFile = true; // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Restore/DotNetCoreRestorerTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Restore/DotNetRestorerTests.cs similarity index 84% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Restore/DotNetCoreRestorerTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Restore/DotNetRestorerTests.cs index fd6107a33e..d9941bd859 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Restore/DotNetCoreRestorerTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Restore/DotNetRestorerTests.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Restore; -using Cake.Common.Tools.DotNetCore; -using Cake.Common.Tools.DotNetCore.Restore; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Restore; +using Cake.Common.Tools.DotNet; +using Cake.Common.Tools.DotNet.Restore; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Restore +namespace Cake.Common.Tests.Unit.Tools.DotNet.Restore { - public sealed class DotNetCoreRestorerTests + public sealed class DotNetRestorerTests { public sealed class TheRestoreMethod { @@ -18,7 +18,7 @@ public sealed class TheRestoreMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -33,7 +33,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Root = "./src/*"; fixture.GivenProcessCannotStart(); @@ -48,7 +48,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.GivenProcessExitsWithCode(1); // When @@ -62,7 +62,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); // When var result = fixture.Run(); @@ -75,7 +75,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Path() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Root = "./src/*"; // When @@ -92,7 +92,7 @@ public void Should_Add_Path() public void Should_Quote_Root_Path(string text, string expected) { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Root = text; // When @@ -106,7 +106,7 @@ public void Should_Quote_Root_Path(string text, string expected) public void Should_Add_Settings() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Settings.Sources = new[] { "https://www.example.com/source1", "https://www.example.com/source2" }; fixture.Settings.NoCache = true; fixture.Settings.DisableParallel = true; @@ -116,7 +116,7 @@ public void Should_Add_Settings() fixture.Settings.Runtime = "runtime1"; fixture.Settings.NoDependencies = true; fixture.Settings.Force = true; - fixture.Settings.Verbosity = DotNetCoreVerbosity.Minimal; + fixture.Settings.Verbosity = DotNetVerbosity.Minimal; // When var result = fixture.Run(); @@ -136,7 +136,7 @@ public void Should_Add_Settings() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Settings.DiagnosticOutput = true; // When @@ -150,7 +150,7 @@ public void Should_Add_Host_Arguments() public void Should_Add_Interactive() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Settings.Interactive = true; // When @@ -164,7 +164,7 @@ public void Should_Add_Interactive() public void Should_Add_UseLockFile() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Settings.UseLockFile = true; // When @@ -178,7 +178,7 @@ public void Should_Add_UseLockFile() public void Should_Add_LockedMode() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Settings.LockedMode = true; // When @@ -192,7 +192,7 @@ public void Should_Add_LockedMode() public void Should_Add_LockFilePath() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); const string lockfile = @"mypackages.lock.json"; fixture.Settings.LockFilePath = lockfile; @@ -207,7 +207,7 @@ public void Should_Add_LockFilePath() public void Should_Add_ForceEvaluate() { // Given - var fixture = new DotNetCoreRestorerFixture(); + var fixture = new DotNetRestorerFixture(); fixture.Settings.ForceEvaluate = true; // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Run/DotNetCoreRunnerTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Run/DotNetRunnerTests.cs similarity index 85% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Run/DotNetCoreRunnerTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Run/DotNetRunnerTests.cs index 847c477ad7..ba6914c251 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Run/DotNetCoreRunnerTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Run/DotNetRunnerTests.cs @@ -2,15 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Run; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Run; using Cake.Common.Tools.DotNet; -using Cake.Common.Tools.DotNetCore; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Run +namespace Cake.Common.Tests.Unit.Tools.DotNet.Run { - public sealed class DotNetCoreRunnerTests + public sealed class DotNetRunnerTests { public sealed class TheRunMethod { @@ -18,7 +17,7 @@ public sealed class TheRunMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreRunnerFixture(); + var fixture = new DotNetRunnerFixture(); fixture.Project = "./src/*"; fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -34,7 +33,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreRunnerFixture(); + var fixture = new DotNetRunnerFixture(); fixture.Project = "./src/*"; fixture.GivenProcessCannotStart(); @@ -49,7 +48,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreRunnerFixture(); + var fixture = new DotNetRunnerFixture(); fixture.Project = "./src/*"; fixture.GivenProcessExitsWithCode(1); @@ -64,7 +63,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreRunnerFixture(); + var fixture = new DotNetRunnerFixture(); // When var result = fixture.Run(); @@ -77,7 +76,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Path_Arguments() { // Given - var fixture = new DotNetCoreRunnerFixture(); + var fixture = new DotNetRunnerFixture(); fixture.Project = "./tools/tool/"; fixture.Arguments = "--args=\"value\""; // When @@ -91,12 +90,12 @@ public void Should_Add_Path_Arguments() public void Should_Add_Additional_Settings() { // Given - var fixture = new DotNetCoreRunnerFixture(); + var fixture = new DotNetRunnerFixture(); fixture.Settings.Framework = "dnxcore50"; fixture.Settings.Configuration = "Release"; fixture.Settings.Runtime = "win7-x86"; fixture.Settings.Sources = new[] { "https://api.nuget.org/v3/index.json" }; - fixture.Settings.RollForward = DotNetCoreRollForward.Major; + fixture.Settings.RollForward = DotNetRollForward.Major; // When var result = fixture.Run(); @@ -109,7 +108,7 @@ public void Should_Add_Additional_Settings() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreRunnerFixture(); + var fixture = new DotNetRunnerFixture(); fixture.Settings.DiagnosticOutput = true; // When @@ -129,7 +128,7 @@ public void Should_Add_Host_Arguments() public void Should_Add_RollForward_Arguments(DotNetRollForward rollForward, string expected) { // Given - var fixture = new DotNetCoreRunnerFixture(); + var fixture = new DotNetRunnerFixture(); fixture.Settings.RollForward = rollForward; // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Test/DotNetCoreTesterTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Test/DotNetTesterTests.cs similarity index 89% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Test/DotNetCoreTesterTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Test/DotNetTesterTests.cs index eaed023794..cc824d7947 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Test/DotNetCoreTesterTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Test/DotNetTesterTests.cs @@ -2,14 +2,14 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Test; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Test; using Cake.Core; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Test +namespace Cake.Common.Tests.Unit.Tools.DotNet.Test { - public sealed class DotNetCoreTesterTests + public sealed class DotNetTesterTests { public sealed class TheTestMethod { @@ -17,7 +17,7 @@ public sealed class TheTestMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); fixture.Project = "./src/*"; fixture.Settings = null; fixture.GivenDefaultToolDoNotExist(); @@ -33,7 +33,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); fixture.Project = "./src/*"; fixture.GivenProcessCannotStart(); @@ -48,7 +48,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); fixture.Project = "./src/*"; fixture.GivenProcessExitsWithCode(1); @@ -63,7 +63,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); // When var result = fixture.Run(); @@ -76,7 +76,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Path() { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); fixture.Project = "./test/Project.Tests/*"; // When @@ -93,7 +93,7 @@ public void Should_Add_Path() public void Should_Quote_Project_Path(string text, string expected) { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); fixture.Project = text; // When @@ -107,7 +107,7 @@ public void Should_Quote_Project_Path(string text, string expected) public void Should_Add_RunSettings_Arguments() { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); fixture.Arguments = new[] { "MSTest.DeploymentEnabled=false", "MSTest.MapInconclusiveToFailed=true" }.ToProcessArguments(); // When @@ -121,7 +121,7 @@ public void Should_Add_RunSettings_Arguments() public void Should_Add_Additional_Settings() { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); fixture.Settings.NoBuild = true; fixture.Settings.NoRestore = true; fixture.Settings.NoLogo = true; @@ -154,7 +154,7 @@ public void Should_Add_Additional_Settings() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreTesterFixture(); + var fixture = new DotNetTesterFixture(); fixture.Settings.DiagnosticOutput = true; // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Tool/DotNetCoreToolTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/Tool/DotNetToolTests.cs similarity index 80% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/Tool/DotNetCoreToolTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/Tool/DotNetToolTests.cs index d4126dcdc1..53755fe376 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Tool/DotNetCoreToolTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/Tool/DotNetToolTests.cs @@ -2,15 +2,15 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.Tool; -using Cake.Common.Tools.DotNetCore; -using Cake.Common.Tools.DotNetCore.Tool; +using Cake.Common.Tests.Fixtures.Tools.DotNet.Tool; +using Cake.Common.Tools.DotNet; +using Cake.Common.Tools.DotNet.Tool; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.Tool +namespace Cake.Common.Tests.Unit.Tools.DotNet.Tool { - public sealed class DotNetCoreToolTests + public sealed class DotNetToolTests { public sealed class TheToolMethod { @@ -18,7 +18,7 @@ public sealed class TheToolMethod public void Should_Not_Throw_If_ProjectPath_IsNull() { // Given - var fixture = new DotNetCoreToolFixture(); + var fixture = new DotNetToolFixture(); fixture.Command = "cake"; fixture.ProjectPath = null; @@ -32,7 +32,7 @@ public void Should_Not_Throw_If_ProjectPath_IsNull() public void Should_Throw_If_Command_IsNull(string command) { // Given - var fixture = new DotNetCoreToolFixture(); + var fixture = new DotNetToolFixture(); fixture.ProjectPath = "./tests/Cake.Common.Tests/"; fixture.Command = command; @@ -49,7 +49,7 @@ public void Should_Throw_If_Command_IsNull(string command) public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreToolFixture(); + var fixture = new DotNetToolFixture(); fixture.ProjectPath = "./tests/Cake.Common.Tests/"; fixture.Command = "xunit"; fixture.Settings = null; @@ -67,10 +67,10 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreToolFixture(); + var fixture = new DotNetToolFixture(); fixture.ProjectPath = "./tests/Cake.Common.Tests/"; fixture.Command = "xunit"; - fixture.Settings = new DotNetCoreToolSettings(); + fixture.Settings = new DotNetToolSettings(); fixture.GivenProcessCannotStart(); // When @@ -84,10 +84,10 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreToolFixture(); + var fixture = new DotNetToolFixture(); fixture.ProjectPath = "./tests/Cake.Common.Tests/"; fixture.Command = "xunit"; - fixture.Settings = new DotNetCoreToolSettings(); + fixture.Settings = new DotNetToolSettings(); fixture.GivenProcessExitsWithCode(1); // When diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/VSTest/DotNetCoreVSTesterTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNet/VSTest/DotNetVSTesterTests.cs similarity index 80% rename from src/Cake.Common.Tests/Unit/Tools/DotNetCore/VSTest/DotNetCoreVSTesterTests.cs rename to src/Cake.Common.Tests/Unit/Tools/DotNet/VSTest/DotNetVSTesterTests.cs index 0d3295f796..711709b06d 100644 --- a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/VSTest/DotNetCoreVSTesterTests.cs +++ b/src/Cake.Common.Tests/Unit/Tools/DotNet/VSTest/DotNetVSTesterTests.cs @@ -2,16 +2,16 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tests.Fixtures.Tools.DotNetCore.VSTest; -using Cake.Common.Tools.DotNetCore.VSTest; +using Cake.Common.Tests.Fixtures.Tools.DotNet.VSTest; +using Cake.Common.Tools.DotNet.VSTest; using Cake.Common.Tools.VSTest; using Cake.Core.IO; using Cake.Testing; using Xunit; -namespace Cake.Common.Tests.Unit.Tools.DotNetCore.VSTest +namespace Cake.Common.Tests.Unit.Tools.DotNet.VSTest { - public sealed class DotNetCoreVSTesterTests + public sealed class DotNetVSTesterTests { public sealed class TheTestMethod { @@ -19,7 +19,7 @@ public sealed class TheTestMethod public void Should_Throw_If_Settings_Are_Null() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, Settings = null @@ -37,7 +37,7 @@ public void Should_Throw_If_Settings_Are_Null() public void Should_Throw_If_Process_Was_Not_Started() { // Given - var fixture = new DotNetCoreVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" } }; + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" } }; fixture.GivenProcessCannotStart(); // When @@ -51,7 +51,7 @@ public void Should_Throw_If_Process_Was_Not_Started() public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() { // Given - var fixture = new DotNetCoreVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" } }; + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" } }; fixture.GivenProcessExitsWithCode(1); // When @@ -65,7 +65,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code() public void Should_Add_Mandatory_Arguments() { // Given - var fixture = new DotNetCoreVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" } }; + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" } }; // When var result = fixture.Run(); @@ -78,7 +78,7 @@ public void Should_Add_Mandatory_Arguments() public void Should_Add_Multiple_Test_File_Arguments() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { @@ -99,7 +99,7 @@ public void Should_Add_Multiple_Test_File_Arguments() public void Should_Quote_Test_File_Path() { // Given - var fixture = new DotNetCoreVSTesterFixture { TestFiles = new[] { (FilePath)"./test/cake unit tests/cake core tests.csproj" } }; + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/cake unit tests/cake core tests.csproj" } }; // When var result = fixture.Run(); @@ -112,10 +112,10 @@ public void Should_Quote_Test_File_Path() public void Should_Add_Settings_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { Settings = "./test/demo.runsettings" } @@ -132,10 +132,10 @@ public void Should_Add_Settings_Argument() public void Should_Add_Tests_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { TestsToRun = new[] { "TestMethod1", "TestMethod2" } } @@ -152,10 +152,10 @@ public void Should_Add_Tests_Argument() public void Should_Add_TestAdapter_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { TestAdapterPath = @"/Working/custom-test-adapter" } @@ -172,10 +172,10 @@ public void Should_Add_TestAdapter_Argument() public void Should_Add_Platform_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { Platform = VSTestPlatform.x64 } @@ -192,10 +192,10 @@ public void Should_Add_Platform_Argument() public void Should_Add_Framework_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { Framework = "dnxcore50" } @@ -212,10 +212,10 @@ public void Should_Add_Framework_Argument() public void Should_Add_Parallel_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { Parallel = true } @@ -232,12 +232,12 @@ public void Should_Add_Parallel_Argument() public void Should_Add_TestCaseFilter_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { - TestCaseFilter = "FullyQualifiedName~Cake.Common.Core.DotNetCore" + TestCaseFilter = "FullyQualifiedName~Cake.Common.Core.DotNet" } }; @@ -245,17 +245,17 @@ public void Should_Add_TestCaseFilter_Argument() var result = fixture.Run(); // Then - Assert.Equal("vstest \"/Working/test/unit.tests.csproj\" --TestCaseFilter:\"FullyQualifiedName~Cake.Common.Core.DotNetCore\"", result.Args); + Assert.Equal("vstest \"/Working/test/unit.tests.csproj\" --TestCaseFilter:\"FullyQualifiedName~Cake.Common.Core.DotNet\"", result.Args); } [Fact] public void Should_Add_Logger_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { Logger = @"trx;LogFileName=/Working/logfile.trx" } @@ -272,10 +272,10 @@ public void Should_Add_Logger_Argument() public void Should_Add_ParentProcessId_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { ParentProcessId = @"100" } @@ -292,10 +292,10 @@ public void Should_Add_ParentProcessId_Argument() public void Should_Add_Port_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { Port = 8000 } @@ -312,10 +312,10 @@ public void Should_Add_Port_Argument() public void Should_Add_Diag_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { DiagnosticFile = "./artifacts/logging/diagnostics.txt" } @@ -332,10 +332,10 @@ public void Should_Add_Diag_Argument() public void Should_Add_ResultsDirectory_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { ResultsDirectory = "./artifacts/TestResults" } @@ -352,10 +352,10 @@ public void Should_Add_ResultsDirectory_Argument() public void Should_Add_Extra_Argument() { // Given - var fixture = new DotNetCoreVSTesterFixture + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" }, - Settings = new DotNetCoreVSTestSettings + Settings = new DotNetVSTestSettings { Arguments = { @@ -376,7 +376,7 @@ public void Should_Add_Extra_Argument() public void Should_Add_Host_Arguments() { // Given - var fixture = new DotNetCoreVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" } }; + var fixture = new DotNetVSTesterFixture { TestFiles = new[] { (FilePath)"./test/unit.tests.csproj" } }; fixture.Settings.DiagnosticOutput = true; // When diff --git a/src/Cake.Common/Tools/Cake/CakeRunner.cs b/src/Cake.Common/Tools/Cake/CakeRunner.cs index 25f8192ff8..822589ac82 100644 --- a/src/Cake.Common/Tools/Cake/CakeRunner.cs +++ b/src/Cake.Common/Tools/Cake/CakeRunner.cs @@ -9,7 +9,7 @@ using System.IO; using System.Linq; using System.Text; -using Cake.Common.Tools.DotNetCore.Execute; +using Cake.Common.Tools.DotNet.Execute; using Cake.Core; using Cake.Core.IO; using Cake.Core.Polyfill; @@ -25,7 +25,7 @@ public sealed class CakeRunner : Tool private readonly ICakeEnvironment _environment; private readonly IFileSystem _fileSystem; private readonly IGlobber _globber; - private readonly DotNetCoreExecutor _coreExecutor; + private readonly DotNetExecutor _coreExecutor; private static readonly IEnumerable _executingAssemblyToolPaths; /// @@ -55,7 +55,7 @@ public CakeRunner(IFileSystem fileSystem, ICakeEnvironment environment, IGlobber _environment = environment; _fileSystem = fileSystem; _globber = globber; - _coreExecutor = new DotNetCoreExecutor(fileSystem, environment, processRunner, tools); + _coreExecutor = new DotNetExecutor(fileSystem, environment, processRunner, tools); } /// @@ -83,7 +83,7 @@ public void ExecuteScript(FilePath scriptPath, CakeSettings settings = null) _coreExecutor.Execute( toolPath, GetArguments(scriptPath, settings), - new DotNetCoreExecuteSettings + new DotNetExecuteSettings { ArgumentCustomization = settings.ArgumentCustomization, EnvironmentVariables = settings.EnvironmentVariables, diff --git a/src/Cake.Common/Tools/DotNet/Build/DotNetBuildSettings.cs b/src/Cake.Common/Tools/DotNet/Build/DotNetBuildSettings.cs index 756dcfbbc5..f817418c29 100644 --- a/src/Cake.Common/Tools/DotNet/Build/DotNetBuildSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Build/DotNetBuildSettings.cs @@ -4,13 +4,12 @@ using System.Collections.Generic; using Cake.Common.Tools.DotNet.MSBuild; -using Cake.Common.Tools.DotNetCore.Build; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.Build { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetBuildSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/Build/DotNetCoreBuilder.cs b/src/Cake.Common/Tools/DotNet/Build/DotNetBuilder.cs similarity index 91% rename from src/Cake.Common/Tools/DotNetCore/Build/DotNetCoreBuilder.cs rename to src/Cake.Common/Tools/DotNet/Build/DotNetBuilder.cs index e7ba896047..c185ae4c68 100644 --- a/src/Cake.Common/Tools/DotNetCore/Build/DotNetCoreBuilder.cs +++ b/src/Cake.Common/Tools/DotNet/Build/DotNetBuilder.cs @@ -3,29 +3,28 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.Build; -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Build +namespace Cake.Common.Tools.DotNet.Build { /// - /// .NET Core project builder. + /// .NET project builder. /// - public sealed class DotNetCoreBuilder : DotNetCoreTool + public sealed class DotNetBuilder : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreBuilder( + public DotNetBuilder( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNetCore/BuildServer/DotNetCoreBuildServer.cs b/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServer.cs similarity index 82% rename from src/Cake.Common/Tools/DotNetCore/BuildServer/DotNetCoreBuildServer.cs rename to src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServer.cs index d9997b350b..ee82c52986 100644 --- a/src/Cake.Common/Tools/DotNetCore/BuildServer/DotNetCoreBuildServer.cs +++ b/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServer.cs @@ -3,34 +3,30 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.BuildServer; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.BuildServer +namespace Cake.Common.Tools.DotNet.BuildServer { /// /// .NET Core project builder. /// - public sealed class DotNetCoreBuildServer : DotNetCoreTool + public sealed class DotNetBuildServer : DotNetTool { - private readonly ICakeEnvironment _environment; - /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreBuildServer( + public DotNetBuildServer( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools) : base(fileSystem, environment, processRunner, tools) { - _environment = environment; } /// diff --git a/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServerSettings.cs b/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServerSettings.cs index 8e70a96f0a..f586090476 100644 --- a/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServerSettings.cs +++ b/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServerSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.BuildServer; - namespace Cake.Common.Tools.DotNet.BuildServer { /// - /// Contains settings used by . + /// Contains settings used by . /// public abstract class DotNetBuildServerSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServerShutdownSettings.cs b/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServerShutdownSettings.cs index 3ab1053d9e..8e67aab7a1 100644 --- a/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServerShutdownSettings.cs +++ b/src/Cake.Common/Tools/DotNet/BuildServer/DotNetBuildServerShutdownSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.BuildServer; - namespace Cake.Common.Tools.DotNet.BuildServer { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetBuildServerShutdownSettings : DotNetBuildServerSettings { diff --git a/src/Cake.Common/Tools/DotNet/Clean/DotNetCleanSettings.cs b/src/Cake.Common/Tools/DotNet/Clean/DotNetCleanSettings.cs index 4c07f94bd6..1b32775fb3 100644 --- a/src/Cake.Common/Tools/DotNet/Clean/DotNetCleanSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Clean/DotNetCleanSettings.cs @@ -3,13 +3,12 @@ // See the LICENSE file in the project root for more information. using Cake.Common.Tools.DotNet.MSBuild; -using Cake.Common.Tools.DotNetCore.Clean; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.Clean { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetCleanSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/Clean/DotNetCoreCleaner.cs b/src/Cake.Common/Tools/DotNet/Clean/DotNetCleaner.cs similarity index 88% rename from src/Cake.Common/Tools/DotNetCore/Clean/DotNetCoreCleaner.cs rename to src/Cake.Common/Tools/DotNet/Clean/DotNetCleaner.cs index ae04f61078..9fffe7d2f6 100644 --- a/src/Cake.Common/Tools/DotNetCore/Clean/DotNetCoreCleaner.cs +++ b/src/Cake.Common/Tools/DotNet/Clean/DotNetCleaner.cs @@ -1,31 +1,29 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. +// The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.Clean; -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Clean +namespace Cake.Common.Tools.DotNet.Clean { /// /// .NET Core project cleaner. /// - public sealed class DotNetCoreCleaner : DotNetCoreTool + public sealed class DotNetCleaner : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreCleaner( + public DotNetCleaner( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNet/DotNetAliases.cs b/src/Cake.Common/Tools/DotNet/DotNetAliases.cs index d1d06b9f0f..4e6dedf7ca 100644 --- a/src/Cake.Common/Tools/DotNet/DotNetAliases.cs +++ b/src/Cake.Common/Tools/DotNet/DotNetAliases.cs @@ -29,21 +29,6 @@ using Cake.Common.Tools.DotNet.Workload.Search; using Cake.Common.Tools.DotNet.Workload.Uninstall; using Cake.Common.Tools.DotNet.Workload.Update; -using Cake.Common.Tools.DotNetCore.Build; -using Cake.Common.Tools.DotNetCore.BuildServer; -using Cake.Common.Tools.DotNetCore.Clean; -using Cake.Common.Tools.DotNetCore.Execute; -using Cake.Common.Tools.DotNetCore.MSBuild; -using Cake.Common.Tools.DotNetCore.NuGet.Delete; -using Cake.Common.Tools.DotNetCore.NuGet.Push; -using Cake.Common.Tools.DotNetCore.NuGet.Source; -using Cake.Common.Tools.DotNetCore.Pack; -using Cake.Common.Tools.DotNetCore.Publish; -using Cake.Common.Tools.DotNetCore.Restore; -using Cake.Common.Tools.DotNetCore.Run; -using Cake.Common.Tools.DotNetCore.Test; -using Cake.Common.Tools.DotNetCore.Tool; -using Cake.Common.Tools.DotNetCore.VSTest; using Cake.Core; using Cake.Core.Annotations; using Cake.Core.IO; @@ -135,7 +120,7 @@ public static void DotNetExecute(this ICakeContext context, FilePath assemblyPat settings = new DotNetExecuteSettings(); } - var executor = new DotNetCoreExecutor(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var executor = new DotNetExecutor(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); executor.Execute(assemblyPath, arguments, settings); } @@ -238,7 +223,7 @@ public static void DotNetRestore(this ICakeContext context, string root, DotNetR settings = new DotNetRestoreSettings(); } - var restorer = new DotNetCoreRestorer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Log); + var restorer = new DotNetRestorer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Log); restorer.Restore(root, settings); } @@ -293,7 +278,7 @@ public static void DotNetBuild(this ICakeContext context, string project, DotNet settings = new DotNetBuildSettings(); } - var builder = new DotNetCoreBuilder(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var builder = new DotNetBuilder(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); builder.Build(project, settings); } @@ -348,7 +333,7 @@ public static void DotNetPublish(this ICakeContext context, string project, DotN settings = new DotNetPublishSettings(); } - var publisher = new DotNetCorePublisher(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var publisher = new DotNetPublisher(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); publisher.Publish(project, settings); } @@ -515,7 +500,7 @@ public static void DotNetTest(this ICakeContext context, string project, Process settings = new DotNetTestSettings(); } - var tester = new DotNetCoreTester(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var tester = new DotNetTester(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); tester.Test(project, arguments, settings); } @@ -570,7 +555,7 @@ public static void DotNetClean(this ICakeContext context, string project, DotNet settings = new DotNetCleanSettings(); } - var cleaner = new DotNetCoreCleaner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var cleaner = new DotNetCleaner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); cleaner.Clean(project, settings); } @@ -710,7 +695,7 @@ public static void DotNetNuGetDelete(this ICakeContext context, string packageNa settings = new DotNetNuGetDeleteSettings(); } - var nugetDeleter = new DotNetCoreNuGetDeleter(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var nugetDeleter = new DotNetNuGetDeleter(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); nugetDeleter.Delete(packageName, packageVersion, settings); } @@ -771,7 +756,7 @@ public static void DotNetNuGetPush(this ICakeContext context, FilePath packageFi settings = new DotNetNuGetPushSettings(); } - var restorer = new DotNetCoreNuGetPusher(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var restorer = new DotNetNuGetPusher(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); restorer.Push(packageFilePath?.FullPath, settings); } @@ -805,7 +790,7 @@ public static void DotNetNuGetAddSource(this ICakeContext context, string name, throw new ArgumentNullException(nameof(context)); } - var sourcer = new DotNetCoreNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var sourcer = new DotNetNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); sourcer.AddSource(name, settings); } @@ -853,7 +838,7 @@ public static void DotNetNuGetDisableSource(this ICakeContext context, string na throw new ArgumentNullException(nameof(context)); } - var sourcer = new DotNetCoreNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var sourcer = new DotNetNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); sourcer.DisableSource(name, settings ?? new DotNetNuGetSourceSettings()); } @@ -901,7 +886,7 @@ public static void DotNetNuGetEnableSource(this ICakeContext context, string nam throw new ArgumentNullException(nameof(context)); } - var sourcer = new DotNetCoreNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var sourcer = new DotNetNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); sourcer.EnableSource(name, settings ?? new DotNetNuGetSourceSettings()); } @@ -951,7 +936,7 @@ public static bool DotNetNuGetHasSource(this ICakeContext context, string name, throw new ArgumentNullException(nameof(context)); } - var sourcer = new DotNetCoreNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var sourcer = new DotNetNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); return sourcer.HasSource(name, settings ?? new DotNetNuGetSourceSettings()); } @@ -999,7 +984,7 @@ public static void DotNetNuGetRemoveSource(this ICakeContext context, string nam throw new ArgumentNullException(nameof(context)); } - var sourcer = new DotNetCoreNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var sourcer = new DotNetNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); sourcer.RemoveSource(name, settings ?? new DotNetNuGetSourceSettings()); } @@ -1033,7 +1018,7 @@ public static void DotNetNuGetUpdateSource(this ICakeContext context, string nam throw new ArgumentNullException(nameof(context)); } - var sourcer = new DotNetCoreNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var sourcer = new DotNetNuGetSourcer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); sourcer.UpdateSource(name, settings); } @@ -1087,7 +1072,7 @@ public static void DotNetPack(this ICakeContext context, string project, DotNetP settings = new DotNetPackSettings(); } - var packer = new DotNetCorePacker(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var packer = new DotNetPacker(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); packer.Pack(project, settings); } @@ -1178,7 +1163,7 @@ public static void DotNetRun(this ICakeContext context, string project, ProcessA settings = new DotNetRunSettings(); } - var runner = new DotNetCoreRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var runner = new DotNetRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); runner.Run(project, arguments, settings); } @@ -1310,7 +1295,7 @@ public static void DotNetMSBuild(this ICakeContext context, string projectOrDire settings = new DotNetMSBuildSettings(); } - var builder = new DotNetCoreMSBuildBuilder(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var builder = new DotNetMSBuildBuilder(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); builder.Build(projectOrDirectory, settings); } @@ -1423,7 +1408,7 @@ public static void DotNetVSTest(this ICakeContext context, IEnumerable settings = new DotNetVSTestSettings(); } - var tester = new DotNetCoreVSTester(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var tester = new DotNetVSTester(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); tester.Test(testFiles, settings); } @@ -1561,7 +1546,7 @@ public static void DotNetTool(this ICakeContext context, FilePath projectPath, s throw new ArgumentNullException(nameof(context)); } - var runner = new DotNetCoreToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var runner = new DotNetToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); runner.Execute(projectPath, command, arguments, settings); } @@ -1608,7 +1593,7 @@ public static void DotNetBuildServerShutdown(this ICakeContext context, DotNetBu throw new ArgumentNullException(nameof(context)); } - var buildServer = new DotNetCoreBuildServer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); + var buildServer = new DotNetBuildServer(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools); buildServer.Shutdown(settings ?? new DotNetBuildServerShutdownSettings()); } diff --git a/src/Cake.Common/Tools/DotNet/Execute/DotNetExecuteSettings.cs b/src/Cake.Common/Tools/DotNet/Execute/DotNetExecuteSettings.cs index 5bda04ca2c..63824c7a80 100644 --- a/src/Cake.Common/Tools/DotNet/Execute/DotNetExecuteSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Execute/DotNetExecuteSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.Execute; - namespace Cake.Common.Tools.DotNet.Execute { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetExecuteSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/Execute/DotNetCoreExecutor.cs b/src/Cake.Common/Tools/DotNet/Execute/DotNetExecutor.cs similarity index 87% rename from src/Cake.Common/Tools/DotNetCore/Execute/DotNetCoreExecutor.cs rename to src/Cake.Common/Tools/DotNet/Execute/DotNetExecutor.cs index d024603dfb..f78a7db0ba 100644 --- a/src/Cake.Common/Tools/DotNetCore/Execute/DotNetCoreExecutor.cs +++ b/src/Cake.Common/Tools/DotNet/Execute/DotNetExecutor.cs @@ -3,29 +3,27 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet; -using Cake.Common.Tools.DotNet.Execute; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Execute +namespace Cake.Common.Tools.DotNet.Execute { /// - /// .NET Core assembly executor. + /// .NET assembly executor. /// - public sealed class DotNetCoreExecutor : DotNetTool + public sealed class DotNetExecutor : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreExecutor( + public DotNetExecutor( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilder.cs b/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildBuilder.cs similarity index 87% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilder.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildBuilder.cs index 01e69f746c..af399ebc02 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilder.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildBuilder.cs @@ -3,28 +3,27 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.MSBuild; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// .NET Core project builder. /// - public sealed class DotNetCoreMSBuildBuilder : DotNetCoreTool + public sealed class DotNetMSBuildBuilder : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreMSBuildBuilder( + public DotNetMSBuildBuilder( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildSettings.cs b/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildSettings.cs index 93f31ea2ae..4bfe90d69b 100644 --- a/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildSettings.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildSettings.cs @@ -4,14 +4,13 @@ using System; using System.Collections.Generic; -using Cake.Common.Tools.DotNetCore.MSBuild; using Cake.Common.Tools.MSBuild; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.MSBuild { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetMSBuildSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildSettingsExtensions.cs b/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildSettingsExtensions.cs index a68b155511..be47afc62c 100644 --- a/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildSettingsExtensions.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/DotNetMSBuildSettingsExtensions.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Cake.Common.Tools.DotNetCore.MSBuild; using Cake.Common.Tools.MSBuild; using Cake.Core.IO; diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildArgumentBuilderExtensions.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildArgumentBuilderExtensions.cs similarity index 99% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildArgumentBuilderExtensions.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildArgumentBuilderExtensions.cs index 6754689645..17416bd2bc 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildArgumentBuilderExtensions.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildArgumentBuilderExtensions.cs @@ -6,12 +6,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using Cake.Common.Tools.DotNet.MSBuild; using Cake.Common.Tools.MSBuild; using Cake.Core; using Cake.Core.IO; -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// Contains functionality related to MSBuild arguments. diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildBinaryLoggerImports.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildBinaryLoggerImports.cs similarity index 93% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildBinaryLoggerImports.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildBinaryLoggerImports.cs index 1fbf31fb33..58a6633f7c 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildBinaryLoggerImports.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildBinaryLoggerImports.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// What files to include in the binary log. diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildBinaryLoggerSettings.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildBinaryLoggerSettings.cs similarity index 92% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildBinaryLoggerSettings.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildBinaryLoggerSettings.cs index 8eff6544e4..388b7fd855 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildBinaryLoggerSettings.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildBinaryLoggerSettings.cs @@ -2,10 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// - /// MSBuild binary logger settings used by . + /// MSBuild binary logger settings used by . /// public class MSBuildBinaryLoggerSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildConsoleColorType.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildConsoleColorType.cs similarity index 94% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildConsoleColorType.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildConsoleColorType.cs index a90b7307b9..e198476f3d 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildConsoleColorType.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildConsoleColorType.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// Represents how the console color should behave in a console. diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildDistributedLogger.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildDistributedLogger.cs similarity index 94% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildDistributedLogger.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildDistributedLogger.cs index beb2c1f432..026945dca8 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildDistributedLogger.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildDistributedLogger.cs @@ -4,7 +4,7 @@ using Cake.Common.Tools.MSBuild; -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// Represents the Distributed Logging Model with a central logger and forwarding logger. diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildFileLoggerSettings.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildFileLoggerSettings.cs similarity index 95% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildFileLoggerSettings.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildFileLoggerSettings.cs index 8432555d44..6a526a18af 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildFileLoggerSettings.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildFileLoggerSettings.cs @@ -4,7 +4,7 @@ using Cake.Core.IO; -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// Represents the settings for a file logger. diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildLoggerOutputLevel.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildLoggerOutputLevel.cs similarity index 93% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildLoggerOutputLevel.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildLoggerOutputLevel.cs index 733f35314e..ccb5b496d0 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildLoggerOutputLevel.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildLoggerOutputLevel.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// Represents the logging output level for a MSBuild logger. diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildLoggerSettings.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildLoggerSettings.cs similarity index 98% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildLoggerSettings.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildLoggerSettings.cs index c63abb49e2..66363aa36c 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildLoggerSettings.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildLoggerSettings.cs @@ -4,7 +4,7 @@ using Cake.Common.Tools.DotNet; -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// Represents the common settings for a logger. diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildTreatAllWarningsAs.cs b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildTreatAllWarningsAs.cs similarity index 93% rename from src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildTreatAllWarningsAs.cs rename to src/Cake.Common/Tools/DotNet/MSBuild/MSBuildTreatAllWarningsAs.cs index ec8b6bff48..fa408f20be 100644 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/MSBuildTreatAllWarningsAs.cs +++ b/src/Cake.Common/Tools/DotNet/MSBuild/MSBuildTreatAllWarningsAs.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Cake.Common.Tools.DotNetCore.MSBuild +namespace Cake.Common.Tools.DotNet.MSBuild { /// /// Represents how all warnings should be treated as by MSBuild. diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleteSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleteSettings.cs index 6635c04ba3..aafeec576e 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleteSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleteSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Delete; - namespace Cake.Common.Tools.DotNet.NuGet.Delete { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetNuGetDeleteSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleter.cs b/src/Cake.Common/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleter.cs similarity index 88% rename from src/Cake.Common/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleter.cs rename to src/Cake.Common/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleter.cs index 1ac7e920f1..67680806d5 100644 --- a/src/Cake.Common/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleter.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Delete/DotNetNuGetDeleter.cs @@ -3,26 +3,25 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.NuGet.Delete; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.NuGet.Delete +namespace Cake.Common.Tools.DotNet.NuGet.Delete { /// - /// .NET Core NuGet deleter. Deletes or unlists a package from the server. + /// .NET NuGet deleter. Deletes or unlists a package from the server. /// - public sealed class DotNetCoreNuGetDeleter : DotNetCoreTool + public sealed class DotNetNuGetDeleter : DotNetTool { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreNuGetDeleter( + public DotNetNuGetDeleter( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Push/DotNetNuGetPushSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Push/DotNetNuGetPushSettings.cs index 0a0c13a76b..8591fad9c8 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Push/DotNetNuGetPushSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Push/DotNetNuGetPushSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Push; - namespace Cake.Common.Tools.DotNet.NuGet.Push { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetNuGetPushSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusher.cs b/src/Cake.Common/Tools/DotNet/NuGet/Push/DotNetNuGetPusher.cs similarity index 91% rename from src/Cake.Common/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusher.cs rename to src/Cake.Common/Tools/DotNet/NuGet/Push/DotNetNuGetPusher.cs index 6c296fb33b..aa93508e7a 100644 --- a/src/Cake.Common/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusher.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Push/DotNetNuGetPusher.cs @@ -3,26 +3,25 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.NuGet.Push; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.NuGet.Push +namespace Cake.Common.Tools.DotNet.NuGet.Push { /// - /// .NET Core nuget pusher. Pushes a package and its symbols to the server. + /// .NET NuGet pusher. Pushes a package and its symbols to the server. /// - public sealed class DotNetCoreNuGetPusher : DotNetCoreTool + public sealed class DotNetNuGetPusher : DotNetTool { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreNuGetPusher( + public DotNetNuGetPusher( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetAddSourceSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetAddSourceSettings.cs index c51284fb4c..2b7fd534ac 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetAddSourceSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetAddSourceSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; - namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// Contains settings used by for adding new sources. + /// Contains settings used by for adding new sources. /// public class DotNetNuGetAddSourceSettings : DotNetNuGetSourceSettings { diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetDisableSourceSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetDisableSourceSettings.cs index 2464af9b0e..be3d3bde68 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetDisableSourceSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetDisableSourceSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; - namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// Contains settings used by for disabling NuGet sources. + /// Contains settings used by for disabling NuGet sources. /// public class DotNetNuGetDisableSourceSettings : DotNetNuGetSourceSettings { diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetEnableSourceSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetEnableSourceSettings.cs index dc8bd85209..64741c6a77 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetEnableSourceSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetEnableSourceSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; - namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// Contains settings used by for enabling a NuGet source. + /// Contains settings used by for enabling a NuGet source. /// public class DotNetNuGetEnableSourceSettings : DotNetNuGetSourceSettings { diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetHasSourceSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetHasSourceSettings.cs index 3ce0b17e4f..dc622b95d9 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetHasSourceSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetHasSourceSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; - namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// Contains settings used by for checking if a NuGet source exists. + /// Contains settings used by for checking if a NuGet source exists. /// public class DotNetNuGetHasSourceSettings : DotNetNuGetSourceSettings { diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetListSourceSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetListSourceSettings.cs index b6d49ae80b..4de2ed7201 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetListSourceSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetListSourceSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; - namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// Contains settings used by for listing NuGet sources. + /// Contains settings used by for listing NuGet sources. /// public class DotNetNuGetListSourceSettings : DotNetNuGetSourceSettings { diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetRemoveSourceSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetRemoveSourceSettings.cs index bcbea85980..f73cd4cfc7 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetRemoveSourceSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetRemoveSourceSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; - namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// Contains settings used by for removing a NuGet source. + /// Contains settings used by for removing a NuGet source. /// public class DotNetNuGetRemoveSourceSettings : DotNetNuGetSourceSettings { diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetSourceSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetSourceSettings.cs index 4b48f7b486..13c21aa8c3 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetSourceSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetSourceSettings.cs @@ -2,13 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetNuGetSourceSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcer.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetSourcer.cs similarity index 97% rename from src/Cake.Common/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcer.cs rename to src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetSourcer.cs index 5edb32a7c8..dfcd8c505a 100644 --- a/src/Cake.Common/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcer.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetSourcer.cs @@ -5,28 +5,27 @@ using System; using System.Linq; using System.Text.RegularExpressions; -using Cake.Common.Tools.DotNet.NuGet.Source; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.NuGet.Source +namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// .NET Core NuGet sourcer. + /// .NET NuGet sourcer. /// - public sealed class DotNetCoreNuGetSourcer : DotNetCoreTool + public sealed class DotNetNuGetSourcer : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreNuGetSourcer( + public DotNetNuGetSourcer( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetUpdateSourceSettings.cs b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetUpdateSourceSettings.cs index eafba39283..e2573e1803 100644 --- a/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetUpdateSourceSettings.cs +++ b/src/Cake.Common/Tools/DotNet/NuGet/Source/DotNetNuGetUpdateSourceSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.NuGet.Source; - namespace Cake.Common.Tools.DotNet.NuGet.Source { /// - /// Contains settings used by for updating a NuGet source. + /// Contains settings used by for updating a NuGet source. /// public class DotNetNuGetUpdateSourceSettings : DotNetNuGetSourceSettings { diff --git a/src/Cake.Common/Tools/DotNet/Pack/DotNetPackSettings.cs b/src/Cake.Common/Tools/DotNet/Pack/DotNetPackSettings.cs index 2395fc5058..fae1a24c07 100644 --- a/src/Cake.Common/Tools/DotNet/Pack/DotNetPackSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Pack/DotNetPackSettings.cs @@ -4,13 +4,12 @@ using System.Collections.Generic; using Cake.Common.Tools.DotNet.MSBuild; -using Cake.Common.Tools.DotNetCore.Pack; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.Pack { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetPackSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/Pack/DotNetCorePacker.cs b/src/Cake.Common/Tools/DotNet/Pack/DotNetPacker.cs similarity index 92% rename from src/Cake.Common/Tools/DotNetCore/Pack/DotNetCorePacker.cs rename to src/Cake.Common/Tools/DotNet/Pack/DotNetPacker.cs index e3f880403a..7af280ece1 100644 --- a/src/Cake.Common/Tools/DotNetCore/Pack/DotNetCorePacker.cs +++ b/src/Cake.Common/Tools/DotNet/Pack/DotNetPacker.cs @@ -3,29 +3,28 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.Pack; -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Pack +namespace Cake.Common.Tools.DotNet.Pack { /// - /// .NET Core project packer. + /// .NET project packer. /// - public sealed class DotNetCorePacker : DotNetCoreTool + public sealed class DotNetPacker : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCorePacker( + public DotNetPacker( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNet/Publish/DotNetPublishSettings.cs b/src/Cake.Common/Tools/DotNet/Publish/DotNetPublishSettings.cs index 69de1172d3..79f9862a77 100644 --- a/src/Cake.Common/Tools/DotNet/Publish/DotNetPublishSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Publish/DotNetPublishSettings.cs @@ -4,13 +4,12 @@ using System.Collections.Generic; using Cake.Common.Tools.DotNet.MSBuild; -using Cake.Common.Tools.DotNetCore.Publish; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.Publish { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetPublishSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/Publish/DotNetCorePublisher.cs b/src/Cake.Common/Tools/DotNet/Publish/DotNetPublisher.cs similarity index 95% rename from src/Cake.Common/Tools/DotNetCore/Publish/DotNetCorePublisher.cs rename to src/Cake.Common/Tools/DotNet/Publish/DotNetPublisher.cs index dd76edd791..b26b7adac0 100644 --- a/src/Cake.Common/Tools/DotNetCore/Publish/DotNetCorePublisher.cs +++ b/src/Cake.Common/Tools/DotNet/Publish/DotNetPublisher.cs @@ -3,29 +3,28 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.Publish; -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Publish +namespace Cake.Common.Tools.DotNet.Publish { /// - /// .NET Core project runner. + /// .NET project publisher. /// - public sealed class DotNetCorePublisher : DotNetCoreTool + public sealed class DotNetPublisher : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCorePublisher( + public DotNetPublisher( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNet/Restore/DotNetRestoreSettings.cs b/src/Cake.Common/Tools/DotNet/Restore/DotNetRestoreSettings.cs index 9e8c3d42ad..13c6ea43f5 100644 --- a/src/Cake.Common/Tools/DotNet/Restore/DotNetRestoreSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Restore/DotNetRestoreSettings.cs @@ -4,13 +4,12 @@ using System.Collections.Generic; using Cake.Common.Tools.DotNet.MSBuild; -using Cake.Common.Tools.DotNetCore.Restore; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.Restore { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetRestoreSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/Restore/DotNetCoreRestorer.cs b/src/Cake.Common/Tools/DotNet/Restore/DotNetRestorer.cs similarity index 91% rename from src/Cake.Common/Tools/DotNetCore/Restore/DotNetCoreRestorer.cs rename to src/Cake.Common/Tools/DotNet/Restore/DotNetRestorer.cs index a262bd0a0b..b8d3175977 100644 --- a/src/Cake.Common/Tools/DotNetCore/Restore/DotNetCoreRestorer.cs +++ b/src/Cake.Common/Tools/DotNet/Restore/DotNetRestorer.cs @@ -3,32 +3,30 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.Restore; -using Cake.Common.Tools.DotNetCore.MSBuild; +using Cake.Common.Tools.DotNet.MSBuild; using Cake.Core; using Cake.Core.Diagnostics; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Restore +namespace Cake.Common.Tools.DotNet.Restore { /// - /// .NET Core project restorer. + /// .NET project restorer. /// - public sealed class DotNetCoreRestorer : DotNetCoreTool + public sealed class DotNetRestorer : DotNetTool { private readonly ICakeEnvironment _environment; - private readonly ICakeLog _log; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. /// The cake log. - public DotNetCoreRestorer( + public DotNetRestorer( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, @@ -36,7 +34,6 @@ public DotNetCoreRestorer( ICakeLog log) : base(fileSystem, environment, processRunner, tools) { _environment = environment; - _log = log; } /// diff --git a/src/Cake.Common/Tools/DotNet/Run/DotNetRunSettings.cs b/src/Cake.Common/Tools/DotNet/Run/DotNetRunSettings.cs index e45b775212..63bec9b122 100644 --- a/src/Cake.Common/Tools/DotNet/Run/DotNetRunSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Run/DotNetRunSettings.cs @@ -3,12 +3,11 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Cake.Common.Tools.DotNetCore.Run; namespace Cake.Common.Tools.DotNet.Run { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetRunSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/Run/DotNetCoreRunner.cs b/src/Cake.Common/Tools/DotNet/Run/DotNetRunner.cs similarity index 92% rename from src/Cake.Common/Tools/DotNetCore/Run/DotNetCoreRunner.cs rename to src/Cake.Common/Tools/DotNet/Run/DotNetRunner.cs index 1e6936f8bd..1e07408322 100644 --- a/src/Cake.Common/Tools/DotNetCore/Run/DotNetCoreRunner.cs +++ b/src/Cake.Common/Tools/DotNet/Run/DotNetRunner.cs @@ -3,26 +3,25 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.Run; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Run +namespace Cake.Common.Tools.DotNet.Run { /// - /// .NET Core project runner. + /// .NET project runner. /// - public sealed class DotNetCoreRunner : DotNetCoreTool + public sealed class DotNetRunner : DotNetTool { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreRunner( + public DotNetRunner( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNet/Test/DotNetTestSettings.cs b/src/Cake.Common/Tools/DotNet/Test/DotNetTestSettings.cs index 8f35942673..aac2dcdaa7 100644 --- a/src/Cake.Common/Tools/DotNet/Test/DotNetTestSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Test/DotNetTestSettings.cs @@ -4,13 +4,12 @@ using System; using System.Collections.Generic; -using Cake.Common.Tools.DotNetCore.Test; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.Test { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetTestSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/Test/DotNetCoreTester.cs b/src/Cake.Common/Tools/DotNet/Test/DotNetTester.cs similarity index 95% rename from src/Cake.Common/Tools/DotNetCore/Test/DotNetCoreTester.cs rename to src/Cake.Common/Tools/DotNet/Test/DotNetTester.cs index 735cb0d280..650be6c57b 100644 --- a/src/Cake.Common/Tools/DotNetCore/Test/DotNetCoreTester.cs +++ b/src/Cake.Common/Tools/DotNet/Test/DotNetTester.cs @@ -3,28 +3,27 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet.Test; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Test +namespace Cake.Common.Tools.DotNet.Test { /// - /// .NET Core project tester. + /// .NET project tester. /// - public sealed class DotNetCoreTester : DotNetCoreTool + public sealed class DotNetTester : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreTester( + public DotNetTester( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNetCore/Tool/DotNetCoreToolRunner.cs b/src/Cake.Common/Tools/DotNet/Tool/DotNetToolRunner.cs similarity index 83% rename from src/Cake.Common/Tools/DotNetCore/Tool/DotNetCoreToolRunner.cs rename to src/Cake.Common/Tools/DotNet/Tool/DotNetToolRunner.cs index caa8eb5acd..b139216831 100644 --- a/src/Cake.Common/Tools/DotNetCore/Tool/DotNetCoreToolRunner.cs +++ b/src/Cake.Common/Tools/DotNet/Tool/DotNetToolRunner.cs @@ -3,35 +3,30 @@ // See the LICENSE file in the project root for more information. using System; -using Cake.Common.Tools.DotNet; -using Cake.Common.Tools.DotNet.Tool; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.Tool +namespace Cake.Common.Tools.DotNet.Tool { /// - /// .NET Core Extensibility Commands Runner. + /// .NET Extensibility Commands Runner. /// - public sealed class DotNetCoreToolRunner : DotNetCoreTool + public sealed class DotNetToolRunner : DotNetTool { - private readonly ICakeEnvironment _environment; - /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreToolRunner( + public DotNetToolRunner( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools) : base(fileSystem, environment, processRunner, tools) { - _environment = environment; } /// diff --git a/src/Cake.Common/Tools/DotNet/Tool/DotNetToolSettings.cs b/src/Cake.Common/Tools/DotNet/Tool/DotNetToolSettings.cs index 202b50ca5d..168a7ac584 100644 --- a/src/Cake.Common/Tools/DotNet/Tool/DotNetToolSettings.cs +++ b/src/Cake.Common/Tools/DotNet/Tool/DotNetToolSettings.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Cake.Common.Tools.DotNetCore.Tool; - namespace Cake.Common.Tools.DotNet.Tool { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetToolSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNet/VSTest/DotNetVSTestSettings.cs b/src/Cake.Common/Tools/DotNet/VSTest/DotNetVSTestSettings.cs index db69d98cc6..3571f91e7a 100644 --- a/src/Cake.Common/Tools/DotNet/VSTest/DotNetVSTestSettings.cs +++ b/src/Cake.Common/Tools/DotNet/VSTest/DotNetVSTestSettings.cs @@ -3,14 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Collections.Generic; -using Cake.Common.Tools.DotNetCore.VSTest; using Cake.Common.Tools.VSTest; using Cake.Core.IO; namespace Cake.Common.Tools.DotNet.VSTest { /// - /// Contains settings used by . + /// Contains settings used by . /// public class DotNetVSTestSettings : DotNetSettings { diff --git a/src/Cake.Common/Tools/DotNetCore/VSTest/DotNetCoreVSTester.cs b/src/Cake.Common/Tools/DotNet/VSTest/DotNetVSTester.cs similarity index 94% rename from src/Cake.Common/Tools/DotNetCore/VSTest/DotNetCoreVSTester.cs rename to src/Cake.Common/Tools/DotNet/VSTest/DotNetVSTester.cs index b16b7abe03..f1178bf8c7 100644 --- a/src/Cake.Common/Tools/DotNetCore/VSTest/DotNetCoreVSTester.cs +++ b/src/Cake.Common/Tools/DotNet/VSTest/DotNetVSTester.cs @@ -5,29 +5,28 @@ using System; using System.Collections.Generic; using System.Linq; -using Cake.Common.Tools.DotNet.VSTest; using Cake.Common.Tools.VSTest; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -namespace Cake.Common.Tools.DotNetCore.VSTest +namespace Cake.Common.Tools.DotNet.VSTest { /// /// .NET Core VSTest tester. /// - public sealed class DotNetCoreVSTester : DotNetCoreTool + public sealed class DotNetVSTester : DotNetTool { private readonly ICakeEnvironment _environment; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The file system. /// The environment. /// The process runner. /// The tool locator. - public DotNetCoreVSTester( + public DotNetVSTester( IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, diff --git a/src/Cake.Common/Tools/DotNetCore/Build/DotNetCoreBuildSettings.cs b/src/Cake.Common/Tools/DotNetCore/Build/DotNetCoreBuildSettings.cs deleted file mode 100644 index 40fbe0ac59..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Build/DotNetCoreBuildSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Build; - -namespace Cake.Common.Tools.DotNetCore.Build -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreBuildSettings : DotNetBuildSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerSettings.cs b/src/Cake.Common/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerSettings.cs deleted file mode 100644 index 7c97de3f90..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.BuildServer; - -namespace Cake.Common.Tools.DotNetCore.BuildServer -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreBuildServerSettings : DotNetBuildServerShutdownSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/Clean/DotNetCoreCleanSettings.cs b/src/Cake.Common/Tools/DotNetCore/Clean/DotNetCoreCleanSettings.cs deleted file mode 100644 index 2f0a965c61..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Clean/DotNetCoreCleanSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Clean; - -namespace Cake.Common.Tools.DotNetCore.Clean -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreCleanSettings : DotNetCleanSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs deleted file mode 100644 index 82e6787a12..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs +++ /dev/null @@ -1,1496 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.Collections.Generic; -using Cake.Common.IO; -using Cake.Common.Tools.DotNet; -using Cake.Common.Tools.DotNet.Build; -using Cake.Common.Tools.DotNet.BuildServer; -using Cake.Common.Tools.DotNet.Clean; -using Cake.Common.Tools.DotNet.Execute; -using Cake.Common.Tools.DotNet.MSBuild; -using Cake.Common.Tools.DotNet.NuGet.Delete; -using Cake.Common.Tools.DotNet.NuGet.Push; -using Cake.Common.Tools.DotNet.NuGet.Source; -using Cake.Common.Tools.DotNet.Pack; -using Cake.Common.Tools.DotNet.Publish; -using Cake.Common.Tools.DotNet.Restore; -using Cake.Common.Tools.DotNet.Run; -using Cake.Common.Tools.DotNet.Test; -using Cake.Common.Tools.DotNet.Tool; -using Cake.Common.Tools.DotNet.VSTest; -using Cake.Common.Tools.DotNetCore.Build; -using Cake.Common.Tools.DotNetCore.BuildServer; -using Cake.Common.Tools.DotNetCore.Clean; -using Cake.Common.Tools.DotNetCore.Execute; -using Cake.Common.Tools.DotNetCore.MSBuild; -using Cake.Common.Tools.DotNetCore.NuGet.Delete; -using Cake.Common.Tools.DotNetCore.NuGet.Push; -using Cake.Common.Tools.DotNetCore.NuGet.Source; -using Cake.Common.Tools.DotNetCore.Pack; -using Cake.Common.Tools.DotNetCore.Publish; -using Cake.Common.Tools.DotNetCore.Restore; -using Cake.Common.Tools.DotNetCore.Run; -using Cake.Common.Tools.DotNetCore.Test; -using Cake.Common.Tools.DotNetCore.Tool; -using Cake.Common.Tools.DotNetCore.VSTest; -using Cake.Core; -using Cake.Core.Annotations; -using Cake.Core.IO; - -namespace Cake.Common.Tools.DotNetCore -{ - /// - /// Contains functionality related to .NET Core CLI. - /// - /// In order to use the commands for this alias, the .Net Core CLI tools will need to be installed on the machine where - /// the Cake script is being executed. See this page for information - /// on how to install. - /// - /// - [CakeAliasCategory("DotNetCore")] - public static class DotNetCoreAliases - { - /// - /// [deprecated] DotNetCoreExecute is obsolete and will be removed in a future release. Use instead. - /// Execute an assembly. - /// - /// The context. - /// The assembly path. - /// - /// - /// DotNetCoreExecute("./bin/Debug/app.dll"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Execute")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Execute")] - [Obsolete("DotNetCoreExecute is obsolete and will be removed in a future release. Use DotNetExecute instead.")] - public static void DotNetCoreExecute(this ICakeContext context, FilePath assemblyPath) - { - context.DotNetExecute(assemblyPath); - } - - /// - /// [deprecated] DotNetCoreExecute is obsolete and will be removed in a future release. Use instead. - /// Execute an assembly with arguments in the specific path. - /// - /// The context. - /// The assembly path. - /// The arguments. - /// - /// - /// DotNetCoreExecute("./bin/Debug/app.dll", "--arg"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Execute")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Execute")] - [Obsolete("DotNetCoreExecute is obsolete and will be removed in a future release. Use DotNetExecute instead.")] - public static void DotNetCoreExecute(this ICakeContext context, FilePath assemblyPath, ProcessArgumentBuilder arguments) - { - context.DotNetExecute(assemblyPath, arguments); - } - - /// - /// [deprecated] DotNetCoreExecute is obsolete and will be removed in a future release. Use instead. - /// Execute an assembly with arguments in the specific path with settings. - /// - /// The context. - /// The assembly path. - /// The arguments. - /// The settings. - /// - /// - /// var settings = new DotNetCoreExecuteSettings - /// { - /// FrameworkVersion = "1.0.3" - /// }; - /// - /// DotNetCoreExecute("./bin/Debug/app.dll", "--arg", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Execute")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Execute")] - [Obsolete("DotNetCoreExecute is obsolete and will be removed in a future release. Use DotNetExecute instead.")] - public static void DotNetCoreExecute(this ICakeContext context, FilePath assemblyPath, ProcessArgumentBuilder arguments, DotNetCoreExecuteSettings settings) - { - context.DotNetExecute(assemblyPath, arguments, settings); - } - - /// - /// [deprecated] DotNetCoreRestore is obsolete and will be removed in a future release. Use instead. - /// Restore all NuGet Packages. - /// - /// The context. - /// - /// - /// DotNetCoreRestore(); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Restore")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Restore")] - [Obsolete("DotNetCoreRestore is obsolete and will be removed in a future release. Use DotNetRestore instead.")] - public static void DotNetCoreRestore(this ICakeContext context) - { - context.DotNetRestore(); - } - - /// - /// [deprecated] DotNetCoreRestore is obsolete and will be removed in a future release. Use instead. - /// Restore all NuGet Packages in the specified path. - /// - /// The context. - /// Path to the project file to restore. - /// - /// - /// DotNetCoreRestore("./src/MyProject/MyProject.csproj"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Restore")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Restore")] - [Obsolete("DotNetCoreRestore is obsolete and will be removed in a future release. Use DotNetRestore instead.")] - public static void DotNetCoreRestore(this ICakeContext context, string root) - { - context.DotNetRestore(root); - } - - /// - /// [deprecated] DotNetCoreRestore is obsolete and will be removed in a future release. Use instead. - /// Restore all NuGet Packages with the settings. - /// - /// The context. - /// The settings. - /// - /// - /// var settings = new DotNetCoreRestoreSettings - /// { - /// Sources = new[] {"https://www.example.com/nugetfeed", "https://www.example.com/nugetfeed2"}, - /// FallbackSources = new[] {"https://www.example.com/fallbacknugetfeed"}, - /// PackagesDirectory = "./packages", - /// Verbosity = Information, - /// DisableParallel = true, - /// InferRuntimes = new[] {"runtime1", "runtime2"} - /// }; - /// - /// DotNetCoreRestore(settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Restore")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Restore")] - [Obsolete("DotNetCoreRestore is obsolete and will be removed in a future release. Use DotNetRestore instead.")] - public static void DotNetCoreRestore(this ICakeContext context, DotNetCoreRestoreSettings settings) - { - context.DotNetRestore(settings); - } - - /// - /// [deprecated] DotNetCoreRestore is obsolete and will be removed in a future release. Use instead. - /// Restore all NuGet Packages in the specified path with settings. - /// - /// The context. - /// Path to the project file to restore. - /// The settings. - /// - /// - /// var settings = new DotNetCoreRestoreSettings - /// { - /// Sources = new[] {"https://www.example.com/nugetfeed", "https://www.example.com/nugetfeed2"}, - /// FallbackSources = new[] {"https://www.example.com/fallbacknugetfeed"}, - /// PackagesDirectory = "./packages", - /// Verbosity = Information, - /// DisableParallel = true, - /// InferRuntimes = new[] {"runtime1", "runtime2"} - /// }; - /// - /// DotNetCoreRestore("./src/MyProject/MyProject.csproj", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Restore")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Restore")] - [Obsolete("DotNetCoreRestore is obsolete and will be removed in a future release. Use DotNetRestore instead.")] - public static void DotNetCoreRestore(this ICakeContext context, string root, DotNetCoreRestoreSettings settings) - { - context.DotNetRestore(root, settings); - } - - /// - /// [deprecated] DotNetCoreBuild is obsolete and will be removed in a future release. Use instead. - /// Build all projects. - /// - /// The context. - /// The projects path. - /// - /// - /// DotNetCoreBuild("./src/*"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Build")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Build")] - [Obsolete("DotNetCoreBuild is obsolete and will be removed in a future release. Use DotNetBuild instead.")] - public static void DotNetCoreBuild(this ICakeContext context, string project) - { - context.DotNetBuild(project); - } - - /// - /// [deprecated] DotNetCoreBuild is obsolete and will be removed in a future release. Use instead. - /// Build all projects. - /// - /// The context. - /// The projects path. - /// The settings. - /// - /// - /// var settings = new DotNetCoreBuildSettings - /// { - /// Framework = "netcoreapp3.1", - /// Configuration = "Debug", - /// OutputDirectory = "./artifacts/" - /// }; - /// - /// DotNetCoreBuild("./src/*", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Build")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Build")] - [Obsolete("DotNetCoreBuild is obsolete and will be removed in a future release. Use DotNetBuild instead.")] - public static void DotNetCoreBuild(this ICakeContext context, string project, DotNetCoreBuildSettings settings) - { - context.DotNetBuild(project, settings); - } - - /// - /// [deprecated] DotNetCorePack is obsolete and will be removed in a future release. Use instead. - /// Package all projects. - /// - /// The context. - /// The projects path. - /// - /// - /// DotNetCorePack("./src/*"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Pack")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Pack")] - [Obsolete("DotNetCorePack is obsolete and will be removed in a future release. Use DotNetPack instead.")] - public static void DotNetCorePack(this ICakeContext context, string project) - { - context.DotNetPack(project); - } - - /// - /// [deprecated] DotNetCorePack is obsolete and will be removed in a future release. Use instead. - /// Package all projects. - /// - /// The context. - /// The projects path. - /// The settings. - /// - /// - /// var settings = new DotNetCorePackSettings - /// { - /// Configuration = "Release", - /// OutputDirectory = "./artifacts/" - /// }; - /// - /// DotNetCorePack("./src/*", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Pack")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Pack")] - [Obsolete("DotNetCorePack is obsolete and will be removed in a future release. Use DotNetPack instead.")] - public static void DotNetCorePack(this ICakeContext context, string project, DotNetCorePackSettings settings) - { - context.DotNetPack(project, settings); - } - - /// - /// [deprecated] DotNetCoreRun is obsolete and will be removed in a future release. Use instead. - /// Run all projects. - /// - /// The context. - /// - /// - /// DotNetCoreRun(); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Run")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Run")] - [Obsolete("DotNetCoreRun is obsolete and will be removed in a future release. Use DotNetRun instead.")] - public static void DotNetCoreRun(this ICakeContext context) - { - context.DotNetRun(); - } - - /// - /// [deprecated] DotNetCoreRun is obsolete and will be removed in a future release. Use instead. - /// Run project. - /// - /// The context. - /// The project path. - /// - /// - /// DotNetCoreRun("./src/Project"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Run")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Run")] - [Obsolete("DotNetCoreRun is obsolete and will be removed in a future release. Use DotNetRun instead.")] - public static void DotNetCoreRun(this ICakeContext context, string project) - { - context.DotNetRun(project); - } - - /// - /// [deprecated] DotNetCoreRun is obsolete and will be removed in a future release. Use instead. - /// Run project with path and arguments. - /// - /// The context. - /// The project path. - /// The arguments. - /// - /// - /// DotNetCoreRun("./src/Project", "--args"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Run")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Run")] - [Obsolete("DotNetCoreRun is obsolete and will be removed in a future release. Use DotNetRun instead.")] - public static void DotNetCoreRun(this ICakeContext context, string project, ProcessArgumentBuilder arguments) - { - context.DotNetRun(project, arguments); - } - - /// - /// [deprecated] DotNetCoreRun is obsolete and will be removed in a future release. Use instead. - /// Run project with settings. - /// - /// The context. - /// The project path. - /// The arguments. - /// The settings. - /// - /// - /// var settings = new DotNetCoreRunSettings - /// { - /// Framework = "netcoreapp3.1", - /// Configuration = "Release" - /// }; - /// - /// DotNetCoreRun("./src/Project", "--args", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Run")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Run")] - [Obsolete("DotNetCoreRun is obsolete and will be removed in a future release. Use DotNetRun instead.")] - public static void DotNetCoreRun(this ICakeContext context, string project, ProcessArgumentBuilder arguments, DotNetCoreRunSettings settings) - { - context.DotNetRun(project, arguments, settings); - } - - /// - /// [deprecated] DotNetCoreRun is obsolete and will be removed in a future release. Use instead. - /// Run project with settings. - /// - /// The context. - /// The project path. - /// The settings. - /// - /// - /// var settings = new DotNetCoreRunSettings - /// { - /// Framework = "netcoreapp2.0", - /// Configuration = "Release" - /// }; - /// - /// DotNetCoreRun("./src/Project", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Run")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Run")] - [Obsolete("DotNetCoreRun is obsolete and will be removed in a future release. Use DotNetRun instead.")] - public static void DotNetCoreRun(this ICakeContext context, string project, DotNetCoreRunSettings settings) - { - context.DotNetRun(project, settings); - } - - /// - /// [deprecated] DotNetCorePublish is obsolete and will be removed in a future release. Use instead. - /// Publish all projects. - /// - /// The context. - /// The projects path. - /// - /// - /// DotNetCorePublish("./src/*"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Publish")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Publish")] - [Obsolete("DotNetCorePublish is obsolete and will be removed in a future release. Use DotNetPublish instead.")] - public static void DotNetCorePublish(this ICakeContext context, string project) - { - context.DotNetPublish(project); - } - - /// - /// [deprecated] DotNetCorePublish is obsolete and will be removed in a future release. Use instead. - /// Publish all projects. - /// - /// The context. - /// The projects path. - /// The settings. - /// - /// - /// var settings = new DotNetCorePublishSettings - /// { - /// Framework = "netcoreapp3.1", - /// Configuration = "Release", - /// OutputDirectory = "./artifacts/" - /// }; - /// - /// DotNetCorePublish("./src/*", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Publish")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Publish")] - [Obsolete("DotNetCorePublish is obsolete and will be removed in a future release. Use DotNetPublish instead.")] - public static void DotNetCorePublish(this ICakeContext context, string project, DotNetCorePublishSettings settings) - { - context.DotNetPublish(project, settings); - } - - /// - /// [deprecated] DotNetCoreTest is obsolete and will be removed in a future release. Use instead. - /// Test project. - /// - /// The context. - /// - /// - /// DotNetCoreTest(); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Test")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Test")] - [Obsolete("DotNetCoreTest is obsolete and will be removed in a future release. Use DotNetTest instead.")] - public static void DotNetCoreTest(this ICakeContext context) - { - context.DotNetTest(); - } - - /// - /// [deprecated] DotNetCoreTest is obsolete and will be removed in a future release. Use instead. - /// Test project with path. - /// - /// The context. - /// The project path. - /// - /// Specify the path to the .csproj file in the test project. - /// - /// DotNetCoreTest("./test/Project.Tests/Project.Tests.csproj"); - /// - /// You could also specify a task that runs multiple test projects. - /// Cake task: - /// - /// Task("Test") - /// .Does(() => - /// { - /// var projectFiles = GetFiles("./test/**/*.csproj"); - /// foreach(var file in projectFiles) - /// { - /// DotNetCoreTest(file.FullPath); - /// } - /// }); - /// - /// If your test project is using project.json, the project parameter should just be the directory path. - /// - /// DotNetCoreTest("./test/Project.Tests/"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Test")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Test")] - [Obsolete("DotNetCoreTest is obsolete and will be removed in a future release. Use DotNetTest instead.")] - public static void DotNetCoreTest(this ICakeContext context, string project) - { - context.DotNetTest(project); - } - - /// - /// [deprecated] DotNetCoreTest is obsolete and will be removed in a future release. Use instead. - /// Test project with settings. - /// - /// The context. - /// The project path. - /// The settings. - /// - /// - /// var settings = new DotNetCoreTestSettings - /// { - /// Configuration = "Release" - /// }; - /// - /// DotNetCoreTest("./test/Project.Tests/Project.Tests.csproj", settings); - /// - /// You could also specify a task that runs multiple test projects. - /// Cake task: - /// - /// Task("Test") - /// .Does(() => - /// { - /// var settings = new DotNetCoreTestSettings - /// { - /// Configuration = "Release" - /// }; - /// - /// var projectFiles = GetFiles("./test/**/*.csproj"); - /// foreach(var file in projectFiles) - /// { - /// DotNetCoreTest(file.FullPath, settings); - /// } - /// }); - /// - /// If your test project is using project.json, the project parameter should just be the directory path. - /// - /// var settings = new DotNetCoreTestSettings - /// { - /// Configuration = "Release" - /// }; - /// - /// DotNetCoreTest("./test/Project.Tests/", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Test")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Test")] - [Obsolete("DotNetCoreTest is obsolete and will be removed in a future release. Use DotNetTest instead.")] - public static void DotNetCoreTest(this ICakeContext context, string project, DotNetCoreTestSettings settings) - { - context.DotNetTest(project, settings); - } - - /// - /// [deprecated] DotNetCoreTest is obsolete and will be removed in a future release. Use instead. - /// Test project with settings. - /// - /// The context. - /// The project path. - /// The arguments. - /// The settings. - /// - /// - /// var settings = new DotNetCoreTestSettings - /// { - /// Configuration = "Release" - /// }; - /// - /// DotNetCoreTest("./test/Project.Tests/Project.Tests.csproj", settings); - /// - /// You could also specify a task that runs multiple test projects. - /// Cake task: - /// - /// Task("Test") - /// .Does(() => - /// { - /// var settings = new DotNetCoreTestSettings - /// { - /// Configuration = "Release" - /// }; - /// - /// var projectFiles = GetFiles("./test/**/*.csproj"); - /// foreach(var file in projectFiles) - /// { - /// DotNetCoreTest(file.FullPath, "MSTest.MapInconclusiveToFailed=true", settings); - /// } - /// }); - /// - /// If your test project is using project.json, the project parameter should just be the directory path. - /// - /// var settings = new DotNetCoreTestSettings - /// { - /// Configuration = "Release" - /// }; - /// - /// DotNetCoreTest("./test/Project.Tests/", "MSTest.MapInconclusiveToFailed=true", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Test")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Test")] - [Obsolete("DotNetCoreTest is obsolete and will be removed in a future release. Use DotNetTest instead.")] - public static void DotNetCoreTest(this ICakeContext context, string project, ProcessArgumentBuilder arguments, DotNetCoreTestSettings settings) - { - context.DotNetTest(project, arguments, settings); - } - - /// - /// [deprecated] DotNetCoreClean is obsolete and will be removed in a future release. Use instead. - /// Cleans a project's output. - /// - /// The context. - /// The project's path. - /// - /// - /// DotNetCoreClean("./src/project"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Clean")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Clean")] - [Obsolete("DotNetCoreClean is obsolete and will be removed in a future release. Use DotNetClean instead.")] - public static void DotNetCoreClean(this ICakeContext context, string project) - { - context.DotNetClean(project); - } - - /// - /// [deprecated] DotNetCoreClean is obsolete and will be removed in a future release. Use instead. - /// Cleans a project's output. - /// - /// The context. - /// The projects path. - /// The settings. - /// - /// - /// var settings = new DotNetCoreCleanSettings - /// { - /// Framework = "netcoreapp3.1", - /// Configuration = "Debug", - /// OutputDirectory = "./artifacts/" - /// }; - /// - /// DotNetCoreClean("./src/project", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Clean")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Clean")] - [Obsolete("DotNetCoreClean is obsolete and will be removed in a future release. Use DotNetClean instead.")] - public static void DotNetCoreClean(this ICakeContext context, string project, DotNetCoreCleanSettings settings) - { - context.DotNetClean(project, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use instead. - /// Delete a NuGet Package from a server. - /// - /// The context. - /// - /// - /// DotNetCoreNuGetDelete(); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Delete")] - [Obsolete("DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use DotNetNuGetDelete instead.")] - public static void DotNetCoreNuGetDelete(this ICakeContext context) - { - context.DotNetNuGetDelete(); - } - - /// - /// [deprecated] DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use instead. - /// Deletes a package from nuget.org. - /// - /// The context. - /// Name of package to delete. - /// - /// - /// DotNetCoreNuGetDelete("Microsoft.AspNetCore.Mvc"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Delete")] - [Obsolete("DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use DotNetNuGetDelete instead.")] - public static void DotNetCoreNuGetDelete(this ICakeContext context, string packageName) - { - context.DotNetNuGetDelete(packageName); - } - - /// - /// [deprecated] DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use instead. - /// Deletes a specific version of a package from nuget.org. - /// - /// The context. - /// Name of package to delete. - /// Version of package to delete. - /// - /// - /// DotNetCoreRestore("Microsoft.AspNetCore.Mvc", "1.0"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Delete")] - [Obsolete("DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use DotNetNuGetDelete instead.")] - public static void DotNetCoreNuGetDelete(this ICakeContext context, string packageName, string packageVersion) - { - context.DotNetNuGetDelete(packageName, packageVersion); - } - - /// - /// [deprecated] DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use instead. - /// Deletes a package from a server. - /// - /// The context. - /// Name of package to delete. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetDeleteSettings - /// { - /// Source = "https://www.example.com/nugetfeed", - /// NonInteractive = true - /// }; - /// - /// DotNetCoreNuGetDelete("Microsoft.AspNetCore.Mvc", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Delete")] - [Obsolete("DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use DotNetNuGetDelete instead.")] - public static void DotNetCoreNuGetDelete(this ICakeContext context, string packageName, DotNetCoreNuGetDeleteSettings settings) - { - context.DotNetNuGetDelete(packageName, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use instead. - /// Deletes a package from a server using the specified settings. - /// - /// The context. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetDeleteSettings - /// { - /// Source = "https://www.example.com/nugetfeed", - /// NonInteractive = true - /// }; - /// - /// DotNetCoreNuGetDelete(settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Delete")] - [Obsolete("DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use DotNetNuGetDelete instead.")] - public static void DotNetCoreNuGetDelete(this ICakeContext context, DotNetCoreNuGetDeleteSettings settings) - { - context.DotNetNuGetDelete(settings); - } - - /// - /// [deprecated] DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use instead. - /// Deletes a package from a server using the specified settings. - /// - /// The context. - /// Name of package to delete. - /// Version of package to delete. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetDeleteSettings - /// { - /// Source = "https://www.example.com/nugetfeed", - /// NonInteractive = true - /// }; - /// - /// DotNetCoreNuGetDelete("Microsoft.AspNetCore.Mvc", "1.0", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Delete")] - [Obsolete("DotNetCoreNuGetDelete is obsolete and will be removed in a future release. Use DotNetNuGetDelete instead.")] - public static void DotNetCoreNuGetDelete(this ICakeContext context, string packageName, string packageVersion, DotNetCoreNuGetDeleteSettings settings) - { - context.DotNetNuGetDelete(packageName, packageVersion, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetPush is obsolete and will be removed in a future release. Use instead. - /// Pushes one or more packages to a server. - /// - /// The context. - /// of the package to push. - /// - /// - /// // With FilePath instance - /// var packageFilePath = GetFiles("*.nupkg").Single(); - /// DotNetCoreNuGetPush(packageFilePath); - /// // With string parameter - /// DotNetCoreNuGetPush("foo*.nupkg"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Push")] - [Obsolete("DotNetCoreNuGetPush is obsolete and will be removed in a future release. Use DotNetNuGetPush instead.")] - public static void DotNetCoreNuGetPush(this ICakeContext context, FilePath packageFilePath) - { - context.DotNetNuGetPush(packageFilePath); - } - - /// - /// [deprecated] DotNetCoreNuGetPush is obsolete and will be removed in a future release. Use instead. - /// Pushes one or more packages to a server using the specified settings. - /// - /// The context. - /// of the package to push. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetPushSettings - /// { - /// Source = "https://www.example.com/nugetfeed", - /// ApiKey = "4003d786-cc37-4004-bfdf-c4f3e8ef9b3a" - /// }; - /// // With FilePath instance - /// var packageFilePath = GetFiles("foo*.nupkg").Single(); - /// DotNetCoreNuGetPush(packageFilePath); - /// // With string parameter - /// DotNetCoreNuGetPush("foo*.nupkg", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Push")] - [Obsolete("DotNetCoreNuGetPush is obsolete and will be removed in a future release. Use DotNetNuGetPush instead.")] - public static void DotNetCoreNuGetPush(this ICakeContext context, FilePath packageFilePath, DotNetCoreNuGetPushSettings settings) - { - context.DotNetNuGetPush(packageFilePath, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetAddSource is obsolete and will be removed in a future release. Use instead. - /// Add the specified NuGet source. - /// - /// The context. - /// The name of the source. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetSourceSettings - /// { - /// Source = "https://www.example.com/nugetfeed", - /// UserName = "username", - /// Password = "password", - /// StorePasswordInClearText = true, - /// ValidAuthenticationTypes = "basic,negotiate" - /// }; - /// - /// DotNetCoreNuGetAddSource("example", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetAddSource is obsolete and will be removed in a future release. Use DotNetNuGetAddSource instead.")] - public static void DotNetCoreNuGetAddSource(this ICakeContext context, string name, DotNetCoreNuGetSourceSettings settings) - { - context.DotNetNuGetAddSource(name, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetDisableSource is obsolete and will be removed in a future release. Use instead. - /// Disable the specified NuGet source. - /// - /// The context. - /// The name of the source. - /// - /// - /// DotNetCoreNuGetDisableSource("example"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetDisableSource is obsolete and will be removed in a future release. Use DotNetNuGetDisableSource instead.")] - public static void DotNetCoreNuGetDisableSource(this ICakeContext context, string name) - { - context.DotNetNuGetDisableSource(name); - } - - /// - /// [deprecated] DotNetCoreNuGetDisableSource is obsolete and will be removed in a future release. Use instead. - /// Disable the specified NuGet source. - /// - /// The context. - /// The name of the source. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetSourceSettings - /// { - /// ConfigFile = "NuGet.config" - /// }; - /// - /// DotNetCoreNuGetDisableSource("example", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetDisableSource is obsolete and will be removed in a future release. Use DotNetNuGetDisableSource instead.")] - public static void DotNetCoreNuGetDisableSource(this ICakeContext context, string name, DotNetCoreNuGetSourceSettings settings) - { - context.DotNetNuGetDisableSource(name, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetEnableSource is obsolete and will be removed in a future release. Use instead. - /// Enable the specified NuGet source. - /// - /// The context. - /// The name of the source. - /// - /// - /// DotNetCoreNuGetEnableSource("example"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetEnableSource is obsolete and will be removed in a future release. Use DotNetNuGetEnableSource instead.")] - public static void DotNetCoreNuGetEnableSource(this ICakeContext context, string name) - { - context.DotNetNuGetEnableSource(name); - } - - /// - /// [deprecated] DotNetCoreNuGetEnableSource is obsolete and will be removed in a future release. Use instead. - /// Enable the specified NuGet source. - /// - /// The context. - /// The name of the source. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetSourceSettings - /// { - /// ConfigFile = "NuGet.config" - /// }; - /// - /// DotNetCoreNuGetEnableSource("example", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetEnableSource is obsolete and will be removed in a future release. Use DotNetNuGetEnableSource instead.")] - public static void DotNetCoreNuGetEnableSource(this ICakeContext context, string name, DotNetCoreNuGetSourceSettings settings) - { - context.DotNetNuGetEnableSource(name, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetHasSource is obsolete and will be removed in a future release. Use instead. - /// Determines whether the specified NuGet source exists. - /// - /// The context. - /// The name of the source. - /// Whether the specified NuGet source exists. - /// - /// - /// var exists = DotNetCoreNuGetHasSource("example"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetHasSource is obsolete and will be removed in a future release. Use DotNetNuGetHasSource instead.")] - public static bool DotNetCoreNuGetHasSource(this ICakeContext context, string name) - { - return context.DotNetNuGetHasSource(name); - } - - /// - /// [deprecated] DotNetCoreNuGetHasSource is obsolete and will be removed in a future release. Use instead. - /// Determines whether the specified NuGet source exists. - /// - /// The context. - /// The name of the source. - /// The settings. - /// Whether the specified NuGet source exists. - /// - /// - /// var settings = new DotNetCoreNuGetSourceSettings - /// { - /// ConfigFile = "NuGet.config" - /// }; - /// - /// var exists = DotNetCoreNuGetHasSource("example", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetHasSource is obsolete and will be removed in a future release. Use DotNetNuGetHasSource instead.")] - public static bool DotNetCoreNuGetHasSource(this ICakeContext context, string name, DotNetCoreNuGetSourceSettings settings) - { - return context.DotNetNuGetHasSource(name, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetRemoveSource is obsolete and will be removed in a future release. Use instead. - /// Remove the specified NuGet source. - /// - /// The context. - /// The name of the source. - /// - /// - /// DotNetCoreNuGetRemoveSource("example"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetRemoveSource is obsolete and will be removed in a future release. Use DotNetNuGetRemoveSource instead.")] - public static void DotNetCoreNuGetRemoveSource(this ICakeContext context, string name) - { - context.DotNetNuGetRemoveSource(name); - } - - /// - /// [deprecated] DotNetCoreNuGetRemoveSource is obsolete and will be removed in a future release. Use instead. - /// Remove the specified NuGet source. - /// - /// The context. - /// The name of the source. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetSourceSettings - /// { - /// ConfigFile = "NuGet.config" - /// }; - /// - /// DotNetCoreNuGetRemoveSource("example", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetRemoveSource is obsolete and will be removed in a future release. Use DotNetNuGetRemoveSource instead.")] - public static void DotNetCoreNuGetRemoveSource(this ICakeContext context, string name, DotNetCoreNuGetSourceSettings settings) - { - context.DotNetNuGetRemoveSource(name, settings); - } - - /// - /// [deprecated] DotNetCoreNuGetUpdateSource is obsolete and will be removed in a future release. Use instead. - /// Update the specified NuGet source. - /// - /// The context. - /// The name of the source. - /// The settings. - /// - /// - /// var settings = new DotNetCoreNuGetSourceSettings - /// { - /// Source = "https://www.example.com/nugetfeed", - /// UserName = "username", - /// Password = "password", - /// StorePasswordInClearText = true, - /// ValidAuthenticationTypes = "basic,negotiate" - /// }; - /// - /// DotNetCoreNuGetUpdateSource("example", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("NuGet")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.NuGet.Source")] - [Obsolete("DotNetCoreNuGetUpdateSource is obsolete and will be removed in a future release. Use DotNetNuGetUpdateSource instead.")] - public static void DotNetCoreNuGetUpdateSource(this ICakeContext context, string name, DotNetCoreNuGetSourceSettings settings) - { - context.DotNetNuGetUpdateSource(name, settings); - } - - /// - /// [deprecated] DotNetCoreMSBuild is obsolete and will be removed in a future release. Use instead. - /// Builds the specified targets in a project file found in the current working directory. - /// - /// The context. - /// - /// - /// DotNetCoreMSBuild(); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("MSBuild")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.MSBuild")] - [Obsolete("DotNetCoreMSBuild is obsolete and will be removed in a future release. Use DotNetMSBuild instead.")] - public static void DotNetCoreMSBuild(this ICakeContext context) - { - context.DotNetMSBuild(); - } - - /// - /// [deprecated] DotNetCoreMSBuild is obsolete and will be removed in a future release. Use instead. - /// Builds the specified targets in the project file. - /// - /// The context. - /// Project file or directory to search for project file. - /// - /// - /// DotNetCoreMSBuild("foobar.proj"); - /// - /// - /// - /// If a directory is specified, MSBuild searches that directory for a project file. - /// - [CakeMethodAlias] - [CakeAliasCategory("MSBuild")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.MSBuild")] - [Obsolete("DotNetCoreMSBuild is obsolete and will be removed in a future release. Use DotNetMSBuild instead.")] - public static void DotNetCoreMSBuild(this ICakeContext context, string projectOrDirectory) - { - context.DotNetMSBuild(projectOrDirectory); - } - - /// - /// [deprecated] DotNetCoreMSBuild is obsolete and will be removed in a future release. Use instead. - /// Builds the specified targets in a project file found in the current working directory. - /// - /// The context. - /// The settings. - /// - /// - /// var settings = new DotNetCoreMSBuildSettings - /// { - /// NoLogo = true, - /// MaxCpuCount = -1 - /// }; - /// - /// DotNetCoreMSBuild(settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("MSBuild")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.MSBuild")] - [Obsolete("DotNetCoreMSBuild is obsolete and will be removed in a future release. Use DotNetMSBuild instead.")] - public static void DotNetCoreMSBuild(this ICakeContext context, DotNetCoreMSBuildSettings settings) - { - context.DotNetMSBuild(settings); - } - - /// - /// [deprecated] DotNetCoreMSBuild is obsolete and will be removed in a future release. Use instead. - /// Builds the specified targets in the project file. - /// - /// The context. - /// Project file or directory to search for project file. - /// The settings. - /// - /// - /// var settings = new DotNetCoreMSBuildSettings - /// { - /// NoLogo = true, - /// MaxCpuCount = -1 - /// }; - /// - /// DotNetCoreMSBuild("foobar.proj", settings); - /// - /// - /// - /// If a project file is not specified, MSBuild searches the current working directory for a file that has a file - /// extension that ends in "proj" and uses that file. If a directory is specified, MSBuild searches that directory for a project file. - /// - [CakeMethodAlias] - [CakeAliasCategory("MSBuild")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.MSBuild")] - [Obsolete("DotNetCoreMSBuild is obsolete and will be removed in a future release. Use DotNetMSBuild instead.")] - public static void DotNetCoreMSBuild(this ICakeContext context, string projectOrDirectory, DotNetCoreMSBuildSettings settings) - { - context.DotNetMSBuild(projectOrDirectory, settings); - } - - /// - /// [deprecated] DotNetCoreVSTest is obsolete and will be removed in a future release. Use instead. - /// Test one or more projects specified by a path or glob pattern using the VS Test host runner. - /// - /// The context. - /// A path to the test file or glob for one or more test files. - /// - /// Specify the path to the .csproj file in the test project. - /// - /// DotNetCoreVSTest("./test/Project.Tests/bin/Release/netcoreapp2.1/Project.Tests.dll"); - /// - /// You could also specify a glob pattern to run multiple test projects. - /// - /// DotNetCoreVSTest("./**/bin/Release/netcoreapp2.1/*.Tests.dll"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Test")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.VSTest")] - [Obsolete("DotNetCoreVSTest is obsolete and will be removed in a future release. Use DotNetVSTest instead.")] - public static void DotNetCoreVSTest(this ICakeContext context, GlobPattern testFile) => context.DotNetVSTest(testFile); - - /// - /// [deprecated] DotNetCoreVSTest is obsolete and will be removed in a future release. Use instead. - /// Test one or more projects specified by a path or glob pattern with settings using the VS Test host runner. - /// - /// The context. - /// A path to the test file or glob for one or more test files. - /// The settings. - /// - /// Specify the path to the .csproj file in the test project. - /// - /// var settings = new DotNetCoreVSTestSettings - /// { - /// Framework = "FrameworkCore10", - /// Platform = "x64" - /// }; - /// - /// DotNetCoreTest("./test/Project.Tests/bin/Release/netcoreapp2.1/Project.Tests.dll", settings); - /// - /// You could also specify a glob pattern to run multiple test projects. - /// - /// var settings = new DotNetCoreVSTestSettings - /// { - /// Framework = "FrameworkCore10", - /// Platform = "x64", - /// Parallel = true - /// }; - /// - /// DotNetCoreVSTest("./**/bin/Release/netcoreapp2.1/*.Tests.dll", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Test")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.VSTest")] - [Obsolete("DotNetCoreVSTest is obsolete and will be removed in a future release. Use DotNetVSTest instead.")] - public static void DotNetCoreVSTest(this ICakeContext context, GlobPattern testFile, DotNetCoreVSTestSettings settings) - { - context.DotNetVSTest(testFile, settings); - } - - /// - /// [deprecated] DotNetCoreVSTest is obsolete and will be removed in a future release. Use instead. - /// Test one or more specified projects with settings using the VS Test host runner. - /// - /// The context. - /// The project paths to test. - /// The settings. - /// - /// - /// var settings = new DotNetCoreVSTestSettings - /// { - /// Framework = "FrameworkCore10", - /// Platform = "x64" - /// }; - /// - /// DotNetCoreVSTest(new[] { (FilePath)"./test/Project.Tests/bin/Release/netcoreapp2.1/Project.Tests.dll" }, settings); - /// - /// You could also specify a task that runs multiple test projects. - /// Cake task: - /// - /// Task("Test") - /// .Does(() => - /// { - /// var settings = new DotNetCoreVSTestSettings - /// { - /// Framework = "FrameworkCore10", - /// Platform = "x64", - /// Parallel = true - /// }; - /// - /// var testFiles = GetFiles("./test/**/bin/Release/netcoreapp2.1/*.Test.dll"); - /// - /// DotNetCoreVSTest(testFiles, settings); - /// }); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Test")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.VSTest")] - [Obsolete("DotNetCoreVSTest is obsolete and will be removed in a future release. Use DotNetVSTest instead.")] - public static void DotNetCoreVSTest(this ICakeContext context, IEnumerable testFiles, DotNetCoreVSTestSettings settings) - { - context.DotNetVSTest(testFiles, settings); - } - - /// - /// [deprecated] DotNetCoreTool is obsolete and will be removed in a future release. Use instead. - /// Execute an .NET Core Extensibility Tool. - /// - /// The context. - /// The command to execute. - /// - /// - /// DotNetCoreTool("cake"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Tool")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Tool")] - [Obsolete("DotNetCoreTool is obsolete and will be removed in a future release. Use DotNetTool instead.")] - public static void DotNetCoreTool(this ICakeContext context, string command) - { - context.DotNetTool(command); - } - - /// - /// [deprecated] DotNetCoreTool is obsolete and will be removed in a future release. Use instead. - /// Execute an .NET Core Extensibility Tool. - /// - /// The context. - /// The command to execute. - /// The settings. - /// - /// - /// var settings = new DotNetCoreToolSettings - /// { - /// DiagnosticOutput = true - /// }; - /// - /// DotNetCoreTool("cake", settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Tool")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Tool")] - [Obsolete("DotNetCoreTool is obsolete and will be removed in a future release. Use DotNetTool instead.")] - public static void DotNetCoreTool(this ICakeContext context, string command, DotNetCoreToolSettings settings) - { - context.DotNetTool(command, settings); - } - - /// - /// [deprecated] DotNetCoreTool is obsolete and will be removed in a future release. Use instead. - /// Execute an .NET Core Extensibility Tool. - /// - /// The context. - /// The project path. - /// The command to execute. - /// - /// - /// DotNetCoreTool("./src/project", "xunit", "-xml report.xml"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Tool")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Tool")] - [Obsolete("DotNetCoreTool is obsolete and will be removed in a future release. Use DotNetTool instead.")] - public static void DotNetCoreTool(this ICakeContext context, FilePath projectPath, string command) - { - context.DotNetTool(projectPath, command); - } - - /// - /// [deprecated] DotNetCoreTool is obsolete and will be removed in a future release. Use instead. - /// Execute an .NET Core Extensibility Tool. - /// - /// The context. - /// The project path. - /// The command to execute. - /// The arguments. - /// - /// - /// DotNetCoreTool("./src/project", "xunit", "-xml report.xml"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Tool")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Tool")] - [Obsolete("DotNetCoreTool is obsolete and will be removed in a future release. Use DotNetTool instead.")] - public static void DotNetCoreTool(this ICakeContext context, FilePath projectPath, string command, ProcessArgumentBuilder arguments) - { - context.DotNetTool(projectPath, command, arguments); - } - - /// - /// [deprecated] DotNetCoreTool is obsolete and will be removed in a future release. Use instead. - /// Execute an .NET Core Extensibility Tool. - /// - /// The context. - /// The project path. - /// The command to execute. - /// The arguments. - /// The settings. - /// - /// - /// DotNetCoreTool("./src/project", "xunit", "-xml report.xml"); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Tool")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.Tool")] - [Obsolete("DotNetCoreTool is obsolete and will be removed in a future release. Use DotNetTool instead.")] - public static void DotNetCoreTool(this ICakeContext context, FilePath projectPath, string command, ProcessArgumentBuilder arguments, DotNetCoreToolSettings settings) - { - context.DotNetTool(projectPath, command, arguments, settings); - } - - /// - /// [deprecated] DotNetCoreBuildServerShutdown is obsolete and will be removed in a future release. Use instead. - /// Shuts down build servers that are started from dotnet. - /// - /// The context. - /// - /// - /// DotNetCoreBuildServerShutdown(); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Build Server")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.BuildServer")] - [Obsolete("DotNetCoreBuildServerShutdown is obsolete and will be removed in a future release. Use DotNetBuildServerShutdown instead.")] - public static void DotNetCoreBuildServerShutdown(this ICakeContext context) - { - context.DotNetBuildServerShutdown(); - } - - /// - /// [deprecated] DotNetCoreBuildServerShutdown is obsolete and will be removed in a future release. Use instead. - /// Shuts down build servers that are started from dotnet. - /// - /// The context. - /// The settings. - /// - /// - /// var settings = new DotNetCoreBuildServerSettings - /// { - /// MSBuild = true - /// }; - /// - /// DotNetCoreBuildServerShutdown(settings); - /// - /// - [CakeMethodAlias] - [CakeAliasCategory("Build Server")] - [CakeNamespaceImport("Cake.Common.Tools.DotNetCore.BuildServer")] - [Obsolete("DotNetCoreBuildServerShutdown is obsolete and will be removed in a future release. Use DotNetBuildServerShutdown instead.")] - public static void DotNetCoreBuildServerShutdown(this ICakeContext context, DotNetCoreBuildServerSettings settings) - { - context.DotNetBuildServerShutdown(settings); - } - } -} \ No newline at end of file diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreRollForward.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreRollForward.cs deleted file mode 100644 index 18945d69a6..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/DotNetCoreRollForward.cs +++ /dev/null @@ -1,308 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.ComponentModel; -using Cake.Common.Tools.DotNet; - -namespace Cake.Common.Tools.DotNetCore -{ - /// - /// Contains the roll forward policy to be used. - /// - [TypeConverter(typeof(DotNetCoreRollForwardConverter))] - public sealed class DotNetCoreRollForward : IEquatable, IComparable, IConvertible, IFormattable - { - private readonly DotNetRollForward _value; - - /// - /// Initializes a new instance of the class. - /// - public DotNetCoreRollForward() - { - _value = default; - } - - internal DotNetCoreRollForward(string stringValue) - { - _value = (DotNetRollForward)Enum.Parse(typeof(DotNetRollForward), stringValue); - } - - private DotNetCoreRollForward(DotNetRollForward value) - { - _value = value; - } - - /// - /// Roll forward to the lowest higher minor version, if requested minor version is missing. - /// - public static readonly DotNetCoreRollForward Minor = new DotNetCoreRollForward(DotNetRollForward.Minor); - - /// - /// Roll forward to the highest patch version. This disables minor version roll forward. - /// - public static readonly DotNetCoreRollForward LatestPatch = new DotNetCoreRollForward(DotNetRollForward.LatestPatch); - - /// - /// Roll forward to lowest higher major version, and lowest minor version, if requested major version is missing. - /// - public static readonly DotNetCoreRollForward Major = new DotNetCoreRollForward(DotNetRollForward.Major); - - /// - /// Roll forward to highest minor version, even if requested minor version is present. - /// - public static readonly DotNetCoreRollForward LatestMinor = new DotNetCoreRollForward(DotNetRollForward.LatestMinor); - - /// - /// Roll forward to highest major and highest minor version, even if requested major is present. - /// - public static readonly DotNetCoreRollForward LatestMajor = new DotNetCoreRollForward(DotNetRollForward.LatestMajor); - - /// - /// Don't roll forward. Only bind to specified version. - /// - public static readonly DotNetCoreRollForward Disable = new DotNetCoreRollForward(DotNetRollForward.Disable); - - /// - /// Explicitly converts to . - /// - /// The . - public static explicit operator int(DotNetCoreRollForward rollForward) - { - return (int)rollForward._value; - } - - /// - /// Implicitly converts to . - /// - /// The . - public static implicit operator DotNetRollForward(DotNetCoreRollForward rollForward) - { - return rollForward._value; - } - - /// - /// Implicitly converts to . - /// - /// The . - public static implicit operator DotNetCoreRollForward(DotNetRollForward rollForward) - { - return rollForward switch - { - DotNetRollForward.Minor => Minor, - DotNetRollForward.LatestPatch => LatestPatch, - DotNetRollForward.Major => Major, - DotNetRollForward.LatestMinor => LatestMinor, - DotNetRollForward.LatestMajor => LatestMajor, - DotNetRollForward.Disable => Disable, - _ => new DotNetCoreRollForward(rollForward), - }; - } - - /// - /// Determines whether the specified object is equal to the current object. - /// - /// The object to compare with the right-hand side object. - /// The object to compare with the left-hand side object. - /// if the specified object is equal to the current object; otherwise, . - public static bool operator ==(DotNetCoreRollForward left, DotNetCoreRollForward right) - { - return left.Equals(right); - } - - /// - /// Determines whether the specified object is not equal to the current object. - /// - /// The object to compare with the right-hand side object. - /// The object to compare with the left-hand side object. - /// if the specified object is not equal to the current object; otherwise, . - public static bool operator !=(DotNetCoreRollForward left, DotNetCoreRollForward right) - { - return !(left == right); - } - - /// - public override string ToString() - { - return _value.ToString(); - } - - /// - public override int GetHashCode() - { - return _value.GetHashCode(); - } - - /// - public override bool Equals(object obj) - { - if (obj is null) - { - return false; - } - - if (!(obj is DotNetCoreRollForward)) - { - return false; - } - - return Equals((DotNetCoreRollForward)obj); - } - - /// - public bool Equals(DotNetCoreRollForward other) - { - return _value.Equals(other._value); - } - - /// - /// Determines whether one or more bit fields are set in the current instance. - /// - /// An enumeration value. - /// - /// if the bit field or bit fields that are set in flag are also set in the - /// current instance; otherwise, . - /// - public bool HasFlag(DotNetCoreRollForward flag) - { - return _value.HasFlag(flag._value); - } - - /// - /// Determines whether one or more bit fields are set in the current instance. - /// - /// An enumeration value. - /// - /// if the bit field or bit fields that are set in flag are also set in the - /// current instance; otherwise, . - /// - public bool HasFlag(Enum flag) - { - return _value.HasFlag(flag); - } - - /// - public int CompareTo(object obj) - { - return _value.CompareTo(obj); - } - - /// - public TypeCode GetTypeCode() - { - return Convert.GetTypeCode(_value); - } - - /// - bool IConvertible.ToBoolean(IFormatProvider provider) - { - return Convert.ToBoolean(_value, provider); - } - - /// - byte IConvertible.ToByte(IFormatProvider provider) - { - return Convert.ToByte(_value, provider); - } - - /// - char IConvertible.ToChar(IFormatProvider provider) - { - return Convert.ToChar(_value, provider); - } - - /// - DateTime IConvertible.ToDateTime(IFormatProvider provider) - { - return Convert.ToDateTime(_value, provider); - } - - /// - decimal IConvertible.ToDecimal(IFormatProvider provider) - { - return Convert.ToDecimal(_value, provider); - } - - /// - double IConvertible.ToDouble(IFormatProvider provider) - { - return Convert.ToDouble(_value, provider); - } - - /// - short IConvertible.ToInt16(IFormatProvider provider) - { - return Convert.ToInt16(_value, provider); - } - - /// - int IConvertible.ToInt32(IFormatProvider provider) - { - return Convert.ToInt32(_value, provider); - } - - /// - long IConvertible.ToInt64(IFormatProvider provider) - { - return Convert.ToInt64(_value, provider); - } - - /// -#pragma warning disable CS3002 // Return type is not CLS-compliant - sbyte IConvertible.ToSByte(IFormatProvider provider) -#pragma warning restore CS3002 // Return type is not CLS-compliant - { - return Convert.ToSByte(_value, provider); - } - - /// - float IConvertible.ToSingle(IFormatProvider provider) - { - return Convert.ToSingle(_value, provider); - } - - /// - string IConvertible.ToString(IFormatProvider provider) - { - return Convert.ToString(_value, provider); - } - - /// - object IConvertible.ToType(Type conversionType, IFormatProvider provider) - { - return Convert.ChangeType(_value, conversionType, provider); - } - - /// -#pragma warning disable CS3002 // Return type is not CLS-compliant - ushort IConvertible.ToUInt16(IFormatProvider provider) -#pragma warning restore CS3002 // Return type is not CLS-compliant - { - return Convert.ToUInt16(_value, provider); - } - - /// -#pragma warning disable CS3002 // Return type is not CLS-compliant - uint IConvertible.ToUInt32(IFormatProvider provider) -#pragma warning restore CS3002 // Return type is not CLS-compliant - { - return Convert.ToUInt32(_value, provider); - } - - /// -#pragma warning disable CS3002 // Return type is not CLS-compliant - ulong IConvertible.ToUInt64(IFormatProvider provider) -#pragma warning restore CS3002 // Return type is not CLS-compliant - { - return Convert.ToUInt64(_value, provider); - } - - /// - [Obsolete("The provider argument is not used. Please use ToString(String).")] - public string ToString(string format, IFormatProvider formatProvider) - { - return _value.ToString(format, formatProvider); - } - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreRollForwardConverter.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreRollForwardConverter.cs deleted file mode 100644 index 9063195e46..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/DotNetCoreRollForwardConverter.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.ComponentModel; -using System.Globalization; - -namespace Cake.Common.Tools.DotNetCore -{ - /// - /// A type converter for . - /// - public class DotNetCoreRollForwardConverter : TypeConverter - { - /// - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType); - } - - /// - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - if (value is string stringValue) - { - return new DotNetCoreRollForward(stringValue); - } - - return base.ConvertFrom(context, culture, value); - } - - /// - public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) - { - return destinationType == typeof(DotNetCoreRollForward) || base.CanConvertTo(context, destinationType); - } - - /// - public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) - { - if (destinationType == typeof(string) && value is DotNetCoreRollForward dotNetRollForwardValue) - { - return dotNetRollForwardValue.ToString(); - } - - return base.ConvertTo(context, culture, value, destinationType); - } - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreSettings.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreSettings.cs deleted file mode 100644 index e1c9cc61bc..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/DotNetCoreSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet; - -namespace Cake.Common.Tools.DotNetCore -{ - /// - /// Contains common settings used by . - /// - public abstract class DotNetCoreSettings : DotNetSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreTool.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreTool.cs deleted file mode 100644 index da15b30cbe..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/DotNetCoreTool.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet; -using Cake.Core; -using Cake.Core.IO; -using Cake.Core.Tooling; - -namespace Cake.Common.Tools.DotNetCore -{ - /// - /// Base class for all .NET Core related tools. - /// - /// The settings type. - public abstract class DotNetCoreTool : DotNetTool - where TSettings : DotNetSettings - { - /// - /// Initializes a new instance of the class. - /// - /// The file system. - /// The environment. - /// The process runner. - /// The tool locator. - protected DotNetCoreTool( - IFileSystem fileSystem, - ICakeEnvironment environment, - IProcessRunner processRunner, - IToolLocator tools) - : base(fileSystem, environment, processRunner, tools) - { - } - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreVerbosity.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreVerbosity.cs deleted file mode 100644 index 57b0ec9df3..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/DotNetCoreVerbosity.cs +++ /dev/null @@ -1,302 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.ComponentModel; -using Cake.Common.Tools.DotNet; - -namespace Cake.Common.Tools.DotNetCore -{ - /// - /// Contains the verbosity of logging to use. - /// - [TypeConverter(typeof(DotNetCoreVerbosityConverter))] - public sealed class DotNetCoreVerbosity : IEquatable, IComparable, IConvertible, IFormattable - { - private readonly DotNetVerbosity _value; - - /// - /// Initializes a new instance of the class. - /// - public DotNetCoreVerbosity() - { - _value = default; - } - - internal DotNetCoreVerbosity(string stringValue) - { - _value = (DotNetVerbosity)Enum.Parse(typeof(DotNetVerbosity), stringValue); - } - - private DotNetCoreVerbosity(DotNetVerbosity value) - { - _value = value; - } - - /// - /// Quiet level. - /// - public static readonly DotNetCoreVerbosity Quiet = new DotNetCoreVerbosity(DotNetVerbosity.Quiet); - - /// - /// Minimal level. - /// - public static readonly DotNetCoreVerbosity Minimal = new DotNetCoreVerbosity(DotNetVerbosity.Minimal); - - /// - /// Normal level. - /// - public static readonly DotNetCoreVerbosity Normal = new DotNetCoreVerbosity(DotNetVerbosity.Normal); - - /// - /// Detailed level. - /// - public static readonly DotNetCoreVerbosity Detailed = new DotNetCoreVerbosity(DotNetVerbosity.Detailed); - - /// - /// Diagnostic level. - /// - public static readonly DotNetCoreVerbosity Diagnostic = new DotNetCoreVerbosity(DotNetVerbosity.Diagnostic); - - /// - /// Explicitly converts to . - /// - /// The . - public static explicit operator int(DotNetCoreVerbosity verbosity) - { - return (int)verbosity._value; - } - - /// - /// Implicitly converts to . - /// - /// The . - public static implicit operator DotNetVerbosity(DotNetCoreVerbosity verbosity) - { - return verbosity._value; - } - - /// - /// Implicitly converts to . - /// - /// The . - public static implicit operator DotNetCoreVerbosity(DotNetVerbosity verbosity) - { - return verbosity switch - { - DotNetVerbosity.Quiet => Quiet, - DotNetVerbosity.Minimal => Minimal, - DotNetVerbosity.Normal => Normal, - DotNetVerbosity.Detailed => Detailed, - DotNetVerbosity.Diagnostic => Diagnostic, - _ => new DotNetCoreVerbosity(verbosity), - }; - } - - /// - /// Determines whether the specified object is equal to the current object. - /// - /// The object to compare with the right-hand side object. - /// The object to compare with the left-hand side object. - /// if the specified object is equal to the current object; otherwise, . - public static bool operator ==(DotNetCoreVerbosity left, DotNetCoreVerbosity right) - { - return left.Equals(right); - } - - /// - /// Determines whether the specified object is not equal to the current object. - /// - /// The object to compare with the right-hand side object. - /// The object to compare with the left-hand side object. - /// if the specified object is not equal to the current object; otherwise, . - public static bool operator !=(DotNetCoreVerbosity left, DotNetCoreVerbosity right) - { - return !(left == right); - } - - /// - public override string ToString() - { - return _value.ToString(); - } - - /// - public override int GetHashCode() - { - return _value.GetHashCode(); - } - - /// - public override bool Equals(object obj) - { - if (obj is null) - { - return false; - } - - if (!(obj is DotNetCoreVerbosity)) - { - return false; - } - - return Equals((DotNetCoreVerbosity)obj); - } - - /// - public bool Equals(DotNetCoreVerbosity other) - { - return _value.Equals(other._value); - } - - /// - /// Determines whether one or more bit fields are set in the current instance. - /// - /// An enumeration value. - /// - /// if the bit field or bit fields that are set in flag are also set in the - /// current instance; otherwise, . - /// - public bool HasFlag(DotNetCoreVerbosity flag) - { - return _value.HasFlag(flag._value); - } - - /// - /// Determines whether one or more bit fields are set in the current instance. - /// - /// An enumeration value. - /// - /// if the bit field or bit fields that are set in flag are also set in the - /// current instance; otherwise, . - /// - public bool HasFlag(Enum flag) - { - return _value.HasFlag(flag); - } - - /// - public int CompareTo(object obj) - { - return _value.CompareTo(obj); - } - - /// - public TypeCode GetTypeCode() - { - return Convert.GetTypeCode(_value); - } - - /// - bool IConvertible.ToBoolean(IFormatProvider provider) - { - return Convert.ToBoolean(_value, provider); - } - - /// - byte IConvertible.ToByte(IFormatProvider provider) - { - return Convert.ToByte(_value, provider); - } - - /// - char IConvertible.ToChar(IFormatProvider provider) - { - return Convert.ToChar(_value, provider); - } - - /// - DateTime IConvertible.ToDateTime(IFormatProvider provider) - { - return Convert.ToDateTime(_value, provider); - } - - /// - decimal IConvertible.ToDecimal(IFormatProvider provider) - { - return Convert.ToDecimal(_value, provider); - } - - /// - double IConvertible.ToDouble(IFormatProvider provider) - { - return Convert.ToDouble(_value, provider); - } - - /// - short IConvertible.ToInt16(IFormatProvider provider) - { - return Convert.ToInt16(_value, provider); - } - - /// - int IConvertible.ToInt32(IFormatProvider provider) - { - return Convert.ToInt32(_value, provider); - } - - /// - long IConvertible.ToInt64(IFormatProvider provider) - { - return Convert.ToInt64(_value, provider); - } - - /// -#pragma warning disable CS3002 // Return type is not CLS-compliant - sbyte IConvertible.ToSByte(IFormatProvider provider) -#pragma warning restore CS3002 // Return type is not CLS-compliant - { - return Convert.ToSByte(_value, provider); - } - - /// - float IConvertible.ToSingle(IFormatProvider provider) - { - return Convert.ToSingle(_value, provider); - } - - /// - string IConvertible.ToString(IFormatProvider provider) - { - return Convert.ToString(_value, provider); - } - - /// - object IConvertible.ToType(Type conversionType, IFormatProvider provider) - { - return Convert.ChangeType(_value, conversionType, provider); - } - - /// -#pragma warning disable CS3002 // Return type is not CLS-compliant - ushort IConvertible.ToUInt16(IFormatProvider provider) -#pragma warning restore CS3002 // Return type is not CLS-compliant - { - return Convert.ToUInt16(_value, provider); - } - - /// -#pragma warning disable CS3002 // Return type is not CLS-compliant - uint IConvertible.ToUInt32(IFormatProvider provider) -#pragma warning restore CS3002 // Return type is not CLS-compliant - { - return Convert.ToUInt32(_value, provider); - } - - /// -#pragma warning disable CS3002 // Return type is not CLS-compliant - ulong IConvertible.ToUInt64(IFormatProvider provider) -#pragma warning restore CS3002 // Return type is not CLS-compliant - { - return Convert.ToUInt64(_value, provider); - } - - /// - [Obsolete("The provider argument is not used. Please use ToString(String).")] - public string ToString(string format, IFormatProvider formatProvider) - { - return _value.ToString(format, formatProvider); - } - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreVerbosityConverter.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreVerbosityConverter.cs deleted file mode 100644 index c3b3793de1..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/DotNetCoreVerbosityConverter.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.ComponentModel; -using System.Globalization; - -namespace Cake.Common.Tools.DotNetCore -{ - /// - /// A type converter for . - /// - public class DotNetCoreVerbosityConverter : TypeConverter - { - /// - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType); - } - - /// - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - if (value is string stringValue) - { - return new DotNetCoreVerbosity(stringValue); - } - - return base.ConvertFrom(context, culture, value); - } - - /// - public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType) - { - return destinationType == typeof(DotNetCoreVerbosity) || base.CanConvertTo(context, destinationType); - } - - /// - public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType) - { - if (destinationType == typeof(string) && value is DotNetCoreVerbosity dotNetVerbosityValue) - { - return dotNetVerbosityValue.ToString(); - } - - return base.ConvertTo(context, culture, value, destinationType); - } - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/Execute/DotNetCoreExecuteSettings.cs b/src/Cake.Common/Tools/DotNetCore/Execute/DotNetCoreExecuteSettings.cs deleted file mode 100644 index e4fa612483..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Execute/DotNetCoreExecuteSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Execute; - -namespace Cake.Common.Tools.DotNetCore.Execute -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreExecuteSettings : DotNetExecuteSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettings.cs b/src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettings.cs deleted file mode 100644 index f80b4c0e56..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.MSBuild; - -namespace Cake.Common.Tools.DotNetCore.MSBuild -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreMSBuildSettings : DotNetMSBuildSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsExtensions.cs b/src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsExtensions.cs deleted file mode 100644 index 83bd0aa2ec..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildSettingsExtensions.cs +++ /dev/null @@ -1,431 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.MSBuild; -using Cake.Core.IO; - -namespace Cake.Common.Tools.DotNetCore.MSBuild -{ - /// - /// Contains functionality related to .NET Core MSBuild settings. - /// - public static class DotNetCoreMSBuildSettingsExtensions - { - /// - /// Adds a MSBuild target to the configuration. - /// - /// The settings. - /// The MSBuild target. - /// The same instance so that multiple calls can be chained. - /// Ignores a target if already added. - public static DotNetCoreMSBuildSettings WithTarget(this DotNetCoreMSBuildSettings settings, string target) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.WithTarget(settings, target); - } - - /// - /// Adds a property to the configuration. - /// - /// The settings. - /// The property name. - /// The property values. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings WithProperty(this DotNetCoreMSBuildSettings settings, string name, params string[] values) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.WithProperty(settings, name, values); - } - - /// - /// Shows detailed information at the end of the build log about the configurations that were built and how they were scheduled to nodes. - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings ShowDetailedSummary(this DotNetCoreMSBuildSettings settings) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.ShowDetailedSummary(settings); - } - - /// - /// Adds a extension to ignore when determining which project file to build. - /// - /// The settings. - /// The extension to ignore. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings WithIgnoredProjectExtension(this DotNetCoreMSBuildSettings settings, string extension) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.WithIgnoredProjectExtension(settings, extension); - } - - /// - /// Sets the maximum CPU count. Without this set MSBuild will compile projects in this solution one at a time. - /// - /// The settings. - /// The maximum CPU count. Set this value to zero to use as many MSBuild processes as available CPUs. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetMaxCpuCount(this DotNetCoreMSBuildSettings settings, int? maxCpuCount) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetMaxCpuCount(settings, maxCpuCount); - } - - /// - /// Exclude any MSBuild.rsp files automatically. - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings ExcludeAutoResponseFiles(this DotNetCoreMSBuildSettings settings) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.ExcludeAutoResponseFiles(settings); - } - - /// - /// Hide the startup banner and the copyright message. - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings HideLogo(this DotNetCoreMSBuildSettings settings) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.HideLogo(settings); - } - - /// - /// Sets a value indicating whether to normalize stored file paths used when producing deterministic builds. - /// - /// - /// For more information see https://devblogs.microsoft.com/dotnet/producing-packages-with-source-link/#deterministic-builds. - /// - /// The settings. - /// A value indicating whether to normalize stored file paths used when producing deterministic builds. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetContinuousIntegrationBuild(this DotNetCoreMSBuildSettings settings, bool? continuousIntegrationBuild = true) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetContinuousIntegrationBuild(settings, continuousIntegrationBuild); - } - - /// - /// Sets the version of the Toolset to use to build the project. - /// - /// The settings. - /// The version. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings UseToolVersion(this DotNetCoreMSBuildSettings settings, MSBuildVersion version) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.UseToolVersion(settings, version); - } - - /// - /// Validate the project file and, if validation succeeds, build the project. - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings ValidateProjectFile(this DotNetCoreMSBuildSettings settings) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.ValidateProjectFile(settings); - } - - /// - /// Adds a response file to use. - /// - /// The settings. - /// The response file to add. - /// The same instance so that multiple calls can be chained. - /// - /// A response file is a text file that is used to insert command-line switches. For more information see https://docs.microsoft.com/en-gb/visualstudio/msbuild/msbuild-response-files. - /// - public static DotNetCoreMSBuildSettings WithResponseFile(this DotNetCoreMSBuildSettings settings, FilePath responseFile) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.WithResponseFile(settings, responseFile); - } - - /// - /// Log the build output of each MSBuild node to its own file. - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings UseDistributedFileLogger(this DotNetCoreMSBuildSettings settings) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.UseDistributedFileLogger(settings); - } - - /// - /// Adds a distributed loggers to use. - /// - /// The settings. - /// The response file to add. - /// The same instance so that multiple calls can be chained. - /// - /// A distributed logger consists of a central and forwarding logger. MSBuild will attach an instance of the forwarding logger to each secondary node. - /// For more information see https://msdn.microsoft.com/en-us/library/bb383987.aspx. - /// - public static DotNetCoreMSBuildSettings WithDistributedLogger(this DotNetCoreMSBuildSettings settings, MSBuildDistributedLogger logger) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.WithDistributedLogger(settings, logger); - } - - /// - /// Sets the parameters for the console logger. - /// - /// The settings. - /// The console logger parameters to set. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetConsoleLoggerSettings(this DotNetCoreMSBuildSettings settings, MSBuildLoggerSettings consoleLoggerParameters) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetConsoleLoggerSettings(settings, consoleLoggerParameters); - } - - /// - /// Adds a file logger with all the default settings. - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - /// - /// Each file logger will be declared in the order added. - /// The first file logger will match up to the /fl parameter. - /// The next nine (max) file loggers will match up to the /fl1 through /fl9 respectively. - /// - public static DotNetCoreMSBuildSettings AddFileLogger(this DotNetCoreMSBuildSettings settings) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.AddFileLogger(settings); - } - - /// - /// Adds a file logger. - /// - /// The settings. - /// Parameters to be passed to the logger. - /// The same instance so that multiple calls can be chained. - /// - /// Each file logger will be declared in the order added. - /// The first file logger will match up to the /fl parameter. - /// The next nine (max) file loggers will match up to the /fl1 through /fl9 respectively. - /// - public static DotNetCoreMSBuildSettings AddFileLogger(this DotNetCoreMSBuildSettings settings, MSBuildFileLoggerSettings fileLoggerParameters) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.AddFileLogger(settings, fileLoggerParameters); - } - - /// - /// Enables the binary logger with all the default settings. - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings EnableBinaryLogger(this DotNetCoreMSBuildSettings settings) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.EnableBinaryLogger(settings); - } - - /// - /// Enables the binary logger with the specified imports and default file name. - /// - /// The settings. - /// The imports. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings EnableBinaryLogger(this DotNetCoreMSBuildSettings settings, MSBuildBinaryLoggerImports imports) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.EnableBinaryLogger(settings, imports); - } - - /// - /// Enables the binary logger with the specified log file name and no imports. - /// - /// The settings. - /// The log file name. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings EnableBinaryLogger(this DotNetCoreMSBuildSettings settings, string fileName) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.EnableBinaryLogger(settings, fileName); - } - - /// - /// Enables the binary logger with the specified log file name and imports. - /// - /// The settings. - /// The log file name. - /// The imports. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings EnableBinaryLogger(this DotNetCoreMSBuildSettings settings, string fileName, MSBuildBinaryLoggerImports imports) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.EnableBinaryLogger(settings, fileName, imports); - } - - /// - /// Adds a custom logger. - /// - /// The settings. - /// The assembly containing the logger. Should match the format {AssemblyName[,StrongName] | AssemblyFile}. - /// The class implementing the logger. Should match the format [PartialOrFullNamespace.]LoggerClassName. If the assembly contains only one logger, class does not need to be specified. - /// Parameters to be passed to the logger. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings WithLogger(this DotNetCoreMSBuildSettings settings, string loggerAssembly, string loggerClass = null, string loggerParameters = null) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.WithLogger(settings, loggerAssembly, loggerClass, loggerParameters); - } - - /// - /// Disables the default console logger, and not log events to the console. - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings DisableConsoleLogger(this DotNetCoreMSBuildSettings settings) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.DisableConsoleLogger(settings); - } - - /// - /// Sets the warning code to treats as an error. - /// - /// The settings. - /// The warning code to treat as an error. - /// The same instance so that multiple calls can be chained. - /// - /// When a warning is treated as an error the target will continue to execute as if it was a warning but the overall build will fail. - /// - public static DotNetCoreMSBuildSettings SetWarningCodeAsError(this DotNetCoreMSBuildSettings settings, string warningCode) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetWarningCodeAsError(settings, warningCode); - } - - /// - /// Sets the warning code to treats as a message. - /// - /// The settings. - /// The warning code to treat as a message. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetWarningCodeAsMessage(this DotNetCoreMSBuildSettings settings, string warningCode) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetWarningCodeAsMessage(settings, warningCode); - } - - /// - /// Sets how all warnings should be treated. - /// - /// The settings. - /// How all warning should be treated. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings TreatAllWarningsAs(this DotNetCoreMSBuildSettings settings, MSBuildTreatAllWarningsAs behaviour) - { - return (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.TreatAllWarningsAs(settings, behaviour); - } - - /// - /// Sets the configuration. - /// - /// The settings. - /// The configuration. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetConfiguration(this DotNetCoreMSBuildSettings settings, string configuration) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetConfiguration(settings, configuration); - - /// - /// Sets the version. - /// - /// The settings. - /// The version. - /// The same instance so that multiple calls can be chained. - /// - /// Version will override VersionPrefix and VersionSuffix if set. - /// This may also override version settings during packaging. - /// - public static DotNetCoreMSBuildSettings SetVersion(this DotNetCoreMSBuildSettings settings, string version) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetVersion(settings, version); - - /// - /// Sets the file version. - /// - /// The settings. - /// The file version. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetFileVersion(this DotNetCoreMSBuildSettings settings, string fileVersion) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetFileVersion(settings, fileVersion); - - /// - /// Sets the assembly version. - /// - /// The settings. - /// The assembly version. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetAssemblyVersion(this DotNetCoreMSBuildSettings settings, string assemblyVersion) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetAssemblyVersion(settings, assemblyVersion); - - /// - /// Sets the informational version. - /// - /// The settings. - /// The informational version. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetInformationalVersion(this DotNetCoreMSBuildSettings settings, string informationalVersion) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetInformationalVersion(settings, informationalVersion); - - /// - /// Sets the package version. - /// - /// The settings. - /// The package version. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetPackageVersion(this DotNetCoreMSBuildSettings settings, string packageVersion) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetPackageVersion(settings, packageVersion); - - /// - /// Sets the package release notes. - /// - /// The settings. - /// The package release notes. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetPackageReleaseNotes(this DotNetCoreMSBuildSettings settings, string packageReleaseNotes) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetPackageReleaseNotes(settings, packageReleaseNotes); - - /// - /// Suppress warning CS7035. - /// This is useful when using semantic versioning and either the file or informational version - /// doesn't match the recommended format. - /// The recommended format is: major.minor.build.revision where - /// each is an integer between 0 and 65534 (inclusive). - /// - /// The settings. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SuppressVersionRecommendedFormatWarning(this DotNetCoreMSBuildSettings settings) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SuppressVersionRecommendedFormatWarning(settings); - - /// - /// Sets the version prefix. - /// - /// The settings. - /// The version prefix. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetVersionPrefix(this DotNetCoreMSBuildSettings settings, string versionPrefix) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetVersionPrefix(settings, versionPrefix); - - /// - /// Sets the version Suffix. - /// - /// The settings. - /// The version prefix. - /// The same instance so that multiple calls can be chained. - public static DotNetCoreMSBuildSettings SetVersionSuffix(this DotNetCoreMSBuildSettings settings, string versionSuffix) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetVersionSuffix(settings, versionSuffix); - - /// - /// Adds a framework to target. - /// - /// The settings. - /// The framework to target. - /// The same instance so that multiple calls can be chained. - /// - /// For list of target frameworks see https://docs.microsoft.com/en-us/dotnet/standard/frameworks. - /// - public static DotNetCoreMSBuildSettings SetTargetFramework(this DotNetCoreMSBuildSettings settings, string targetFramework) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetTargetFramework(settings, targetFramework); - - /// - /// Sets a target operating systems where the application or assembly will run. - /// - /// The settings. - /// The runtime id of the operating system. - /// The same instance so that multiple calls can be chained. - /// - /// For list of runtime ids see https://docs.microsoft.com/en-us/dotnet/core/rid-catalog. - /// - public static DotNetCoreMSBuildSettings SetRuntime(this DotNetCoreMSBuildSettings settings, string runtimeId) - => (DotNetCoreMSBuildSettings)DotNet.MSBuild.DotNetMSBuildSettingsExtensions.SetRuntime(settings, runtimeId); - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleteSettings.cs b/src/Cake.Common/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleteSettings.cs deleted file mode 100644 index be5462c8f9..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleteSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.NuGet.Delete; - -namespace Cake.Common.Tools.DotNetCore.NuGet.Delete -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreNuGetDeleteSettings : DotNetNuGetDeleteSettings - { - } -} \ No newline at end of file diff --git a/src/Cake.Common/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPushSettings.cs b/src/Cake.Common/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPushSettings.cs deleted file mode 100644 index 35d0ce0ca5..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPushSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.NuGet.Push; - -namespace Cake.Common.Tools.DotNetCore.NuGet.Push -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreNuGetPushSettings : DotNetNuGetPushSettings - { - } -} \ No newline at end of file diff --git a/src/Cake.Common/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourceSettings.cs b/src/Cake.Common/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourceSettings.cs deleted file mode 100644 index 487bead022..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourceSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.NuGet.Source; - -namespace Cake.Common.Tools.DotNetCore.NuGet.Source -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreNuGetSourceSettings : DotNetNuGetSourceSettings - { - } -} \ No newline at end of file diff --git a/src/Cake.Common/Tools/DotNetCore/Pack/DotNetCorePackSettings.cs b/src/Cake.Common/Tools/DotNetCore/Pack/DotNetCorePackSettings.cs deleted file mode 100644 index f9eeb86e10..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Pack/DotNetCorePackSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Pack; - -namespace Cake.Common.Tools.DotNetCore.Pack -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCorePackSettings : DotNetPackSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/Publish/DotNetCorePublishSettings.cs b/src/Cake.Common/Tools/DotNetCore/Publish/DotNetCorePublishSettings.cs deleted file mode 100644 index 8a94d013c3..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Publish/DotNetCorePublishSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Publish; - -namespace Cake.Common.Tools.DotNetCore.Publish -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCorePublishSettings : DotNetPublishSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/Restore/DotNetCoreRestoreSettings.cs b/src/Cake.Common/Tools/DotNetCore/Restore/DotNetCoreRestoreSettings.cs deleted file mode 100644 index 01b3e68353..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Restore/DotNetCoreRestoreSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Restore; - -namespace Cake.Common.Tools.DotNetCore.Restore -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreRestoreSettings : DotNetRestoreSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/Run/DotNetCoreRunSettings.cs b/src/Cake.Common/Tools/DotNetCore/Run/DotNetCoreRunSettings.cs deleted file mode 100644 index f8d0043b73..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Run/DotNetCoreRunSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Run; - -namespace Cake.Common.Tools.DotNetCore.Run -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreRunSettings : DotNetRunSettings - { - } -} \ No newline at end of file diff --git a/src/Cake.Common/Tools/DotNetCore/Test/DotNetCoreTestSettings.cs b/src/Cake.Common/Tools/DotNetCore/Test/DotNetCoreTestSettings.cs deleted file mode 100644 index 36e1b7f653..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Test/DotNetCoreTestSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Test; - -namespace Cake.Common.Tools.DotNetCore.Test -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreTestSettings : DotNetTestSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/Tool/DotNetCoreToolSettings.cs b/src/Cake.Common/Tools/DotNetCore/Tool/DotNetCoreToolSettings.cs deleted file mode 100644 index fc1324a18c..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/Tool/DotNetCoreToolSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.Tool; - -namespace Cake.Common.Tools.DotNetCore.Tool -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreToolSettings : DotNetToolSettings - { - } -} diff --git a/src/Cake.Common/Tools/DotNetCore/VSTest/DotNetCoreVSTestSettings.cs b/src/Cake.Common/Tools/DotNetCore/VSTest/DotNetCoreVSTestSettings.cs deleted file mode 100644 index 24bc2955d8..0000000000 --- a/src/Cake.Common/Tools/DotNetCore/VSTest/DotNetCoreVSTestSettings.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Cake.Common.Tools.DotNet.VSTest; - -namespace Cake.Common.Tools.DotNetCore.VSTest -{ - /// - /// Contains settings used by . - /// - public sealed class DotNetCoreVSTestSettings : DotNetVSTestSettings - { - } -} diff --git a/tests/integration/Cake.Common/ArgumentAliases.cake b/tests/integration/Cake.Common/ArgumentAliases.cake index be80aa8f63..f24a999304 100644 --- a/tests/integration/Cake.Common/ArgumentAliases.cake +++ b/tests/integration/Cake.Common/ArgumentAliases.cake @@ -118,24 +118,24 @@ Task("Cake.Common.ArgumentAliases.Argument.FilePathArgument") Assert.Equal(testAssemblyPath.FullPath, arg.FullPath); }); -Task("Cake.Common.ArgumentAliases.Argument.DotNetCoreVerbosityArgument") +Task("Cake.Common.ArgumentAliases.Argument.DotNetVerbosityArgument") .Does(() => { // Given, When - var arg = Argument("testDotNetCoreVerbosity"); + var arg = Argument("testDotNetVerbosity"); // Then - Assert.Equal(DotNetCoreVerbosity.Diagnostic, arg); + Assert.Equal(DotNetVerbosity.Diagnostic, arg); }); -Task("Cake.Common.ArgumentAliases.Argument.DotNetCoreRollForwardArgument") +Task("Cake.Common.ArgumentAliases.Argument.DotNetRollForwardArgument") .Does(() => { // Given, When - var arg = Argument("testDotNetRollForward"); + var arg = Argument("testDotNetRollForward"); // Then - Assert.Equal(DotNetCoreRollForward.LatestMajor, arg); + Assert.Equal(DotNetRollForward.LatestMajor, arg); }); ////////////////////////////////////////////////////////////////////////////// @@ -151,6 +151,6 @@ Task("Cake.Common.ArgumentAliases") .IsDependentOn("Cake.Common.ArgumentAliases.Argument.MultipleArguments.WithLazyDefaultValue") .IsDependentOn("Cake.Common.ArgumentAliases.Argument.DirectoryPathArgument") .IsDependentOn("Cake.Common.ArgumentAliases.Argument.FilePathArgument") - .IsDependentOn("Cake.Common.ArgumentAliases.Argument.DotNetCoreVerbosityArgument") - .IsDependentOn("Cake.Common.ArgumentAliases.Argument.DotNetCoreRollForwardArgument") + .IsDependentOn("Cake.Common.ArgumentAliases.Argument.DotNetVerbosityArgument") + .IsDependentOn("Cake.Common.ArgumentAliases.Argument.DotNetRollForwardArgument") ; diff --git a/tests/integration/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cake b/tests/integration/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cake deleted file mode 100644 index 10b3094451..0000000000 --- a/tests/integration/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cake +++ /dev/null @@ -1,268 +0,0 @@ -#load "./../../../utilities/xunit.cake" -#load "./../../../utilities/paths.cake" - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.Setup") - .Does(() => -{ - var dotnetExePath = Paths.TestRoot.CombineWithFilePath(Context.IsRunningOnUnix() ? ".dotnet/dotnet" : ".dotnet/dotnet.exe"); - if (FileExists(dotnetExePath)) - { - Context.Tools.RegisterFile(dotnetExePath); - } - - var sourcePath = Paths.Resources.Combine("./Cake.Common/Tools/DotNet"); - var targetPath = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - EnsureDirectoryExist(targetPath.Combine("../").Collapse()); - CopyDirectory(sourcePath, targetPath); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreRestore") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.Setup") - .Does(() => -{ - // Given - var root = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - - // When - DotNetCoreRestore(root.FullPath, new DotNetCoreRestoreSettings { Verbosity = DotNetCoreVerbosity.Minimal }); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuild") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreRestore") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var project = path.CombineWithFilePath("hwapp/hwapp.csproj"); - var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll"); - - // When - DotNetCoreBuild(project.FullPath); - - // Then - Assert.True(System.IO.File.Exists(assembly.FullPath)); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuild") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var project = path.CombineWithFilePath("hwapp.tests/hwapp.tests.csproj"); - - // When - DotNetCoreTest(project.FullPath); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreVSTest") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuild") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var assembly = path.CombineWithFilePath("hwapp.tests/bin/Debug/netcoreapp3.1/hwapp.tests.dll"); - - // When - DotNetCoreVSTest(assembly.FullPath); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTool") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuild") - .Does(() => -{ - // When - DotNetCoreTool("--info"); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreRun") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreVSTest") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var project = path.CombineWithFilePath("hwapp/hwapp.csproj"); - - // When - DotNetCoreRun(project.FullPath); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCorePack") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var project = path.CombineWithFilePath("hwapp/hwapp.csproj"); - var outputPath = path.Combine("DotNetCorePack"); - var nuget = outputPath.CombineWithFilePath("hwapp.1.0.0.nupkg"); - var nugetSymbols = outputPath.CombineWithFilePath("hwapp.1.0.0.symbols.nupkg"); - EnsureDirectoryExist(outputPath); - - // When - DotNetCorePack(project.FullPath, new DotNetCorePackSettings { OutputDirectory = outputPath, IncludeSymbols = true }); - - // Then - Assert.True(System.IO.File.Exists(nuget.FullPath), "Path:" + nuget.FullPath); - Assert.True(System.IO.File.Exists(nugetSymbols.FullPath), "Path:" + nugetSymbols.FullPath); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreNuGetPush") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCorePack") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var outputPath = path.Combine("DotNetCorePack"); - var nugetServerPath = path.Combine("DotNetCorePush"); - var nugetSource = outputPath.CombineWithFilePath("hwapp.1.0.0.nupkg"); - var nugetDestination = nugetServerPath.CombineWithFilePath("hwapp.1.0.0.nupkg"); - - EnsureDirectoryExist(outputPath); - EnsureDirectoryExist(nugetServerPath); - Assert.True(System.IO.File.Exists(nugetSource.FullPath), "Path:" + nugetSource.FullPath); - - // When - DotNetCoreNuGetPush(nugetSource.FullPath, new DotNetCoreNuGetPushSettings { Source = nugetServerPath.FullPath }); - - // Then - Assert.True(System.IO.File.Exists(nugetDestination.FullPath), "Path:" + nugetDestination.FullPath); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreNuGetDelete") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreNuGetPush") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var nugetServerPath = path.Combine("DotNetCorePush"); - var nugetDestination = nugetServerPath.CombineWithFilePath("hwapp.1.0.0.nupkg"); - - EnsureDirectoryExist(nugetServerPath); - Assert.True(System.IO.File.Exists(nugetDestination.FullPath), "Path:" + nugetDestination.FullPath); - - // When - DotNetCoreNuGetDelete("hwapp", "1.0.0", new DotNetCoreNuGetDeleteSettings { Source = nugetServerPath.FullPath, NonInteractive = true }); - - // Then - Assert.False(System.IO.File.Exists(nugetDestination.FullPath), "Path:" + nugetDestination.FullPath); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCorePublish") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var project = path.CombineWithFilePath("hwapp/hwapp.csproj"); - var outputPath = path.Combine("DotNetCorePublish"); - var publishFiles = new [] { - outputPath.CombineWithFilePath("hwapp.common.dll"), - outputPath.CombineWithFilePath("hwapp.common.pdb"), - outputPath.CombineWithFilePath("hwapp.deps.json"), - outputPath.CombineWithFilePath("hwapp.dll"), - outputPath.CombineWithFilePath("hwapp.pdb"), - outputPath.CombineWithFilePath("hwapp.runtimeconfig.json") - }; - - EnsureDirectoryExist(outputPath); - - // When - DotNetCorePublish(project.FullPath, new DotNetCorePublishSettings { OutputDirectory = outputPath }); - - // Then - foreach(var file in publishFiles) - { - Assert.True(System.IO.File.Exists(file.FullPath), "Path:" + file.FullPath); - } -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreExecute") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll"); - - // When - DotNetCoreExecute(assembly); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreClean") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuild") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var project = path.CombineWithFilePath("hwapp/hwapp.csproj"); - var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll"); - Assert.True(System.IO.File.Exists(assembly.FullPath)); - - // When - DotNetCoreClean(project.FullPath); - - // Then - Assert.False(System.IO.File.Exists(assembly.FullPath)); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreMSBuild") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreClean") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var project = path.CombineWithFilePath("hwapp/hwapp.csproj"); - var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll"); - - // When - DotNetCoreMSBuild(project.FullPath); - - // Then - Assert.True(System.IO.File.Exists(assembly.FullPath)); -}); - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest.Fail") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest") - .Does(() => -{ - // Given - var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet"); - var project = path.CombineWithFilePath("hwapp.tests/hwapp.tests.csproj"); - - // When - var exception = Record.Exception(()=>DotNetCoreTest(project.FullPath, - new DotNetCoreTestSettings { EnvironmentVariables = new Dictionary {{ "hwapp_fail_test", "true" }} - })); - - // Then - Assert.NotNull(exception); - Assert.IsType(exception); - Assert.Equal(exception.Message, ".NET CLI: Process returned an error (exit code 1)."); -}); - - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuildServerShutdown") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreRestore") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuild") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreVSTest") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTool") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreRun") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCorePack") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreNuGetPush") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreNuGetDelete") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCorePublish") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreExecute") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreClean") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreMSBuild") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreTest.Fail") - .Does(() => -{ - // When - DotNetCoreBuildServerShutdown(); -});; - -Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuildServerShutdown"); \ No newline at end of file diff --git a/tests/integration/Cake.Common/Tools/TextTransform/TextTransformAliases.cake b/tests/integration/Cake.Common/Tools/TextTransform/TextTransformAliases.cake index fd90ca9f8f..0b18f5ce50 100644 --- a/tests/integration/Cake.Common/Tools/TextTransform/TextTransformAliases.cake +++ b/tests/integration/Cake.Common/Tools/TextTransform/TextTransformAliases.cake @@ -7,7 +7,7 @@ Task("Cake.Common.Tools.TextTransform.TextTransformAliases.TransformTemplate.Set var t4Path = Context.Tools.Resolve("t4") ?? Context.Tools.Resolve("t4.exe"); if (t4Path == null) { - DotNetCoreTool(null, "tool", "install --tool-path ./tools dotnet-t4 --version \"2.2.0-preview-0020-g990c44075e\" --add-source \"https://pkgs.dev.azure.com/cake-build/Cake/_packaging/cake/nuget/v3/index.json\""); + DotNetTool(null, "tool", "install --tool-path ./tools dotnet-t4 --version \"2.2.0-preview-0020-g990c44075e\" --add-source \"https://pkgs.dev.azure.com/cake-build/Cake/_packaging/cake/nuget/v3/index.json\""); } }); diff --git a/tests/integration/build.cake b/tests/integration/build.cake index d923d6455d..57f565c261 100644 --- a/tests/integration/build.cake +++ b/tests/integration/build.cake @@ -27,7 +27,6 @@ #load "./Cake.Common/Tools/Cake/CakeAliases.cake" #load "./Cake.Common/Tools/Command/CommandAliases.cake" #load "./Cake.Common/Tools/DotNet/DotNetAliases.cake" -#load "./Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cake" #load "./Cake.Common/Tools/NuGet/NuGetAliases.cake" #load "./Cake.Common/Tools/Chocolatey/ChocolateyAliases.cake" #load "./Cake.Common/Tools/TextTransform/TextTransformAliases.cake" @@ -94,7 +93,6 @@ Task("Cake.Common") .IsDependentOn("Cake.Common.Tools.Cake.CakeAliases") .IsDependentOn("Cake.Common.Tools.Command.CommandAliases") .IsDependentOn("Cake.Common.Tools.DotNet.DotNetAliases") - .IsDependentOn("Cake.Common.Tools.DotNetCore.DotNetCoreAliases") .IsDependentOn("Cake.Common.Tools.NuGet.NuGetAliases") .IsDependentOn("Cake.Common.Tools.TextTransform.TextTransformAliases");