Fix dependencies

specklesystems · Jul 2, 2024 · 3e76cf5 · 3e76cf5
1 parent 9fd1114
commit 3e76cf5
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 19 deletions.
diff --git a/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/DUI3-DX/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json
@@ -477,10 +477,17 @@
           "Speckle.Converters.Common": "[2.0.999-local, )"
         }
       },
+      "speckle.converters.rhino7": {
+        "type": "Project",
+        "dependencies": {
+          "RhinoCommon": "[7.13.21348.13001, )",
+          "Speckle.Converters.Common": "[2.0.999-local, )"
+        }
+      },
       "speckle.converters.rhino7.dependencyinjection": {
         "type": "Project",
         "dependencies": {
-          "RhinoCommon": "[7.13.21348.13001, )"
+          "Speckle.Converters.Rhino7": "[2.0.999-local, )"
         }
       },
       "Microsoft.Extensions.Logging.Abstractions": {

diff --git a/...erters/Revit/Speckle.Converters.Revit2023.Tests/Speckle.Converters.Revit2023.Tests.csproj b/...erters/Revit/Speckle.Converters.Revit2023.Tests/Speckle.Converters.Revit2023.Tests.csproj
@@ -19,6 +19,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Speckle.Revit2023.Fakes" VersionOverride="0.2.1-preview.4" />
+    <PackageReference Include="Speckle.Revit2023.Fakes" VersionOverride="[0.2.1-preview.4, 1.0.0)" />
   </ItemGroup>
 </Project>
diff --git a/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json b/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json
@@ -66,9 +66,12 @@
       },
       "Speckle.Revit2023.Fakes": {
         "type": "Direct",
-        "requested": "[0.2.1-preview.4, )",
-        "resolved": "1.0.0",
-        "contentHash": "IJ1DWoH3KxTMLkPGYre2n5HSMTrjHqL6daI6wVkj3D8pTLRbV+i69Wh2cLz3+myNuPRlnhIGzk1t7TNq3DCP+w=="
+        "requested": "[0.2.1-preview.4, 1.0.0)",
+        "resolved": "0.2.1-preview.4",
+        "contentHash": "ZyPgvJ5BfC/lF+40bb24OSE8k5taszGU1fLs21dEI5GDsVRfPgeMIXFXDdpjjqtEZQbeteCWfkY3ef5OpHgW2g==",
+        "dependencies": {
+          "System.Drawing.Common": "8.0.6"
+        }
       },
       "Castle.Core": {
         "type": "Transitive",
@@ -239,6 +242,11 @@
           "Newtonsoft.Json": "13.0.1"
         }
       },
+      "Microsoft.Win32.SystemEvents": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
+      },
       "Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.1",
@@ -416,6 +424,14 @@
           "NETStandard.Library": "1.6.1"
         }
       },
+      "System.Drawing.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.6",
+        "contentHash": "aSwRnJzz6fZ73JvWMMG0KvBwOnXsBTFtfHLriQyAPrDIZ+NrDfl15GWbO/A35k0dtH77D7jfxzEcFF7RONtU/w==",
+        "dependencies": {
+          "Microsoft.Win32.SystemEvents": "8.0.0"
+        }
+      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",

diff --git a/...onverters.Rhino7.DependencyInjection/Speckle.Converters.Rhino7.DependencyInjection.csproj b/...onverters.Rhino7.DependencyInjection/Speckle.Converters.Rhino7.DependencyInjection.csproj
@@ -7,10 +7,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common.DependencyInjection\Speckle.Converters.Common.DependencyInjection.csproj" PrivateAssets="All"/>
-    <ProjectReference Include="..\..\..\Converters\Rhino\Speckle.Converters.Rhino7\Speckle.Converters.Rhino7.csproj" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="RhinoCommon" VersionOverride="7.13.21348.13001" />
+    <ProjectReference Include="..\Speckle.Converters.Rhino7\Speckle.Converters.Rhino7.csproj" />
   </ItemGroup>
 </Project>
diff --git a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.DependencyInjection/packages.lock.json
@@ -18,12 +18,6 @@
         "resolved": "1.14.1",
         "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
       },
