diff --git a/AddInManager.sln b/AddInManager.sln
index 17769b2..6ee595e 100644
--- a/AddInManager.sln
+++ b/AddInManager.sln
@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CadAddinManager", "CadAddinManager\CadAddinManager.csproj", "{E05305A7-28E1-4658-B505-E035FEDDD266}"
EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestVB", "TestVB\TestVB.vbproj", "{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "TestVB", "TestVB\TestVB.vbproj", "{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,45 +28,47 @@ Global
Release A23|Any CPU = Release A23|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A21|Any CPU.ActiveCfg = Debug|Any CPU
+ {E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A21|Any CPU.Build.0 = Debug|Any CPU
+ {E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A22|Any CPU.ActiveCfg = Debug|Any CPU
{E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
{E3C87D34-638C-47A0-A73A-D967B119458D}.Installer|Any CPU.ActiveCfg = Release|Any CPU
{E3C87D34-638C-47A0-A73A-D967B119458D}.Installer|Any CPU.Build.0 = Release|Any CPU
{E3C87D34-638C-47A0-A73A-D967B119458D}.Release A23|Any CPU.ActiveCfg = Release|Any CPU
- {E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A22|Any CPU.ActiveCfg = Debug|Any CPU
- {E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A21|Any CPU.ActiveCfg = Debug|Any CPU
- {E3C87D34-638C-47A0-A73A-D967B119458D}.Debug A21|Any CPU.Build.0 = Debug|Any CPU
+ {5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A21|Any CPU.ActiveCfg = Debug|Any CPU
+ {5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A21|Any CPU.Build.0 = Debug|Any CPU
+ {5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A22|Any CPU.ActiveCfg = Debug|Any CPU
{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A23|Any CPU.ActiveCfg = Debug|Any CPU
{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Installer|Any CPU.ActiveCfg = Release|Any CPU
{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Installer|Any CPU.Build.0 = Release|Any CPU
{5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Release A23|Any CPU.ActiveCfg = Release|Any CPU
- {5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A22|Any CPU.ActiveCfg = Debug|Any CPU
- {5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A21|Any CPU.ActiveCfg = Debug|Any CPU
- {5016ED6D-5A9A-4F59-AE49-CAA9615798F7}.Debug A21|Any CPU.Build.0 = Debug|Any CPU
+ {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A21|Any CPU.ActiveCfg = Debug A21|Any CPU
+ {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A21|Any CPU.Build.0 = Debug A21|Any CPU
+ {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A22|Any CPU.ActiveCfg = Debug A22|Any CPU
+ {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A22|Any CPU.Build.0 = Debug A22|Any CPU
+ {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A23|Any CPU.ActiveCfg = Debug A23|Any CPU
+ {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A23|Any CPU.Build.0 = Debug A23|Any CPU
{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Installer|Any CPU.ActiveCfg = Release A23|Any CPU
{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release A23|Any CPU.ActiveCfg = Release A23|Any CPU
{1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Release A23|Any CPU.Build.0 = Release A23|Any CPU
- {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A23|Any CPU.ActiveCfg = Debug A23|Any CPU
- {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A23|Any CPU.Build.0 = Debug A23|Any CPU
- {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A22|Any CPU.ActiveCfg = Debug A22|Any CPU
- {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A22|Any CPU.Build.0 = Debug A22|Any CPU
- {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A21|Any CPU.ActiveCfg = Debug A21|Any CPU
- {1661572C-EF3A-4DD6-83BD-CB4239CE8CDD}.Debug A21|Any CPU.Build.0 = Debug A21|Any CPU
+ {E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A21|Any CPU.ActiveCfg = Debug A22|Any CPU
+ {E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A21|Any CPU.Build.0 = Debug A22|Any CPU
+ {E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A22|Any CPU.ActiveCfg = Debug A22|Any CPU
+ {E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A22|Any CPU.Build.0 = Debug A22|Any CPU
{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A23|Any CPU.ActiveCfg = Debug A23|Any CPU
{E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A23|Any CPU.Build.0 = Debug A23|Any CPU
{E05305A7-28E1-4658-B505-E035FEDDD266}.Installer|Any CPU.ActiveCfg = Release A23|Any CPU
{E05305A7-28E1-4658-B505-E035FEDDD266}.Release A23|Any CPU.ActiveCfg = Release A23|Any CPU
{E05305A7-28E1-4658-B505-E035FEDDD266}.Release A23|Any CPU.Build.0 = Release A23|Any CPU
- {E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A22|Any CPU.ActiveCfg = Debug A22|Any CPU
- {E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A22|Any CPU.Build.0 = Debug A22|Any CPU
- {E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A21|Any CPU.ActiveCfg = Debug A22|Any CPU
- {E05305A7-28E1-4658-B505-E035FEDDD266}.Debug A21|Any CPU.Build.0 = Debug A22|Any CPU
+ {C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A21|Any CPU.ActiveCfg = Debug A23|Any CPU
+ {C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A21|Any CPU.Build.0 = Debug A23|Any CPU
+ {C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A22|Any CPU.ActiveCfg = Debug A23|Any CPU
+ {C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A22|Any CPU.Build.0 = Debug A23|Any CPU
{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A23|Any CPU.ActiveCfg = Release A23|Any CPU
{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A23|Any CPU.Build.0 = Release A23|Any CPU
{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Installer|Any CPU.ActiveCfg = Release A23|Any CPU
{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Release A23|Any CPU.ActiveCfg = Release A23|Any CPU
{C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Release A23|Any CPU.Build.0 = Release A23|Any CPU
- {C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A21|Any CPU.ActiveCfg = Debug A23|Any CPU
- {C736FCE7-CAE8-474B-8A55-672BC5C1F39B}.Debug A21|Any CPU.Build.0 = Debug A23|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CadAddinManager/CadAddinManager.csproj b/CadAddinManager/CadAddinManager.csproj
index c3dfef8..dadf855 100644
--- a/CadAddinManager/CadAddinManager.csproj
+++ b/CadAddinManager/CadAddinManager.csproj
@@ -6,7 +6,7 @@
true
false
net48
- Debug A22;Debug A23;Debug A24
+ Debug A21;Debug A22;Debug A23;Debug A24
$(Configurations);Release A22;Release A23;Release A24
CadAddinManager
@@ -20,10 +20,22 @@
none
$(DefineConstants);RELEASE
+
+ 2021
+ $(DefineConstants);A21
+
+
+ 2022
+ $(DefineConstants);A22
+
2023
$(DefineConstants);A23
+
+ 2024
+ $(DefineConstants);A24
+
$(CADVersion)
true
diff --git a/CadAddinManager/PackageContents.xml b/CadAddinManager/PackageContents.xml
index 1039723..11f35ff 100644
--- a/CadAddinManager/PackageContents.xml
+++ b/CadAddinManager/PackageContents.xml
@@ -4,7 +4,7 @@
ProductType="Application"
Name="CadAddinManager">
diff --git a/CadAddinManager/View/FrmAddInManager.xaml b/CadAddinManager/View/FrmAddInManager.xaml
index e8e883f..225c2c9 100644
--- a/CadAddinManager/View/FrmAddInManager.xaml
+++ b/CadAddinManager/View/FrmAddInManager.xaml
@@ -2,9 +2,9 @@
x:Class="CadAddinManager.View.FrmAddInManager"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:control="clr-namespace:CadAddinManager.View.Control"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:control="clr-namespace:CadAddinManager.View.Control"
xmlns:viewModel="clr-namespace:CadAddinManager.ViewModel"
Title="CAD Add In Manager"
Width="400"
@@ -13,16 +13,15 @@
MinHeight="400"
d:DataContext="{d:DesignInstance viewModel:AddInManagerViewModel}"
FocusManager.FocusedElement="{x:Reference tbxSearch}"
- PreviewKeyDown="CloseFormEvent"
Icon="../Resources/dev.ico"
+ PreviewKeyDown="CloseFormEvent"
mc:Ignorable="d">
-
+
@@ -46,25 +45,38 @@
+ PreviewKeyDown="HandleTextboxKeyPress"
+ Text="{Binding SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-
+
+
+
+