diff --git a/.idea/.idea.AvaloniaValidation/.idea/vcs.xml b/.idea/.idea.AvaloniaValidation/.idea/vcs.xml index d843f34..94a25f7 100644 --- a/.idea/.idea.AvaloniaValidation/.idea/vcs.xml +++ b/.idea/.idea.AvaloniaValidation/.idea/vcs.xml @@ -1,4 +1,6 @@ - + + + \ No newline at end of file diff --git a/AvaloniaValidation/AvaloniaValidation.csproj b/AvaloniaValidation/AvaloniaValidation.csproj index 3eb9659..b8ec0f2 100644 --- a/AvaloniaValidation/AvaloniaValidation.csproj +++ b/AvaloniaValidation/AvaloniaValidation.csproj @@ -18,5 +18,11 @@ None All + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/AvaloniaValidation/Client.cs b/AvaloniaValidation/Client.cs index dc0028c..1281309 100644 --- a/AvaloniaValidation/Client.cs +++ b/AvaloniaValidation/Client.cs @@ -31,20 +31,20 @@ public class Client { if (password.Length < 6) { - throw new ArgumentException("Password must be at least 6 characters long"); + throw new ArgumentException("Парольдолжен быть длинее 6 символов"); } if (!password.Any(char.IsDigit)) { - throw new ArgumentException("Password must contain at least one digit"); + throw new ArgumentException("Пароль должен содержать хотя бы 1 цифру"); } if (!password.Any(char.IsUpper) || !password.Any(char.IsLower)) { - throw new ArgumentException("Password must contain at least one uppercase letter"); + throw new ArgumentException("Пароль должен содержать хотя бы 1 заглавную букву"); } var regex = new Regex(@"[!@#$%^&*()_+{}|{}\\|]"); if (!regex.IsMatch(password)) { - throw new ArgumentException("Password must contain at least one uppercase letter"); + throw new ArgumentException("Пароль должен содержать хотя бы 1 специальный символ"); } } diff --git a/AvaloniaValidation/MainWindow.axaml b/AvaloniaValidation/MainWindow.axaml index a48c294..4d49c98 100644 --- a/AvaloniaValidation/MainWindow.axaml +++ b/AvaloniaValidation/MainWindow.axaml @@ -2,47 +2,66 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:model="using:AvaloniaValidation" - mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - Width="650" Height="500" + mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="450" + Width="1150" + Height="700" x:Class="AvaloniaValidation.MainWindow" x:CompileBindings="False" - x:DataType="model:Client" Title="AvaloniaValidation"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -