Update all Nuget Packages

dd-bim · Oct 10, 2023 · 86664d4 · 86664d4
1 parent 540f930
commit 86664d4
Show file tree

Hide file tree

Showing 14 changed files with 280 additions and 226 deletions.
diff --git a/BIMGISInteropLibs/BIMGISInteropLibs.csproj b/BIMGISInteropLibs/BIMGISInteropLibs.csproj
diff --git a/BIMGISInteropLibs/EPSG/Datum.cs b/BIMGISInteropLibs/EPSG/Datum.cs
@@ -112,7 +112,7 @@ public static Root get(int code)
             string requestString = "/v1/Datum/" + code.ToString() + "/";
 
             //build request as rest request
-            var request = new RestRequest(requestString, DataFormat.Json);
+            var request = new RestRequest(requestString, (Method)DataFormat.Json);
 
             //send request and get response
             var response = client.Execute(request) as RestResponse;

diff --git a/BIMGISInteropLibs/EPSG/GeodeticCRS.cs b/BIMGISInteropLibs/EPSG/GeodeticCRS.cs
@@ -125,7 +125,7 @@ public static Root get(int code)
             string requestString = "/v1/GeodeticCoordRefSystem/" + code.ToString() + "/";
 
             //build request as rest request
-            var request = new RestRequest(requestString, DataFormat.Json);
+            var request = new RestRequest(requestString, (Method)DataFormat.Json);
 
             //send request and get response
             var response = client.Execute(request) as RestResponse;

diff --git a/BIMGISInteropLibs/GdalConfiguration.cs b/BIMGISInteropLibs/GdalConfiguration.cs
@@ -45,8 +45,8 @@ public static partial class GdalConfiguration
 
         [DllImport("kernel32", CharSet = CharSet.Auto, SetLastError = true)]
         static extern bool SetDefaultDllDirectories(uint directoryFlags);
-        //               LOAD_LIBRARY_SEARCH_USER_DIRS | LOAD_LIBRARY_SEARCH_SYSTEM32
-        private const uint DllSearchFlags = 0x00000400 | 0x00000800;
+        //               LOAD_LIBRARY_SEARCH_DEFAULT_DIRS
+        private const uint DllSearchFlags = 0x00001000;
 
         [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
@@ -106,6 +106,9 @@ static GdalConfiguration()
                 Environment.SetEnvironmentVariable("PROJ_LIB", projSharePath);
                 Gdal.SetConfigOption("PROJ_LIB", projSharePath);
                 OSGeo.OSR.Osr.SetPROJSearchPaths(new[] { projSharePath });
+
+				string certificateFile = Path.Combine(gdalPath, "curl-ca-bundle.crt");
+                Gdal.SetConfigOption("GDAL_CURL_CA_BUNDLE", certificateFile);
 
                 _usable = true;
             }

diff --git a/BIMGISInteropLibs/app.config b/BIMGISInteropLibs/app.config
@@ -8,7 +8,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -24,7 +24,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -36,7 +36,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -52,35 +52,43 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.2" newVersion="5.0.0.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Npgsql" publicKeyToken="5d8b90d52f46fda7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.0.10.0" newVersion="5.0.10.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/BIMGISInteropLibs/packages.config b/BIMGISInteropLibs/packages.config
@@ -1,57 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GDAL" version="3.4.2" targetFramework="net48" />
-  <package id="GDAL.Native" version="3.4.2" targetFramework="net48" />
-  <package id="GeoJSON.Net" version="1.2.19" targetFramework="net48" />
+  <package id="GDAL" version="3.7.2" targetFramework="net48" />
+  <package id="GDAL.Native" version="3.7.2" targetFramework="net48" />
+  <package id="GeoJSON.Net" version="1.3.6-rc" targetFramework="net48" />
   <package id="IxMilia.Dxf" version="0.8.3" targetFramework="net48" />
-  <package id="ManagedEsent" version="1.9.4" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Configuration.Binder" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="5.0.2" targetFramework="net48" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Logging" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Options" version="5.0.0" targetFramework="net48" />
-  <package id="Microsoft.Extensions.Primitives" version="5.0.1" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="6.12.2" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.Logging" version="6.12.2" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.Tokens" version="6.12.2" targetFramework="net48" />
-  <package id="netDXF" version="2.2.0.1" targetFramework="net461" />
-  <package id="NetTopologySuite" version="2.3.0" targetFramework="net48" />
+  <package id="ManagedEsent" version="2.0.0" targetFramework="net48" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Configuration" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Options" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.Extensions.Primitives" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Abstractions" version="7.0.2" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="7.0.2" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Logging" version="7.0.2" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Tokens" version="7.0.2" targetFramework="net48" />
+  <package id="netDxf" version="2022.11.2" targetFramework="net48" />
+  <package id="NetTopologySuite" version="2.5.0" targetFramework="net48" />
   <package id="NetTopologySuite.Features" version="2.1.0" targetFramework="net48" />
-  <package id="NetTopologySuite.IO.GeoJSON" version="2.0.4" targetFramework="net48" />
+  <package id="NetTopologySuite.IO.GeoJSON" version="4.0.0" targetFramework="net48" />
   <package id="NetTopologySuite.IO.PostGis" version="2.1.0" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
