197 lines
8.7 KiB
Diff
197 lines
8.7 KiB
Diff
From 5632607b6b15623849efb64ac2e93a62766c6ff3 Mon Sep 17 00:00:00 2001
|
||
From: Kenneth Skovhede <kenneth@hexad.dk>
|
||
Date: Wed, 23 Jul 2014 15:03:38 +0200
|
||
Subject: [PATCH] Changed to use Duplicati key-file for signing
|
||
|
||
---
|
||
HttpServer.sln | 10 +++++-----
|
||
HttpServer/Duplicati.snk | Bin 0 -> 596 bytes
|
||
HttpServer/HttpServer.csproj | 21 +++++++++++----------
|
||
HttpServer/httpserver.pfx | Bin 1756 -> 0 bytes
|
||
HttpServer/test.snk | Bin 596 -> 0 bytes
|
||
5 files changed, 16 insertions(+), 15 deletions(-)
|
||
create mode 100644 HttpServer/Duplicati.snk
|
||
mode change 100755 => 100644 HttpServer/HttpServer.csproj
|
||
delete mode 100755 HttpServer/httpserver.pfx
|
||
delete mode 100755 HttpServer/test.snk
|
||
|
||
diff --git a/HttpServer.sln b/HttpServer.sln
|
||
index c725924..a398e46 100644
|
||
--- a/HttpServer.sln
|
||
+++ b/HttpServer.sln
|
||
@@ -1,6 +1,6 @@
|
||
|
||
-Microsoft Visual Studio Solution File, Format Version 10.00
|
||
-# Visual Studio 2008
|
||
+Microsoft Visual Studio Solution File, Format Version 11.00
|
||
+# Visual C# Express 2010
|
||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpServer", "HttpServer\HttpServer.csproj", "{455E7D70-1C85-4D7F-9F01-DC801B8B8C34}"
|
||
EndProject
|
||
Global
|
||
@@ -17,10 +17,10 @@ Global
|
||
{455E7D70-1C85-4D7F-9F01-DC801B8B8C34}.Test|Any CPU.ActiveCfg = Test|Any CPU
|
||
{455E7D70-1C85-4D7F-9F01-DC801B8B8C34}.Test|Any CPU.Build.0 = Test|Any CPU
|
||
EndGlobalSection
|
||
- GlobalSection(MonoDevelopProperties) = preSolution
|
||
- StartupItem = HttpServer\HttpServer.csproj
|
||
- EndGlobalSection
|
||
GlobalSection(SolutionProperties) = preSolution
|
||
HideSolutionNode = FALSE
|
||
EndGlobalSection
|
||
+ GlobalSection(MonoDevelopProperties) = preSolution
|
||
+ StartupItem = HttpServer\HttpServer.csproj
|
||
+ EndGlobalSection
|
||
EndGlobal
|
||
diff --git a/HttpServer/Duplicati.snk b/HttpServer/Duplicati.snk
|
||
new file mode 100644
|
||
index 0000000000000000000000000000000000000000..e0c1e2dd86119728adaeefc5f14f2e597dabceeb
|
||
GIT binary patch
|
||
literal 596
|
||
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098e&YbeASI`aP2sa|^c*=Vgk~YB=15kLM
|
||
z6B<YiWvwUE<(|pH%%wkswD9()^!1)?2<TO8%B4*tiA_O)JKtg3mYe#cEJRtAufRSd
|
||
zp*O}dkA17H>le7?%rzf5lQi@8^2-|;@G9`<QW0-U-++qMA2UFqpl}*gRm+5<rR$#Y
|
||
z`mC{oH`rBPm}y-b_=)eQ2xg6URklBIbvh;{sNYL`<5N!9%-k?#uBsQ+{OJEkI<Qwb
|
||
z$|So|iI{;k686jCQ4Xb|;Kg7tg$P&|hZ52cQ8GHhE-`7YH<B}PJcp9|;2l9FD)bZm
|
||
zXJ`R;(~ORzX0|XIrrQe+4<giBvUkU^;DeIXTj(<Trrrjq61ReBH|bqmNj^sJ@e7zu
|
||
z3qYe`6@Gbj2toJ^pr#9(UP@|$CVA3uW~aDv8qPOSV(0-u0WeznB_NK-10qV7)e?Z|
|
||
z@pRLiRcQW<BjMtoX%$E@W{Zn5E@K|AID>V-z=FMF_PcZSs*&!F`tUQUDaR;O!QV57
|
||
zcL#UCLy6{4TM42#Sq8wU(0JEJwaKaO08k_-0(e*zaa9dM^Ns<3pXG+PwGl!LEd7mN
|
||
zppXdDRR2f;AT-tHwTXQzHH^`&uIWnZ%w;A3xd8awj#n6GqmX}=Pk0ssHUW#6fQ#+z
|
||
z_S|XnhcE>JGe7M>W()k5s}qyKQA=h=DrsUx<aA#JIm;D(`F7OE$J+;dTnocY;8v;M
|
||
i+Wck*xKNK{xU`2iSPLjN<SzIp{9kbAxOXkZB3*11JsH9P
|
||
|
||
literal 0
|
||
HcmV?d00001
|
||
|
||
diff --git a/HttpServer/HttpServer.csproj b/HttpServer/HttpServer.csproj
|
||
old mode 100755
|
||
new mode 100644
|
||
index 576e62a..81bb2eb
|
||
--- a/HttpServer/HttpServer.csproj
|
||
+++ b/HttpServer/HttpServer.csproj
|
||
@@ -1,23 +1,23 @@
|
||
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="2.0">
|
||
+<?xml version="1.0" encoding="utf-8"?>
|
||
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
|
||
<PropertyGroup>
|
||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||
- <ProductVersion>9.0.30729</ProductVersion>
|
||
+ <ProductVersion>8.0.30703</ProductVersion>
|
||
<SchemaVersion>2.0</SchemaVersion>
|
||
<ProjectGuid>{455E7D70-1C85-4D7F-9F01-DC801B8B8C34}</ProjectGuid>
|
||
<OutputType>Library</OutputType>
|
||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||
<RootNamespace>HttpServer</RootNamespace>
|
||
<AssemblyName>HttpServer</AssemblyName>
|
||
- <StartupObject>
|
||
- </StartupObject>
|
||
<SignAssembly>true</SignAssembly>
|
||
- <AssemblyOriginatorKeyFile>test.snk</AssemblyOriginatorKeyFile>
|
||
+ <AssemblyOriginatorKeyFile>Duplicati.snk</AssemblyOriginatorKeyFile>
|
||
<FileUpgradeFlags>
|
||
</FileUpgradeFlags>
|
||
<UpgradeBackupLocation>
|
||
</UpgradeBackupLocation>
|
||
- <OldToolsVersion>2.0</OldToolsVersion>
|
||
+ <OldToolsVersion>3.5</OldToolsVersion>
|
||
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||
</PropertyGroup>
|
||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||
<DebugSymbols>true</DebugSymbols>
|
||
@@ -46,6 +46,8 @@
|
||
<DebugType>full</DebugType>
|
||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||
<ErrorReport>prompt</ErrorReport>
|
||
+ <WarningLevel>4</WarningLevel>
|
||
+ <Optimize>false</Optimize>
|
||
</PropertyGroup>
|
||
<ItemGroup>
|
||
<Reference Include="System" />
|
||
@@ -133,10 +135,6 @@
|
||
<Compile Include="Templates\SmartyEngine.cs" />
|
||
<Compile Include="Templates\TemplateEngine.cs" />
|
||
</ItemGroup>
|
||
- <ItemGroup>
|
||
- <None Include="httpserver.pfx" />
|
||
- <None Include="test.snk" />
|
||
- </ItemGroup>
|
||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||
Other similar extension points exist, see Microsoft.Common.targets.
|
||
@@ -145,4 +143,7 @@
|
||
<Target Name="AfterBuild">
|
||
</Target>
|
||
-->
|
||
+ <ItemGroup>
|
||
+ <None Include="Duplicati.snk" />
|
||
+ </ItemGroup>
|
||
</Project>
|
||
\ No newline at end of file
|
||
diff --git a/HttpServer/httpserver.pfx b/HttpServer/httpserver.pfx
|
||
deleted file mode 100755
|
||
index 2ba33088b51785a8dbf88106abf0ec3dd7a54994..0000000000000000000000000000000000000000
|
||
GIT binary patch
|
||
literal 0
|
||
HcmV?d00001
|
||
|
||
literal 1756
|
||
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
|
||
|
||
diff --git a/HttpServer/test.snk b/HttpServer/test.snk
|
||
deleted file mode 100755
|
||
index 8da3182b4ebfb542507eb7ef48ffbfce2bf3995b..0000000000000000000000000000000000000000
|
||
GIT binary patch
|
||
literal 0
|
||
HcmV?d00001
|
||
|
||
literal 596
|
||
zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50097bzgeh{8PZA&elL^}7m-6lG|{kbaa9P5
|
||
z6e@YDGh=|GP9%|kZDq^AxDp8i8ol~tW*zyPCUH^Y0q!HZ`nqyF+b?rNIuOl6sJ%lW
|
||
zlMb&1^h=-twO35$90By~P4G-7iifzzpVSD}Bs+gQv@iL2u8^ioiXa*UMGvLryokaD
|
||
zUd}+4OdXNRIo<d9Psku(J*E_#SphiN7^Uo}%XJej*FLvAz~w@6Ba=e$`J_&=(mOtw
|
||
z`_j<^FX;6A5~lOzA??rdf9H|oGE}qP%M{roR}vb-PiO8rA-NWirc`DaVe&@lqt6M0
|
||
zNYTev1im3KTiiGLf_?ECRq8OoNM+0oKL+y@NhJxZ&|w*?*^T!;j>ng?<<6!9K$)!7
|
||
zByqNO1qp1^_%$`#e+>@`pd;RK{7uWBj<2KCFZnO%#TTJDxSw+v(~D(u#{CaVH$Nxr
|
||
zzyiIV;fL=Bs+Gq!@zn0M*%Ne)SNZFA@!M-ZJ$2Q%<cUXT9{m^1JbQUGTQkK}SAHIt
|
||
zuVP~u36&u3fOR<Ec(#28TfDQ!b+a|eFU2`@f4)(wJ=UfqtnhiWMfz%!2n&+JO=N=4
|
||
zRsK9!_0wHJqo`jldFP~oDN-(;rSGAEZ_fU(hUt$Zf%3o7<{(V?N>g3NUhR!8qA0#}
|
||
zSJY#IGkNY<GBvgO-4-YSKpvY^NzV=oMVg+V=>v4L$XLA)9v59%3fY#qPdXYvdKy)H
|
||
iTkg*w>*3ZPja^HsjVZRb<eow3IYN|8+vu9umTNsdQXNqM
|
||
|
||
--
|
||
1.8.4.2
|
||
|