From e66ac44b7e635112083f1488c7e48c504e3ce188 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Thu, 9 Nov 2017 12:45:20 -0500 Subject: [PATCH] Very WIP please force push --- TGCommandLine/Properties/AssemblyInfo.cs | 2 +- TGCommandLine/TGCommandLine.csproj | 7 +++++++ TGControlPanel/TGControlPanel.csproj | 7 +++++++ TGDreamDaemonBridge/TGDreamDaemonBridge.csproj | 7 +++++++ TGInstallerWrapper/TGInstallerWrapper.csproj | 7 +++++++ TGServerService/Properties/AssemblyInfo.cs | 2 +- TGServerService/TGServerService.csproj | 7 +++++++ TGServiceInterface/TGServiceInterface.csproj | 7 +++++++ TGServiceTests/TGServiceTests.csproj | 8 ++++++++ TGStationServer3.pfx | Bin 0 -> 1701 bytes TGStationServer3.sln | 1 - Tools/TGStationServer3.enc.snk | 1 - 12 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 TGStationServer3.pfx delete mode 100644 Tools/TGStationServer3.enc.snk diff --git a/TGCommandLine/Properties/AssemblyInfo.cs b/TGCommandLine/Properties/AssemblyInfo.cs index 27af13774e..322a46bb38 100644 --- a/TGCommandLine/Properties/AssemblyInfo.cs +++ b/TGCommandLine/Properties/AssemblyInfo.cs @@ -17,4 +17,4 @@ using System.Runtime.InteropServices; [assembly: Guid("9ad1f086-a83e-4d14-a844-58a9471106b6")] //allow the unit tester to peek inside us -[assembly: InternalsVisibleTo("TGServiceTests", AllInternalsVisible = true)] +[assembly: InternalsVisibleTo("TGServiceTests, PublicKeyToken=<1521fb3fe76ed910>", AllInternalsVisible = true)] diff --git a/TGCommandLine/TGCommandLine.csproj b/TGCommandLine/TGCommandLine.csproj index 0c299ad037..415cb7db44 100644 --- a/TGCommandLine/TGCommandLine.csproj +++ b/TGCommandLine/TGCommandLine.csproj @@ -40,6 +40,12 @@ MinimumRecommendedRules.ruleset true + + true + + + ..\TGStationServer3.pfx + @@ -58,6 +64,7 @@ + diff --git a/TGControlPanel/TGControlPanel.csproj b/TGControlPanel/TGControlPanel.csproj index d1b390395f..cc3254c1bb 100644 --- a/TGControlPanel/TGControlPanel.csproj +++ b/TGControlPanel/TGControlPanel.csproj @@ -39,6 +39,12 @@ MinimumRecommendedRules.ruleset true + + true + + + ..\TGStationServer3.pfx + @@ -109,6 +115,7 @@ SettingsSingleFileGenerator Settings.Designer.cs + diff --git a/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj b/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj index 99acc47c27..4c25253e64 100644 --- a/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj +++ b/TGDreamDaemonBridge/TGDreamDaemonBridge.csproj @@ -34,6 +34,12 @@ prompt MinimumRecommendedRules.ruleset + + true + + + ..\TGStationServer3.pfx + @@ -51,6 +57,7 @@ + diff --git a/TGInstallerWrapper/TGInstallerWrapper.csproj b/TGInstallerWrapper/TGInstallerWrapper.csproj index ffee3114b1..ca314a4891 100644 --- a/TGInstallerWrapper/TGInstallerWrapper.csproj +++ b/TGInstallerWrapper/TGInstallerWrapper.csproj @@ -42,6 +42,12 @@ MinimumRecommendedRules.ruleset true + + true + + + ..\TGStationServer3.pfx + ..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll @@ -80,6 +86,7 @@ + diff --git a/TGServerService/Properties/AssemblyInfo.cs b/TGServerService/Properties/AssemblyInfo.cs index 6df01aa814..da48afa5bb 100644 --- a/TGServerService/Properties/AssemblyInfo.cs +++ b/TGServerService/Properties/AssemblyInfo.cs @@ -17,4 +17,4 @@ using System.Runtime.InteropServices; [assembly: Guid("f32eda25-0855-411c-af5e-f0d042917e2d")] //allow the unit tester to peek inside us -[assembly: InternalsVisibleTo("TGServiceTests", AllInternalsVisible = true)] +[assembly: InternalsVisibleTo("TGServiceTests, PublicKeyToken=<1521fb3fe76ed910>", AllInternalsVisible = true)] diff --git a/TGServerService/TGServerService.csproj b/TGServerService/TGServerService.csproj index 375c542010..eeabedd68f 100644 --- a/TGServerService/TGServerService.csproj +++ b/TGServerService/TGServerService.csproj @@ -41,6 +41,12 @@ MinimumRecommendedRules.ruleset true + + true + + + ..\TGStationServer3.pfx + ..\packages\Discord.Net.Core.1.0.2\lib\net45\Discord.Net.Core.dll @@ -138,6 +144,7 @@ SettingsSingleFileGenerator Settings.Designer.cs + diff --git a/TGServiceInterface/TGServiceInterface.csproj b/TGServiceInterface/TGServiceInterface.csproj index 5e9befc3be..78858a76d8 100644 --- a/TGServiceInterface/TGServiceInterface.csproj +++ b/TGServiceInterface/TGServiceInterface.csproj @@ -36,6 +36,12 @@ MinimumRecommendedRules.ruleset false + + true + + + ..\TGStationServer3.pfx + @@ -71,6 +77,7 @@ + \ No newline at end of file diff --git a/TGServiceTests/TGServiceTests.csproj b/TGServiceTests/TGServiceTests.csproj index e8ad0a9acc..1a31210837 100644 --- a/TGServiceTests/TGServiceTests.csproj +++ b/TGServiceTests/TGServiceTests.csproj @@ -37,6 +37,12 @@ prompt 4 + + true + + + ..\TGStationServer3.pfx + ..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll @@ -70,9 +76,11 @@ + + diff --git a/TGStationServer3.pfx b/TGStationServer3.pfx new file mode 100644 index 0000000000000000000000000000000000000000..0d12863e897a237f9f87baa7dc34e054fe83d0e7 GIT binary patch literal 1701 zcmcIlX;4#F7`=Hf31Jh02nA&|LS=n{uqiE@tg=g>3K64hA{q!Fi);xRrL0Ai89|7n z2(q^Wi~F6gLO1ck6D^un~%&h%$HcfNPObMANE{oZosVqD@C1czc= zB7-Qd!*k+^q;X<6K9}f@=Mr5Y?SOI7+J7verFbq{1nEK;=ZTVks-z@v2%n48VqByW z+eVc5i-tGfgeN6G6b>C#aqdG9v0w3AyH+bv#`~T=N!rMpdkrg3^vZHsX?R9HZfr8uA+v**yFQQNA)JPc|JhaRBNAH^)soB-ws%a4|vGj*f z+q06zg*hLkf?NVFIoEx<(^@i9;#Vk^`P?EsOE0%jq%nb_5kb-xJTXP`=Z6{fbh5VR zgqpkeyiQV?aH?48V1ULo8RLzcP&1yO>N zVdDWmrAd-?yAZ1vxksaC;%*3VnfLsJ^yxHysGG!)!SN$mPJu@n`G$EP@<~e4##+oy zxyq7d#UPa-r#1wJJQ?9uNQJjwzBM+Nl){Mf z@gI0a2@15xV~xz=o7q?WTN2|;Lfh1;b&Gc7M5J=Fl6Noaj7whfFtl1+wD0eDl(VAO zZtk6FkJMB0ZR1TQjeX8sv}!I%u4W!%y-Z}HwT@jek*i^pZYxz8A4@*NK)dXj`D#!% z!I`nYFS7mtEg{GHw34Z^%W7^hGV1XtC8Z~|QeCDsH)>(xN6SV%4)_)6PcwAAe$#jvs4#w;?pOEt z*j7;(N$gd>u%K1BofN!mm{p)2#!d*Zd-F6`F14^^aOHM*2sYGkSC96sxbV16g;_OM ztwwXAh+!C-@}Zm2v2uC8)3;T2ea$fzOiH+YMQHOq_Me zVw*R9Z}BZuA|8(e0AT)qlk!w|RabBdP=PV91Gc~d4im5k=mQ%#*04UH0dp8sn3)4J zIMZNe1{`1=6;{|mr7gr5FoL>d40=tMh{NN!W@H@IQ`H@~furCEU;`G2h7kf{fI8R* zuWQT+5DJkU%o9K)ne5Nxn6e?q970q*wBG_8{My&8R0<7B||y^M(mf4 zMd6|wB%L?>Dz305uz&&+$Wt*c?h+qGa0nv1dBJ^>W-WWo?HP{uJ~Uqglit__CrJR9 zAC->nBcgOX`X9e7RYhs48I_7zU>MEZ#N+^k=IhXO9sYkCb4tH_MjQd4oNRz`G7t_2 z+~V(^oOcdqdS&-Z*_g_$8j9XV@$Gva1Tb8#HlE|upzMy{9lx?2`=#9e(5)_0>-h#m zJ87Fr8)36+3_)jjDY4Ua>H9k&mKrCdJmQ7R`0*P}VUiatgAbnRjJk-jO{2HxpQdYx zx9fe=_PKd5&nZ!&<->w?P0ADBG&QfY_!$Jn0o<4E!B2p~zD^oW^5!m2MF=Vucwf z?l{7YFrq8%r*8RoKkdfUFfk%QcN2;zf7m{L2ZX38JzYJ2~kN;f*PmrlaV>os*o Xl3cW$h>^C1Nvw48J649u+JW&02E$(` literal 0 HcmV?d00001 diff --git a/TGStationServer3.sln b/TGStationServer3.sln index f9e733d0a1..b39a6dd329 100644 --- a/TGStationServer3.sln +++ b/TGStationServer3.sln @@ -82,7 +82,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{081BB0BB Tools\install_byond.sh = Tools\install_byond.sh Tools\Test.dm = Tools\Test.dm Tools\TGS3Build.ps1 = Tools\TGS3Build.ps1 - Tools\TGStationServer3.enc.snk = Tools\TGStationServer3.enc.snk Tools\UploadCoverage.ps1 = Tools\UploadCoverage.ps1 EndProjectSection EndProject diff --git a/Tools/TGStationServer3.enc.snk b/Tools/TGStationServer3.enc.snk deleted file mode 100644 index d2883820d1..0000000000 --- a/Tools/TGStationServer3.enc.snk +++ /dev/null @@ -1 +0,0 @@ -zBxk8Hcf2/FEdhnH7/XfeNzbdMXQ2lRwbP1cM7L4K2c6TrMuczuMWz/ohdIjYHD6CzPNBhfzIawIEB/Aer60Ek0OxRd1rcEXvNbwlmzsdcN/Nj6iGmMq5OhnW4vxm5opjZZqtF5ZsKyXsbrQzRkDfQiXUh40zDw7ysA6LwMEUkR8Ue03UaWghv+MdAu0sUmClC5uQ0E3yW+FwlrpEY4ouvfm4rerhv/qaa4N4tv0IXtZqrzXuTCyGjXRzs83PGyu+3LKu2/g3VOrKV6cK8+m50O21EFac/jvmw96s3V2L2p44Us45bgVhoan4atUXV5XRr2xwO+vK1dEd1tVTyTRVEScIdgHYj2w7MjMqpjPg2toh/++iZjVZ46saJzzDoc9x69RGiGmsyUi6ZioyhwhCX2e17SdLWgs1YtUtEPRggKPRoBbyqpMFMuxnSQEeeSOsOXl6WOSDfO0dfl0Gy+3wPKFEv/QIyrRdMfKvDVqs61lp/brkWP3siUEhZGLGHt/TFHMOeIYYGLpEBkpPgdPwdaOMbUPi/0RHpbrfs3EzgzQg7tVsxFA6qr0nzfvi5dxzkrK0GcVPJX/i1Xj55VWRyizmfo+Fcc4nHnftqOGzTpR610bcpP1Bwbe3lNhj81F4MTNWog4DJKKUbs3+b0WdTiad/iespuu91++W/EmFaxFmLJyZvo+2j9HeAe6nNkMGQIXXWzM5NeSlbD4LzStzE0PR9yz44Tx0zydLARc+Hfleo/tDX2qJ5Fqz+TaOfHKGC87AR7XUY0a67MfuHICBvqnsQpevj74UwyOdya1lR99Ace0da/nagigy0ikDnRAteNb0U1FxQCM3T/FEh0rvIb21tv095gzZIujkF26ThevVN3evW0+1wo23BiqGv6a0M22UftrKIwl2lcOHAIbXj1q8C1WoIb5uGK6jfI9rgyY2O+AkECsy0UhsSI/gL6tyMxuj0odFoQ1xddP18T5oS2oY1YGJFsf42ybQqivYsWQ58fzgwZc8+aLWFKfZq6cPfGASoBrouZLWEkZR5OcyL9Dh517jEQx90eBiskyEYQ= \ No newline at end of file