-  <package id="Npgsql" version="5.0.10" targetFramework="net48" />
-  <package id="Npgsql.LegacyPostgis" version="5.0.7" targetFramework="net472" />
-  <package id="Npgsql.NetTopologySuite" version="5.0.7" targetFramework="net48" />
-  <package id="RestSharp" version="106.12.0" targetFramework="net48" />
-  <package id="RestSharp.Serializers.NewtonsoftJson" version="106.12.0" targetFramework="net48" />
-  <package id="Serilog" version="2.10.0" targetFramework="net48" />
-  <package id="Serilog.Sinks.Console" version="4.0.0" targetFramework="net48" />
-  <package id="Serilog.Sinks.File" version="5.0.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="Npgsql" version="8.0.0-preview.4" targetFramework="net48" />
+  <package id="Npgsql.LegacyPostgis" version="6.0.0-preview7" targetFramework="net48" />
+  <package id="Npgsql.NetTopologySuite" version="8.0.0-preview.4" targetFramework="net48" />
+  <package id="RestSharp" version="106.15.0" targetFramework="net48" />
+  <package id="RestSharp.Serializers.NewtonsoftJson" version="106.15.0" targetFramework="net48" />
+  <package id="Serilog" version="3.1.0-dev-02077" targetFramework="net48" />
+  <package id="Serilog.Sinks.Console" version="4.2.0-dev-00918" targetFramework="net48" />
+  <package id="Serilog.Sinks.File" version="5.0.1-dev-00968" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="5.0.1" targetFramework="net48" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="6.12.2" targetFramework="net48" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
+  <package id="System.Collections.Immutable" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="7.0.2" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
-  <package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="5.0.1" targetFramework="net48" />
-  <package id="System.Text.Json" version="5.0.2" targetFramework="net48" />
-  <package id="System.Threading.Channels" version="5.0.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="7.0.0-preview.2.22152.2" targetFramework="net48" />
+  <package id="System.Text.Encoding.CodePages" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="System.Text.Encodings.Web" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="System.Text.Json" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
+  <package id="System.Threading.Channels" version="8.0.0-rc.1.23419.4" targetFramework="net48" />
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-  <package id="Xbim.Common" version="5.1.323" targetFramework="net472" />
-  <package id="Xbim.Essentials" version="5.1.323" targetFramework="net472" />
-  <package id="Xbim.Geometry.Engine.Interop" version="5.1.403" targetFramework="net472" />
-  <package id="Xbim.Ifc" version="5.1.323" targetFramework="net472" />
-  <package id="Xbim.Ifc2x3" version="5.1.323" targetFramework="net472" />
-  <package id="Xbim.Ifc4" version="5.1.323" targetFramework="net472" />
-  <package id="Xbim.IO.Esent" version="5.1.323" targetFramework="net472" />
-  <package id="Xbim.IO.MemoryModel" version="5.1.323" targetFramework="net472" />
-  <package id="Xbim.Tessellator" version="5.1.323" targetFramework="net472" />
+  <package id="Xbim.Common" version="5.1.341" targetFramework="net48" />
+  <package id="Xbim.Essentials" version="5.1.341" targetFramework="net48" />
+  <package id="Xbim.Geometry.Engine.Interop" version="5.1.437" targetFramework="net48" />
+  <package id="Xbim.Ifc" version="5.1.341" targetFramework="net48" />
+  <package id="Xbim.Ifc2x3" version="5.1.341" targetFramework="net48" />
+  <package id="Xbim.Ifc4" version="5.1.341" targetFramework="net48" />
+  <package id="Xbim.IO.Esent" version="5.1.341" targetFramework="net48" />
+  <package id="Xbim.IO.MemoryModel" version="5.1.341" targetFramework="net48" />
+  <package id="Xbim.Tessellator" version="5.1.341" targetFramework="net48" />
 </packages>
diff --git a/CityBIM/CityBIM.csproj b/CityBIM/CityBIM.csproj
@@ -35,8 +35,8 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="GDAL" Version="3.7.1" />
-    <PackageReference Include="GDAL.Native" Version="3.7.1" />
+    <PackageReference Include="GDAL" Version="3.7.2" />
+    <PackageReference Include="GDAL.Native" Version="3.7.2" />
     <PackageReference Include="GeoJSON.Net" Version="1.2.19" />
     <PackageReference Include="ManagedEsent" Version="2.0.0" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
@@ -49,7 +49,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Primitives" Version="7.0.0" />
-    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="6.32.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Logging" Version="7.0.2" />
     <PackageReference Include="netDXF" Version="2022.11.2" />
     <PackageReference Include="NetTopologySuite" Version="2.5.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@@ -59,7 +59,7 @@
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="7.0.2" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.32.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.2" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />

diff --git a/CityBIM/utils.cs b/CityBIM/utils.cs
@@ -429,8 +429,6 @@ public static DataStorage getRefPlaneDataStorageObject(Document doc)
         /// </summary>
         public enum rvtVersion
         {
-            R20 = 2020,
-            R21 = 2021,
             R22 = 2022,
             R23 = 2023,
             R24 = 2024,  
@@ -453,12 +451,6 @@ public static rvtVersion GetVersionInfo(Autodesk.Revit.ApplicationServices.Appli
 
             switch (num)
             {
-                case 2020:
-                    rV = rvtVersion.R20;
-                    break;
-                case 2021:
-                    rV = rvtVersion.R21;
-                    break;
                 case 2022:
                     rV = rvtVersion.R22;
                     break;
@@ -472,11 +464,8 @@ public static rvtVersion GetVersionInfo(Autodesk.Revit.ApplicationServices.Appli
                     rV = 0;
                     break;
             }
-
             return rV;
         }
-
-
     }
 
     public static class IfcGuid