Skip to content

Commit dd1d941

Browse files
committed
Fixed issue with post-publish tagging.
1 parent 92e3602 commit dd1d941

File tree

3 files changed

+27
-2
lines changed

3 files changed

+27
-2
lines changed

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ namespace PostSharp.Engineering.BuildTools.Build;
2020
public class BaseBuildSettings : CommonCommandSettings
2121
{
2222
private BuildConfiguration? _resolvedConfiguration;
23+
private BuildConfiguration? _specifiedConfiguration;
2324

2425
[Description( "Sets the build configuration (Debug | Release | Public)" )]
2526
[CommandOption( "-c|--configuration" )]
@@ -28,7 +29,7 @@ public BuildConfiguration BuildConfiguration
2829
get
2930
=> this._resolvedConfiguration
3031
?? throw new InvalidOperationException( "Call the Initialize method or set the BuildConfiguration first ." );
31-
set => this._resolvedConfiguration = value;
32+
set => this._specifiedConfiguration = value;
3233
}
3334

3435
[Description( "Overrides the .NET SDK version." )]
@@ -52,8 +53,10 @@ protected override void AppendSettings( StringBuilder stringBuilder )
5253

5354
public override void Initialize( BuildContext context )
5455
{
55-
if ( this._resolvedConfiguration != null )
56+
if ( this._specifiedConfiguration != null )
5657
{
58+
this._resolvedConfiguration = this._specifiedConfiguration;
59+
5760
return;
5861
}
5962

@@ -72,4 +75,12 @@ public override void Initialize( BuildContext context )
7275
this._resolvedConfiguration = defaultConfiguration.Value;
7376
}
7477
}
78+
79+
public void OverrideDefaultBuildConfiguration( BuildConfiguration configuration )
80+
{
81+
if ( this._specifiedConfiguration == null )
82+
{
83+
this._resolvedConfiguration = configuration;
84+
}
85+
}
7586
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ private static bool Execute( BuildContext context, PublishSettings settings )
3737
return false;
3838
}
3939

40+
settings.OverrideDefaultBuildConfiguration( BuildConfiguration.Public );
41+
42+
if ( settings.BuildConfiguration != BuildConfiguration.Public && !settings.Force )
43+
{
44+
context.Console.WriteError( $"This command must be executed with the `-c Public` argument unless --force is used." );
45+
}
46+
4047
if ( !GitHelper.TryConfigureCredentials( context ) )
4148
{
4249
return false;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ internal class PrePublishCommand : BaseCommand<PublishSettings>
1818
private static bool Execute( BuildContext context, PublishSettings settings )
1919
{
2020
var product = context.Product;
21+
22+
settings.OverrideDefaultBuildConfiguration( BuildConfiguration.Public );
23+
24+
if ( settings.BuildConfiguration != BuildConfiguration.Public && !settings.Force )
25+
{
26+
context.Console.WriteError( $"This command must be executed with the `-c Public` argument unless --force is used." );
27+
}
2128

2229
if ( !GitHelper.TryConfigureCredentials( context ) )
2330
{

0 commit comments

Comments
 (0)