From 33f6b38fc22e141800a1fb5917e3c0075fdc3916 Mon Sep 17 00:00:00 2001
From: Will Pearson <will@mcneel.com>
Date: Sun, 23 Aug 2020 20:38:17 +0100
Subject: [PATCH] Remove redundant nuget packages and assembly binding
 redirects

The System.Net.Http nuget packages and assembly binding redirects were preventing compute from running in docker. The issues started when a few of Rhino's core libraries were updated to .NET 4.8. The nuget packages and assembly binding redirects were added in 7c7bcae764ee37f262b2f52766903a5b083b8bb1 and are no longer necessary. System.Net.Http is now referenced directly from the .NET Framework.
---
 .dockerignore                                |  2 ++
 src/compute.frontend/App.config              | 22 +-------------------
 src/compute.frontend/compute.frontend.csproj |  9 ++------
 src/compute.geometry/App.config              | 22 +-------------------
 src/compute.geometry/compute.geometry.csproj |  8 +------
 5 files changed, 7 insertions(+), 56 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..3d2ce4e8
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+**/obj/
+**/bin/
\ No newline at end of file
diff --git a/src/compute.frontend/App.config b/src/compute.frontend/App.config
index 02f9e090..a2d15d38 100644
--- a/src/compute.frontend/App.config
+++ b/src/compute.frontend/App.config
@@ -3,24 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
     </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Google.Apis.Auth" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.30.0.0" newVersion="1.30.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Google.Apis.Auth.PlatformServices" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.30.0.0" newVersion="1.30.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/compute.frontend/compute.frontend.csproj b/src/compute.frontend/compute.frontend.csproj
index f3e903b9..eab883cd 100644
--- a/src/compute.frontend/compute.frontend.csproj
+++ b/src/compute.frontend/compute.frontend.csproj
@@ -44,6 +44,7 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Authentication\ApiKey.cs" />
@@ -93,12 +94,6 @@
     <PackageReference Include="Serilog.Sinks.File">
       <Version>4.0.0</Version>
     </PackageReference>
-    <PackageReference Include="System.Interactive.Async">
-      <Version>3.1.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Net.Http">
-      <Version>4.3.1</Version>
-    </PackageReference>
     <PackageReference Include="Topshelf">
       <Version>4.1.0</Version>
     </PackageReference>
@@ -114,4 +109,4 @@
     </ItemGroup>
     <Delete Files="@(FilesToDelete)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/compute.geometry/App.config b/src/compute.geometry/App.config
index 02f9e090..a2d15d38 100644
--- a/src/compute.geometry/App.config
+++ b/src/compute.geometry/App.config
@@ -3,24 +3,4 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
     </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Google.Apis.Auth" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.30.0.0" newVersion="1.30.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Google.Apis.Auth.PlatformServices" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.30.0.0" newVersion="1.30.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/src/compute.geometry/compute.geometry.csproj b/src/compute.geometry/compute.geometry.csproj
index f4641fff..d3145e0c 100644
--- a/src/compute.geometry/compute.geometry.csproj
+++ b/src/compute.geometry/compute.geometry.csproj
@@ -115,12 +115,6 @@
     <PackageReference Include="Serilog.Sinks.File">
       <Version>4.0.0</Version>
     </PackageReference>
-    <PackageReference Include="System.Interactive.Async">
-      <Version>3.1.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Net.Http">
-      <Version>4.3.1</Version>
-    </PackageReference>
     <PackageReference Include="Topshelf">
       <Version>4.1.0</Version>
     </PackageReference>
@@ -136,4 +130,4 @@
     </ItemGroup>
     <Delete Files="@(FilesToDelete)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>