FiddlerCore を Nekoxy に変更

* ライセンス・ライブラリ周りの調整
RadarNyan · Nov 17, 2015 · 1d3064c · 1d3064c
1 parent d1a8176
commit 1d3064c
Show file tree

Hide file tree

Showing 37 changed files with 581 additions and 21,528 deletions.
diff --git a/Browser/Browser.csproj b/Browser/Browser.csproj
@@ -47,18 +47,15 @@
     <WarningLevel>1</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BCMakeCert">
-      <HintPath>..\packages\FiddlerCore.4.4.8.4\lib\net40\BCMakeCert.dll</HintPath>
-    </Reference>
-    <Reference Include="CertMaker">
-      <HintPath>..\packages\FiddlerCore.4.4.8.4\lib\net40\CertMaker.dll</HintPath>
-    </Reference>
-    <Reference Include="FiddlerCore4">
-      <HintPath>..\packages\FiddlerCore.4.4.8.4\lib\net40\FiddlerCore4.dll</HintPath>
+    <Reference Include="log4net">
+      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Nekoxy">
+      <HintPath>..\packages\Nekoxy.1.5.1.19\lib\net45\Nekoxy.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.ServiceModel" />
@@ -70,6 +67,9 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="TrotiNet">
+      <HintPath>..\packages\Nekoxy.1.5.1.19\lib\net45\TrotiNet.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FormBrowser.cs">

diff --git a/Browser/FormBrowser.cs b/Browser/FormBrowser.cs
@@ -1,5 +1,6 @@
 using BrowserLib;
 using mshtml;
+using Nekoxy;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -494,7 +495,7 @@ public partial class FormBrowser : Form, IBrowser {
 
 
 		public void SetProxy( string address, int port ) {
-			Fiddler.URLMonInterop.SetProxyInProcess( string.Format( "{0}:{1}", address, port ), "<local>" );
+			WinInetUtil.SetProxyInProcess( string.Format( "http={0}:{1}", address, port ), "local" );
 		}
 
 

diff --git a/Browser/packages.config b/Browser/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FiddlerCore" version="4.4.8.4" targetFramework="net45" />
+  <package id="log4net" version="2.0.3" targetFramework="net45" />
+  <package id="Nekoxy" version="1.5.1.19" targetFramework="net45" />
 </packages>
diff --git a/ElectronicObserver/App.config b/ElectronicObserver/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.14.0" newVersion="1.2.14.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>