Clean up. Default git identity values for TeamCity.

Author: gfraiteur

DockerBuild.ps1

@@ -98,9 +98,22 @@ if (-not $KeepEnv)
         $env:ENG_USERNAME = $env:USERNAME
     }
 
-    $env:GIT_USER_NAME = git config --global user.name
     $env:GIT_USER_EMAIL = git config --global user.email
-    
+
+    $env:GIT_USER_NAME = git config --global user.name
+
+    if ( $env:IS_TEAMCITY_AGENT )
+    {
+        if (-not $env:GIT_USER_EMAIL)
+        {
+            $env:GIT_USER_EMAIL = 'teamcity@postsharp.net'
+        }
+        if (-not $env:GIT_USER_NAME)
+        {
+            $env:GIT_USER_EMAIL = 'teamcity'
+        }
+    }
+
     New-EnvJson -EnvironmentVariableList $EnvironmentVariables
 }
 

src/PostSharp.Engineering.BuildTools/BaseCommand.cs

@@ -44,7 +44,7 @@ public sealed override int Execute( CommandContext context, T settings )
 
                 MSBuildHelper.InitializeLocator();
 
-                if ( DockerHelper.IsDockerBuild() )
+                if ( buildContext.IsRunningUnderContainer )
                 {
                     buildContext.Console.WriteMessage( "Docker detected." );
                 }

src/PostSharp.Engineering.BuildTools/Build/Bumping/BumpCommand.cs

@@ -169,7 +169,7 @@ public static bool Execute( BuildContext context, BumpSettings settings )
         }
 
         // Commit the version bump.
-        if ( !GitIntegrationHelper.TryCommitVersionBump( context, oldVersion, newVersion, settings ) )
+        if ( !GitIntegrationHelper.TryCommitVersionBump( context, oldVersion, newVersion ) )
         {
             return false;
         }

src/PostSharp.Engineering.BuildTools/Build/CleanCommand.cs

@@ -101,7 +101,7 @@ void CleanNugetCache()
             }
 
             // NugetCache must be automatically deleted only on TeamCity.
-            if ( TeamCityHelper.IsTeamCityBuild( settings ) && !DockerHelper.IsDockerBuild() && !settings.NoNuGetCacheCleanup )
+            if ( context is { IsContinuousIntegrationBuild: true, IsRunningUnderContainer: false } && !settings.NoNuGetCacheCleanup )
             {
                 context.Console.WriteHeading( "Cleaning NuGet cache" );
                 context.Console.WriteMessage( "The NuGet cache cleanup can be skipped using --no-nuget-cache-cleanup." );

src/PostSharp.Engineering.BuildTools/Build/Helpers/GitIntegrationHelper.cs

@@ -83,7 +83,7 @@ public static bool TryAddTagToLastCommit( BuildContext context, PublishSettings
         var isHttps = gitOrigin.StartsWith( "https", StringComparison.InvariantCulture );
 
         // When on TeamCity, if the repository is of HTTPS origin, the origin will be updated to form including Git authentication credentials.
-        if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+        if ( context.IsContinuousIntegrationBuild )
         {
             if ( isHttps )
             {
@@ -116,7 +116,7 @@ public static bool TryAddTagToLastCommit( BuildContext context, PublishSettings
         return true;
     }
 
-    public static bool TryCommitVersionBump( BuildContext context, Version? currentVersion, Version newVersion, CommonCommandSettings settings )
+    public static bool TryCommitVersionBump( BuildContext context, Version? currentVersion, Version newVersion )
     {
         var product = context.Product;
 
@@ -150,7 +150,7 @@ public static bool TryCommitVersionBump( BuildContext context, Version? currentV
         var isHttps = gitOrigin.StartsWith( "https", StringComparison.InvariantCulture );
 
         // When on TeamCity, Git user credentials are set to TeamCity and if the repository is of HTTPS origin, the origin will be updated to form including Git authentication credentials.
-        if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+        if ( context.IsContinuousIntegrationBuild )
         {
             if ( !TeamCityHelper.TrySetGitIdentityCredentials( context ) )
             {

src/PostSharp.Engineering.BuildTools/Build/PrepareCommand.cs

@@ -33,7 +33,7 @@ public static bool Execute(
 
         var product = context.Product;
 
-        if ( settings.BuildConfiguration == BuildConfiguration.Public && !TeamCityHelper.IsTeamCityBuild( settings ) && !settings.Force )
+        if ( settings.BuildConfiguration == BuildConfiguration.Public && !context.IsContinuousIntegrationBuild && !settings.Force )
         {
             context.Console.WriteError( "Cannot prepare a public configuration on a local machine without --force because it may corrupt the package cache." );
 

src/PostSharp.Engineering.BuildTools/Build/Publishing/PostPublishCommand.cs

@@ -26,7 +26,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
                 return false;
             }
 
-            if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+            if ( context.IsContinuousIntegrationBuild )
             {
                 // When on TeamCity, Git user credentials are set to TeamCity.
                 if ( !TeamCityHelper.TrySetGitIdentityCredentials( context ) )

src/PostSharp.Engineering.BuildTools/Build/Publishing/PrePublishCommand.cs

@@ -38,7 +38,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
             return false;
         }
 
-        if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+        if ( context.IsContinuousIntegrationBuild )
         {
             // When on TeamCity, Git user credentials are set to TeamCity.
             if ( !TeamCityHelper.TrySetGitIdentityCredentials( context ) )

src/PostSharp.Engineering.BuildTools/Build/Publishing/PublishCommand.cs

@@ -150,7 +150,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )
         // For consolidated deployments, this is part of the post-deployment step.
         if ( !product.ProductFamily.HasConsolidatedBuild && !settings.IsStandalone )
         {
-            if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+            if ( context.IsContinuousIntegrationBuild )
             {
                 // When on TeamCity, Git user credentials are set to TeamCity.
                 if ( !TeamCityHelper.TrySetGitIdentityCredentials( context ) )

src/PostSharp.Engineering.BuildTools/Build/Solutions/DotNetSolution.cs

@@ -226,7 +226,7 @@ private bool RunBuildOrTests(
                     options );
             }
 
-            if ( test && TeamCityHelper.IsTeamCityBuild( settings ) )
+            if ( test && context.IsContinuousIntegrationBuild )
             {
                 // Export test result files to TeamCity.
                 TeamCityHelper.SendImportDataMessage(