Merge branch 'master' of https://github.com/DomCR/ACadSharp

Author: DomCR

.github/workflows/build_n_test.yml

@@ -24,4 +24,4 @@ jobs:
       run: |
           dotnet restore
           dotnet build --configuration Release --no-restore
-          dotnet test --configuration Release --no-build --verbosity normal
+          dotnet test --configuration Release --no-build --verbosity normal

src/ACadSharp.Tests/ACadSharp.Tests.csproj

@@ -12,11 +12,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="coverlet.msbuild" Version="6.0.2">
+		<PackageReference Include="coverlet.msbuild" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.2">
+		<PackageReference Include="coverlet.collector" Version="6.0.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
@@ -25,7 +25,7 @@
 		<PackageReference Include="MSTest.TestFramework" Version="3.*" />
 		<PackageReference Include="xunit" Version="2.*" />
 		<PackageReference Include="xunit.extensibility.core" Version="2.*" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.*">
+		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

src/ACadSharp/IO/DXF/DxfDocumentBuilder.cs

@@ -26,8 +26,6 @@ public DxfDocumentBuilder(ACadVersion version, CadDocument document, DxfReaderCo
 
 		public override void BuildDocument()
 		{
-			this.buildDictionaries();
-
 			if (this.ModelSpaceTemplate == null)
 			{
 				BlockRecord record = BlockRecord.ModelSpace;
@@ -37,11 +35,13 @@ public override void BuildDocument()
 			}
 
 			this.ModelSpaceTemplate.OwnedObjectsHandlers.AddRange(this.ModelSpaceEntities);
-			
+
 			this.RegisterTables();
 
 			this.BuildTables();
 
+			this.buildDictionaries();
+
 			//Assign the owners for the different objects
 			foreach (CadTemplate template in this.cadObjectsTemplates.Values)
 			{

src/ACadSharp/IO/DXF/DxfStreamReader/DxfBlockSectionReader.cs

@@ -59,6 +59,7 @@ private void readBlock()
 
 			string name = null;
 			BlockRecord record = null;
+			CadBlockRecordTemplate recordTemplate = null;
 
 			while (this._reader.DxfCode != DxfCode.Start)
 			{
@@ -112,7 +113,7 @@ private void readBlock()
 			{
 				record = new BlockRecord(name);
 				record.BlockEntity = blckEntity;
-				CadBlockRecordTemplate recordTemplate = new CadBlockRecordTemplate(record);
+				recordTemplate = new CadBlockRecordTemplate(record);
 
 				this._builder.BlockRecords.Add(record);
 
@@ -121,6 +122,10 @@ private void readBlock()
 					this._builder.ModelSpaceTemplate = recordTemplate;
 				}
 			}
+			else
+			{
+				recordTemplate = new CadBlockRecordTemplate(record);
+			}
 
 			while (this._reader.ValueAsString != DxfFileToken.EndBlock)
 			{
@@ -146,7 +151,7 @@ private void readBlock()
 
 				//Add the object and the template to the builder
 				this._builder.AddTemplate(entityTemplate);
-				record.Entities.Add(entityTemplate.CadObject);
+				recordTemplate.OwnedObjectsHandlers.Add(entityTemplate.CadObject.Handle);
 			}
 
 			this.readBlockEnd(record.BlockEnd);

src/ACadSharp/IO/DXF/DxfStreamReader/DxfTablesSectionReader.cs

@@ -34,7 +34,7 @@ public override void Read()
 				if (this._reader.ValueAsString == DxfFileToken.TableEntry)
 					this.readTable();
 				else
-					throw new DxfException($"Unexpected token at the begining of a table: {this._reader.ValueAsString}", this._reader.Position);
+					throw new DxfException($"Unexpected token at the beginning of a table: {this._reader.ValueAsString}", this._reader.Position);
 
 
 				if (this._reader.ValueAsString == DxfFileToken.EndTable)