Clean up. Default git identity values for TeamCity.

gfraiteur · gfraiteur · commit 07c98779aea3 · 2025-09-21T18:49:34.000+02:00
diff --git a/DockerBuild.ps1 b/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
 }
 
diff --git a/src/PostSharp.Engineering.BuildTools/BaseCommand.cs b/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." );
                 }
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Bumping/BumpCommand.cs b/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;
         }
diff --git a/src/PostSharp.Engineering.BuildTools/Build/CleanCommand.cs b/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." );
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Helpers/GitIntegrationHelper.cs b/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 ) )
             {
diff --git a/src/PostSharp.Engineering.BuildTools/Build/PrepareCommand.cs b/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." );
 
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Publishing/PostPublishCommand.cs b/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 ) )
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Publishing/PrePublishCommand.cs b/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 ) )
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Publishing/PublishCommand.cs b/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 ) )
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Solutions/DotNetSolution.cs b/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(
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Solutions/MsbuildSolution.cs b/src/PostSharp.Engineering.BuildTools/Build/Solutions/MsbuildSolution.cs
@@ -119,7 +119,7 @@ private bool RunMSBuild( BuildContext context, BuildSettings settings, string pr
                 argsBuilder.Append( CultureInfo.InvariantCulture, $" -p:{property.Key}={property.Value}" );
             }
 
-            if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+            if ( context.IsContinuousIntegrationBuild )
             {
                 argsBuilder.Append( " -p:ContinuousIntegrationBuild=True" );
             }
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Model/DependenciesConfigurationFile.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Model/DependenciesConfigurationFile.cs
@@ -218,7 +218,7 @@ bool TryGetBuildId( out string? versionFile1, out ICiBuildSpec? ciBuildSpec )
                                     return false;
                                 }
 
