Merge pull request #218 from ivsavchenko/bugfix/check-field-existence

"Sequence contains no matching element" while trying to load recursively assembly that has c++ dependencies

ArchUnit.sln

@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1

ArchUnitNET/Loader/TypeFactory.cs

@@ -177,10 +177,13 @@ private ITypeInstance<IType> CreateTypeFromTypeReference(TypeReference typeRefer
                 return new TypeInstance<IType>(type);
             }
 
-            if (typeDefinition.CustomAttributes.Any(att =>
-                att.AttributeType.FullName == typeof(UnsafeValueTypeAttribute).FullName))
+            const string fixedElementField = "FixedElementField";
+
+            if (typeDefinition.CustomAttributes
+                    .Any(att => att.AttributeType.FullName == typeof(UnsafeValueTypeAttribute).FullName) &&
+                    typeDefinition.Fields.Any(field => field.Name == fixedElementField))
             {
-                var arrayType = typeDefinition.Fields.First(field => field.Name == "FixedElementField").FieldType;
+                var arrayType = typeDefinition.Fields.First(field => field.Name == fixedElementField).FieldType;
                 var arrayTypeInstance = GetOrCreateStubTypeInstanceFromTypeReference(arrayType);
                 var dimensions = new List<int> { 1 };
 

ArchUnitNETTests/ArchUnitNETTests.csproj

@@ -19,9 +19,22 @@
     </ItemGroup>
 
     <ItemGroup>
+        <None Update="Dependencies\cpplib\CppDllTest.dll">
+          <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+        </None>
         <None Update="Domain\PlantUml\zzz_test_version_with_errors.puml">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Dependencies\cpplib\" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Reference Include="CppDllTest">
+        <HintPath>Dependencies\cpplib\CppDllTest.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+
 </Project>

ArchUnitNETTests/Dependencies/CppDependenciesTests.cs

@@ -0,0 +1,53 @@
+//  Copyright 2019 Florian Gather <[email protected]>
+// 	Copyright 2019 Fritz Brandhuber <[email protected]>
+// 	Copyright 2020 Pavel Fischer <[email protected]>
+// 
+// 	SPDX-License-Identifier: Apache-2.0
+// 
+
+using ArchUnitNET.Domain;
+using ArchUnitNET.Domain.Extensions;
+using ArchUnitNET.Loader;
+using Xunit;
+
+namespace ArchUnitNETTests.Dependencies
+{
+    public class CppDependenciesTests
+    {
+        private static readonly Architecture Architecture = new ArchLoader()
+            .LoadAssembliesRecursively(new[] { typeof(CppExampleClassUser).Assembly },
+            filterFunc => FilterResult.LoadAndContinue)
+            .Build();
+
+        [Fact]
+        public void CppClassUserFound()
+        {
+            var exampleCppUser = Architecture.GetClassOfType(typeof(CastClassA));
+            Assert.Contains(exampleCppUser, Architecture.Classes);
+        }
+    }
+
+    internal class CppExampleClassUser
+    {
+        CppExampleClass _cppExampleClass = new CppExampleClass();
+    }
+
+    /*
+     * C++/CLI code contains the next .h .cpp content
+    CppExampleClass.h
+    #pragma once
+    public ref class CppExampleClass
+    {
+	    public:
+		    void DoCall();
+    };
+
+    CppExampleClass.cpp
+    #include "pch.h"
+    #include "CppExampleClass.h"
+
+    void CppExampleClass::DoCall()
+    {
+    }
+    */
+}