opened up restrictions for the xml tags to allow more openness wrt xm…

…l tag prefixes
roger-castaldo · Feb 28, 2019 · 5f28037 · 5f28037
1 parent 93452ea
commit 5f28037
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/Attributes/XMLTag.cs b/Attributes/XMLTag.cs
@@ -32,7 +32,9 @@ internal bool Matches(XmlPrefixMap map, string tagName)
         {
             if (tagName.ToLower() == ToString().ToLower())
                 return true;
-            else if (_prefix!=null)
+            else if (tagName.ToLower() == _name.ToLower())
+                return true;
+            else if (_prefix != null)
                 return map.isMatch(_prefix, _name, tagName);
             return false;
         }

diff --git a/BpmEngine.csproj b/BpmEngine.csproj
@@ -4,16 +4,16 @@
     <TargetFrameworks>netstandard2.0;net452;net20</TargetFrameworks>
     <RootNamespace>Org.Reddragonit.BpmEngine</RootNamespace>
     <PackageId>Org.Reddragonit.BpmEngine</PackageId>
-    <Version>1.9.6</Version>
+    <Version>1.9.8</Version>
     <Authors>Roger Castaldo</Authors>
     <Description>A BPMN Engine written in .net. The engine attempts to read in a bpmn notation xml document defining both the process(s) as well as the diagrams. From here you can then load/unload the state, render the diagram in its current state or animated into a gif. Using the delegates for a process, you intercept and handle task and condition checking by reading additional xml held within flow and task objects.</Description>
     <PackageProjectUrl>https://github.com/roger-castaldo/BPMEngine</PackageProjectUrl>
     <PackageLicenseUrl>https://www.gnu.org/licenses/gpl-3.0.en.html</PackageLicenseUrl>
     <RepositoryUrl>https://github.com/roger-castaldo/BPMEngine</RepositoryUrl>
     <PackageTags>BPMN</PackageTags>
-    <PackageReleaseNotes>migrated begininvoke calls to await task calls for .netstandard and 452</PackageReleaseNotes>
-    <AssemblyVersion>1.9.6.0</AssemblyVersion>
-    <FileVersion>1.9.6.0</FileVersion>
+    <PackageReleaseNotes>updated package to loosen up loading restrictions by not checking for xml prefix in valid documents</PackageReleaseNotes>
+    <AssemblyVersion>1.9.8.0</AssemblyVersion>
+    <FileVersion>1.9.8.0</FileVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
@@ -47,16 +47,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-    <PackageReference Include="CoreCompat.System.Drawing" Version="1.0.0-beta006" />
-    <PackageReference Include="System.CodeDom">
-      <Version>4.4.0</Version>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.CodeAnalysis.Compilers">
-      <Version>2.7.0</Version>
-    </PackageReference>
+    <PackageReference Include="CoreCompat.System.Drawing" Version="[1.0.0-beta006,)" />
+    <PackageReference Include="System.CodeDom" Version="[4.4.0,)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="[2.7.0,)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ElementTypeCache.cs b/ElementTypeCache.cs
@@ -46,6 +46,14 @@ public void MapIdeals(XmlPrefixMap map)
                         }
                     }
                 }
+                else
+                {
+                    foreach (String tag in ideals[prefix].Keys)
+                    {
+                        _cachedMaps.Add(string.Format("{0}:{1}", prefix, tag), ideals[prefix][tag]);
+                        _cachedMaps.Add(tag, ideals[prefix][tag]);
+                    }
+                }
             }
         }
     }