Moved all EnvironmentVariableNames to their own class.

gfraiteur · gfraiteur · commit 09411a2e5f6b · 2025-09-17T09:06:03.000+02:00
diff --git a/src/PostSharp.Engineering.BuildTools/BillOfMaterials/LicenceNoticeDownloader.cs b/src/PostSharp.Engineering.BuildTools/BillOfMaterials/LicenceNoticeDownloader.cs
@@ -28,7 +28,7 @@ public static async Task AppendLicenseAndNoticeFilesAsync(
             AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate | DecompressionMethods.Brotli
         };
 
-        var gitHubToken = Environment.GetEnvironmentVariable( "GITHUB_TOKEN" );
+        var gitHubToken = Environment.GetEnvironmentVariable( EnvironmentVariableNames.GitHubToken );
 
         if ( string.IsNullOrEmpty( gitHubToken ) )
         {
diff --git a/src/PostSharp.Engineering.BuildTools/Build/BuildContext.cs b/src/PostSharp.Engineering.BuildTools/Build/BuildContext.cs
@@ -50,7 +50,7 @@ public string GetWorkingDirectory( string projectOrSolution )
         /// Gets a value indicating whether the current device is a guest device, as opposed to a device owned and configured by PostSharp.
         /// The main difference is that guest devices use feed packages while company devices use TeamCity artefacts.
         /// </summary>
-        public static bool IsGuestDevice => !bool.TryParse( Environment.GetEnvironmentVariable( "IS_POSTSHARP_OWNED" ), out var value ) || !value;
+        public static bool IsGuestDevice => !bool.TryParse( Environment.GetEnvironmentVariable( EnvironmentVariableNames.IsPostSharpOwned ), out var value ) || !value;
 
         /// <summary>
         /// Gets the full path of the current manifest file (i.e. the file called <c>My.Product.version.props</c>)
diff --git a/src/PostSharp.Engineering.BuildTools/Build/BuildSettings.cs b/src/PostSharp.Engineering.BuildTools/Build/BuildSettings.cs
@@ -177,7 +177,7 @@ public int? SolutionId
 
         [Description( "Overrides the user name." )]
         [CommandOption( "--user" )]
-        public string UserName { get; set; } = Environment.GetEnvironmentVariable( "ENG_USERNAME" ) ?? Environment.UserName;
+        public string UserName { get; set; } = Environment.GetEnvironmentVariable( EnvironmentVariableNames.EngUserName ) ?? Environment.UserName;
 
         public BuildSettings WithIncludeTests( bool value )
         {
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Model/Product.cs b/src/PostSharp.Engineering.BuildTools/Build/Model/Product.cs
@@ -134,15 +134,15 @@ public BuildAgentRequirements ResolvedBuildAgentRequirements
 
         public ConfigurationSpecific<BuildConfigurationInfo> Configurations { get; init; } = DefaultConfigurations;
 
-        public TimeSpan BuildTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 5 );
+        public TimeSpan BuildTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 60 );
 
-        public TimeSpan DeploymentTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 5 );
+        public TimeSpan DeploymentTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 30 );
 
-        public TimeSpan SwapTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 5 );
+        public TimeSpan SwapTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 15 );
 
-        public TimeSpan VersionBumpTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 5 );
+        public TimeSpan VersionBumpTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 15 );
 
-        public TimeSpan DownstreamMergeTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 5 );
+        public TimeSpan DownstreamMergeTimeOutThreshold { get; init; } = TimeSpan.FromMinutes( 15 );
 
         public static ImmutableArray<Publisher> DefaultPublicPublishers { get; }
             =
