xBimTeam · andyward · Jan 9, 2023 · Jan 9, 2023 · Jan 9, 2023 · Jan 10, 2023
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# IDE0055: Fix formatting
+dotnet_diagnostic.IDE0055.severity = suggestion
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@
 *.sln.docstates
 *.orig
 .vs/
+.idea/
+global.json
 
 # Build results
 [Dd]ebug/

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,33 +1,31 @@
 <Project>
+
   <PropertyGroup>
     <IsTestProject Condition="$(MSBuildProjectName.EndsWith('Tests')) OR $(MSBuildProjectName.EndsWith('Regression'))">true</IsTestProject>
   </PropertyGroup>
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <GenerateDocumentationFile Condition=" '$(IsTestProject)' != 'true' ">true</GenerateDocumentationFile>
-    <NoWarn>CS1591</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>5.1.0.0</Version>
-    <AssemblyVersion>5.1.0.0</AssemblyVersion>
+    <Version>6.0.0.0-dev</Version>
+    <AssemblyVersion>6.0.0.0</AssemblyVersion>
     <Copyright>Copyright © XBIM Ltd</Copyright>
     <Company>Xbim Ltd.</Company>
     <Authors>Steve Lockley, Martin Cerny and XBIMTeam Contributors</Authors>
     <Product>XBIM Geometry</Product>
     <PackageLicenseExpression>CDDL-1.0</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/xBimTeam/XbimGeometry</PackageProjectUrl>   
-	<PackageIcon>xbim-toolkit-icon.png</PackageIcon>
-    <PackageReleaseNotes>Version 5.1 update. See https://github.com/xBimTeam/XbimGeometry/blob/master/CHANGELOG.md
+    <PackageProjectUrl>https://github.com/xBimTeam/XbimGeometry</PackageProjectUrl>
+    <PackageIcon>xbim-toolkit-icon.png</PackageIcon>
+    <PackageReleaseNotes>TODO: Update for v6. See https://github.com/xBimTeam/XbimGeometry/blob/master/CHANGELOG.md
     </PackageReleaseNotes>
     <PackageTags>BIM, IFC, Geometry, Meshing, Tesselation</PackageTags>
