Fixes an issue where ACMA performance degrades when large numbers of users with the same account name prefix are added

ryannewington · ryannewington · commit e80315cddc80 · 2016-07-29T16:34:55.000+10:00
Updates project to .NET FX 4.5
diff --git a/src/Lithnet.Acma.Ecma2/Lithnet.Acma.Ecma2.csproj b/src/Lithnet.Acma.Ecma2/Lithnet.Acma.Ecma2.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.Ecma2</RootNamespace>
     <AssemblyName>Lithnet.Acma.Ecma2</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
diff --git a/src/Lithnet.Acma.Ecma2/packages.config b/src/Lithnet.Acma.Ecma2/packages.config
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Costura.Fody" version="1.3.3.0" targetFramework="net40" />
-  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="ILMerge" version="2.14.1208" targetFramework="net40" />
   <package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
   <package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
 </packages>
diff --git a/src/Lithnet.Acma.Editor/Lithnet.Acma.Editor.csproj b/src/Lithnet.Acma.Editor/Lithnet.Acma.Editor.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.Editor</RootNamespace>
     <AssemblyName>Lithnet.Acma.Editor</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
diff --git a/src/Lithnet.Acma.Editor/Properties/Resources.Designer.cs b/src/Lithnet.Acma.Editor/Properties/Resources.Designer.cs
diff --git a/src/Lithnet.Acma.Editor/Properties/Settings.Designer.cs b/src/Lithnet.Acma.Editor/Properties/Settings.Designer.cs
diff --git a/src/Lithnet.Acma.Editor/app.config b/src/Lithnet.Acma.Editor/app.config
@@ -14,4 +14,4 @@
       </setting>
     </Lithnet.Acma.Editor.Properties.Settings>
   </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/src/Lithnet.Acma.Editor/packages.config b/src/Lithnet.Acma.Editor/packages.config
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
   <package id="Lithnet.Common.Presentation" version="1.0.5777.18976" targetFramework="net40" />
   <package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices.Resolver" version="1.0.6006.11723" targetFramework="net40" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net40" />
 </packages>
diff --git a/src/Lithnet.Acma.Installer.CustomActions/Lithnet.Acma.Installer.CustomActions.csproj b/src/Lithnet.Acma.Installer.CustomActions/Lithnet.Acma.Installer.CustomActions.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.Installer</RootNamespace>
     <AssemblyName>Lithnet.Acma.Installer.CustomActions</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.CA.targets</WixCATargetsPath>
     <TargetFrameworkProfile />
diff --git a/src/Lithnet.Acma.Installer/Product.wxs b/src/Lithnet.Acma.Installer/Product.wxs
@@ -4,7 +4,7 @@
   <Product Id="*"
            Name="Lithnet ACMA"
            Language="1033"
-           Version="1.1.5954"
+           Version="1.1.6058"
            Manufacturer="Lithnet"
            UpgradeCode="bcb559bd-8b3a-4a77-9d30-df3fa44b7a13">
 
diff --git a/src/Lithnet.Acma.PS/AcmaObjects/GetAcmaObject.cs b/src/Lithnet.Acma.PS/AcmaObjects/GetAcmaObject.cs
@@ -11,7 +11,7 @@
 
 namespace Lithnet.Acma.PS
 {
-    [Cmdlet(VerbsCommon.Get, "AcmaObject", DefaultParameterSetName = "GetResource")]
+    [Cmdlet(VerbsCommon.Get, "AcmaObject", DefaultParameterSetName = "GetResourceByKey")]
     public class GetAcmaObjectCmdLet : AcmaCmdletConnected
     {
         [Parameter(ParameterSetName = "GetResource", ValueFromPipeline = true, Mandatory = true, Position = 1)]
diff --git a/src/Lithnet.Acma.PS/Lithnet.Acma.PS.csproj b/src/Lithnet.Acma.PS/Lithnet.Acma.PS.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.PS</RootNamespace>
     <AssemblyName>Lithnet.Acma.PS</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
diff --git a/src/Lithnet.Acma.PS/Wrappers/AcmaPSObject.cs b/src/Lithnet.Acma.PS/Wrappers/AcmaPSObject.cs
@@ -92,7 +92,14 @@ internal MAObjectHologram GetResourceWithAppliedChanges()
         {
             foreach (var property in this.Properties)
             {
-                if (ActiveConfig.DB.GetAttribute(property.Name).IsReadOnlyInClass(this.Hologram.ObjectClass))
+                AcmaSchemaAttribute attribute = ActiveConfig.DB.GetAttribute(property.Name);
+
+                if (attribute.IsReadOnlyInClass(this.Hologram.ObjectClass))
+                {
+                    continue;
+                }
+
+                if (attribute.Operation == AcmaAttributeOperation.AcmaInternalTemp)
                 {
                     continue;
                 }
diff --git a/src/Lithnet.Acma.PS/packages.config b/src/Lithnet.Acma.PS/packages.config
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
   <package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices.Resolver" version="1.0.6006.11723" targetFramework="net40" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" />
-  <package id="System.Management.Automation" version="6.1.7601.17515" targetFramework="net40" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
+  <package id="System.Management.Automation" version="6.1.7601.17515" targetFramework="net40" requireReinstallation="true" />
 </packages>
diff --git a/src/Lithnet.Acma.Presentation/Lithnet.Acma.Presentation.csproj b/src/Lithnet.Acma.Presentation/Lithnet.Acma.Presentation.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.Presentation</RootNamespace>
     <AssemblyName>Lithnet.Acma.Presentation</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
diff --git a/src/Lithnet.Acma.Presentation/packages.config b/src/Lithnet.Acma.Presentation/packages.config
@@ -2,13 +2,13 @@
 <packages>
   <package id="AvalonEdit" version="5.0.3" targetFramework="net40" />
   <package id="DocX" version="1.0.0.19" targetFramework="net40" />
-  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
   <package id="Lithnet.Common.Presentation" version="1.0.5777.18976" targetFramework="net40" />
   <package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
   <package id="Lithnet.Transforms" version="1.5.6017.25693" targetFramework="net40" />
   <package id="Lithnet.Transforms.Presentation" version="1.5.6017.25705" targetFramework="net40" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net40" />
 </packages>
diff --git a/src/Lithnet.Acma.Service/App.config b/src/Lithnet.Acma.Service/App.config
@@ -24,6 +24,6 @@
   
 
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
   </startup>
 </configuration>
diff --git a/src/Lithnet.Acma.Service/Lithnet.Acma.Service.csproj b/src/Lithnet.Acma.Service/Lithnet.Acma.Service.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.Service</RootNamespace>
     <AssemblyName>Lithnet.Acma.Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
diff --git a/src/Lithnet.Acma.Service/packages.config b/src/Lithnet.Acma.Service/packages.config
@@ -1,9 +1,9 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
   <package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices.Resolver" version="1.0.6006.11723" targetFramework="net40" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
 </packages>
diff --git a/src/Lithnet.Acma.ServiceModel.Client/Lithnet.Acma.ServiceModel.Client.csproj b/src/Lithnet.Acma.ServiceModel.Client/Lithnet.Acma.ServiceModel.Client.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.ServiceModel.Client</RootNamespace>
     <AssemblyName>Lithnet.Acma.ServiceModel.Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/src/Lithnet.Acma.ServiceModel.Sync/Lithnet.Acma.ServiceModel.Sync.csproj b/src/Lithnet.Acma.ServiceModel.Sync/Lithnet.Acma.ServiceModel.Sync.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.ServiceModel</RootNamespace>
     <AssemblyName>Lithnet.Acma.ServiceModel.Sync</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/src/Lithnet.Acma.TestEngine.UnitTests/Lithnet.Acma.TestEngine.UnitTests.csproj b/src/Lithnet.Acma.TestEngine.UnitTests/Lithnet.Acma.TestEngine.UnitTests.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.TestEngine.UnitTests</RootNamespace>
     <AssemblyName>Lithnet.Acma.TestEngine.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/src/Lithnet.Acma.TestEngine.UnitTests/packages.config b/src/Lithnet.Acma.TestEngine.UnitTests/packages.config
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
 </packages>
diff --git a/src/Lithnet.Acma.TestEngine/Lithnet.Acma.TestEngine.csproj b/src/Lithnet.Acma.TestEngine/Lithnet.Acma.TestEngine.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.TestEngine</RootNamespace>
     <AssemblyName>Lithnet.Acma.TestEngine</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
diff --git a/src/Lithnet.Acma.TestEngine/packages.config b/src/Lithnet.Acma.TestEngine/packages.config
@@ -1,8 +1,8 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
   <package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
 </packages>
diff --git a/src/Lithnet.Acma.UnitTests/App.config b/src/Lithnet.Acma.UnitTests/App.config
@@ -5,4 +5,4 @@
       <add name="XmlSerialization.Compilation" value="4"/>
     </switches>
   </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/src/Lithnet.Acma.UnitTests/Lithnet.Acma.UnitTests.csproj b/src/Lithnet.Acma.UnitTests/Lithnet.Acma.UnitTests.csproj
@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lithnet.Acma.UnitTests</RootNamespace>
     <AssemblyName>Lithnet.Acma.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SccProjectName>SAK</SccProjectName>
diff --git a/src/Lithnet.Acma.UnitTests/packages.config b/src/Lithnet.Acma.UnitTests/packages.config
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
+  <package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
   <package id="Lithnet.Common.ObjectModel" version="1.0.5777.18973" targetFramework="net40" />
   <package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices" version="1.0.6017.24789" targetFramework="net40" />
   <package id="Lithnet.MetadirectoryServices.Resolver" version="1.0.6006.11723" targetFramework="net40" />
   <package id="Lithnet.Transforms" version="1.5.6017.25693" targetFramework="net40" />
-  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" />
+  <package id="PropertyChanged.Fody" version="1.51.3" targetFramework="net40" developmentDependency="true" requireReinstallation="true" />
 </packages>
diff --git a/src/Lithnet.Acma/Config/Constructors/AttributeConstructors/UniqueValueConstructor.cs b/src/Lithnet.Acma/Config/Constructors/AttributeConstructors/UniqueValueConstructor.cs
@@ -259,7 +259,7 @@ private void Initialize()
         {
             this.StaticDeclarations = new List<ValueDeclaration>();
             this.UniqueAllocationAttributes = new List<AcmaSchemaAttribute>();
-            this.valueCache = new Dictionary<string, List<string>>();
+            this.valueCache = new Dictionary<string, HashSet<string>>();
         }
 
         private void GetAlgorithmMode()
@@ -287,17 +287,20 @@ private void GetAlgorithmMode()
             }
         }
 
-        private Dictionary<string, List<string>> valueCache;
+        private Dictionary<string, HashSet<string>> valueCache;
 
         private void PopulateValueCache(MAObjectHologram hologram, string wilcardValue)
         {
             if (!this.valueCache.ContainsKey(wilcardValue))
             {
-                this.valueCache.Add(wilcardValue, new List<string>());
+                this.valueCache.Add(wilcardValue, new HashSet<string>(StringComparer.CurrentCultureIgnoreCase));
 
                 foreach (AcmaSchemaAttribute attribute in this.UniqueAllocationAttributes)
                 {
-                    this.valueCache[wilcardValue].AddRange(ActiveConfig.DB.GetAttributeValues(attribute, wilcardValue, hologram.ObjectID).ToList());
+                    foreach (string item in ActiveConfig.DB.GetAttributeValues(attribute, wilcardValue, hologram.ObjectID))
+                    {
+                        this.valueCache[wilcardValue].Add(item);
+                    }
                 }
             }
         }
@@ -326,19 +329,20 @@ internal bool IsAttributeUnique(MAObjectHologram hologram, string valueToTest, s
 
                     this.PopulateValueCache(hologram, wildcardValue);
 
-                    if (!this.valueCache[wildcardValue].Contains<string>(valueToTest, StringComparer.CurrentCultureIgnoreCase))
+                    if (this.valueCache[wildcardValue].Add(valueToTest))
                     {
-                        this.valueCache[wildcardValue].Add(valueToTest);
                         return true;
                     }
-
-                    return false;
+                    else
+                    {
+                        return false;
+                    }
                 }
                 finally
                 {
                     if (UniqueValueConstructor.DisableCaching)
                     {
-                        this.valueCache = new Dictionary<string, List<string>>();
+                        this.valueCache = new Dictionary<string, HashSet<string>>();
                     }
 
                 }
diff --git a/src/Lithnet.Acma/DataModel/DBSchema.designer.cs b/src/Lithnet.Acma/DataModel/DBSchema.designer.cs
diff --git a/src/Lithnet.Acma/Lithnet.Acma.csproj b/src/Lithnet.Acma/Lithnet.Acma.csproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/Lithnet.Acma/Properties/Settings.Designer.cs b/src/Lithnet.Acma/Properties/Settings.Designer.cs
diff --git a/src/Lithnet.Acma/packages.config b/src/Lithnet.Acma/packages.config
diff --git a/src/Lithnet.Acma/strings.Designer.cs b/src/Lithnet.Acma/strings.Designer.cs

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Lithnet.Acma.PS`
`13`	`13`	`{`
`14`		`- [Cmdlet(VerbsCommon.Get, "AcmaObject", DefaultParameterSetName = "GetResource")]`
	`14`	`+ [Cmdlet(VerbsCommon.Get, "AcmaObject", DefaultParameterSetName = "GetResourceByKey")]`
`15`	`15`	`public class GetAcmaObjectCmdLet : AcmaCmdletConnected`
`16`	`16`	`{`
`17`	`17`	`[Parameter(ParameterSetName = "GetResource", ValueFromPipeline = true, Mandatory = true, Position = 1)]`