successfully perform a commit from C#

nodepen · Oct 3, 2022 · 2773bfb · 2773bfb
1 parent 9c14c68
commit 2773bfb
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 62 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "apps/speckle-server"]
 	path = apps/speckle-server
 	url = https://github.com/specklesystems/speckle-server.git
-[submodule "packages/speckle-sharp"]
-	path = packages/speckle-sharp
-	url = [email protected]:specklesystems/speckle-sharp.git
diff --git a/apps/rhino-compute-server/Program.cs b/apps/rhino-compute-server/Program.cs
@@ -8,13 +8,13 @@
 using Nancy.TinyIoc;
 using Nancy.Bootstrapper;
 using NodePen.Converters;
-using Newtonsoft.Json;
 using Grasshopper.Kernel;
 using GH_IO.Serialization;
 using Speckle.Core.Api;
 using Speckle.Core.Models;
 using Speckle.Core.Credentials;
 using Speckle.Core.Transports;
+using Speckle.Newtonsoft.Json;
 
 namespace Rhino.Compute
 {
@@ -24,58 +24,7 @@ class Program
 
         public static IDisposable RhinoCore { get; set; }
 
-        static void Main(string[] args)
-        {
-            RhinoInside.Resolver.Initialize();
-
-            HostFactory.Run((Host) =>
-            {
-                Host.Service<SelfHostService>();
-                Host.SetDisplayName("NodePen");
-            });
-
-        }
-
-    }
-
-    internal class SelfHostService : ServiceControl
-    {
-
-        public bool Start(HostControl host)
-        {
-            // Start headless Rhino process
-            Console.WriteLine($"Rhino system directory: {RhinoInside.Resolver.RhinoSystemDirectory}");
-            Program.RhinoCore = new Rhino.Runtime.InProcess.RhinoCore(null, Rhino.Runtime.InProcess.WindowStyle.NoWindow);
-
-            // Start web server
-            var options = new StartOptions();
-            options.Urls.Add("http://localhost:6500");
-
-            WebApp.Start<Startup>(options);
-
-            return true;
-        }
-
-        public bool Stop(HostControl host)
-        {
-            return true;
-        }
-
-    }
-
-    internal class Startup
-    {
-
-        public void Configuration(IAppBuilder app)
-        {
-            app.UseNancy();
-        }
-
-    }
-
-    public class Bootstrapper : Nancy.DefaultNancyBootstrapper
-    {
-        private async Task<string> TryThis()
+        private static async Task<string> TryThis()
         {
             var account = new Account()
             {
@@ -103,7 +52,8 @@ private async Task<string> TryThis()
             var data = new Base();
             data["test"] = "Some Value 2";
 
-            var commitId = await Helpers.Send("http://localhost:3000/streams/b0d3a3c122/branches/main", data, "Test message");
+            Console.WriteLine("Sending!");
+            var commitId = await Helpers.Send("http://localhost:3000/streams/b0d3a3c122/branches/main", data, "Test message", useDefaultCache: false, account: account);
 
             // var objectId = await Operations.Send(
             //     data,
@@ -146,6 +96,62 @@ private async Task<string> TryThis()
 
             return commitId;
         }
+
+        static void Main(string[] args)
+        {
+            var commitId = TryThis().Result;
+
+            Console.WriteLine(commitId);
+
+            // RhinoInside.Resolver.Initialize();
+
+            // HostFactory.Run((Host) =>
+            // {
+            //     Host.Service<SelfHostService>();
+            //     Host.SetDisplayName("NodePen");
+            // });
+
+        }
+
+    }
+
+    internal class SelfHostService : ServiceControl
+    {
+
+        public bool Start(HostControl host)
+        {
+            // Start headless Rhino process
+            Console.WriteLine($"Rhino system directory: {RhinoInside.Resolver.RhinoSystemDirectory}");
+            Program.RhinoCore = new Rhino.Runtime.InProcess.RhinoCore(null, Rhino.Runtime.InProcess.WindowStyle.NoWindow);
+
+            // Start web server
+            var options = new StartOptions();
+            options.Urls.Add("http://localhost:6500");
+
+            WebApp.Start<Startup>(options);
+
+            return true;
+        }
+
+        public bool Stop(HostControl host)
+        {
+            return true;
+        }
+
+    }
+
+    internal class Startup
+    {
+
+        public void Configuration(IAppBuilder app)
+        {
+            app.UseNancy();
+        }
+
+    }
+
+    public class Bootstrapper : Nancy.DefaultNancyBootstrapper
+    {
         protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
         {
             // Load Grasshopper
@@ -163,7 +169,8 @@ protected override void ApplicationStartup(TinyIoCContainer container, IPipeline
 
             // var streamUrl = "http://localhost:3000/streams/b0d3a3c122";
 
-            var commitId = TryThis().Result;
+            // var commitId = TryThis().Result;
+            var commitId = "ok";
 
             // var commitId = client.CommitCreate(new CommitCreateInput()
             // {

diff --git a/apps/rhino-compute-server/Rhino.Compute.csproj b/apps/rhino-compute-server/Rhino.Compute.csproj
@@ -24,14 +24,15 @@
     <PackageReference Include="Nancy" Version="1.4.4" />
     <PackageReference Include="Nancy.Owin" Version="1.4.1" />
     <PackageReference Include="Rhino.Inside" Version="7.0.0" />
-    <!-- <PackageReference Include="Speckle.Objects.Converter.Rhino7" Version="2.8.0" /> -->
+    <PackageReference Include="Speckle.Core" Version="2.8.0" />
+    <PackageReference Include="Speckle.Objects" Version="2.8.0" />
+    <PackageReference Include="Speckle.Objects.Converter.Rhino7" Version="2.8.0" />
+    <PackageReference Include="Speckle.Objects.Converter.Grasshopper7" Version="2.8.0" />
     <PackageReference Include="Topshelf" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\packages\converters\Nodepen.Converters.csproj" />
-    <ProjectReference Include="..\..\packages\speckle-sharp\Core\Core\Core.csproj" />
-    <ProjectReference Include="..\..\packages\speckle-sharp\Objects\Objects\Objects.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/packages/speckle-sharp b/packages/speckle-sharp