-      "RhinoCommon": {
-        "type": "Direct",
-        "requested": "[7.13.21348.13001, )",
-        "resolved": "7.13.21348.13001",
-        "contentHash": "JQdaNw61ddBqIe08E9O4N/grwrN1hjDHcYW7tWylwCZyFR7SepoCD4NS+6LN6+oSQhNbhLi9Bf+hQOFYFdRAEA=="
-      },
       "Speckle.InterfaceGenerator": {
         "type": "Direct",
         "requested": "[0.9.5, )",
@@ -391,6 +385,12 @@
           "System.Memory": "4.5.5"
         }
       },
+      "RhinoCommon": {
+        "type": "CentralTransitive",
+        "requested": "[7.13.21348.13001, )",
+        "resolved": "7.13.21348.13001",
+        "contentHash": "JQdaNw61ddBqIe08E9O4N/grwrN1hjDHcYW7tWylwCZyFR7SepoCD4NS+6LN6+oSQhNbhLi9Bf+hQOFYFdRAEA=="
+      },
       "Speckle.Core": {
         "type": "CentralTransitive",
         "requested": "[3.0.1-alpha.14, )",

diff --git a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.Tests/GlobalUsings.cs b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.Tests/GlobalUsings.cs
diff --git a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json
@@ -64,6 +64,15 @@
         "resolved": "0.9.5",
         "contentHash": "oU/L7pN1R7q8KkbrpQ3WJnHirPHqn+9DEA7asOcUiggV5dzVg1A/VYs7GOSusD24njxXh03tE3a2oTLOjt3cVg=="
       },
+      "Speckle.Rhino7.Fakes": {
+        "type": "Direct",
+        "requested": "[0.2.1-preview.4, )",
+        "resolved": "0.2.1-preview.4",
+        "contentHash": "8o2pESS4SWjLG1nc62Jo1CzTbbwm8ad61KF1y2NVDUbbfzd4YPkY7VFF4zJUM3sW0pWhnkslOomOPblg9Px22Q==",
+        "dependencies": {
+          "System.Drawing.Common": "8.0.6"
+        }
+      },
       "Castle.Core": {
         "type": "Transitive",
         "resolved": "5.1.1",
@@ -233,6 +242,11 @@
           "Newtonsoft.Json": "13.0.1"
         }
       },
+      "Microsoft.Win32.SystemEvents": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw=="
+      },
       "Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.1",
@@ -410,6 +424,14 @@
           "NETStandard.Library": "1.6.1"
         }
       },
+      "System.Drawing.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.6",
+        "contentHash": "aSwRnJzz6fZ73JvWMMG0KvBwOnXsBTFtfHLriQyAPrDIZ+NrDfl15GWbO/A35k0dtH77D7jfxzEcFF7RONtU/w==",
+        "dependencies": {
+          "Microsoft.Win32.SystemEvents": "8.0.0"
+        }
+      },
       "System.Memory": {
         "type": "Transitive",
         "resolved": "4.5.3",

diff --git a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/Speckle.Converters.Rhino7.csproj b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/Speckle.Converters.Rhino7.csproj
@@ -3,6 +3,8 @@
     <PropertyGroup>
         <TargetFramework>net48</TargetFramework>
     </PropertyGroup>
+
+  <Import Project="..\Speckle.Converters.RhinoShared\Speckle.Converters.RhinoShared.projitems" Label="Shared" />
 
   <ItemGroup>
     <PackageReference Include="RhinoCommon" VersionOverride="7.13.21348.13001"  IncludeAssets="compile;build"/>

diff --git a/DUI3-DX/Directory.Packages.props b/DUI3-DX/Directory.Packages.props
@@ -19,6 +19,7 @@
     <PackageVersion Include="Speckle.AutoCAD.API" Version="2023.0.0" />
     <PackageVersion Include="Speckle.Revit.API" Version="2023.0.0" />
     <PackageVersion Include="Speckle.Revit2023.Fakes" Version="0.2.1-preview.2" />
+    <PackageVersion Include="Speckle.Rhino7.Fakes" Version="0.2.1-preview.4" />
     <PackageVersion Include="RhinoCommon" Version="7.13.21348.13001"  />
     <PackageVersion Include="RhinoWindows" Version="7.13.21348.13001"  />
     <PackageVersion Include="System.Resources.Extensions" Version="7.0.0"/>