cleanup

Author: arturcic

build/CI.sln

@@ -4,6 +4,7 @@ ProjectSection(SolutionItems) = preProject
 	Directory.Build.props = Directory.Build.props
 	Directory.Packages.props = Directory.Packages.props
 	..\dotnet-tools.json = ..\dotnet-tools.json
+	..\global.json = ..\global.json
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "build", "build\build.csproj", "{1AC00FB2-E28A-46B7-9683-AA7A1AFC29EB}"

build/artifacts/BuildLifetime.cs

@@ -12,7 +12,7 @@ public override void Setup(BuildContext context, ISetupContext info)
         context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
         context.TestArm64Artifacts = context.EnvironmentVariable("TEST_ARM64_ARTIFACTS", false);
 
-        context.Architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : (Architecture?)null;
+        context.Architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : null;
         var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
         var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
         var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();

build/common/Addins/GitVersion/GitVersionRunner.cs

@@ -43,7 +43,7 @@ public GitVersion Run(GitVersionSettings settings)
             output = string.Join("\n", process.GetStandardOutput());
             if (log.Verbosity < Verbosity.Diagnostic)
             {
-                var errors = Regex.Matches(output, @"( *ERROR:? [^\n]*)\n([^\n]*)").Cast<Match>()
+                var errors = Regex.Matches(output, @"( *ERROR:? [^\n]*)\n([^\n]*)")
                     .SelectMany(match => new[] { match.Groups[1].Value, match.Groups[2].Value });
                 foreach (var error in errors)
                 {

build/common/Utilities/DockerContextExtensions.cs

@@ -52,7 +52,7 @@ public static void DockerBuildImage(this BuildContextBase context, DockerImage d
             File = workDir.CombineWithFilePath("Dockerfile").FullPath,
             BuildArg = new[]
             {
-                $"contentFolder=/content",
+                "contentFolder=/content",
                 $"REGISTRY={registry}",
                 $"DOTNET_VERSION={targetFramework}",
                 $"DISTRO={distro}",

build/docker/Tasks/DockerHubReadmePublish.cs

@@ -43,7 +43,7 @@ public override void Run(BuildContext context)
             var token = context.ParseJson(response).Value<string>("token");
             settings
                 .SetContentType("application/json")
-                .SetAuthorization($"JWT", token)
+                .SetAuthorization("JWT", token)
                 .SetJsonRequestBody(new { full_description = readme });
         });
     }