(#3693) Remove 'Core' suffix of some settings classes

cake-build · Nov 14, 2021 · cd2b601 · cd2b601
1 parent 34f522f
commit cd2b601
Show file tree

Hide file tree

Showing 50 changed files with 772 additions and 137 deletions.
diff --git a/build.cake b/build.cake
@@ -415,6 +415,8 @@ Task("Run-Integration-Tests")
                     .AppendSwitchQuoted("--multipleargs", "=", "b")
                     .AppendSwitchQuoted("--testAssemblyDirectoryPath", "=", cakeAssembly.GetDirectory().FullPath)
                     .AppendSwitchQuoted("--testAssemblyFilePath", "=", cakeAssembly.FullPath)
+                    .AppendSwitchQuoted("--testDotNetCoreVerbosity", "=", "Diagnostic")
+                    .AppendSwitchQuoted("--testDotNetRollForward", "=", "LatestMajor")
             });
     }
     catch(Exception ex)

diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Build/DotNetCoreBuilderFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Build/DotNetCoreBuilderFixture.cs
@@ -2,11 +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.DotNet.Build;
 using Cake.Common.Tools.DotNetCore.Build;
 
 namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Build
 {
-    internal sealed class DotNetCoreBuilderFixture : DotNetCoreFixture<DotNetCoreBuildSettings>
+    internal sealed class DotNetCoreBuilderFixture : DotNetCoreFixture<DotNetBuildSettings>
     {
         public string Project { get; set; }
 

diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerFixture.cs
@@ -2,11 +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.DotNet.BuildServer;
 using Cake.Common.Tools.DotNetCore.BuildServer;
 
 namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Build
 {
-    internal sealed class DotNetCoreBuildServerFixture : DotNetCoreFixture<DotNetCoreBuildServerSettings>
+    internal sealed class DotNetCoreBuildServerFixture : DotNetCoreFixture<DotNetBuildServerShutdownSettings>
     {
         protected override void RunTool()
         {

diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Clean/DotNetCoreCleanerFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/Clean/DotNetCoreCleanerFixture.cs
@@ -2,11 +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.DotNet.Clean;
 using Cake.Common.Tools.DotNetCore.Clean;
 
 namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.Clean
 {
-    internal sealed class DotNetCoreCleanerFixture : DotNetCoreFixture<DotNetCoreCleanSettings>
+    internal sealed class DotNetCoreCleanerFixture : DotNetCoreFixture<DotNetCleanSettings>
     {
         public string Project { get; set; }
 

diff --git a/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/DotNetCoreFixture.cs b/src/Cake.Common.Tests/Fixtures/Tools/DotNetCore/DotNetCoreFixture.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.Tools.DotNetCore;
+using Cake.Common.Tools.DotNet;
 using Cake.Core.IO;
 using Cake.Testing.Fixtures;
 
 namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore
 {
     internal abstract class DotNetCoreFixture<TSettings> : ToolFixture<TSettings, ToolFixtureResult>
-        where TSettings : DotNetCoreSettings, new()
+        where TSettings : DotNetSettings, new()
     {
         protected DotNetCoreFixture()
             : base("dotnet.exe")

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Build/DotNetCoreBuilderTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Build/DotNetCoreBuilderTests.cs
@@ -57,7 +57,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -72,7 +72,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/BuildServer/DotNetCoreBuildServerTests.cs
@@ -40,7 +40,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -54,7 +54,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Clean/DotNetCoreCleanTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Clean/DotNetCoreCleanTests.cs
@@ -58,7 +58,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -73,7 +73,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Execute/DotNetCoreExecutorTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Execute/DotNetCoreExecutorTests.cs
@@ -44,7 +44,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -61,7 +61,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilderTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/MSBuild/DotNetCoreMSBuildBuilderTests.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using Cake.Common.Tests.Fixtures.Tools.DotNetCore.MSBuild;
+using Cake.Common.Tools.DotNet;
 using Cake.Common.Tools.DotNetCore;
 using Cake.Common.Tools.DotNetCore.MSBuild;
 using Cake.Common.Tools.MSBuild;
@@ -64,7 +65,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -81,7 +82,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]
@@ -1013,12 +1014,12 @@ public void Should_Append_DisableMultiprocessorLogging_If_Specified()
             }
 
             [Theory]
-            [InlineData(DotNetCoreVerbosity.Quiet)]
-            [InlineData(DotNetCoreVerbosity.Minimal)]
-            [InlineData(DotNetCoreVerbosity.Normal)]
-            [InlineData(DotNetCoreVerbosity.Detailed)]
-            [InlineData(DotNetCoreVerbosity.Diagnostic)]
-            public void Should_Append_Verbosity_If_Specified(DotNetCoreVerbosity verbosity)
+            [InlineData(DotNetVerbosity.Quiet)]
+            [InlineData(DotNetVerbosity.Minimal)]
+            [InlineData(DotNetVerbosity.Normal)]
+            [InlineData(DotNetVerbosity.Detailed)]
+            [InlineData(DotNetVerbosity.Diagnostic)]
+            public void Should_Append_Verbosity_If_Specified(DotNetVerbosity verbosity)
             {
                 // Given
                 var fixture = new DotNetCoreMSBuildBuilderFixture();
@@ -1270,12 +1271,12 @@ public void Should_Append_DisableMultiprocessorLogging_If_Specified()
             }
 
             [Theory]
-            [InlineData(DotNetCoreVerbosity.Quiet)]
-            [InlineData(DotNetCoreVerbosity.Minimal)]
-            [InlineData(DotNetCoreVerbosity.Normal)]
-            [InlineData(DotNetCoreVerbosity.Detailed)]
-            [InlineData(DotNetCoreVerbosity.Diagnostic)]
-            public void Should_Append_Verbosity_If_Specified(DotNetCoreVerbosity verbosity)
+            [InlineData(DotNetVerbosity.Quiet)]
+            [InlineData(DotNetVerbosity.Minimal)]
+            [InlineData(DotNetVerbosity.Normal)]
+            [InlineData(DotNetVerbosity.Detailed)]
+            [InlineData(DotNetVerbosity.Diagnostic)]
+            public void Should_Append_Verbosity_If_Specified(DotNetVerbosity verbosity)
             {
                 // Given
                 var fixture = new DotNetCoreMSBuildBuilderFixture();

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleterTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleterTests.cs
@@ -76,7 +76,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -90,7 +90,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Push/DotNetCoreNuGetPusherTests.cs
@@ -58,7 +58,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -73,7 +73,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerTests.cs
@@ -73,7 +73,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -88,7 +88,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]
@@ -185,7 +185,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -199,7 +199,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]
@@ -274,7 +274,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -288,7 +288,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]
@@ -363,7 +363,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -377,7 +377,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]
@@ -459,7 +459,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -473,7 +473,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]
@@ -562,7 +562,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -576,7 +576,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]
@@ -651,7 +651,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -665,7 +665,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]

diff --git a/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Pack/DotNetCorePackerTests.cs b/src/Cake.Common.Tests/Unit/Tools/DotNetCore/Pack/DotNetCorePackerTests.cs
@@ -39,7 +39,7 @@ public void Should_Throw_If_Process_Was_Not_Started()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process was not started.");
+                AssertEx.IsCakeException(result, ".NET CLI: Process was not started.");
             }
 
             [Fact]
@@ -53,7 +53,7 @@ public void Should_Throw_If_Process_Has_A_Non_Zero_Exit_Code()
                 var result = Record.Exception(() => fixture.Run());
 
                 // Then
-                AssertEx.IsCakeException(result, ".NET Core CLI: Process returned an error (exit code 1).");
+                AssertEx.IsCakeException(result, ".NET CLI: Process returned an error (exit code 1).");
             }
 
             [Fact]