@@ -488,7 +488,7 @@ void CreateEmptyPublicDirectory()
                 {
                     context.Console.WriteHeading( "Signing artifacts" );
 
-                    var signToolSecret = Environment.GetEnvironmentVariable( "SIGNSERVER_SECRET" );
+                    var signToolSecret = Environment.GetEnvironmentVariable( EnvironmentVariableNames.SignServerSecret );
 
                     if ( signToolSecret == null )
                     {
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Publishers/NugetPublisher.cs b/src/PostSharp.Engineering.BuildTools/Build/Publishers/NugetPublisher.cs
@@ -53,12 +53,11 @@ public override SuccessCode PublishFile(
                 return SuccessCode.Fatal;
             }
 
-            const string azEndpointsEnvironmentVariableName = "VSS_NUGET_EXTERNAL_FEED_ENDPOINTS";
-
-            if ( apiKey == "az" && Environment.GetEnvironmentVariable( azEndpointsEnvironmentVariableName ) == null )
+            
+            if ( apiKey == "az" && Environment.GetEnvironmentVariable( EnvironmentVariableNames.AzEndpoints ) == null )
             {
                 context.Console.WriteImportantMessage(
-                    $"{azEndpointsEnvironmentVariableName} environment variable not set. If the authorization fails, set this variable or sign in interactively. See https://github.com/microsoft/artifacts-credprovider#use for details." );
+                    $"{EnvironmentVariableNames.AzEndpoints} environment variable not set. If the authorization fails, set this variable or sign in interactively. See https://github.com/microsoft/artifacts-credprovider#use for details." );
             }
 
             var exe = "dotnet";
diff --git a/src/PostSharp.Engineering.BuildTools/Build/Publishers/VsixPublisher.cs b/src/PostSharp.Engineering.BuildTools/Build/Publishers/VsixPublisher.cs
@@ -33,7 +33,7 @@ public override SuccessCode PublishFile(
                 hasEnvironmentError = true;
             }
 
-            if ( string.IsNullOrEmpty( Environment.GetEnvironmentVariable( "VS_MARKETPLACE_ACCESS_TOKEN" ) ) )
+            if ( string.IsNullOrEmpty( Environment.GetEnvironmentVariable( EnvironmentVariableNames.VsMarketplaceAccessToken ) ) )
             {
                 context.Console.WriteError( $"The VS_MARKETPLACE_ACCESS_TOKEN environment variable is not defined." );
                 hasEnvironmentError = true;
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/AzureDevOpsHelper.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/AzureDevOpsHelper.cs
@@ -19,15 +19,14 @@ public static class AzureDevOpsHelper
 {
     private static bool TryConnect( ConsoleHelper console, string url, [NotNullWhen( true )] out VssConnection? connection )
     {
-        var user = Environment.GetEnvironmentVariable( "AZURE_DEVOPS_USER" ) ?? "teamcity@postsharp.net";
+        var user = Environment.GetEnvironmentVariable( EnvironmentVariableNames.AzureDevOpsUser ) ?? "teamcity@postsharp.net";
 
-        const string tokenEnvironmentVariableName = "AZURE_DEVOPS_TOKEN";
-
-        var token = Environment.GetEnvironmentVariable( tokenEnvironmentVariableName );
+        
+        var token = Environment.GetEnvironmentVariable( EnvironmentVariableNames.AzureDevOpsToken );
 
         if ( string.IsNullOrEmpty( token ) )
         {
-            console.WriteError( $"The '{tokenEnvironmentVariableName}' environment variable is not defined." );
+            console.WriteError( $"The '{EnvironmentVariableNames.AzureDevOpsToken}' environment variable is not defined." );
             connection = null;
 
             return false;
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/GitHubHelper.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/GitHubHelper.cs
@@ -20,15 +20,13 @@ namespace PostSharp.Engineering.BuildTools.ContinuousIntegration;
 
 public static class GitHubHelper
 {
-    private const string _tokenEnvironmentVariableName = "GITHUB_TOKEN";
-    private const string _reviewerTokenEnvironmentVariableName = "GITHUB_REVIEWER_TOKEN";
     private const string _productHeaderName = "PostSharp.Engineering";
     private static readonly string _productHeaderVersion = typeof(GitHubHelper).Assembly.GetName().Version!.ToString();
 
     private static bool TryGetToken(
         ConsoleHelper console,
         [NotNullWhen( true )] out string? token,
-        string tokenEnvironmentVariableName = _tokenEnvironmentVariableName )
+        string tokenEnvironmentVariableName = EnvironmentVariableNames.GitHubToken )
     {
         token = Environment.GetEnvironmentVariable( tokenEnvironmentVariableName );
 
@@ -49,7 +47,7 @@ private static GitHubClient ConnectRestApi( string token )
     private static bool TryConnectRestApi(
         ConsoleHelper console,
         [NotNullWhen( true )] out GitHubClient? client,
-        string tokenEnvironmentVariableName = _tokenEnvironmentVariableName )
+        string tokenEnvironmentVariableName = EnvironmentVariableNames.GitHubToken )
     {
         if ( !TryGetToken( console, out var token, tokenEnvironmentVariableName ) )
         {
@@ -109,7 +107,7 @@ bool TryConnectRestApis( [NotNullWhen( true )] out GitHubClient? c, [NotNullWhen
                 return false;
             }
 
-            if ( !TryGetToken( console, out var reviewerToken, _reviewerTokenEnvironmentVariableName ) )
+            if ( !TryGetToken( console, out var reviewerToken, EnvironmentVariableNames.GitHubReviewerToken ) )
             {
                 return false;
             }
@@ -157,7 +155,7 @@ bool TryConnectRestApis( [NotNullWhen( true )] out GitHubClient? c, [NotNullWhen
 
         var pullRequestId = await graphQl.Run( pullRequestQuery );
 
-        var authorEmail = Environment.GetEnvironmentVariable( "GITHUB_AUTHOR_EMAIL" ) ?? "teamcity@postsharp.net";
+        var authorEmail = Environment.GetEnvironmentVariable( EnvironmentVariableNames.GitHubAuthorEmail ) ?? "teamcity@postsharp.net";
 
         var enableAutoMergeMutation = new Mutation()
             .EnablePullRequestAutoMerge(
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/BuildSteps/TeamCityPowerShellBuildStep.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/BuildSteps/TeamCityPowerShellBuildStep.cs
@@ -29,13 +29,10 @@ public TeamCityPowerShellBuildStep( string id, string name, string scriptPath, s
 
     public override string GenerateTeamCityCode()
     {
-        var parameters = this.TimeOut != null ? $"param(\"TimeOut\", \"{this.TimeOut.Value.TotalSeconds}\")" : "";
-
         return $@"        powerShell {{
             name = ""{this.Name}""
             id = ""{this.Id}""{(this.WorkingDirectory == null ? "" : $@"
             workingDir = ""{this.WorkingDirectory.Replace( Path.DirectorySeparatorChar, '/' )}""")}
-            {parameters}
             scriptMode = file {{
                 path = ""{this.ScriptPath}""
             }}
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/TeamCityBuildConfiguration.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/Model/TeamCityBuildConfiguration.cs
@@ -113,9 +113,9 @@ public void GenerateTeamcityCode( TextWriter writer )
             {
                 var timeOutParameter = new TeamCityTextBuildConfigurationParameterBase(
                     "TimeOut",
-                    "Time-Out Threshold",
-                    "Seconds after the duration of the last successful build.",
-                    $"{(int) this.BuildTimeOutThreshold.Value.TotalSeconds}" ) { Validation = (@"\d+", "The timeout has to be an integer number.") };
+                    "Time-Out",
+                    "Timeout, in minutes.",
+                    $"{(int) this.BuildTimeOutThreshold.Value.TotalMinutes}" ) { Validation = (@"\d+", "The timeout has to be an integer number.") };
 
                 buildParameters.Add( timeOutParameter );
             }
@@ -185,19 +185,11 @@ public void GenerateTeamcityCode( TextWriter writer )
             if ( this.BuildTimeOutThreshold.HasValue )
             {
                 writer.WriteLine(
-                    @$"
-    failureConditions {{
-        failOnMetricChange {{
-            metric = BuildFailureOnMetric.MetricType.BUILD_DURATION
-            units = BuildFailureOnMetric.MetricUnit.DEFAULT_UNIT
-            comparison = BuildFailureOnMetric.MetricComparison.MORE
-            compareTo = build {{
-                buildRule = lastSuccessful()
-            }}
-            stopBuildOnFailure = true
-            param(""metricThreshold"", ""%TimeOut%"")
-        }}
-    }}" );
+                    $$"""
+                          failureConditions {
+                               executionTimeoutMin = {{(int) this.BuildTimeOutThreshold.Value.TotalMinutes}}
+                          }
+                      """ );
             }
 
             if ( !this.IsComposite && this.BuildAgentRequirements != null )
diff --git a/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCityHelper.cs b/src/PostSharp.Engineering.BuildTools/ContinuousIntegration/TeamCityHelper.cs
@@ -24,26 +24,24 @@ namespace PostSharp.Engineering.BuildTools.ContinuousIntegration;
 public static class TeamCityHelper
 {
     public const string TeamCityOnPremUrl = "https://tc.postsharp.net";
-    public const string TeamCityOnPremTokenEnvironmentVariableName = "TEAMCITY_TOKEN";
     public const string TeamCityCloudUrl = "https://postsharp.teamcity.com";
-    public const string TeamCityCloudTokenEnvironmentVariableName = "TEAMCITY_CLOUD_TOKEN";
     public const string TeamCityUsername = "teamcity@postsharp.net";
     public const string TeamcityApiBuildQueuePath = $"/app/rest/buildQueue";
     public const string TeamCityApiRunningBuildsPath = "/app/rest/builds?locator=state:running";
     public const string TeamCityApiFinishedBuildsPath = "/app/rest/builds?locator=state:finished";
 
     public static bool IsTeamCityBuild( CommonCommandSettings settings )
-        => settings.SimulateContinuousIntegration || Environment.GetEnvironmentVariable( "IS_TEAMCITY_AGENT" )?.ToLowerInvariant() == "true";
+        => settings.SimulateContinuousIntegration || Environment.GetEnvironmentVariable( EnvironmentVariableNames.IsTeamCityAgent )?.ToLowerInvariant() == "true";
 
     public static ImmutableDictionary<string, string?> GetSimulatedContinuousIntegrationEnvironmentVariables( CommonCommandSettings settings )
     {
         if ( settings.SimulateContinuousIntegration )
         {
-            var isIsTeamCityAgentEnvironmentVariableSet = Environment.GetEnvironmentVariable( "IS_TEAMCITY_AGENT" )?.ToLowerInvariant() == "true";
+            var isIsTeamCityAgentEnvironmentVariableSet = Environment.GetEnvironmentVariable( EnvironmentVariableNames.IsTeamCityAgent )?.ToLowerInvariant() == "true";
 
             if ( !isIsTeamCityAgentEnvironmentVariableSet )
             {
-                return new Dictionary<string, string?> { { "IS_TEAMCITY_AGENT", "true" } }.ToImmutableDictionary();
+                return new Dictionary<string, string?> { { EnvironmentVariableNames.IsTeamCityAgent, "true" } }.ToImmutableDictionary();
             }
         }
 
@@ -315,12 +313,12 @@ public static CiProjectConfiguration CreateConfiguration(
 
         if ( isCloudInstance )
         {
-            tokenEnvironmentVariableName = TeamCityCloudTokenEnvironmentVariableName;
+            tokenEnvironmentVariableName = EnvironmentVariableNames.TeamCityCloudToken;
             baseUrl = TeamCityCloudUrl;
         }
         else
         {
-            tokenEnvironmentVariableName = TeamCityOnPremTokenEnvironmentVariableName;
+            tokenEnvironmentVariableName = EnvironmentVariableNames.TeamCityOnPremToken;
             baseUrl = TeamCityOnPremUrl;
         }
 
diff --git a/src/PostSharp.Engineering.BuildTools/EnvironmentVariableNames.cs b/src/PostSharp.Engineering.BuildTools/EnvironmentVariableNames.cs
@@ -0,0 +1,48 @@
+﻿// Copyright (c) SharpCrafters s.r.o. See the LICENSE.md file in the root directory of this repository root for details.
+
+namespace PostSharp.Engineering.BuildTools;
+
+public static class EnvironmentVariableNames
+{
+    public const string TeamCityOnPremToken = "TEAMCITY_TOKEN";
+    public const string TeamCityCloudToken = "TEAMCITY_CLOUD_TOKEN";
+    public const string VsMarketplaceAccessToken = "VS_MARKETPLACE_ACCESS_TOKEN";
+    public const string GitHubToken = "GITHUB_TOKEN";
+    public const string IsPostSharpOwned = "IS_POSTSHARP_OWNED";
+    public const string IsTeamCityAgent = "IS_TEAMCITY_AGENT";
+    public const string EngUserName = "ENG_USERNAME";
+    public const string SignServerSecret = "SIGNSERVER_SECRET";
+    public const string AzEndpoints = "VSS_NUGET_EXTERNAL_FEED_ENDPOINTS";
+    public const string AzureDevOpsUser = "AZURE_DEVOPS_USER";
+    public const string AzureDevOpsToken = "AZURE_DEVOPS_TOKEN";
+    public const string GitHubReviewerToken = "GITHUB_REVIEWER_TOKEN";
+    public const string GitHubAuthorEmail = "GITHUB_AUTHOR_EMAIL";
+    public const string NuGetOrgApiKey = "NUGET_ORG_API_KEY";
+    public const string AwsAccessKeyId = "AWS_ACCESS_KEY_ID";
+    public const string AwsAccessKeySecret = "AWS_SECRET_ACCESS_KEY";
+    public const string TypeSenseApiKey = "TYPESENSE_API_KEY";
+    public const string AzIdentityUserName = "AZ_IDENTITY_USERNAME";
+
+    public static readonly string[] All =
+    [
+        TeamCityOnPremToken,
+        TeamCityCloudToken,
+        VsMarketplaceAccessToken,
+        GitHubToken,
+        IsPostSharpOwned,
+        IsTeamCityAgent,
+        EngUserName,
+        SignServerSecret,
+        AzEndpoints,
+        AzureDevOpsUser,
+        AzureDevOpsToken,
+        GitHubReviewerToken,
+        GitHubAuthorEmail,
+        NuGetOrgApiKey,
+        AwsAccessKeyId,
+        AwsAccessKeySecret,
+        TypeSenseApiKey,
+        AzIdentityUserName
+    ];
+
+}
diff --git a/src/PostSharp.Engineering.BuildTools/NuGet/UnlistNugetPackageCommand.cs b/src/PostSharp.Engineering.BuildTools/NuGet/UnlistNugetPackageCommand.cs
@@ -108,13 +108,12 @@ private static bool TryDeserializeVersions( string versionsJson, [NotNullWhen( t
 
     private static bool UnlistPackage( ConsoleHelper console, string packageName, List<string> packageVersions )
     {
-        var nugetUnlistApiKeyEnvironmentVariable = "NUGET_ORG_UNLIST_API_KEY";
-        var nugetUnlistApiKey = Environment.GetEnvironmentVariable( nugetUnlistApiKeyEnvironmentVariable );
+        var nugetUnlistApiKey = Environment.GetEnvironmentVariable( EnvironmentVariableNames.NuGetOrgApiKey );
 
         if ( string.IsNullOrEmpty( nugetUnlistApiKey ) )
         {
             console.WriteImportantMessage(
-                $"'{nugetUnlistApiKeyEnvironmentVariable}' environment variable required for unlisting the package from NuGet.org is not set." );
+                $"'{EnvironmentVariableNames.NuGetOrgApiKey}' environment variable required for unlisting the package from NuGet.org is not set." );
 
             return false;
         }
diff --git a/src/PostSharp.Engineering.BuildTools/S3/Publishers/S3Publisher.cs b/src/PostSharp.Engineering.BuildTools/S3/Publishers/S3Publisher.cs
@@ -34,13 +34,13 @@ public override SuccessCode PublishFile(
             var packageConfiguration = this._configuration.Single( c => c.PackageFileName.ToString( buildInfo ) == fileName );
             var hasEnvironmentError = false;
 
-            if ( string.IsNullOrEmpty( Environment.GetEnvironmentVariable( "AWS_ACCESS_KEY_ID" ) ) )
+            if ( string.IsNullOrEmpty( Environment.GetEnvironmentVariable( EnvironmentVariableNames.AwsAccessKeyId ) ) )
             {
                 context.Console.WriteError( $"The AWS_ACCESS_KEY_ID environment variable is not defined." );
                 hasEnvironmentError = true;
             }
 
-            if ( string.IsNullOrEmpty( Environment.GetEnvironmentVariable( "AWS_SECRET_ACCESS_KEY" ) ) )
+            if ( string.IsNullOrEmpty( Environment.GetEnvironmentVariable( EnvironmentVariableNames.AwsAccessKeySecret ) ) )
             {
                 context.Console.WriteError( $"The AWS_SECRET_ACCESS_KEY environment variable is not defined." );
                 hasEnvironmentError = true;
@@ -51,8 +51,8 @@ public override SuccessCode PublishFile(
                 return SuccessCode.Fatal;
             }
 
-            var awsAccessKeyId = Environment.GetEnvironmentVariable( "AWS_ACCESS_KEY_ID" );
-            var awsSecretAccessKey = Environment.GetEnvironmentVariable( "AWS_SECRET_ACCESS_KEY" );
+            var awsAccessKeyId = Environment.GetEnvironmentVariable( EnvironmentVariableNames.AwsAccessKeyId );
+            var awsSecretAccessKey = Environment.GetEnvironmentVariable( EnvironmentVariableNames.AwsAccessKeySecret );
 
             var message =
                 $"Publishing '{file}' file to '{packageConfiguration.KeyName}' in '{packageConfiguration.BucketName}' bucket in '{packageConfiguration.RegionEndpoint}' region. AWS access key ID: '{awsAccessKeyId}'.";
diff --git a/src/PostSharp.Engineering.BuildTools/Search/UpdateSearchCommand.cs b/src/PostSharp.Engineering.BuildTools/Search/UpdateSearchCommand.cs
@@ -48,12 +48,11 @@ private static async Task<bool> ExecuteCoreAsync( BuildContext context, UpdateSe
         }
         else
         {
-            const string apiKeyEnvironmentVariableName = "TYPESENSE_API_KEY";
-            var apiKey = Environment.GetEnvironmentVariable( apiKeyEnvironmentVariableName );
+            var apiKey = Environment.GetEnvironmentVariable( EnvironmentVariableNames.TypeSenseApiKey );
 
             if ( apiKey == null )
             {
-                console.WriteError( $"{apiKeyEnvironmentVariableName} environment variable not set." );
+                console.WriteError( $"{EnvironmentVariableNames.TypeSenseApiKey} environment variable not set." );
 
                 return false;
             }
diff --git a/src/PostSharp.Engineering.BuildTools/Search/UpdateSearchProductExtension.cs b/src/PostSharp.Engineering.BuildTools/Search/UpdateSearchProductExtension.cs
@@ -71,7 +71,7 @@ public UpdateSearchProductExtension(
         this.Source = source;
         this.SourceUrl = sourceUrl;
         this.BuildConfigurations = buildConfigurations ?? [BuildConfiguration.Public];
-        this.TimeOutThreshold = timeOutThreshold ?? TimeSpan.FromMinutes( 5 );
+        this.TimeOutThreshold = timeOutThreshold ?? TimeSpan.FromMinutes( 30 );
         this.CustomBuildConfigurationName = customBuildConfigurationName;
         this.BuildTriggers = buildTriggers;
     }
diff --git a/src/PostSharp.Engineering.BuildTools/Utilities/AzHelper.cs b/src/PostSharp.Engineering.BuildTools/Utilities/AzHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static async Task AppendLicenseAndNoticeFilesAsync(`
`28`	`28`	`AutomaticDecompression = DecompressionMethods.GZip \| DecompressionMethods.Deflate \| DecompressionMethods.Brotli`
`29`	`29`	`};`
`30`	`30`
`31`		`- var gitHubToken = Environment.GetEnvironmentVariable( "GITHUB_TOKEN" );`
	`31`	`+ var gitHubToken = Environment.GetEnvironmentVariable( EnvironmentVariableNames.GitHubToken );`
`32`	`32`
`33`	`33`	`if ( string.IsNullOrEmpty( gitHubToken ) )`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public int? SolutionId`
`177`	`177`
`178`	`178`	`[Description( "Overrides the user name." )]`
`179`	`179`	`[CommandOption( "--user" )]`
`180`		`- public string UserName { get; set; } = Environment.GetEnvironmentVariable( "ENG_USERNAME" ) ?? Environment.UserName;`
	`180`	`+ public string UserName { get; set; } = Environment.GetEnvironmentVariable( EnvironmentVariableNames.EngUserName ) ?? Environment.UserName;`
`181`	`181`
`182`	`182`	`public BuildSettings WithIncludeTests( bool value )`
`183`	`183`	`{`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,11 @@ public override SuccessCode PublishFile(`
`53`	`53`	`return SuccessCode.Fatal;`
`54`	`54`	`}`
`55`	`55`
`56`		`- const string azEndpointsEnvironmentVariableName = "VSS_NUGET_EXTERNAL_FEED_ENDPOINTS";`
`57`		`-`
`58`		`- if ( apiKey == "az" && Environment.GetEnvironmentVariable( azEndpointsEnvironmentVariableName ) == null )`
	`56`	`+`
	`57`	`+ if ( apiKey == "az" && Environment.GetEnvironmentVariable( EnvironmentVariableNames.AzEndpoints ) == null )`
`59`	`58`	`{`
`60`	`59`	`context.Console.WriteImportantMessage(`
`61`		`- $"{azEndpointsEnvironmentVariableName} environment variable not set. If the authorization fails, set this variable or sign in interactively. See https://github.com/microsoft/artifacts-credprovider#use for details." );`
	`60`	`+ $"{EnvironmentVariableNames.AzEndpoints} environment variable not set. If the authorization fails, set this variable or sign in interactively. See https://github.com/microsoft/artifacts-credprovider#use for details." );`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`var exe = "dotnet";`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public override SuccessCode PublishFile(`
`33`	`33`	`hasEnvironmentError = true;`
`34`	`34`	`}`
`35`	`35`
`36`		`- if ( string.IsNullOrEmpty( Environment.GetEnvironmentVariable( "VS_MARKETPLACE_ACCESS_TOKEN" ) ) )`
	`36`	`+ if ( string.IsNullOrEmpty( Environment.GetEnvironmentVariable( EnvironmentVariableNames.VsMarketplaceAccessToken ) ) )`
`37`	`37`	`{`
`38`	`38`	`context.Console.WriteError( $"The VS_MARKETPLACE_ACCESS_TOKEN environment variable is not defined." );`
`39`	`39`	`hasEnvironmentError = true;`
Original file line number	Diff line number	Diff line change
`@@ -19,15 +19,14 @@ public static class AzureDevOpsHelper`
`19`	`19`	`{`
`20`	`20`	`private static bool TryConnect( ConsoleHelper console, string url, [NotNullWhen( true )] out VssConnection? connection )`
`21`	`21`	`{`
`22`		`- var user = Environment.GetEnvironmentVariable( "AZURE_DEVOPS_USER" ) ?? "[email protected]";`
	`22`	`+ var user = Environment.GetEnvironmentVariable( EnvironmentVariableNames.AzureDevOpsUser ) ?? "[email protected]";`
`23`	`23`
`24`		`- const string tokenEnvironmentVariableName = "AZURE_DEVOPS_TOKEN";`
`25`		`-`
`26`		`- var token = Environment.GetEnvironmentVariable( tokenEnvironmentVariableName );`
	`24`	`+`
	`25`	`+ var token = Environment.GetEnvironmentVariable( EnvironmentVariableNames.AzureDevOpsToken );`
`27`	`26`
`28`	`27`	`if ( string.IsNullOrEmpty( token ) )`
`29`	`28`	`{`
`30`		`- console.WriteError( $"The '{tokenEnvironmentVariableName}' environment variable is not defined." );`
	`29`	`+ console.WriteError( $"The '{EnvironmentVariableNames.AzureDevOpsToken}' environment variable is not defined." );`
`31`	`30`	`connection = null;`
`32`	`31`
`33`	`32`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,13 @@ namespace PostSharp.Engineering.BuildTools.ContinuousIntegration;`
`20`	`20`
`21`	`21`	`public static class GitHubHelper`
`22`	`22`	`{`
`23`		`- private const string _tokenEnvironmentVariableName = "GITHUB_TOKEN";`
`24`		`- private const string _reviewerTokenEnvironmentVariableName = "GITHUB_REVIEWER_TOKEN";`
`25`	`23`	`private const string _productHeaderName = "PostSharp.Engineering";`
`26`	`24`	`private static readonly string _productHeaderVersion = typeof(GitHubHelper).Assembly.GetName().Version!.ToString();`
`27`	`25`
`28`	`26`	`private static bool TryGetToken(`
`29`	`27`	`ConsoleHelper console,`
`30`	`28`	`[NotNullWhen( true )] out string? token,`
`31`		`- string tokenEnvironmentVariableName = _tokenEnvironmentVariableName )`
	`29`	`+ string tokenEnvironmentVariableName = EnvironmentVariableNames.GitHubToken )`
`32`	`30`	`{`
`33`	`31`	`token = Environment.GetEnvironmentVariable( tokenEnvironmentVariableName );`
`34`	`32`
`@@ -49,7 +47,7 @@ private static GitHubClient ConnectRestApi( string token )`
`49`	`47`	`private static bool TryConnectRestApi(`
`50`	`48`	`ConsoleHelper console,`
`51`	`49`	`[NotNullWhen( true )] out GitHubClient? client,`
`52`		`- string tokenEnvironmentVariableName = _tokenEnvironmentVariableName )`
	`50`	`+ string tokenEnvironmentVariableName = EnvironmentVariableNames.GitHubToken )`
`53`	`51`	`{`
`54`	`52`	`if ( !TryGetToken( console, out var token, tokenEnvironmentVariableName ) )`
`55`	`53`	`{`
`@@ -109,7 +107,7 @@ bool TryConnectRestApis( [NotNullWhen( true )] out GitHubClient? c, [NotNullWhen`
`109`	`107`	`return false;`
`110`	`108`	`}`
`111`	`109`
`112`		`- if ( !TryGetToken( console, out var reviewerToken, _reviewerTokenEnvironmentVariableName ) )`
	`110`	`+ if ( !TryGetToken( console, out var reviewerToken, EnvironmentVariableNames.GitHubReviewerToken ) )`
`113`	`111`	`{`
`114`	`112`	`return false;`
`115`	`113`	`}`
`@@ -157,7 +155,7 @@ bool TryConnectRestApis( [NotNullWhen( true )] out GitHubClient? c, [NotNullWhen`
`157`	`155`
`158`	`156`	`var pullRequestId = await graphQl.Run( pullRequestQuery );`
`159`	`157`
`160`		`- var authorEmail = Environment.GetEnvironmentVariable( "GITHUB_AUTHOR_EMAIL" ) ?? "[email protected]";`
	`158`	`+ var authorEmail = Environment.GetEnvironmentVariable( EnvironmentVariableNames.GitHubAuthorEmail ) ?? "[email protected]";`
`161`	`159`
`162`	`160`	`var enableAutoMergeMutation = new Mutation()`
`163`	`161`	`.EnablePullRequestAutoMerge(`