Fixed a bug in the licensing manager which was causing an exception. Cleaned up the RegisterContent once I realized that it was a stale dll that was causing the issue, oppsy.

Author: WTDT

Applications/Licensing/Gui/RegisterContent.xaml

@@ -1,11 +1,13 @@
 <UserControl x:Class="WaveTech.Scutex.Licensing.Gui.RegisterContent"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-						 xmlns:ctrls="clr-namespace:WaveTech.Scutex.Licensing.Gui.Controls" 
-						 mc:Ignorable="d" Background="Transparent"
-             d:DesignHeight="300" d:DesignWidth="300">
+             xmlns:ctrls="clr-namespace:WaveTech.Scutex.Licensing.Gui.Controls"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             Background="Transparent"
+             d:DesignHeight="300"
+             d:DesignWidth="300"
+             mc:Ignorable="d">
 	<Grid>
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition />
@@ -18,11 +20,34 @@
 			<RowDefinition Height="96*" />
 		</Grid.RowDefinitions>
 
-		<TextBlock Grid.Row="0" Text="Please enter your License Key" FontSize="20" Foreground="Azure" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-		<ctrls:MaskedTextBox x:Name="txtLicenseKey" Grid.Row="1" FontSize="20" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="5,5,5,5" ></ctrls:MaskedTextBox>
-
-		<TextBlock  Grid.Row="2" x:Name="lblResult" FontSize="14" VerticalAlignment="Center" HorizontalAlignment="Center" />
-		<ProgressBar Grid.Row="3" x:Name="pdgActivationProgress" IsIndeterminate="True" Visibility="Collapsed" Margin="0,0,0,2.5"/>
-		<Button x:Name="btnActivite" Grid.Row="4" Content="Activate this License Key" Margin="15,15,15,15" Click="btnActivite_Click" />
+		<TextBlock Grid.Row="0"
+		           HorizontalAlignment="Center"
+		           VerticalAlignment="Center"
+		           FontSize="20"
+		           Foreground="Azure"
+		           Text="Please enter your License Key" />
+		<ctrls:MaskedTextBox x:Name="txtLicenseKey"
+		                     Grid.Row="1"
+		                     Margin="5,5,5,5"
+		                     HorizontalAlignment="Center"
+		                     VerticalAlignment="Center"
+		                     FontSize="20"
+		                     FontWeight="Bold"
+		                     InputMask="wwwww-wwwww-wwwww-wwwww-wwwww" />
+		<TextBlock x:Name="lblResult"
+		           Grid.Row="2"
+		           HorizontalAlignment="Center"
+		           VerticalAlignment="Center"
+		           FontSize="14" />
+		<ProgressBar x:Name="pdgActivationProgress"
+		             Grid.Row="3"
+		             Margin="0,0,0,2.5"
+		             IsIndeterminate="True"
+		             Visibility="Collapsed" />
+		<Button x:Name="btnActivite"
+		        Grid.Row="4"
+		        Margin="15,15,15,15"
+		        Click="btnActivite_Click"
+		        Content="Activate this License Key" />
 	</Grid>
 </UserControl>

Applications/Licensing/Gui/RegisterContent.xaml.cs

@@ -33,6 +33,8 @@ public RegisterContent()
 
 			_licenseKeyService = ObjectLocator.GetInstance<ILicenseKeyService>();
 			_registerService = ObjectLocator.GetInstance<IRegisterService>();
+
+
 		}
 
 		public RegisterContent(ClientLicense clientLicense, ScutexLicense scutexLicense)
@@ -41,17 +43,17 @@ public RegisterContent(ClientLicense clientLicense, ScutexLicense scutexLicense)
 			_clientLicense = clientLicense;
 			_scutexLicense = scutexLicense;
 
-			switch (_clientLicense.KeyGeneratorType)
+			if (_clientLicense != null)
 			{
-				case KeyGeneratorTypes.StaticSmall:
-					txtLicenseKey.InputMask = @"www-wwwwww-wwww";
-					break;
-				case KeyGeneratorTypes.StaticLarge:
-					txtLicenseKey.InputMask = @"wwwww-wwwww-wwwww-wwwww-wwwww";
-					break;
-				//default:
-				//  txtLicenseKey.InputMask = @"wwwww-wwwww-wwwww-wwwww-wwwww";
-				//  break;
+				switch (_clientLicense.KeyGeneratorType)
+				{
+					case KeyGeneratorTypes.StaticSmall:
+						txtLicenseKey.InputMask = @"www-wwwwww-wwww";
+						break;
+					case KeyGeneratorTypes.StaticLarge:
+						txtLicenseKey.InputMask = @"WWWWW-WWWWW-WWWWW-WWWWW-WWWWW";
+						break;
+				}
 			}
 		}
 

Applications/Licensing/LicensingManager.cs

@@ -96,8 +96,12 @@ public LicensingManager(object instance)
 		/// </param>
 		public LicensingManager(object instance, LicensingManagerOptions options)
 		{
-			_options = options;
-			_killOnError = _options.KillOnError;
+			if (options != null)
+			{
+				_options = options;
+				_killOnError = _options.KillOnError;
+			}
+
 			this.instance = instance;
 
 			Bootstrapper.Configure();

Common/AssemblyInfo.cs

@@ -64,5 +64,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.1111.2207")]	// Rule: *.*.YYMM.DDhh
-[assembly: AssemblyFileVersion("0.4.1111.2207")]	// Rule: *.*.YYMM.DDhh
+[assembly: AssemblyVersion("0.4.1202.2207")]	// Rule: *.*.YYMM.DDhh
+[assembly: AssemblyFileVersion("0.4.1202.2207")]	// Rule: *.*.YYMM.DDhh