Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
033dff05
Commit
033dff05
authored
Jul 08, 2015
by
titanium007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fiddler root with another test root; Fix nuspec
parent
745f8869
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
9 deletions
+11
-9
Titanium.Web.Proxy.nuspec
Titanium.Web.Proxy.nuspec
+4
-4
DO_NOT_TRUST_FiddlerRoot.cer
Titanium.Web.Proxy/DO_NOT_TRUST_FiddlerRoot.cer
+0
-0
ProxyServer.cs
Titanium.Web.Proxy/ProxyServer.cs
+1
-1
Titanium.Web.Proxy.csproj
Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
+4
-4
Titanium_Proxy_Test_Root.cer
Titanium.Web.Proxy/Titanium_Proxy_Test_Root.cer
+0
-0
build.bat
build.bat
+2
-0
No files found.
Titanium.Web.Proxy.nuspec
View file @
033dff05
...
@@ -15,9 +15,9 @@
...
@@ -15,9 +15,9 @@
<tags></tags>
<tags></tags>
</metadata>
</metadata>
<files>
<files>
<file
src=
"Titanium.Web.Proxy\bin\$configuration$\Titanium.Web.Proxy.dll"
/>
<file
src=
"Titanium.Web.Proxy\bin\$configuration$\Titanium.Web.Proxy.dll"
target=
"lib\net40\"
/>
<file
src=
"Titanium.Web.Proxy\bin\$configuration$\Ionic.Zip.dll"
/>
<file
src=
"Titanium.Web.Proxy\bin\$configuration$\Ionic.Zip.dll"
target=
"lib\net40\"
/>
<file
src=
"Titanium.Web.Proxy\bin\$configuration$\makecert.exe"
/>
<file
src=
"Titanium.Web.Proxy\bin\$configuration$\makecert.exe"
target=
"content"
/>
<file
src=
"Titanium.Web.Proxy\bin\$configuration$\DO_NOT_TRUST_FiddlerRoot.cer"
/>
<file
src=
"Titanium.Web.Proxy\bin\$configuration$\DO_NOT_TRUST_FiddlerRoot.cer"
target=
"content"
/>
</files>
</files>
</package>
</package>
\ No newline at end of file
Titanium.Web.Proxy/DO_NOT_TRUST_FiddlerRoot.cer
deleted
100644 → 0
View file @
745f8869
File deleted
Titanium.Web.Proxy/ProxyServer.cs
View file @
033dff05
...
@@ -102,7 +102,7 @@ namespace Titanium.Web.Proxy
...
@@ -102,7 +102,7 @@ namespace Titanium.Web.Proxy
if
(
EnableSSL
)
if
(
EnableSSL
)
{
{
RootCertificateName
=
RootCertificateName
==
null
?
"
DO_NOT_TRUST_Fiddler
Root"
:
RootCertificateName
;
RootCertificateName
=
RootCertificateName
==
null
?
"
Titanium_Proxy_Test_
Root"
:
RootCertificateName
;
bool
certTrusted
=
CertManager
.
CreateTrustedRootCertificate
();
bool
certTrusted
=
CertManager
.
CreateTrustedRootCertificate
();
if
(!
certTrusted
)
if
(!
certTrusted
)
...
...
Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
View file @
033dff05
...
@@ -93,15 +93,15 @@
...
@@ -93,15 +93,15 @@
<Folder
Include=
"Properties\"
/>
<Folder
Include=
"Properties\"
/>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<None
Include=
"DO_NOT_TRUST_FiddlerRoot.cer"
>
<None
Include=
"packages.config"
/>
<None
Include=
"Titanium_Proxy_Test_Root.cer"
>
<CopyToOutputDirectory>
PreserveNewest
</CopyToOutputDirectory>
<CopyToOutputDirectory>
PreserveNewest
</CopyToOutputDirectory>
</None>
</None>
<None
Include=
"packages.config"
/>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<
Content
Include=
"makecert.exe"
>
<
None
Include=
"makecert.exe"
>
<CopyToOutputDirectory>
PreserveNewest
</CopyToOutputDirectory>
<CopyToOutputDirectory>
PreserveNewest
</CopyToOutputDirectory>
</
Content
>
</
None
>
</ItemGroup>
</ItemGroup>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Import
Project=
"$(SolutionDir)\.nuget\NuGet.targets"
Condition=
"Exists('$(SolutionDir)\.nuget\NuGet.targets')"
/>
<Import
Project=
"$(SolutionDir)\.nuget\NuGet.targets"
Condition=
"Exists('$(SolutionDir)\.nuget\NuGet.targets')"
/>
...
...
Titanium.Web.Proxy/Titanium_Proxy_Test_Root.cer
0 → 100644
View file @
033dff05
File added
build.bat
View file @
033dff05
...
@@ -17,5 +17,7 @@ if "%nuget%" == "" (
...
@@ -17,5 +17,7 @@ if "%nuget%" == "" (
%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Titanium.Web.Proxy.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false
%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild Titanium.Web.Proxy.sln /p:Configuration="%config%" /m /v:M /fl /flp:LogFile=msbuild.log;Verbosity=diag /nr:false
mkdir Build
mkdir Build
mkdir Build\lib
mkdir Build\lib\net40
%nuget% pack "Titanium.Web.Proxy.nuspec" -NoPackageAnalysis -verbosity detailed -o Build -Version %version% -p Configuration="%config%"
%nuget% pack "Titanium.Web.Proxy.nuspec" -NoPackageAnalysis -verbosity detailed -o Build -Version %version% -p Configuration="%config%"
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment