Skip to content

Commit 0dceff5

Browse files
CodeDeadCodeDead
committed
* Added new special characters
* Upgraded to .NET 4.7 * Removed unused classes * Bumped version number * Make use of UpdateManager * Minor design changes * Code improvements
1 parent e3a4fd6 commit 0dceff5

File tree

12 files changed

+34
-180
lines changed

12 files changed

+34
-180
lines changed

‎Advanced PassGen/Advanced PassGen.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Advanced_PassGen</RootNamespace>
1111
<AssemblyName>Advanced PassGen</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
17+
<TargetFrameworkProfile />
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -57,6 +58,9 @@
5758
</Reference>
5859
<Reference Include="UIAutomationProvider" />
5960
<Reference Include="UIAutomationTypes" />
61+
<Reference Include="UpdateManager">
62+
<HintPath>..\..\UpdateManager\UpdateManager\bin\Release\UpdateManager.dll</HintPath>
63+
</Reference>
6064
<Reference Include="WindowsBase" />
6165
<Reference Include="PresentationCore" />
6266
<Reference Include="PresentationFramework" />
@@ -74,8 +78,6 @@
7478
<Compile Include="Classes\PasswordGenerator.cs" />
7579
<Compile Include="Classes\Password.cs" />
7680
<Compile Include="Classes\StyleManager.cs" />
77-
<Compile Include="Classes\Update.cs" />
78-
<Compile Include="Classes\UpdateManager.cs" />
7981
<Compile Include="Windows\MainWindow.xaml.cs">
8082
<DependentUpon>MainWindow.xaml</DependentUpon>
8183
</Compile>

‎Advanced PassGen/App.config

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="Advanced_PassGen.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="Advanced_PassGen.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
88
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
1010
</startup>
1111
<userSettings>
1212
<Advanced_PassGen.Properties.Settings>
@@ -20,7 +20,7 @@
2020
<value>True</value>
2121
</setting>
2222
<setting name="CharacterSet" serializeAs="String">
23-
<value />
23+
<value/>
2424
</setting>
2525
<setting name="BorderThickness" serializeAs="String">
2626
<value>1</value>
@@ -39,4 +39,4 @@
3939
</setting>
4040
</Advanced_PassGen.Properties.Settings>
4141
</userSettings>
42-
</configuration>
42+
</configuration>

‎Advanced PassGen/Classes/Password.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Text.RegularExpressions;
1+
using System.Text.RegularExpressions;
32

43
namespace Advanced_PassGen.Classes
54
{
@@ -16,7 +15,7 @@ public class Password
1615
/// </summary>
1716
public string ActualPassword
1817
{
19-
get { return _actualPassword; }
18+
get => _actualPassword;
2019
set
2120
{
2221
_actualPassword = value;
@@ -42,10 +41,10 @@ public string ActualPassword
4241
/// <returns>Returns a password score.</returns>
4342
private static int CheckStrength(string password)
4443
{
45-
int score = 0;
44+
int score = 1;
4645

4746
if (string.IsNullOrEmpty(password)) return 0;
48-
if (password.Length < 1) return 0;
47+
if (password.Length < 2) return 0;
4948
if (password.Length < 4) return 1;
5049
if (password.Length >= 8) score++;
5150
if (password.Length >= 10) score++;

‎Advanced PassGen/Classes/PasswordGenerator.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ namespace Advanced_PassGen.Classes
1313
internal class PasswordGenerator
1414
{
1515
#region Variables
16-
1716
private readonly int _minLength;
1817
private readonly int _maxLength;
1918
private readonly int _amount;
@@ -22,7 +21,6 @@ internal class PasswordGenerator
2221

2322
internal List<Password> PasswordList;
2423
private static Random _rnd = new Random();
25-
2624
#endregion
2725

2826
/// <summary>

‎Advanced PassGen/Classes/Update.cs

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎Advanced PassGen/Classes/UpdateManager.cs

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎Advanced PassGen/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[assembly: AssemblyConfiguration("")]
1313
[assembly: AssemblyCompany("CodeDead")]
1414
[assembly: AssemblyProduct("Advanced PassGen")]
15-
[assembly: AssemblyCopyright("Copyright © CodeDead 2016")]
15+
[assembly: AssemblyCopyright("Copyright © CodeDead 2017")]
1616
[assembly: AssemblyTrademark("")]
1717
[assembly: AssemblyCulture("")]
1818

@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("1.3.1.0")]
55-
[assembly: AssemblyFileVersion("1.3.1.0")]
54+
[assembly: AssemblyVersion("1.4.0.0")]
55+
[assembly: AssemblyFileVersion("1.4.0.0")]

‎Advanced PassGen/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Advanced PassGen/Windows/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<RowDefinition Height="Auto"></RowDefinition>
5858
<RowDefinition Height="Auto"></RowDefinition>
5959
</Grid.RowDefinitions>
60-
<CheckBox x:Name="ChbUseAdvanced" Checked="chbUseAdvanced_Checked" Unchecked="chbUseAdvanced_Checked">Use advanced options</CheckBox>
60+
<CheckBox x:Name="ChbUseAdvanced" Checked="ChbUseAdvanced_Checked" Unchecked="ChbUseAdvanced_Checked">Use advanced options</CheckBox>
6161
<GroupBox x:Name="GrbAdvanced" IsEnabled="False" Grid.Row="1" Header="Advanced options">
6262
<Grid>
6363
<Grid.RowDefinitions>

‎Advanced PassGen/Windows/MainWindow.xaml.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@ namespace Advanced_PassGen.Windows
1414
public partial class MainWindow
1515
{
1616
#region Variables
17-
18-
internal readonly UpdateManager UpdateManager;
17+
internal readonly UpdateManager.UpdateManager UpdateManager;
1918
private readonly GridViewColumn _gvc;
2019
private PasswordGenerator _generator;
21-
2220
#endregion
2321

2422
/// <summary>
2523
/// Initiate a new MainWindow.
2624
/// </summary>
2725
public MainWindow()
2826
{
29-
UpdateManager = new UpdateManager("http://codedead.com/Software/Advanced%20PassGen/update.xml");
27+
UpdateManager = new UpdateManager.UpdateManager(Assembly.GetExecutingAssembly().GetName().Version, "https://codedead.com/Software/Advanced%20PassGen/update.xml", "Advanced PassGen");
3028

3129
InitializeComponent();
3230
ChangeVisualStyle();
@@ -88,7 +86,7 @@ internal void ChangeVisualStyle()
8886
StyleManager.ChangeStyle(this);
8987
}
9088

91-
private void chbUseAdvanced_Checked(object sender, RoutedEventArgs e)
89+
private void ChbUseAdvanced_Checked(object sender, RoutedEventArgs e)
9290
{
9391
if (ChbUseAdvanced.IsChecked == null) return;
9492
GrbAdvanced.IsEnabled = ChbUseAdvanced.IsChecked.Value;
@@ -108,7 +106,7 @@ private async void BtnGenerate_Click(object sender, RoutedEventArgs e)
108106

109107
if (ChbUseAdvanced.IsChecked != null && !ChbUseAdvanced.IsChecked.Value)
110108
{
111-
if (ChbNumbers.IsChecked != null && (ChbSpecialCharacters.IsChecked != null && (ChbSmallLetters.IsChecked != null && (ChbCapitalLetters.IsChecked != null && (!ChbCapitalLetters.IsChecked.Value && !ChbSmallLetters.IsChecked.Value && !ChbSpecialCharacters.IsChecked.Value && !ChbNumbers.IsChecked.Value)))))
109+
if (ChbNumbers.IsChecked != null && ChbSpecialCharacters.IsChecked != null && ChbSmallLetters.IsChecked != null && ChbCapitalLetters.IsChecked != null && !ChbCapitalLetters.IsChecked.Value && !ChbSmallLetters.IsChecked.Value && !ChbSpecialCharacters.IsChecked.Value && !ChbNumbers.IsChecked.Value)
112110
{
113111
MessageBox.Show(this, "Please select at least one option!", "Advanced PassGen", MessageBoxButton.OK, MessageBoxImage.Exclamation);
114112
return;
@@ -129,7 +127,7 @@ private async void BtnGenerate_Click(object sender, RoutedEventArgs e)
129127
}
130128
if (ChbSpecialCharacters.IsChecked != null && ChbSpecialCharacters.IsChecked.Value)
131129
{
132-
charSet += "=+-<>(){}[]!?.,:/%^*$€£&µ";
130+
charSet += "=+-<>(){}[]!?.,;:/%^*$€£&µ@#";
133131
}
134132
if (ChbNumbers.IsChecked != null && ChbNumbers.IsChecked.Value)
135133
{

0 commit comments

Comments
 (0)