[Failed] Auto refactor by Resharper CLT

.github/workflows/linter.yml

@@ -6,30 +6,78 @@ on: push
 jobs:
   # Set the job key. The key is displayed as the job name
   # when a job name is not provided
-  lint:
+  client-lint:
     # Name the Job
-    name: Lint C# code base
+    name: Lint client code base
     # Set the type of machine to run on
     runs-on: ubuntu-latest
     env:
-      working-directory : ./
-    strategy:
-      matrix:
-        codebasePath:
-        - Zilon.Client/Assets/Zilon/Scripts
-        - Zilon.Core/
-      fail-fast: false
+      working-directory : ./Zilon.Client/
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: git pull
+      - run: dotnet tool install -g dotnet-format
+      - name: format
+        run: dotnet-format -f Assets/Zilon/Scripts -v d
+        working-directory: ${{env.working-directory}}
+      - name: Commit changes
+        uses: EndBug/add-and-commit@v5
+        with:
+          message: "[Bot] Automated dotnet-format update"
+          add: "*.cs"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  # Set the job key. The key is displayed as the job name
+  # when a job name is not provided
+  core-lint:
+    # Name the Job
+    name: Lint core code base
+    # Set the type of machine to run on
+    runs-on: ubuntu-latest
+    env:
+      working-directory : ./Zilon.Core/
+
     steps:
       - uses: actions/checkout@v2
       - run: git pull
       - run: dotnet tool install -g dotnet-format
-      - name: format codebase ${{ matrix.codebasePath }}
-        run: dotnet-format -f ${{ matrix.codebasePath }} -v d
+      - name: format
+        run: dotnet-format Zilon.Core.sln -v d
         working-directory: ${{env.working-directory}}
       - name: Commit changes
         uses: EndBug/add-and-commit@v5
         with:
           message: "[Bot] Automated dotnet-format update"
           add: "*.cs"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  # Set the job key. The key is displayed as the job name
+  # when a job name is not provided
+  resharper-core-lint:
+    # Name the Job
+    name: Lint core code base
+    # Set the type of machine to run on
+    runs-on: ubuntu-latest
+    env:
+      working-directory : ./Zilon.Core/
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: git pull
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '3.1.x'
+      - name: Setup ReSharper Command Line Tools
+        run: dotnet tool install -g JetBrains.ReSharper.GlobalTools
+      - name: Clean up code
+        run: jb cleanupcode --profile="Full Cleanup" Zilon.Core.sln
+        working-directory: ${{env.working-directory}}
+      - name: Commit changes
+        uses: EndBug/add-and-commit@v5
+        with:
+          message: "[Bot] Automated ReSharper update"
+          add: "*.cs"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Zilon.Core/Zilon.Bot.Players.DevelopmentTests/AutoplayEngine.cs

@@ -7,11 +7,12 @@
 
 namespace Zilon.Bot.Players.DevelopmentTests
 {
-    class AutoplayEngine : AutoplayEngineBase
+    internal class AutoplayEngine : AutoplayEngineBase
     {
         private readonly Startup _startup;
 
-        public AutoplayEngine(Startup startup, BotSettings botSettings, IGlobeInitializer globeInitializer) : base(botSettings, globeInitializer)
+        public AutoplayEngine(Startup startup, BotSettings botSettings, IGlobeInitializer globeInitializer) : base(
+            botSettings, globeInitializer)
         {
             _startup = startup;
         }

Zilon.Core/Zilon.Bot.Players.DevelopmentTests/BotActorTaskSourceTests.cs

@@ -7,6 +7,7 @@
 using NUnit.Framework;
 
 using Zilon.Bot.Sdk;
+using Zilon.Core.Localization;
 using Zilon.Core.PersonModules;
 using Zilon.Core.Persons;
 using Zilon.Core.Players;
@@ -32,7 +33,10 @@ public async Task GetActorTasksTestAsync(string mode)
             startUp.RegisterServices(serviceContainer);
             var serviceProvider = serviceContainer.BuildServiceProvider();
 
-            var botSettings = new BotSettings { Mode = mode };
+            var botSettings = new BotSettings
+            {
+                Mode = mode
+            };
 
             var globeInitializer = serviceProvider.GetRequiredService<IGlobeInitializer>();
             var player = serviceProvider.GetRequiredService<IPlayer>();
@@ -55,7 +59,8 @@ public async Task GetActorTasksTestAsync(string mode)
         private static void PrintPersonBacklog(IPerson humanPerson)
         {
             Console.WriteLine("Build In Traits:");
-            var buildinTraits = humanPerson.GetModule<IEvolutionModule>().Perks.Where(x => x.Scheme.IsBuildIn).ToArray();
+            var buildinTraits = humanPerson.GetModule<IEvolutionModule>().Perks.Where(x => x.Scheme.IsBuildIn)
+                .ToArray();
             foreach (var buildInTrait in buildinTraits)
             {
                 Console.WriteLine(buildInTrait.Scheme.Name.En);
@@ -117,7 +122,7 @@ private static void PrintResult(ServiceProvider serviceProvider)
             {
                 var deathReason = deathReasonService.GetDeathReasonSummary(
                     lastEvent,
-                    Core.Localization.Language.En);
+                    Language.En);
 
                 Console.WriteLine($"Death Reason: {deathReason}");
             }

Zilon.Core/Zilon.Bot.Players.DevelopmentTests/GlobalSuppressions.cs

@@ -5,4 +5,8 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "<Pending>", Scope = "member", Target = "~M:Zilon.Bot.Players.DevelopmentTests.BotActorTaskSourceTests.PrintPersonBacklog(Zilon.Core.Persons.IPerson)")]
+[assembly:
+    SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "<Pending>",
+        Scope = "member",
+        Target =
+            "~M:Zilon.Bot.Players.DevelopmentTests.BotActorTaskSourceTests.PrintPersonBacklog(Zilon.Core.Persons.IPerson)")]

