Skip to content

Commit fecd665

Browse files
authored
Merge pull request #3 from telerik/piskov/fix-demos
[FID-7125] Update FiddlerCore Demos for version 6.0.0
2 parents ef87718 + 0c28608 commit fecd665

13 files changed

+34
-597
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net8</TargetFramework>
6+
<ServerGarbageCollection>true</ServerGarbageCollection>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageReference Include="FiddlerCore" Version="6.0.0" />
11+
</ItemGroup>
12+
13+
</Project>

CaptureTraffic/NetStandard/CaptureTraffic/Program.cs CaptureTraffic/CaptureTraffic/Program.cs

+4-7
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
*/
44
using System;
55
using System.Collections.Generic;
6-
using System.ComponentModel.Composition.Hosting;
76
using System.IO;
87
using System.Linq;
98
using System.Reflection;
109
using System.Text;
1110
using System.Threading;
1211
using Fiddler;
13-
using Telerik.NetworkConnections;
14-
using BCCertMaker;
1512

1613
namespace CaptureTraffic
1714
{
@@ -158,9 +155,9 @@ private static void EnsureRootCertificate()
158155
}
159156

160157
// Once the root certificate is set up, ensure it's trusted.
161-
if (!CertMaker.rootCertIsTrusted())
158+
if (!CertMaker.IsRootCertificateTrusted())
162159
{
163-
CertMaker.trustRootCert();
160+
CertMaker.TrustRootCertificate();
164161
}
165162
}
166163

@@ -172,7 +169,7 @@ private static void StartupFiddlerCore()
172169
.RegisterAsSystemProxy()
173170
.ChainToUpstreamGateway()
174171
.DecryptSSL()
175-
.OptimizeThreadPool()
172+
.EnableHTTP2()
176173
.Build();
177174

178175
FiddlerApplication.Startup(startupSettings);
@@ -300,7 +297,7 @@ private static void ReadSessions(ICollection<Session> sessions)
300297
string sResult = Console.ReadLine();
301298
Console.WriteLine();
302299
return sResult;
303-
});
300+
}, out string sazVersion);
304301

305302
if (loaded == null || loaded.Length == 0)
306303
{

CaptureTraffic/NetFramework/CaptureTraffic.sln

-25
This file was deleted.
Binary file not shown.

CaptureTraffic/NetFramework/CaptureTraffic/CaptureTraffic.csproj

-112
This file was deleted.

0 commit comments

Comments
 (0)