-                                if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+                                if ( context.IsContinuousIntegrationBuild )
                                 {
                                     if ( buildSpec == null )
                                     {
@@ -405,7 +405,7 @@ void WriteBuildServerSource()
                 switch ( dependencySource.SourceKind )
                 {
                     case DependencySourceKind.BuildServer:
-                    case DependencySourceKind.RestoredDependency when !TeamCityHelper.IsTeamCityBuild( settings ):
+                    case DependencySourceKind.RestoredDependency when !context.IsContinuousIntegrationBuild:
                         {
                             var dependencyDefinition = context.Product.ParametrizedDependencies.SingleOrDefault( p => p.Name == dependency.Key )?.Definition;
 
@@ -584,6 +584,6 @@ internal static string GetPath( BuildContext context, CommonCommandSettings sett
             => Path.Combine(
                 context.RepoDirectory,
                 context.Product.EngineeringDirectory,
-                $"Versions.{configuration}.{(TeamCityHelper.IsTeamCityBuild( settings ) ? "ci." : "")}g.props" );
+                $"Versions.{configuration}.{(context.IsContinuousIntegrationBuild ? "ci." : "")}g.props" );
     }
 }
diff --git a/src/PostSharp.Engineering.BuildTools/Dependencies/Model/VersionFile.cs b/src/PostSharp.Engineering.BuildTools/Dependencies/Model/VersionFile.cs
@@ -112,7 +112,7 @@ public static bool TryRead(
             {
                 dependencySource = DependencySource.CreateLocalRepo( DependencyConfigurationOrigin.Default );
             }
-            else if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+            else if ( context.IsContinuousIntegrationBuild )
             {
                 dependencySource = DependencySource.CreateRestoredDependency(
                     context,
diff --git a/src/PostSharp.Engineering.BuildTools/Resources/DockerBuild.ps1 b/src/PostSharp.Engineering.BuildTools/Resources/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
 }
 
diff --git a/src/PostSharp.Engineering.BuildTools/Tools/Git/DownstreamMerge.cs b/src/PostSharp.Engineering.BuildTools/Tools/Git/DownstreamMerge.cs
@@ -135,7 +135,7 @@ private static bool TryCheckPendingMerges( BuildContext context, BaseBuildSettin
     public static bool MergeDownstream( BuildContext context, DownstreamMergeSettings settings )
     {
         // When on TeamCity, Git user credentials are set to TeamCity.
-        if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+        if ( context.IsContinuousIntegrationBuild )
         {
             if ( !TeamCityHelper.TrySetGitIdentityCredentials( context ) )
             {
diff --git a/src/PostSharp.Engineering.BuildTools/Utilities/DotNetHelper.cs b/src/PostSharp.Engineering.BuildTools/Utilities/DotNetHelper.cs
@@ -124,7 +124,7 @@ private static string CreateCommandLine(
                 argsBuilder.Append( CultureInfo.InvariantCulture, $" -p:{property.Key}={property.Value}" );
             }
 
-            if ( TeamCityHelper.IsTeamCityBuild( settings ) && !isTestDllCommand )
+            if ( context.IsContinuousIntegrationBuild && !isTestDllCommand )
             {
                 argsBuilder.Append( " -p:ContinuousIntegrationBuild=True" );
             }
diff --git a/src/PostSharp.Engineering.BuildTools/Utilities/TestLicenseKeyDownloader.cs b/src/PostSharp.Engineering.BuildTools/Utilities/TestLicenseKeyDownloader.cs
@@ -41,7 +41,7 @@ public static bool Download( BuildContext context, BuildSettings settings )
 
         if ( !AzHelper.Login( context.Console ) )
         {
-            if ( TeamCityHelper.IsTeamCityBuild( settings ) )
+            if ( context.IsContinuousIntegrationBuild )
             {
                 context.Console.WriteError( "Cannot download test license keys." );
             }

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public sealed override int Execute( CommandContext context, T settings )`
`44`	`44`
`45`	`45`	`MSBuildHelper.InitializeLocator();`
`46`	`46`
`47`		`- if ( DockerHelper.IsDockerBuild() )`
	`47`	`+ if ( buildContext.IsRunningUnderContainer )`
`48`	`48`	`{`
`49`	`49`	`buildContext.Console.WriteMessage( "Docker detected." );`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public static bool Execute( BuildContext context, BumpSettings settings )`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`// Commit the version bump.`
`172`		`- if ( !GitIntegrationHelper.TryCommitVersionBump( context, oldVersion, newVersion, settings ) )`
	`172`	`+ if ( !GitIntegrationHelper.TryCommitVersionBump( context, oldVersion, newVersion ) )`
`173`	`173`	`{`
`174`	`174`	`return false;`
`175`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ void CleanNugetCache()`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// NugetCache must be automatically deleted only on TeamCity.`
`104`		`- if ( TeamCityHelper.IsTeamCityBuild( settings ) && !DockerHelper.IsDockerBuild() && !settings.NoNuGetCacheCleanup )`
	`104`	`+ if ( context is { IsContinuousIntegrationBuild: true, IsRunningUnderContainer: false } && !settings.NoNuGetCacheCleanup )`
`105`	`105`	`{`
`106`	`106`	`context.Console.WriteHeading( "Cleaning NuGet cache" );`
`107`	`107`	`context.Console.WriteMessage( "The NuGet cache cleanup can be skipped using --no-nuget-cache-cleanup." );`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public static bool TryAddTagToLastCommit( BuildContext context, PublishSettings`
`83`	`83`	`var isHttps = gitOrigin.StartsWith( "https", StringComparison.InvariantCulture );`
`84`	`84`
`85`	`85`	`// When on TeamCity, if the repository is of HTTPS origin, the origin will be updated to form including Git authentication credentials.`
`86`		`- if ( TeamCityHelper.IsTeamCityBuild( settings ) )`
	`86`	`+ if ( context.IsContinuousIntegrationBuild )`
`87`	`87`	`{`
`88`	`88`	`if ( isHttps )`
`89`	`89`	`{`
`@@ -116,7 +116,7 @@ public static bool TryAddTagToLastCommit( BuildContext context, PublishSettings`
`116`	`116`	`return true;`
`117`	`117`	`}`
`118`	`118`
`119`		`- public static bool TryCommitVersionBump( BuildContext context, Version? currentVersion, Version newVersion, CommonCommandSettings settings )`
	`119`	`+ public static bool TryCommitVersionBump( BuildContext context, Version? currentVersion, Version newVersion )`
`120`	`120`	`{`
`121`	`121`	`var product = context.Product;`
`122`	`122`
`@@ -150,7 +150,7 @@ public static bool TryCommitVersionBump( BuildContext context, Version? currentV`
`150`	`150`	`var isHttps = gitOrigin.StartsWith( "https", StringComparison.InvariantCulture );`
`151`	`151`
`152`	`152`	`// 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.`
`153`		`- if ( TeamCityHelper.IsTeamCityBuild( settings ) )`
	`153`	`+ if ( context.IsContinuousIntegrationBuild )`
`154`	`154`	`{`
`155`	`155`	`if ( !TeamCityHelper.TrySetGitIdentityCredentials( context ) )`
`156`	`156`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public static bool Execute(`
`33`	`33`
`34`	`34`	`var product = context.Product;`
`35`	`35`
`36`		`- if ( settings.BuildConfiguration == BuildConfiguration.Public && !TeamCityHelper.IsTeamCityBuild( settings ) && !settings.Force )`
	`36`	`+ if ( settings.BuildConfiguration == BuildConfiguration.Public && !context.IsContinuousIntegrationBuild && !settings.Force )`
`37`	`37`	`{`
`38`	`38`	`context.Console.WriteError( "Cannot prepare a public configuration on a local machine without --force because it may corrupt the package cache." );`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )`
`26`	`26`	`return false;`
`27`	`27`	`}`
`28`	`28`
`29`		`- if ( TeamCityHelper.IsTeamCityBuild( settings ) )`
	`29`	`+ if ( context.IsContinuousIntegrationBuild )`
`30`	`30`	`{`
`31`	`31`	`// When on TeamCity, Git user credentials are set to TeamCity.`
`32`	`32`	`if ( !TeamCityHelper.TrySetGitIdentityCredentials( context ) )`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static bool Execute( BuildContext context, PublishSettings settings )`
`38`	`38`	`return false;`
`39`	`39`	`}`
`40`	`40`
`41`		`- if ( TeamCityHelper.IsTeamCityBuild( settings ) )`
	`41`	`+ if ( context.IsContinuousIntegrationBuild )`
`42`	`42`	`{`
`43`	`43`	`// When on TeamCity, Git user credentials are set to TeamCity.`
`44`	`44`	`if ( !TeamCityHelper.TrySetGitIdentityCredentials( context ) )`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ private bool RunBuildOrTests(`
`226`	`226`	`options );`
`227`	`227`	`}`
`228`	`228`
`229`		`- if ( test && TeamCityHelper.IsTeamCityBuild( settings ) )`
	`229`	`+ if ( test && context.IsContinuousIntegrationBuild )`
`230`	`230`	`{`
`231`	`231`	`// Export test result files to TeamCity.`
`232`	`232`	`TeamCityHelper.SendImportDataMessage(`