Bump System.Net.Http and Octokit builds to pick up type conflict fix

shana · StanleyGoldman · commit 634ae54f2370 · 2018-01-16T17:49:38.000-05:00
Fixes #503 When running System.Net.Http in Unity with the 4.6 experimental runtime, Unity will load Mono's version of System.Net.Http, which causes type conflicts all over the place given that both dlls are running side by side. Easiest way of avoiding that is to move all the classes in System.Net.Http into its own namespace - "DotNetHttp35". Also renamed the dll to reflect the namespace change. See github-for-unity/dotnet-httpclient35@8566426a9217
diff --git a/common/build.targets b/common/build.targets
@@ -30,7 +30,7 @@
           <HintPath>$(SolutionDir)lib\octokit.net\Octokit.dll</HintPath>
         </Reference>
         <Reference Include="System.Net.Http">
-          <HintPath>$(SolutionDir)lib\dotnet-httpclient35\System.Net.Http.dll</HintPath>
+          <HintPath>$(SolutionDir)lib\dotnet-httpclient35\DotNetHttp35.dll</HintPath>
         </Reference>
       </ItemGroup>
     </Otherwise>
diff --git a/lib/dotnet-httpClient35/DotNetHttp35.dll b/lib/dotnet-httpClient35/DotNetHttp35.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6daaf4e57900d0a092a94dbe10aca3796ad7496f40347112b602a6ff6dcf0275
+size 123392
diff --git a/lib/dotnet-httpClient35/DotNetHttp35.dll.mdb b/lib/dotnet-httpClient35/DotNetHttp35.dll.mdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be437526dd7332f42ea2c10cf9548e5c8b4f3f0fc735d584294d72ba4d592e81
+size 47000
diff --git a/lib/dotnet-httpClient35/System.Net.Http.dll b/lib/dotnet-httpClient35/System.Net.Http.dll
diff --git a/lib/dotnet-httpClient35/System.Net.Http.dll.mdb b/lib/dotnet-httpClient35/System.Net.Http.dll.mdb
diff --git a/lib/dotnet-httpClient35/md5sums.txt b/lib/dotnet-httpClient35/md5sums.txt
@@ -1,2 +1,2 @@
-e15a0894ef162ec53566fa9c8211e583 *System.Net.Http.dll
-161847a9a61eb3cdab7a7706e83265a1 *System.Net.Http.dll.mdb
+0b299a0c541e19a6205f1265da27e540 *DotNetHttp35.dll
+4698f765de6671c08befd610eb254013 *DotNetHttp35.dll.mdb
diff --git a/lib/octokit.net/Octokit.dll b/lib/octokit.net/Octokit.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:003fb61b6517b43d4ce412070bede800af20a161bcf8cb9cbcbac38aed1075da
+oid sha256:cb297646723b439a8755e1b967a9f5850dd9c50f1126f1e6ba9ddd8677188f84
 size 741888
diff --git a/lib/octokit.net/Octokit.dll.mdb b/lib/octokit.net/Octokit.dll.mdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe50d2c5d38b8dd9407a9053f46b4cec638959637d690ff169cf7aea2db4a187
-size 288546
+oid sha256:ebdf240eb57a1154884fdc1ae5962e0d2af5f0c663fe5cb8f1897fa5c82b7218
+size 283050
diff --git a/lib/octokit.net/md5sums.txt b/lib/octokit.net/md5sums.txt
@@ -1,2 +1,2 @@
-ecb6930236469c41a36dee6d84fcab7a *Octokit.dll
-2a41d96c1ad9229d8ff2f46b8847ec6a *Octokit.dll.mdb
+352dbd9611f700a9dbde52999752d88d *Octokit.dll
+883c04490791e7d4f63c2e918233dc55 *Octokit.dll.mdb
diff --git a/script b/script
@@ -1 +1 @@
-Subproject commit 591ff936add8cc2e165712b523a8597a66233478
+Subproject commit a3601bd256ce6498b222914676b9b6e2e04ac7c2
diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/DotNetHttp35.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/DotNetHttp35.dll.meta

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:6daaf4e57900d0a092a94dbe10aca3796ad7496f40347112b602a6ff6dcf0275`
	`3`	`+size 123392`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+version https://git-lfs.github.com/spec/v1`
	`2`	`+oid sha256:be437526dd7332f42ea2c10cf9548e5c8b4f3f0fc735d584294d72ba4d592e81`
	`3`	`+size 47000`