diff --git a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs index 0c5e9c31b7..c8ce21013e 100644 --- a/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs +++ b/src/ServiceControl.Config/Commands/AddServiceControlInstanceCommand.cs @@ -18,7 +18,7 @@ public AddServiceControlInstanceCommand(IServiceControlWindowManager windowManag public override async Task ExecuteAsync(object obj) { - if (!await commandChecks.CanAddInstance()) + if (!await commandChecks.CanAddInstance(true)) { return; } diff --git a/src/ServiceControl.Config/UI/Shell/ShellView.xaml b/src/ServiceControl.Config/UI/Shell/ShellView.xaml index 001b08ea57..dea57a4a05 100644 --- a/src/ServiceControl.Config/UI/Shell/ShellView.xaml +++ b/src/ServiceControl.Config/UI/Shell/ShellView.xaml @@ -126,7 +126,7 @@ HorizontalOffset="-288" Placement="Bottom" PlacementTarget="{Binding ElementName=StatusPanel}"> - + diff --git a/src/ServiceControl.Management.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs b/src/ServiceControl.Management.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs index 66bd8e8730..96e905e064 100644 --- a/src/ServiceControl.Management.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs +++ b/src/ServiceControl.Management.PowerShell/Cmdlets/ServiceControlInstances/NewServiceControlInstance.cs @@ -184,7 +184,7 @@ protected override void ProcessRecord() try { var checks = new PowerShellCommandChecks(this, Acknowledgements); - if (!checks.CanAddInstance().GetAwaiter().GetResult()) + if (!checks.CanAddInstance(true).GetAwaiter().GetResult()) { return; } diff --git a/src/ServiceControlInstaller.Engine/Validation/AbstractCommandChecks.cs b/src/ServiceControlInstaller.Engine/Validation/AbstractCommandChecks.cs index 8400dec2b2..2c4804b62c 100644 --- a/src/ServiceControlInstaller.Engine/Validation/AbstractCommandChecks.cs +++ b/src/ServiceControlInstaller.Engine/Validation/AbstractCommandChecks.cs @@ -23,10 +23,10 @@ public abstract class AbstractCommandChecks protected abstract Task NotifyForIncompatibleUpgradeVersion(UpgradeInfo upgradeInfo); protected abstract Task NotifyError(string title, string message); - public async Task CanAddInstance() + public async Task CanAddInstance(bool allowExpiredLicense = false) { // Check for license - if (!await IsLicenseOk().ConfigureAwait(false)) + if (!allowExpiredLicense && !await IsLicenseOk().ConfigureAwait(false)) { return false; }