Skip to content

Commit 33f6b38

Browse files
committed
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 7c7bcae and are no longer necessary. System.Net.Http is now referenced directly from the .NET Framework.
1 parent b67137c commit 33f6b38

File tree

5 files changed

+7
-56
lines changed

5 files changed

+7
-56
lines changed

.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
**/obj/
2+
**/bin/

src/compute.frontend/App.config

+1-21
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,4 @@
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
55
</startup>
6-
<runtime>
7-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<dependentAssembly>
9-
<assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
11-
</dependentAssembly>
12-
<dependentAssembly>
13-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
15-
</dependentAssembly>
16-
<dependentAssembly>
17-
<assemblyIdentity name="Google.Apis.Auth" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-1.30.0.0" newVersion="1.30.0.0" />
19-
</dependentAssembly>
20-
<dependentAssembly>
21-
<assemblyIdentity name="Google.Apis.Auth.PlatformServices" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-1.30.0.0" newVersion="1.30.0.0" />
23-
</dependentAssembly>
24-
</assemblyBinding>
25-
</runtime>
26-
</configuration>
6+
</configuration>

src/compute.frontend/compute.frontend.csproj

+2-7
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<Reference Include="Microsoft.CSharp" />
4545
<Reference Include="System.Data" />
4646
<Reference Include="System.Xml" />
47+
<Reference Include="System.Net.Http" />
4748
</ItemGroup>
4849
<ItemGroup>
4950
<Compile Include="Authentication\ApiKey.cs" />
@@ -93,12 +94,6 @@
9394
<PackageReference Include="Serilog.Sinks.File">
9495
<Version>4.0.0</Version>
9596
</PackageReference>
96-
<PackageReference Include="System.Interactive.Async">
97-
<Version>3.1.1</Version>
98-
</PackageReference>
99-
<PackageReference Include="System.Net.Http">
100-
<Version>4.3.1</Version>
101-
</PackageReference>
10297
<PackageReference Include="Topshelf">
10398
<Version>4.1.0</Version>
10499
</PackageReference>
@@ -114,4 +109,4 @@
114109
</ItemGroup>
115110
<Delete Files="@(FilesToDelete)" />
116111
</Target>
117-
</Project>
112+
</Project>

src/compute.geometry/App.config

+1-21
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,4 @@
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
55
</startup>
6-
<runtime>
7-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8-
<dependentAssembly>
9-
<assemblyIdentity name="System.Interactive.Async" publicKeyToken="94bc3704cddfc263" culture="neutral" />
10-
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
11-
</dependentAssembly>
12-
<dependentAssembly>
13-
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14-
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
15-
</dependentAssembly>
16-
<dependentAssembly>
17-
<assemblyIdentity name="Google.Apis.Auth" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
18-
<bindingRedirect oldVersion="0.0.0.0-1.30.0.0" newVersion="1.30.0.0" />
19-
</dependentAssembly>
20-
<dependentAssembly>
21-
<assemblyIdentity name="Google.Apis.Auth.PlatformServices" publicKeyToken="4b01fa6e34db77ab" culture="neutral" />
22-
<bindingRedirect oldVersion="0.0.0.0-1.30.0.0" newVersion="1.30.0.0" />
23-
</dependentAssembly>
24-
</assemblyBinding>
25-
</runtime>
26-
</configuration>
6+
</configuration>

src/compute.geometry/compute.geometry.csproj

+1-7
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@
115115
<PackageReference Include="Serilog.Sinks.File">
116116
<Version>4.0.0</Version>
117117
</PackageReference>
118-
<PackageReference Include="System.Interactive.Async">
119-
<Version>3.1.1</Version>
120-
</PackageReference>
121-
<PackageReference Include="System.Net.Http">
122-
<Version>4.3.1</Version>
123-
</PackageReference>
124118
<PackageReference Include="Topshelf">
125119
<Version>4.1.0</Version>
126120
</PackageReference>
@@ -136,4 +130,4 @@
136130
</ItemGroup>
137131
<Delete Files="@(FilesToDelete)" />
138132
</Target>
139-
</Project>
133+
</Project>

0 commit comments

Comments
 (0)