Merge pull request #3992 from devlead/feature/gh-3722/gh-3991

GH3722/GH3991: Remove Obsolete DotNetCore aliases
cake-build · Oct 18, 2022 · ca6699c · ca6699c
2 parents bffc607 + 2e2c21c
commit ca6699c
Show file tree

Hide file tree

Showing 118 changed files with 703 additions and 3,964 deletions.
diff --git 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/...SBuild/DotNetCoreMSBuildBuilderFixture.cs → ...SBuild/DotNetCoreMSBuildBuilderFixture.cs b/...SBuild/DotNetCoreMSBuildBuilderFixture.cs → ...SBuild/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<DotNetCoreMSBuildSettings>
+    internal sealed class DotNetMSBuildBuilderFixture : DotNetFixture<DotNetMSBuildSettings>
     {
         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
@@ -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<DotNetBuildSettings>
+    internal sealed class DotNetBuilderFixture : DotNetFixture<DotNetBuildSettings>
     {
         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
@@ -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<DotNetBuildServerShutdownSettings>
+    internal sealed class DotNetBuildServerFixture : DotNetFixture<DotNetBuildServerShutdownSettings>
     {
         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
@@ -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<DotNetCleanSettings>
+    internal sealed class DotNetCleanerFixture : DotNetFixture<DotNetCleanSettings>
     {
         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
@@ -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<TSettings> : DotNetFixture<TSettings>
         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
@@ -2,20 +2,20 @@
 // 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<DotNetCoreExecuteSettings>
+    internal sealed class DotNetExecutorFixture : DotNetFixture<DotNetExecuteSettings>
     {
         public FilePath AssemblyPath { get; set; }
 
         public ProcessArgumentBuilder Arguments { get; set; }
 
         protected override void RunTool()
         {
-            var tool = new DotNetCoreExecutor(FileSystem, Environment, ProcessRunner, Tools);
+            var tool = new DotNetExecutor(FileSystem, Environment, ProcessRunner, Tools);
             tool.Execute(AssemblyPath, Arguments, Settings);
         }
     }

diff --git a/...Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleterFixture.cs b/...Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Delete/DotNetCoreNuGetDeleterFixture.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.NuGet.Delete;
+using Cake.Common.Tools.DotNet.NuGet.Delete;
 
-namespace Cake.Common.Tests.Fixtures.Tools.DotNetCore.NuGet.Delete
+namespace Cake.Common.Tests.Fixtures.Tools.DotNet.NuGet.Delete
 {
-    internal sealed class DotNetCoreNuGetDeleterFixture : DotNetCoreFixture<DotNetCoreNuGetDeleteSettings>
+    internal sealed class DotNetNuGetDeleterFixture : DotNetFixture<DotNetNuGetDeleteSettings>
     {
         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
@@ -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<DotNetCoreNuGetPushSettings>
+    internal sealed class DotNetNuGetPusherFixture : DotNetFixture<DotNetNuGetPushSettings>
     {
         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/...ke.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetAddSourceFixture.cs b/...ke.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/...ommon.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetDisableSourceFixture.cs b/...ommon.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/...Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetEnableSourceFixture.cs b/...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/...ke.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetHasSourceFixture.cs b/...ke.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/...e.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetListSourceFixture.cs b/...e.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/...Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetRemoveSourceFixture.cs b/...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/...Cake.Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetSourcerFixture.cs b/...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<DotNetCoreNuGetSourceSettings>
+    internal abstract class DotNetNuGetSourcerFixture : DotNetFixture<DotNetNuGetSourceSettings>
     {
         public string Name { get; set; } = "name";
     }

diff --git a/...Common.Tests/Fixtures/Tools/DotNetCore/NuGet/Source/DotNetCoreNuGetUpdateSourceFixture.cs b/...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
@@ -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<DotNetCorePackSettings>
+    internal sealed class DotNetPackFixture : DotNetFixture<DotNetPackSettings>
     {
         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
@@ -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<DotNetCorePublishSettings>
+    internal sealed class DotNetPublisherFixture : DotNetFixture<DotNetPublishSettings>
     {
         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
@@ -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<DotNetCoreRestoreSettings>
+    internal sealed class DotNetRestorerFixture : DotNetFixture<DotNetRestoreSettings>
     {
         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);
         }
     }