Code cleanups and improvements

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "build/modules/premake-qt"]
-	path = build/modules/premake-qt
-	url = https://github.com/dcourtois/premake-qt.git

Directory.Build.props

@@ -34,7 +34,7 @@
     <GeneratorFileExtension>dll</GeneratorFileExtension>
     <DotNetCmd Condition="'$(PlatformTarget)' == 'x86' AND Exists('$(MSBuildProgramFiles32)\dotnet\dotnet.exe')">"$(MSBuildProgramFiles32)\dotnet\dotnet.exe"</DotNetCmd>
     <DotNetCmd Condition="'$(PlatformTarget)' == 'x64' AND Exists('$(ProgramW6432)\dotnet\dotnet.exe')">"$(ProgramW6432)\dotnet\dotnet.exe"</DotNetCmd>
-    <RID Condition="$(IsWindows)">win</RID>    
+    <RID Condition="$(IsWindows)">win</RID>
     <RID Condition="$(IsLinux)">linux</RID>
     <RID Condition="$(IsMacOSX)">osx</RID>
     <RID>$(RID)-$(PlatformTarget)</RID>

build/Helpers.lua

@@ -47,7 +47,7 @@ rootdir = path.getabsolute("../")
 srcdir = path.join(rootdir, "src");
 incdir = path.join(rootdir, "include");
 examplesdir = path.join(rootdir, "examples");
-testsdir = path.join(rootdir, "tests");
+testsdir = path.join(rootdir, "tests/dotnet");
 builddir = path.join(rootdir, "build")
 bindir = path.join(rootdir, "bin")
 objsdir = path.join(builddir, "obj");

build/premake5.lua

@@ -44,7 +44,7 @@ workspace "CppSharp"
   workspacefiles(path.join(builddir, "premake5.lua"))
   workspacefiles(path.join(builddir, "*.sh"))
   workspacefiles(path.join(rootdir, ".github/workflows/*.yml"))
-  workspacefiles(path.join(rootdir, "tests/Test*.props"))
+  workspacefiles(path.join(testsdir, "Test*.props"))
 
   group "Libraries"
     if EnableNativeProjects() then

src/AST/Property.cs

@@ -22,109 +22,62 @@ public Property(Property property)
             parameters.AddRange(property.Parameters);
         }
 
-        public Type Type
-        {
-            get { return QualifiedType.Type; }
-        }
+        public Type Type => QualifiedType.Type;
 
         public QualifiedType QualifiedType { get; set; }
 
-        public bool IsStatic
-        {
-            get
-            {
-                return (GetMethod != null && GetMethod.IsStatic) ||
-                       (SetMethod != null && SetMethod.IsStatic);
-            }
-        }
+        public bool IsStatic =>
+            GetMethod is {IsStatic: true} ||
+            SetMethod is {IsStatic: true};
 
-        public bool IsPure
-        {
-            get
-            {
-                return (GetMethod != null && GetMethod.IsPure) ||
-                       (SetMethod != null && SetMethod.IsPure);
-            }
-        }
+        public bool IsPure =>
+            GetMethod is {IsPure: true} ||
+            SetMethod is {IsPure: true};
 
-        public bool IsVirtual
-        {
-            get
-            {
-                return (GetMethod != null && GetMethod.IsVirtual) ||
-                       (SetMethod != null && SetMethod.IsVirtual);
-            }
-        }
+        public bool IsVirtual =>
+            GetMethod is {IsVirtual: true} ||
+            SetMethod is {IsVirtual: true};
 
-        public bool IsOverride
-        {
-            get
-            {
-                return (GetMethod != null && GetMethod.IsOverride) ||
-                       (SetMethod != null && SetMethod.IsOverride);
-            }
-        }
+        public bool IsOverride =>
+            GetMethod is {IsOverride: true} ||
+            SetMethod is {IsOverride: true};
 
         public Method GetMethod { get; set; }
 
         public Method SetMethod { get; set; }
 
-        public bool HasGetter
-        {
-            get
-            {
-                return (GetMethod != null &&
-                        GetMethod.GenerationKind != GenerationKind.None) ||
-                       (Field != null &&
-                        Field.GenerationKind != GenerationKind.None);
-            }
-        }
+        public bool HasGetter =>
+            (GetMethod != null &&
+             GetMethod.GenerationKind != GenerationKind.None) ||
+            (Field != null &&
+             Field.GenerationKind != GenerationKind.None);
 
-        public bool HasSetter
-        {
-            get
-            {
-                return (SetMethod != null &&
-                        SetMethod.GenerationKind != GenerationKind.None) ||
-                       (Field != null &&
-                        (!Field.QualifiedType.IsConst() ||
-                         Field.Type.IsConstCharString()) &&
-                        Field.GenerationKind != GenerationKind.None);
-            }
-        }
+        public bool HasSetter =>
+            (SetMethod != null &&
+             SetMethod.GenerationKind != GenerationKind.None) ||
+            (Field != null &&
+             (!Field.QualifiedType.IsConst() ||
+              Field.Type.IsConstCharString()) &&
+             Field.GenerationKind != GenerationKind.None);
 
         // The field that should be get and set by this property
         public Field Field { get; set; }
 
         public Class ExplicitInterfaceImpl { get; set; }
 
-        private readonly List<Parameter> parameters = new List<Parameter>();
+        private readonly List<Parameter> parameters = new();
 
         /// <summary>
         /// Only applicable to index ([]) properties.
         /// </summary>
-        public List<Parameter> Parameters
-        {
-            get { return parameters; }
-        }
+        public List<Parameter> Parameters => parameters;
 
-        public bool IsIndexer
-        {
-            get
-            {
-                return GetMethod != null &&
-                       GetMethod.OperatorKind == CXXOperatorKind.Subscript;
-            }
-        }
+        public bool IsIndexer =>
+            GetMethod is {OperatorKind: CXXOperatorKind.Subscript};
 
-        public bool IsSynthetized
-        {
-            get
-            {
-                return (GetMethod != null && GetMethod.IsSynthetized) ||
-                       (SetMethod != null && SetMethod.IsSynthetized);
-            }
-        }
+        public bool IsSynthetized =>
+            (GetMethod != null && GetMethod.IsSynthetized) ||
+            (SetMethod != null && SetMethod.IsSynthetized);
 
         public override T Visit<T>(IDeclVisitor<T> visitor)
         {