diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4551a01..0850934 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -20,5 +20,7 @@ jobs: uses: actions/setup-dotnet@v3 with: global-json-file: global.json + - name: Add Paket credentials + run: dotnet paket config add-token https://nuget.pkg.github.com/aardvark-platform/index.json ${{ secrets.GITHUB_TOKEN }} - name: Build run: sh ./build.sh diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index d87a3dc..3677f16 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -20,5 +20,7 @@ jobs: uses: actions/setup-dotnet@v3 with: global-json-file: global.json + - name: Add Paket credentials + run: dotnet paket config add-token https://nuget.pkg.github.com/aardvark-platform/index.json ${{ secrets.GITHUB_TOKEN }} - name: Build run: bash ./build.sh diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 492bb7d..8ba3c50 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,6 +20,8 @@ jobs: global-json-file: global.json - name: Restore Tools run: dotnet tool restore + - name: Add Paket credentials + run: dotnet paket config add-token https://nuget.pkg.github.com/aardvark-platform/index.json ${{ secrets.GITHUB_TOKEN }} - name: Restore run: dotnet paket restore - name: Build diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0184a2c..04c5957 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,5 +20,7 @@ jobs: uses: actions/setup-dotnet@v3 with: global-json-file: global.json + - name: Add Paket credentials + run: dotnet paket config add-token https://nuget.pkg.github.com/aardvark-platform/index.json ${{ secrets.GITHUB_TOKEN }} - name: Build run: .\build.cmd diff --git a/paket.dependencies b/paket.dependencies index 02f4fe3..ecd90c8 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,6 +1,8 @@ framework: auto-detect storage: none source https://api.nuget.org/v3/index.json +source https://www.myget.org/F/xbim-develop/api/v3/index.json +source https://nuget.pkg.github.com/aardvark-platform/index.json nuget Aardvark.Build ~> 1.0.22 nuget FSharp.Core >= 5.0.1 lowest_matching: true @@ -18,24 +20,24 @@ nuget Pfim ~> 0.11.2 nuget System.Drawing.Common >= 6.0.0 lowest_matching: true // XBim does not have proper version constraints so we declare and reference everything explicitly -nuget Xbim.Ifc ~> 5.1.341 -nuget Xbim.Ifc2x3 ~> 5.1.341 -nuget Xbim.Ifc4 ~> 5.1.341 -nuget Xbim.IO.Esent ~> 5.1.341 -nuget Xbim.IO.MemoryModel ~> 5.1.341 -nuget Xbim.Essentials ~> 5.1.341 -nuget Xbim.Common ~> 5.1.341 -nuget Xbim.Tessellator ~> 5.1.341 -nuget Xbim.Geometry ~> 5.1.437 -nuget Xbim.Geometry.Engine.Interop ~> 5.1.437 -nuget Xbim.ModelGeometry.Scene ~> 5.1.437 -nuget Microsoft.Extensions.Logging >= 3.1.3 lowest_matching: true -nuget Microsoft.Extensions.Logging.Abstractions >= 3.1.3 lowest_matching: true -nuget Microsoft.Extensions.Configuration.Abstractions >= 3.1.3 lowest_matching: true -nuget Microsoft.Extensions.Configuration.Binder >= 3.1.3 lowest_matching: true -nuget Microsoft.Extensions.DependencyInjection.Abstractions >= 3.1.3 lowest_matching: true -nuget Microsoft.Extensions.Options >= 3.1.3 lowest_matching: true -nuget Microsoft.Extensions.Primitives >= 3.1.3 lowest_matching: true +nuget Xbim.Ifc ~> 6.0.0 +nuget Xbim.Ifc2x3 ~> 6.0.0 +nuget Xbim.Ifc4 ~> 6.0.0 +nuget Xbim.IO.Esent ~> 6.0.0 +nuget Xbim.IO.MemoryModel ~> 6.0.0 +nuget Xbim.Essentials ~> 6.0.0 +nuget Xbim.Common ~> 6.0.0 +nuget Xbim.Tessellator ~> 6.0.0 +nuget Xbim.Geometry ~> 6.0.0-dev +nuget Xbim.Geometry.Engine.Interop ~> 6.0.0-dev +nuget Xbim.ModelGeometry.Scene ~> 6.0.0-dev +nuget Microsoft.Extensions.Logging >= 6.0.0 lowest_matching: true +nuget Microsoft.Extensions.Logging.Abstractions >= 6.0.0 lowest_matching: true +nuget Microsoft.Extensions.Configuration.Abstractions >= 6.0.0 lowest_matching: true +nuget Microsoft.Extensions.Configuration.Binder >= 6.0.0 lowest_matching: true +nuget Microsoft.Extensions.DependencyInjection.Abstractions >= 6.0.0 lowest_matching: true +nuget Microsoft.Extensions.Options >= 6.0.0 lowest_matching: true +nuget Microsoft.Extensions.Primitives >= 6.0.0 lowest_matching: true group Test framework: auto-detect diff --git a/paket.lock b/paket.lock index 292b6f9..c60adbe 100644 --- a/paket.lock +++ b/paket.lock @@ -84,33 +84,40 @@ NUGET FsPickler (5.3.2) FSharp.Core (>= 4.3.2) System.Reflection.Emit.Lightweight (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - ManagedEsent (2.0) - restriction: || (== net472) (&& (== net6.0) (>= net45) (< netstandard2.0)) (&& (== net6.0) (>= net47)) (&& (== net6.0-windows7.0) (>= net45) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= net47)) (&& (== netstandard2.0) (>= net47)) Microsoft.Bcl.AsyncInterfaces (8.0) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== net6.0-windows7.0) (< net6.0)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - Microsoft.Database.ManagedEsent (2.0.4) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Microsoft.Extensions.Configuration (3.1.3) - Microsoft.Extensions.Configuration.Abstractions (>= 3.1.3) - Microsoft.Extensions.Configuration.Abstractions (3.1.3) - Microsoft.Extensions.Primitives (>= 3.1.3) - Microsoft.Extensions.Configuration.Binder (3.1.3) - Microsoft.Extensions.Configuration (>= 3.1.3) - Microsoft.Extensions.DependencyInjection (3.1.3) - Microsoft.Bcl.AsyncInterfaces (>= 1.1) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 3.1.3) - Microsoft.Extensions.DependencyInjection.Abstractions (3.1.3) - Microsoft.Extensions.Logging (3.1.3) - Microsoft.Extensions.Configuration.Binder (>= 3.1.3) - Microsoft.Extensions.DependencyInjection (>= 3.1.3) - Microsoft.Extensions.Logging.Abstractions (>= 3.1.3) - Microsoft.Extensions.Options (>= 3.1.3) - Microsoft.Extensions.Logging.Abstractions (3.1.3) - Microsoft.Extensions.Options (3.1.3) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 3.1.3) - Microsoft.Extensions.Primitives (>= 3.1.3) - System.ComponentModel.Annotations (>= 4.7) - restriction: || (== net472) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - Microsoft.Extensions.Primitives (3.1.3) - System.Memory (>= 4.5.2) - restriction: || (== net472) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) - System.Runtime.CompilerServices.Unsafe (>= 4.7.1) - restriction: || (== net472) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) + Microsoft.Database.ManagedEsent (2.0.4) + Microsoft.Extensions.Configuration.Abstractions (6.0) + Microsoft.Extensions.Primitives (>= 6.0) + System.ValueTuple (>= 4.5) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) + Microsoft.Extensions.Configuration.Binder (6.0) + Microsoft.Extensions.Configuration.Abstractions (>= 6.0) + Microsoft.Extensions.DependencyInjection (6.0.1) + Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Extensions.DependencyInjection.Abstractions (6.0) + Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Extensions.Logging (6.0) + Microsoft.Bcl.AsyncInterfaces (>= 6.0) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Extensions.DependencyInjection (>= 6.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) + Microsoft.Extensions.Logging.Abstractions (>= 6.0) + Microsoft.Extensions.Options (>= 6.0) + System.Diagnostics.DiagnosticSource (>= 6.0) + System.ValueTuple (>= 4.5) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) + Microsoft.Extensions.Logging.Abstractions (6.0) + System.Buffers (>= 4.5.1) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< net6.0)) (== netstandard2.0) + System.Memory (>= 4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< net6.0)) (== netstandard2.0) + Microsoft.Extensions.Options (6.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) + Microsoft.Extensions.Primitives (>= 6.0) + System.ComponentModel.Annotations (>= 5.0) - restriction: || (&& (== net472) (< net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Extensions.Primitives (6.0) + System.Memory (>= 4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) Microsoft.NETCore.Platforms (7.0.4) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.Win32.SystemEvents (8.0) - restriction: || (&& (== net472) (>= netcoreapp3.1)) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) @@ -121,7 +128,7 @@ NUGET System.Numerics.Vectors (>= 4.5) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 5.0) System.Text.Encoding.CodePages (>= 5.0) - System.Buffers (4.5.1) - restriction: || (== net472) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netcoreapp3.1) (>= xamarinios)) (&& (== net6.0) (< netcoreapp3.1) (>= xamarinmac)) (&& (== net6.0) (< netcoreapp3.1) (>= xamarintvos)) (&& (== net6.0) (< netcoreapp3.1) (>= xamarinwatchos)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= monotouch)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (< netcoreapp3.1) (>= xamarinios)) (&& (== net6.0-windows7.0) (< netcoreapp3.1) (>= xamarinmac)) (&& (== net6.0-windows7.0) (< netcoreapp3.1) (>= xamarintvos)) (&& (== net6.0-windows7.0) (< netcoreapp3.1) (>= xamarinwatchos)) (&& (== net6.0-windows7.0) (< netstandard1.1)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (== netstandard2.0) + System.Buffers (4.5.1) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== net6.0-windows7.0) (< net6.0)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (== netstandard2.0) System.Collections (4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) @@ -129,11 +136,16 @@ NUGET System.Collections.Immutable (8.0) System.Memory (>= 4.5.5) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== net6.0-windows7.0) (< net6.0)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.ComponentModel.Annotations (5.0) - restriction: || (== net472) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0) + System.ComponentModel.Annotations (5.0) - restriction: || (&& (== net472) (== net6.0)) (&& (== net472) (== net6.0-windows7.0)) (&& (== net472) (< net461)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + System.Configuration.ConfigurationManager (8.0) - restriction: || (== net472) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + System.Security.Cryptography.ProtectedData (>= 8.0) - restriction: || (&& (== net472) (< net462)) (&& (== net472) (>= net6.0)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Diagnostics.Debug (4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Runtime (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + System.Diagnostics.DiagnosticSource (8.0.1) + System.Memory (>= 4.5.5) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== net6.0-windows7.0) (< net6.0)) (== netstandard2.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) System.Drawing.Common (6.0) Microsoft.Win32.SystemEvents (>= 6.0) - restriction: || (&& (== net472) (>= netcoreapp3.1)) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) System.Dynamic.Runtime (4.3) @@ -185,12 +197,12 @@ NUGET System.Runtime (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Runtime.Extensions (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Threading (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Memory (4.5.5) + System.Memory (4.5.5) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== net6.0-windows7.0) (< net6.0)) (== netstandard2.0) System.Buffers (>= 4.5.1) - restriction: || (== net472) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== net6.0-windows7.0) (>= monotouch)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netstandard1.1)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= xamarinios)) (&& (== net6.0-windows7.0) (>= xamarinmac)) (&& (== net6.0-windows7.0) (>= xamarintvos)) (&& (== net6.0-windows7.0) (>= xamarinwatchos)) (== netstandard2.0) System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net472) (< net45)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (== netstandard2.0) System.Numerics.Vectors (>= 4.5) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== netstandard2.0) (>= net461)) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net472) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== net6.0-windows7.0) (>= monotouch)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (< netstandard1.1)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= uap10.1)) (&& (== net6.0-windows7.0) (>= xamarinios)) (&& (== net6.0-windows7.0) (>= xamarinmac)) (&& (== net6.0-windows7.0) (>= xamarintvos)) (&& (== net6.0-windows7.0) (>= xamarinwatchos)) (== netstandard2.0) - System.Numerics.Vectors (4.5) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (== netstandard2.0) + System.Numerics.Vectors (4.5) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (&& (== net6.0) (>= net472)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== net6.0-windows7.0) (< netcoreapp2.0)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (== netstandard2.0) System.ObjectModel (4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Collections (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Diagnostics.Debug (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) @@ -235,6 +247,7 @@ NUGET Microsoft.NETCore.Platforms (>= 1.1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Runtime (>= 4.3.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + System.Security.Cryptography.ProtectedData (8.0) - restriction: || (&& (== net472) (== netstandard2.0)) (&& (== net472) (< net462)) (&& (== net472) (>= net6.0)) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) System.Text.Encoding (4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) @@ -257,51 +270,69 @@ NUGET System.Threading (4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Runtime (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Threading.Tasks (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - System.Threading.Tasks (4.3) + System.Threading.Tasks (4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + Microsoft.NETCore.Targets (>= 1.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) + System.Runtime (>= 4.3) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) System.Threading.Tasks.Extensions (4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (>= net462)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== net6.0-windows7.0) (< net6.0)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (< netcoreapp2.1)) (&& (== net6.0-windows7.0) (< netstandard1.0)) (&& (== net6.0-windows7.0) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= wp8)) (== netstandard2.0) - System.ValueTuple (4.5) - restriction: || (== net472) (&& (== net6.0) (>= net462)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== netstandard2.0) (>= net462)) - Xbim.Common (5.1.341) - Microsoft.Extensions.Logging (>= 2.1.1) - restriction: || (== net472) (&& (== net6.0) (>= net47)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net47)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - Microsoft.Extensions.Logging (>= 3.1.3) - restriction: || (&& (== net472) (>= netcoreapp3.1)) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - Microsoft.Extensions.Logging.Abstractions (>= 2.1.1) - restriction: || (== net472) (&& (== net6.0) (>= net47)) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (>= net47)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) - Microsoft.Extensions.Logging.Abstractions (>= 3.1.3) - restriction: || (&& (== net472) (>= netcoreapp3.1)) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= netcoreapp3.1)) - System.Memory (>= 4.5.4) - Xbim.Essentials (5.1.341) - Xbim.Common (>= 5.1.341) - Xbim.Ifc (>= 5.1.341) - Xbim.Ifc2x3 (>= 5.1.341) - Xbim.Ifc4 (>= 5.1.341) - Xbim.IO.Esent (>= 5.1.341) - restriction: || (== net472) (&& (== net6.0) (>= net45) (< netstandard2.0)) (&& (== net6.0) (>= net46) (< netstandard2.0)) (&& (== net6.0) (>= net47)) (&& (== net6.0-windows7.0) (>= net45) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= net46) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= net47)) (&& (== netstandard2.0) (>= net47)) - Xbim.IO.MemoryModel (>= 5.1.341) - Xbim.Tessellator (>= 5.1.341) - Xbim.Geometry (5.1.437) - Xbim.Geometry.Engine.Interop (>= 5.1.437) - Xbim.ModelGeometry.Scene (>= 5.1.437) - Xbim.Geometry.Engine.Interop (5.1.437) - Microsoft.Extensions.Logging (>= 2.1.1) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) - Microsoft.Extensions.Logging.Abstractions (>= 2.1.1) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) - System.Threading.Tasks (>= 4.3) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) - Xbim.Ifc (>= 5.1.341) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) - Xbim.Tessellator (>= 5.1.314) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) - Xbim.Ifc (5.1.341) - Xbim.IO.MemoryModel (>= 5.1.341) - Xbim.Ifc2x3 (5.1.341) - Xbim.Ifc4 (>= 5.1.341) - Xbim.Ifc4 (5.1.341) - Xbim.Common (>= 5.1.341) - Xbim.IO.Esent (5.1.341) - ManagedEsent (>= 1.9.4) - restriction: || (== net472) (&& (== net6.0) (>= net45) (< netstandard2.0)) (&& (== net6.0) (>= net47)) (&& (== net6.0-windows7.0) (>= net45) (< netstandard2.0)) (&& (== net6.0-windows7.0) (>= net47)) (&& (== netstandard2.0) (>= net47)) - Microsoft.Database.ManagedEsent (>= 2.0.1) - restriction: || (&& (== net472) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0) - Xbim.IO.MemoryModel (>= 5.1.341) - Xbim.IO.MemoryModel (5.1.341) - Xbim.Ifc2x3 (>= 5.1.341) - Xbim.ModelGeometry.Scene (5.1.437) - Xbim.Geometry.Engine.Interop (>= 5.1.437) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) - Xbim.Ifc (>= 5.1.341) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) - Xbim.Tessellator (>= 5.1.341) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) - Xbim.Tessellator (5.1.341) - Xbim.Ifc2x3 (>= 5.1.341) + System.ValueTuple (4.5) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (>= net462)) (&& (== net6.0-windows7.0) (>= net461)) (&& (== net6.0-windows7.0) (>= net462)) (&& (== netstandard2.0) (>= net461)) (&& (== netstandard2.0) (>= net462)) + Xbim.Common (6.0.445) + Microsoft.Extensions.DependencyInjection (>= 2.1.1) - restriction: || (== net472) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< net6.0)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Extensions.DependencyInjection (>= 6.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net6.0)) + Microsoft.Extensions.Logging.Abstractions (>= 2.1.1) - restriction: || (== net472) (&& (== net6.0) (< netstandard2.1)) (&& (== net6.0-windows7.0) (< net6.0)) (&& (== net6.0-windows7.0) (< netstandard2.1)) (== netstandard2.0) + Microsoft.Extensions.Logging.Abstractions (>= 6.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net6.0)) + Xbim.Essentials (6.0.445) + Xbim.Common (>= 6.0.445) + Xbim.Ifc (>= 6.0.445) + Xbim.Ifc2x3 (>= 6.0.445) + Xbim.Ifc4 (>= 6.0.445) + Xbim.Ifc4x3 (>= 6.0.445) + Xbim.IO.Esent (>= 6.0.445) + Xbim.IO.MemoryModel (>= 6.0.445) + Xbim.Tessellator (>= 6.0.445) + Xbim.Ifc (6.0.445) + Xbim.Common (>= 6.0.445) + Xbim.Ifc2x3 (>= 6.0.445) + Xbim.Ifc4 (>= 6.0.445) + Xbim.Ifc4x3 (>= 6.0.445) + Xbim.IO.Esent (>= 6.0.445) + Xbim.IO.MemoryModel (>= 6.0.445) + Xbim.Ifc2x3 (6.0.445) + Xbim.Common (>= 6.0.445) + Xbim.Ifc4 (>= 6.0.445) + Xbim.Ifc4 (6.0.445) + Xbim.Common (>= 6.0.445) + Xbim.Ifc4x3 (6.0.445) + Xbim.Common (>= 6.0.445) + Xbim.Ifc4 (>= 6.0.445) + Xbim.IO.Esent (6.0.445) + Microsoft.Database.ManagedEsent (>= 2.0.3) + Xbim.Common (>= 6.0.445) + Xbim.IO.MemoryModel (>= 6.0.445) + Xbim.IO.MemoryModel (6.0.445) + Xbim.Common (>= 6.0.445) + Xbim.Ifc2x3 (>= 6.0.445) + Xbim.Ifc4 (>= 6.0.445) + Xbim.Ifc4x3 (>= 6.0.445) + Xbim.Tessellator (6.0.445) + Xbim.Common (>= 6.0.445) + Xbim.Ifc2x3 (>= 6.0.445) + Xbim.Ifc4 (>= 6.0.445) + remote: https://nuget.pkg.github.com/aardvark-platform/index.json + Xbim.Geometry (6.0.0-dev) + Xbim.Geometry.Engine.Interop (>= 6.0.0-dev) - restriction: || (== net472) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + Xbim.ModelGeometry.Scene (>= 6.0.0-dev) - restriction: || (== net472) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + Xbim.Geometry.Engine.Interop (6.0.0-dev) + Microsoft.Extensions.Options (>= 2.1.1) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0-windows7.0) (>= net472)) (&& (== netstandard2.0) (>= net472)) + Microsoft.Extensions.Options (>= 6.0) - restriction: || (&& (== net472) (>= net6.0)) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net6.0)) + Xbim.Geometry.Abstractions (>= 6.2.344-develop) - restriction: || (== net472) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + Xbim.ModelGeometry.Scene (6.0.0-dev) + System.Configuration.ConfigurationManager (>= 6.0.1) - restriction: || (== net472) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + Xbim.Geometry.Engine.Interop (>= 6.0.0-dev) - restriction: || (== net472) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + remote: https://www.myget.org/F/xbim-develop/api/v3/index.json + Xbim.Geometry.Abstractions (6.2.346-develop) - restriction: || (== net472) (== net6.0) (== net6.0-windows7.0) (&& (== netstandard2.0) (>= net472)) (&& (== netstandard2.0) (>= net6.0)) + Xbim.Essentials (>= 6.0.414-develop) GROUP Test STORAGE: NONE diff --git a/src/Aardvark.Data.Ifc/Aardvark.Data.Ifc.csproj b/src/Aardvark.Data.Ifc/Aardvark.Data.Ifc.csproj index 4b75492..58588d3 100644 --- a/src/Aardvark.Data.Ifc/Aardvark.Data.Ifc.csproj +++ b/src/Aardvark.Data.Ifc/Aardvark.Data.Ifc.csproj @@ -1,7 +1,7 @@  - net472 + net472;net6.0 true 9.0 diff --git a/src/Aardvark.Data.Ifc/IFCParser.cs b/src/Aardvark.Data.Ifc/IFCParser.cs index 744a897..9fb0c04 100644 --- a/src/Aardvark.Data.Ifc/IFCParser.cs +++ b/src/Aardvark.Data.Ifc/IFCParser.cs @@ -33,7 +33,7 @@ public static IFCData PreprocessIFC(string filePath, XbimEditorCredentials edito { var context = new Xbim3DModelContext(model); //upgrade to new geometry representation, uses the default 3D model - context.CreateContext(); // THIS IS COSTLY! + context.CreateContext(null, true, false); // THIS IS COSTLY! } foreach (var modelReference in model.ReferencedModels) @@ -46,7 +46,7 @@ public static IFCData PreprocessIFC(string filePath, XbimEditorCredentials edito continue; var context = new Xbim3DModelContext(modelReference.Model); //upgrade to new geometry representation, uses the default 3D model - context.CreateContext(); + context.CreateContext(null, true, false); } var project = model.Instances.OfType().First().UnitsInContext; diff --git a/src/Aardvark.Data.Ifc/README.md b/src/Aardvark.Data.Ifc/README.md new file mode 100644 index 0000000..da7cc65 --- /dev/null +++ b/src/Aardvark.Data.Ifc/README.md @@ -0,0 +1,13 @@ +# Aardvark.Data.Ifc +Simple IFC loader for the Aardvark Platform. +## Installing Xbim 6.X packages +Currently, there are no official packages for Xbim 6.X. You will have to add the Xbim development and aardvark-platform feeds to your `paket.dependencies` file: +``` +source https://www.myget.org/F/xbim-develop/api/v3/index.json +source https://nuget.pkg.github.com/aardvark-platform/index.json +``` +For the aardvark-platform feed you need an access token with read access and add it to paket: +``` +dotnet tool restore +dotnet paket config add-token https://nuget.pkg.github.com/aardvark-platform/index.json +``` diff --git a/src/Tests/IfcTests/IfcTests.csproj b/src/Tests/IfcTests/IfcTests.csproj index 202a9e4..b65fe38 100644 --- a/src/Tests/IfcTests/IfcTests.csproj +++ b/src/Tests/IfcTests/IfcTests.csproj @@ -2,7 +2,7 @@ Library - net472 + net6.0 9.0