Zilon.Core/Zilon.Bot.Players.DevelopmentTests/Startup.cs

@@ -12,7 +12,7 @@
 
 namespace Zilon.Bot.Players.DevelopmentTests
 {
-    class Startup : InitializationBase
+    internal class Startup : InitializationBase
     {
         public override void ConfigureAux(IServiceProvider serviceProvider)
         {
@@ -27,7 +27,7 @@ protected override void RegisterBot(IServiceCollection container)
 
             container.AddSingleton<HumanBotActorTaskSource<ISectorTaskSourceContext>>();
             container.AddSingleton<IActorTaskSource<ISectorTaskSourceContext>>(serviceProvider =>
-            serviceProvider.GetRequiredService<HumanBotActorTaskSource<ISectorTaskSourceContext>>());
+                serviceProvider.GetRequiredService<HumanBotActorTaskSource<ISectorTaskSourceContext>>());
 
             container.AddSingleton<IPlayer, HumanPlayer>();
             container.AddSingleton<IScoreManager, ScoreManager>();

Zilon.Core/Zilon.Bot.Players.Tests/Logics/SelectActHelperTests.cs

@@ -6,8 +6,11 @@
 
 using NUnit.Framework;
 
+using Zilon.Core.Common;
+using Zilon.Core.Components;
 using Zilon.Core.Persons;
 using Zilon.Core.Props;
+using Zilon.Core.Schemes;
 using Zilon.Core.Tests.Common.Schemes;
 
 namespace Zilon.Bot.Players.Logics.Tests
@@ -21,46 +24,48 @@ public void SelectBestAct_HasResourceRequireActAndHasNoResource_SelectsDefault()
         {
             // ARRANGE
 
-            var acts = new ITacticalAct[] {
-                new TacticalAct(new TestTacticalActScheme{
-                    Sid = "default",
-                    Stats = new TestTacticalActStatsSubScheme{
-                        Effect = Core.Schemes.TacticalActEffectType.Damage,
-                        Efficient = new Core.Common.Roll(3,1),
-                        Offence = new TestTacticalActOffenceSubScheme
+            var acts = new ITacticalAct[]
+            {
+                new TacticalAct(
+                    new TestTacticalActScheme
+                    {
+                        Sid = "default",
+                        Stats = new TestTacticalActStatsSubScheme
                         {
-                            ApRank = 1,
-                            Impact = Core.Common.ImpactType.Kinetic,
-                            Type = Core.Components.OffenseType.Tactical
+                            Effect = TacticalActEffectType.Damage,
+                            Efficient = new Roll(3, 1),
+                            Offence = new TestTacticalActOffenceSubScheme
+                            {
+                                ApRank = 1, Impact = ImpactType.Kinetic, Type = OffenseType.Tactical
+                            }
                         }
-                    }
-                },
-                new Core.Common.Roll(3,1),
-                new Core.Common.Roll(3,3),
-                equipment: null
+                    },
+                    new Roll(3, 1),
+                    new Roll(3, 3),
+                    null
                 ),
-                new TacticalAct(new TestTacticalActScheme{
-                    Sid = "resource-required",
-                    Stats = new TestTacticalActStatsSubScheme{
-                        Effect = Core.Schemes.TacticalActEffectType.Damage,
-                        Efficient = new Core.Common.Roll(3,3),
-                        Offence = new TestTacticalActOffenceSubScheme
+                new TacticalAct(
+                    new TestTacticalActScheme
+                    {
+                        Sid = "resource-required",
+                        Stats = new TestTacticalActStatsSubScheme
                         {
-                            ApRank = 1,
-                            Impact = Core.Common.ImpactType.Kinetic,
-                            Type = Core.Components.OffenseType.Tactical
+                            Effect = TacticalActEffectType.Damage,
+                            Efficient = new Roll(3, 3),
+                            Offence = new TestTacticalActOffenceSubScheme
+                            {
+                                ApRank = 1, Impact = ImpactType.Kinetic, Type = OffenseType.Tactical
+                            }
+                        },
+                        Constrains = new TestTacticalActConstrainsSubScheme
+                        {
+                            PropResourceType = "resource", PropResourceCount = 1
                         }
                     },
-                    Constrains = new TestTacticalActConstrainsSubScheme
-                    {
-                        PropResourceType = "resource",
-                        PropResourceCount = 1
-                    }
-                },
-                new Core.Common.Roll(3,1),
-                new Core.Common.Roll(3,3),
-                equipment: null
-                ),
+                    new Roll(3, 1),
+                    new Roll(3, 3),
+                    null
+                )
             };
 
             var inventoryMock = new Mock<IPropStore>();
@@ -79,46 +84,48 @@ public void SelectBestAct_HasResourceRequireActAndHasNoInventory_SelectsDefault(
         {
             // ARRANGE
 
-            var acts = new ITacticalAct[] {
-                new TacticalAct(new TestTacticalActScheme{
-                    Sid = "default",
-                    Stats = new TestTacticalActStatsSubScheme{
-                        Effect = Core.Schemes.TacticalActEffectType.Damage,
-                        Efficient = new Core.Common.Roll(3,1),
-                        Offence = new TestTacticalActOffenceSubScheme
+            var acts = new ITacticalAct[]
+            {
+                new TacticalAct(
+                    new TestTacticalActScheme
+                    {
+                        Sid = "default",
+                        Stats = new TestTacticalActStatsSubScheme
                         {
-                            ApRank = 1,
-                            Impact = Core.Common.ImpactType.Kinetic,
-                            Type = Core.Components.OffenseType.Tactical
+                            Effect = TacticalActEffectType.Damage,
+                            Efficient = new Roll(3, 1),
+                            Offence = new TestTacticalActOffenceSubScheme
+                            {
+                                ApRank = 1, Impact = ImpactType.Kinetic, Type = OffenseType.Tactical
+                            }
                         }
-                    }
-                },
-                new Core.Common.Roll(3,1),
-                new Core.Common.Roll(3,3),
-                null
+                    },
+                    new Roll(3, 1),
+                    new Roll(3, 3),
+                    null
                 ),
-                new TacticalAct(new TestTacticalActScheme{
-                    Sid = "resource-required",
-                    Stats = new TestTacticalActStatsSubScheme{
-                        Effect = Core.Schemes.TacticalActEffectType.Damage,
-                        Efficient = new Core.Common.Roll(3,3),
-                        Offence = new TestTacticalActOffenceSubScheme
+                new TacticalAct(
+                    new TestTacticalActScheme
+                    {
+                        Sid = "resource-required",
+                        Stats = new TestTacticalActStatsSubScheme
                         {
-                            ApRank = 1,
-                            Impact = Core.Common.ImpactType.Kinetic,
-                            Type = Core.Components.OffenseType.Tactical
+                            Effect = TacticalActEffectType.Damage,
+                            Efficient = new Roll(3, 3),
+                            Offence = new TestTacticalActOffenceSubScheme
+                            {
+                                ApRank = 1, Impact = ImpactType.Kinetic, Type = OffenseType.Tactical
+                            }
+                        },
+                        Constrains = new TestTacticalActConstrainsSubScheme
+                        {
+                            PropResourceType = "resource", PropResourceCount = 1
                         }
                     },
-                    Constrains = new TestTacticalActConstrainsSubScheme
-                    {
-                        PropResourceType = "resource",
-                        PropResourceCount = 1
-                    }
-                },
-                new Core.Common.Roll(3,1),
-                new Core.Common.Roll(3,3),
-                null
-                ),
+                    new Roll(3, 1),
+                    new Roll(3, 3),
+                    null
+                )
             };
 
             // ACT