-    <RepositoryUrl>https://github.com/xBimTeam/XbimEssentials/tree/master</RepositoryUrl>
+    <RepositoryUrl>https://github.com/xBimTeam/XbimGeometry/tree/master</RepositoryUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
-    <SignAssembly>true</SignAssembly>   
-    <AssemblyOriginatorKeyFile>..\XbimOpenSourceKeyFile.snk</AssemblyOriginatorKeyFile>   
-    <DelaySign>false</DelaySign>
+    <SignAssembly>false</SignAssembly>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/GeometryProfiler/GeometryProfiler.csproj b/GeometryProfiler/GeometryProfiler.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <SignAssembly>False</SignAssembly>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Xbim.Geometry.Abstractions" Version="6.2.138" />
+    <PackageReference Include="Xbim.Ifc" Version="5.1.361-develop" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Xbim.Geometry.Engine.Interop\Xbim.Geometry.Engine.Interop.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/GeometryProfiler/Program.cs b/GeometryProfiler/Program.cs
@@ -0,0 +1,52 @@
+// See https://aka.ms/new-console-template for more information
+using Microsoft.Extensions.Logging;
+using System.Diagnostics;
+using Xbim.Geometry.Engine.Interop;
+using Xbim.Ifc4.GeometricModelResource;
+using Xbim.Ifc4.GeometryResource;
+using Xbim.IO.Memory;
+
+Console.WriteLine("Profiling");
+ILoggerFactory loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
+using var csgModel = InitCsgModel();
+var modelService = XbimGeometryEngine.CreateModelGeometryService(csgModel, loggerFactory);
+var v5Engine = XbimGeometryEngine.CreateGeometryEngineV5(csgModel, loggerFactory);
+
+var cone = csgModel.Instances.OfType<IfcRightCircularCone>().First();
+var v5Time = Time(() => v5Engine.CreateSolid(cone, null), 1000);
+var v6Time = Time(() => modelService.SolidFactory.Build(cone), 1000);
+
+
+MemoryModel InitCsgModel()
+{
+    var m = new MemoryModel(new Xbim.Ifc4.EntityFactoryIfc4());
+
+    using (var txn = m.BeginTransaction("Test"))
+    {
+        var cylinder = m.Instances.New<IfcRightCircularCone>();
+        var p = m.Instances.New<IfcAxis2Placement3D>();
+        p.Axis = m.Instances.New<IfcDirection>(d => d.SetXYZ(1, 0, 0));
+        p.Location = m.Instances.New<IfcCartesianPoint>(c => c.SetXYZ(0, 0, 0));
+        cylinder.Position = p;
+        cylinder.BottomRadius = 0.5;
+        cylinder.Height = 2;
+
+
+
+
+        txn.Commit();
+    }
+    return m;
+}
+
+TimeSpan Time(Action action, int executionCount = 1)
+{
+    action();
+    var t = Stopwatch.StartNew();
+    for (int i = 0; i < executionCount; i++)
+    {
+        action();
+    }
+    t.Stop();
+    return t.Elapsed;
+}
diff --git a/README.md b/README.md
@@ -11,22 +11,40 @@ XbimGeometry is part of the [Xbim Toolkit](https://github.com/xBimTeam).
 It contains the the Geometry Engine and Scene processing, which provide geometric and topological operations 
 to enable users to visualise models in 3D models, typically as a Tesselated scene or mesh.
 
-The native Geometry Engine is built around the open source [Open Cascade 7.3 library](https://www.opencascade.com/content/overview)
+The native Geometry Engine is built around the open source [Open Cascade 7.7.0 library](https://www.opencascade.com/content/overview)
 which performs much of the boolean operations involve in generating 3D solids. 
 This technology is included under a licence which permits the use as part of a larger work, compatible with our open source CDDL licence.
 
+## Getting started
+
+Before using this library you should register the Geometry Engine with the xbim ServiceProvider.
+
+```csharp
+	// Either configure the internal Services
+	XbimServices.Current.ConfigureServices(opt => opt.AddXbimToolkit(conf => 
+		conf.AddGeometryServices()
+		));
+
+	// or configure your services and register the provider with xbim:
+
+	services.AddXbimToolkit(conf => conf.AddGeometryServices());
+	// Once the DI container is built
+	XbimServices.Current.UseExternalServiceProvider(serviceProvider);
+```
+
+
 ## Compilation
 
-**Visual Studio 2017 or 2019 is recommended.**
+**Visual Studio 2022 is recommended.**
 Prior versions of Visual Studio are unlikely to work on this solution.
 
-The [free VS 2019 Community Edition](https://visualstudio.microsoft.com/downloads/) will be fine. 
+The [free VS 2022 Community Edition](https://visualstudio.microsoft.com/downloads/) will be fine. 
 
 In order to compile this solution which includes C++ projects you'll need the following additional 
 components installed:
 
 - Visual C++ Core desktop features
-- VC++ 2017 v141 tools
+- VC++ 2022 v143 tools
 - Windows 10 SDK (10.0.17134.0) 
 
 The XBIM toolkit [uses the NuGet](https://www.nuget.org/packages/Xbim.Geometry/) for the management of our published packages.

diff --git a/Xbim.Geometry.Dependencies/Program.cs b/Xbim.Geometry.Dependencies/Program.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Xbim.Geometry.Dependencies
+{
+    internal class Program
+    {
+        static void Main(string[] args)
+        {
+            Console.WriteLine("Hello World!");
+        }
+    }
+}
diff --git a/Xbim.Geometry.Dependencies/Xbim.Geometry.Dependencies.csproj b/Xbim.Geometry.Dependencies/Xbim.Geometry.Dependencies.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net472</TargetFramework>
+		<Configurations>Debug;Release</Configurations>
+		<Platforms>x64;x86;AnyCPU</Platforms>
+		<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+		<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+		<PackageIcon>xbim-toolkit-icon.png</PackageIcon>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Platform)'=='AnyCPU'">
+		<RuntimeIdentifier>win-x86</RuntimeIdentifier>
+		<PlatformTarget>x86</PlatformTarget>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(PlatformTarget)'=='x86'">
+		<RuntimeIdentifier>win-x86</RuntimeIdentifier>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(PlatformTarget)'=='x64'">
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+	</PropertyGroup>
+
+	<ItemGroup>
+	  <None Include="..\xbim-toolkit-icon.png">
+	    <Pack>True</Pack>
+	    <PackagePath>\</PackagePath>
+	  </None>
+	</ItemGroup>
+	<ItemGroup>
+    <PackageReference Include="Xbim.Geometry.Abstractions" Version="6.2.363-develop" />
+	</ItemGroup>
+
+	<Target Name="Buildx64" BeforeTargets="AfterBuild" Condition="'$(PlatformTarget)' == 'x86'">
+		<Message Importance="high" Text="Building x64 Platform: $(Platform)" />
+		<MSBuild Projects="$(MSBuildProjectFile)" Properties="Platform = AnyCPU;PlatformTarget=x64;Configuration=$(Configuration);RunTimeIdentifier=win-x64" RunEachTargetSeparately="true" />
+	</Target>
+
+</Project>
diff --git a/Xbim.Geometry.Engine.Interop.Tests/EntityRepository.cs b/Xbim.Geometry.Engine.Interop.Tests/EntityRepository.cs
diff --git a/Xbim.Geometry.Engine.Interop.Tests/GithubIssuesTests.cs b/Xbim.Geometry.Engine.Interop.Tests/GithubIssuesTests.cs