(build) fix formatting issues in build project

arturcic · arturcic · commit 19dffc2247d4 · 2021-10-14T12:36:33.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -21,7 +21,7 @@ dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = true
 
 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = true:warning
+dotnet_style_qualification_for_field = false:silent
 dotnet_style_qualification_for_property = false:silent
 dotnet_style_qualification_for_method = false:silent
 dotnet_style_qualification_for_event = false:silent
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
@@ -34,5 +34,8 @@
         <Using Include="Cake.Docker" />
         <Using Include="Cake.Frosting" />
     </ItemGroup>
+    <ItemGroup>
+        <Using Include="Common.Utilities.Constants" Alias="Constants"/>
+    </ItemGroup>
 
 </Project>
diff --git a/build/artifacts/artifacts.csproj b/build/artifacts/artifacts.csproj
@@ -6,9 +6,4 @@
     <ItemGroup>
         <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
-    <ItemGroup>
-      <Compile Include="..\common\Utilities\ImportUsings.cs">
-        <Link>ImportUsings.cs</Link>
-      </Compile>
-    </ItemGroup>
 </Project>
diff --git a/build/build/build.csproj b/build/build/build.csproj
@@ -4,15 +4,10 @@
         <RootNamespace>Build</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\common\common.csproj"/>
+        <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Cake.Codecov" Version="1.0.1"/>
-        <PackageReference Include="Cake.Coverlet" Version="2.5.4"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
+        <PackageReference Include="Cake.Codecov" Version="1.0.1" />
+        <PackageReference Include="Cake.Coverlet" Version="2.5.4" />
     </ItemGroup>
 </Project>
diff --git a/build/chores/BuildContext.cs b/build/chores/BuildContext.cs
@@ -1,6 +1,3 @@
-using Cake.Core;
-using Cake.Frosting;
-
 namespace Chores;
 
 public class BuildContext : FrostingContext
diff --git a/build/chores/BuildLifetime.cs b/build/chores/BuildLifetime.cs
@@ -1,5 +1,3 @@
-using Cake.Core;
-using Cake.Frosting;
 using Common.Utilities;
 
 namespace Chores;
diff --git a/build/chores/Program.cs b/build/chores/Program.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Chores;
 
 return new CakeHost()
diff --git a/build/chores/Startup.cs b/build/chores/Startup.cs
@@ -1,4 +1,3 @@
-using Cake.Frosting;
 using Common.Lifetime;
 using Microsoft.Extensions.DependencyInjection;
 
diff --git a/build/chores/Tasks/Default.cs b/build/chores/Tasks/Default.cs
@@ -1,5 +1,3 @@
-using Cake.Frosting;
-
 namespace Chores.Tasks;
 
 [TaskDescription("Shows this output")]
diff --git a/build/chores/Tasks/ToolsInstall.cs b/build/chores/Tasks/ToolsInstall.cs
@@ -1,5 +1,3 @@
-using System.Linq;
-using Cake.Frosting;
 using Cake.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/build/chores/Tasks/ToolsUpdate.cs b/build/chores/Tasks/ToolsUpdate.cs
@@ -1,6 +1,3 @@
-using System.Linq;
-using Cake.Common.Tools.DotNetCore;
-using Cake.Frosting;
 using Cake.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs b/build/common/Addins/Cake.DotNetCoreFormat/DotNetCoreFormatAliases.cs
@@ -1,5 +1,3 @@
-using Cake.Core.Annotations;
-
 namespace Common.Addins.Cake.DotNetCoreFormat;
 
 /// <summary>
diff --git a/build/common/Addins/GitVersion/GitVersionRunner.cs b/build/common/Addins/GitVersion/GitVersionRunner.cs
@@ -23,10 +23,7 @@ public GitVersionRunner(
         ICakeEnvironment environment,
         IProcessRunner processRunner,
         IToolLocator tools,
-        ICakeLog log) : base(fileSystem, environment, processRunner, tools)
-    {
-        this.log = log;
-    }
+        ICakeLog log) : base(fileSystem, environment, processRunner, tools) => this.log = log;
 
     /// <summary>
     /// Runs GitVersion and processes the results.
@@ -62,7 +59,7 @@ public GitVersion Run(GitVersionSettings settings)
         var jsonEndIndex = output.IndexOf("}", StringComparison.Ordinal);
         var json = output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
 
-        return JsonConvert.DeserializeObject<GitVersion>(json);
+        return JsonConvert.DeserializeObject<GitVersion>(json) ?? new GitVersion();
     }
 
     private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
@@ -163,17 +160,11 @@ private ProcessArgumentBuilder GetArguments(GitVersionSettings settings)
     /// Gets the name of the tool.
     /// </summary>
     /// <returns>The name of the tool.</returns>
-    protected override string GetToolName()
-    {
-        return "GitVersion";
-    }
+    protected override string GetToolName() => "GitVersion";
 
     /// <summary>
     /// Gets the possible names of the tool executable.
     /// </summary>
     /// <returns>The tool executable name.</returns>
-    protected override IEnumerable<string> GetToolExecutableNames()
-    {
-        return new[] { "GitVersion.exe", "dotnet-gitversion", "dotnet-gitversion.exe", "gitversion" };
-    }
+    protected override IEnumerable<string> GetToolExecutableNames() => new[] { "GitVersion.exe", "dotnet-gitversion", "dotnet-gitversion.exe", "gitversion" };
 }
diff --git a/build/common/Utilities/ImportUsings.cs b/build/common/Utilities/ImportUsings.cs
diff --git a/build/docker/docker.csproj b/build/docker/docker.csproj
@@ -6,9 +6,4 @@
     <ItemGroup>
         <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
-    </ItemGroup>
 </Project>
diff --git a/build/docs/docs.csproj b/build/docs/docs.csproj
@@ -10,9 +10,4 @@
         <PackageReference Include="Cake.Git" Version="1.1.0" />
         <PackageReference Include="Cake.Wyam" Version="2.2.12" />
     </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
-    </ItemGroup>
 </Project>
diff --git a/build/publish/publish.csproj b/build/publish/publish.csproj
@@ -4,11 +4,6 @@
         <RootNamespace>Publish</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\common\common.csproj"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
+        <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
 </Project>
diff --git a/build/release/release.csproj b/build/release/release.csproj
@@ -4,11 +4,6 @@
         <RootNamespace>Release</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\common\common.csproj"/>
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="..\common\Utilities\ImportUsings.cs">
-            <Link>ImportUsings.cs</Link>
-        </Compile>
+        <ProjectReference Include="..\common\common.csproj" />
     </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using Cake.Core;`
`2`		`-using Cake.Frosting;`
`3`	`1`	`using Common.Utilities;`
`4`	`2`
`5`	`3`	`namespace Chores;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using Cake.Frosting;`
`2`	`1`	`using Chores;`
`3`	`2`
`4`	`3`	`return new CakeHost()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using Cake.Frosting;`
`2`	`1`	`using Common.Lifetime;`
`3`	`2`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using Cake.Frosting;`
`2`		`-`
`3`	`1`	`namespace Chores.Tasks;`
`4`	`2`
`5`	`3`	`[TaskDescription("Shows this output")]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-using System.Linq;`
`2`		`-using Cake.Frosting;`
`3`	`1`	`using Cake.Json;`
`4`	`2`	`using Newtonsoft.Json.Linq;`
`5`	`3`