Commit 033dff05 authored by titanium007's avatar titanium007

Replace fiddler root with another test root; Fix nuspec

parent 745f8869
...@@ -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
...@@ -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_FiddlerRoot" : RootCertificateName; RootCertificateName = RootCertificateName == null ? "Titanium_Proxy_Test_Root" : RootCertificateName;
bool certTrusted = CertManager.CreateTrustedRootCertificate(); bool certTrusted = CertManager.CreateTrustedRootCertificate();
if (!certTrusted) if (!certTrusted)
......
...@@ -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')" />
......
...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment