fix some things + nuget stuff

Author: Angel-foxxo

Datamodel.NET/Datamodel.NET.csproj

@@ -5,6 +5,7 @@
     <RootNamespace>Datamodel</RootNamespace>
     <PackageId>KeyValues2</PackageId>
     <Version>0.8</Version>
+    <Version>0.9</Version>
 	<Nullable>enable</Nullable>
     <PackageLicenseFile>COPYING</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -53,11 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
-  	<ProjectReference Include="..\ElementFactoryGenerator\ElementFactoryGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+  	<ProjectReference Include="..\ElementFactoryGenerator\ElementFactoryGenerator.csproj" Version="0.1" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
   </ItemGroup>
-
-	<ItemGroup>
-		<Analyzer Include="@(Analyzer)" Pack="true" />
-	</ItemGroup>
 
 </Project>

ElementFactoryGenerator/COPYING

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Tom Edwards contact@steamreview.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

ElementFactoryGenerator/ElementFactory.cs

@@ -42,14 +42,14 @@ public class ElementFactory : Datamodel.Codecs.IElementFactory
 
         var (compilation, classDeclList) = tuple;
 
-        var runningAssembly = new FactoryAssembly(compilation.AssemblyName!);
+        var runningAssembly = new FactoryAssembly(compilation.AssemblyName);
         foreach (var classDecl in classDeclList)
         {
             var type = compilation.GetSemanticModel(classDecl.SyntaxTree).GetDeclaredSymbol(classDecl);
 
-            if(type is not null)
+            if (type is not null)
             {
-                runningAssembly.AddType(type.ContainingNamespace.Name, type);
+                runningAssembly.AddType(type.ContainingNamespace.ToDisplayString(), type);
             }
         }
         assemblies.Add(runningAssembly);
@@ -66,7 +66,7 @@ public class ElementFactory : Datamodel.Codecs.IElementFactory
             var assemblyTypes = GetAllClassesFromAssembly(assemblySymbol);
             foreach (var assemblyType in assemblyTypes)
             {
-                referencedAssembly.AddType(assemblyType.ContainingNamespace.Name, assemblyType);
+                referencedAssembly.AddType(assemblyType.ContainingNamespace.ToDisplayString(), assemblyType);
             }
 
             assemblies.Add(referencedAssembly);
@@ -97,26 +97,26 @@ public class ElementFactory : Datamodel.Codecs.IElementFactory
                 var validTypes = 0;
                 foreach (var type in nameSpace.Types)
                 {
-                    if (ValidateType(type))
+                    if (ValidateType(type, compilation))
                     {
                         validTypes++;
 
-                     typeseStringBuilder.AppendLine(
-                     $""""
+                        typeseStringBuilder.AppendLine(
+                        $""""
 
                                                 case "{type.Name}":
                                                     return new {type.ToDisplayString()}();
                     """");
                     }
-                        
+
                 }
 
                 typeseStringBuilder.AppendLine(
                 """"
                                         }
                 """");
 
-                if(validTypes > 0)
+                if (validTypes > 0)
                 {
                     validNamespaces++;
                     namespaceStringBuilder.AppendLine(
@@ -127,15 +127,15 @@ public class ElementFactory : Datamodel.Codecs.IElementFactory
                                         break;
                     """");
                 }
-               
+
             }
 
             namespaceStringBuilder.AppendLine(
                 """"
                                 }
                 """");
 
-            if(validNamespaces > 0)
+            if (validNamespaces > 0)
             {
                 elementFactory.AppendLine(
                 $"""
@@ -145,7 +145,7 @@ public class ElementFactory : Datamodel.Codecs.IElementFactory
                  
                  """);
             }
-           
+
         }
 
         elementFactory.AppendLine(
@@ -161,7 +161,7 @@ public class ElementFactory : Datamodel.Codecs.IElementFactory
         context.AddSource("ElementFactory.g.cs", elementFactory.ToString());
     }
 
-    private static bool ValidateType(INamedTypeSymbol type)
+    private static bool ValidateType(INamedTypeSymbol type, Compilation compilation)
     {
         if (InheritsFromFullName(type, "Datamodel.Element"))
         {
@@ -171,12 +171,20 @@ private static bool ValidateType(INamedTypeSymbol type)
                 return false;
             }
 
-            // only allow public and internal classes
-            if (type.DeclaredAccessibility != Accessibility.Public && type.DeclaredAccessibility != Accessibility.Internal)
+            if (type.DeclaredAccessibility != Accessibility.Internal && type.DeclaredAccessibility != Accessibility.Public)
             {
                 return false;
             }
 
+            // only internal classes in execution assembly are fine
+            if (type.DeclaredAccessibility == Accessibility.Internal)
+            {
+                if(compilation.Assembly != type.ContainingAssembly)
+                {
+                    return false;
+                }
+            }
+
             return true;
         }
 
@@ -249,7 +257,7 @@ public void AddType(string nameSpaceName, INamedTypeSymbol type)
         {
             NamespacesContainsNamespace(nameSpaceName, out FactoryNamespace? foundNameSpace);
 
-            if(foundNameSpace == null)
+            if (foundNameSpace == null)
             {
                 foundNameSpace = new FactoryNamespace(nameSpaceName);
                 Namespaces.Add(foundNameSpace);
@@ -262,7 +270,7 @@ private bool NamespacesContainsNamespace(string namespaceName, out FactoryNamesp
         {
             foreach (var nameSpace in Namespaces)
             {
-                if(nameSpace.Name == namespaceName)
+                if (nameSpace.Name == namespaceName)
                 {
                     outNameSpace = nameSpace;
                     return true;

ElementFactoryGenerator/ElementFactoryGenerator.csproj

@@ -3,8 +3,12 @@
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
+		<Version>0.1</Version>
+		<PackageLicenseFile>COPYING</PackageLicenseFile>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<Nullable>enable</Nullable>
-		<IncludeBuildOutput>false</IncludeBuildOutput>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<IsRoslynComponent>true</IsRoslynComponent>
 	</PropertyGroup>
 

ElementFactoryGenerator/README.md

@@ -0,0 +1 @@
+Code generator for reflection based deserialisation in Datamodel.NET

Tests/Tests.cs

@@ -9,7 +9,7 @@
 using System.Numerics;
 using DM = Datamodel.Datamodel;
 using System.Globalization;
-using VMAP;
+using Tests.VMAP;
 
 namespace Datamodel_Tests
 {
@@ -321,7 +321,7 @@ private static void Validate_Vmap_Reflection(Datamodel.Datamodel unserialisedVma
             Assert.AreEqual(vertexData.size, 8);
             Assert.AreEqual(vertexData.streams[0]["semanticName"], "position");
 
-            var typedPolygonMeshData = (VMAP.CDmePolygonMeshDataStream)vertexData.streams[0];
+            var typedPolygonMeshData = (CDmePolygonMeshDataStream)vertexData.streams[0];
             Assert.AreEqual(typedPolygonMeshData.semanticName, "position");
 
             var typedPolygonMeshDataStream = typedPolygonMeshData.data as Vector3Array;

Tests/ValveMap.cs

@@ -2,7 +2,7 @@
 using System.Numerics;
 using DMElement = Datamodel.Element;
 
-namespace VMAP;
+namespace Tests.VMAP;
 
 #nullable enable