From c642c7ca414a35696c1ba3d81abb0ae2cc6c5741 Mon Sep 17 00:00:00 2001 From: Daniel Cazzulino Date: Thu, 2 Jun 2016 13:45:32 -0300 Subject: [PATCH] Added icon to test MSI, formatting changes on the rest --- build.proj | 10 ++--- icon/256.png | Bin 0 -> 27705 bytes icon/Clide.ico | Bin 0 -> 11554 bytes .../Clide.IntegrationTests.csproj | 7 ++-- src/Clide.Msi/Clide.Msi.targets | 6 ++- src/Clide.Msi/Clide.Msi.wixproj | 10 +++-- src/Clide.Msi/Product.wxs | 3 ++ src/Clide.Msi/packages.config | 2 +- src/Clide.sln | 11 +++++- src/GlobalAssemblyInfo.cs | 2 +- src/Package/Clide.nuspec | 36 +++++++++--------- src/Package/Clide.targets | 3 +- 12 files changed, 55 insertions(+), 35 deletions(-) create mode 100644 icon/256.png create mode 100644 icon/Clide.ico diff --git a/build.proj b/build.proj index c2bbb6b7..920319c0 100644 --- a/build.proj +++ b/build.proj @@ -69,7 +69,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -145,9 +145,9 @@ $(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(GitSemVerDashLabel) - - - + + + diff --git a/icon/256.png b/icon/256.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a797eca9503ebe4667190928c4a7560586b94a GIT binary patch literal 27705 zcmeEtWVm+M^6OFd9{BUr zOIuOqN!1ADHt-LM-D|biPoC5yW8GPxK6!%tL{n8){txKsQzRrLWMpI%6ckicR5Ua+ zbaeD*&z@mmU|?cmVqsxnV`Jms;Naro;^E=p>L~%oSd9oTwL7T+&nxyyu7?GU%uqy({SkWMpJzW##1Lg@uKsrKOdXm9@3Cjg5`1t*xD%oxQ!igM)*kqob3Ple4q4i;Ih^ ztE-!vo4dQahlhu!r>B>fm$$dKkB^V9udkn*C(A&3fgM))ZLPA1A zL;w5lKL`X878VvB9v%@95g8d76%`d79UT)B6B`>F7Z(>FAD@trkeHa5l$4a5oc!+H zyZ7(kr=+B$rlzK)rKP8*XJlk#W@di)@F6QJD?2+oCnqO2H#aXY@8idh`T6+;1qFqL zg+)b0#l^*+K7IQ9`SX`AUrI_!N=r-2%F4>i%PT4>pipRKWo1=WRdsbW3y zsi`Rh0x>;3Ju@>iJ3Bi!H#a{&|LfPUg@uL1#l@wirQg4QFE1~ztgNiAuCA@Et*@_d zY;0_9Zfv zJjh$e&DPt`!qeu7yM=?RH@B;eH?06SFSn>Oe~9{%C-xuT$i3F}H``zEDIn6jML${y z;-S(Gi)1Z|iL-3CwD6<*FtcC@E}-}2V3w|V-qUlS-ouE^`wn-z^;giQUuQMuua=<^ zQM(a|(I1zmqq`O2qd%m?Z`)ex>_!Gqop5@3!51L8PiV;TF_U00 z!FzISPI~Qdh`gNR|3Lq9!T+M*|1AXlka%15yWpP2{IcAaCcimg9s8G4BRi4BGvhv9 z^+vnx`dqxs^P4R<9qJS0k2FFjjwuhHul07Hs>IENo*pylb_hdAd6H^Lfm%R2)z7iKRqXDcZP^1?D; z8&fdXO~aA{6~*t*elZaF>)!$%CHm1;u0f&9)eD6;Q+e zdp}(6UT$qVL5Se;z;i@r1tkU=$$Iz%Bc_kTlZ|aGK^u#i|I2K zRZQLlkkwEXYz?8z2XGvUyGY?Af2uhB2^7%{M+=IUpD>pRl_JY*n` z-kRLTqPT*zdmA2qxr-N)4iTT?G4_@HuGxz7@BnJnXO6V~6_OmPNj* zD1(FBh|RLT@xoYXa+!~3{TP$v8m&tW(j!|TK~<)x5{(6Bt?#Wz)QcrDa3I{ z|5L$q%%(ZIodXY=FWkF}FaCE@<^H46)lexHhnXF{y!Np8XEBEU^|Ss@?>FG=9dh5N zJA40)5;&gqzGnL*0^8V&e~5?wb=fnIj5#dBKxC)f4?_kj|BTY!EAhcEn}d_LqZ#p_ z{GB*@g?cD0At_k)4!~1xyJ4;W8eFd&jm5d0`5IiY@a0fDyCC z3;vwJ5J3kj0b`PXxNIGFf5%cRXykmsRM$V1SI#<*9SXT&N%F;?{}J}Eg`lICMl`^8 z!lmN7|LXRAVo!sz5O)x1w~pMtPUK%Gy`s|Nsw?M!eHr|K+a&gHOpbIFU+*U|sE9eu zkmR5JT4T2&3OKr`h~O=l+&`33B~j()Vm6opMk~Xn`M)t$mQ`9}O(GC+-cPgl|GZQv z1=kuZVTBzidf8b1jj#yE7W`h-^`=&u79ULJo>FNvG{FIRvo9*ag&HI!>lI=KsJ?Q zx^CIdK60ZWZrC|V$lu)_&SI_lm-AztIq&vYAB1z8?Q#fnW2l3}WbxG$!IH5VH$O`! z3@?Kvh{c)X6t_otO#H5*%&eSf_KXCGA$nufT#2CJ%25hl%v;8|r8}NOQCrj8y!S&% za5E+y0#J2Pu@?Jc!*tMTjWqr1FA{!;C=r!nA3|T&tT^}_GESmuT`@X|Z+#pqi51PB z2@Q*r_l|n^BFY3lNLo?+d)utTVYzW$;<#PsP`^U3_~kaPsHDGv=(V)TYUZdTdi!R`q8=HX}()FlNriy!S^)e+dr5)3i#f8dL{M0*-tuS!t6yyNZEhl zP&|oxt(?@q^SjmeGZUr?lO&8}Ql4SqyIFLzT

Lj!3;Jfs{@789b1}#k+XzWg3%m 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 literal 0 HcmV?d00001 diff --git a/icon/Clide.ico b/icon/Clide.ico new file mode 100644 index 0000000000000000000000000000000000000000..7b435606341e0a94f7c1d3a3e1dcd18bb0d9f467 GIT binary patch literal 11554 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 - True + False - True + False - True + False ..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll @@ -176,7 +176,6 @@ - diff --git a/src/Clide.Msi/Clide.Msi.targets b/src/Clide.Msi/Clide.Msi.targets index e14789e8..8ed70006 100644 --- a/src/Clide.Msi/Clide.Msi.targets +++ b/src/Clide.Msi/Clide.Msi.targets @@ -22,7 +22,7 @@ PrepareConstants; $(BuildDependsOn) - + @@ -37,4 +37,8 @@ + + + + \ No newline at end of file diff --git a/src/Clide.Msi/Clide.Msi.wixproj b/src/Clide.Msi/Clide.Msi.wixproj index d4d6a086..675a9ea9 100644 --- a/src/Clide.Msi/Clide.Msi.wixproj +++ b/src/Clide.Msi/Clide.Msi.wixproj @@ -1,6 +1,6 @@  - + Debug x86 @@ -11,6 +11,9 @@ Package bin\$(Configuration)\ obj\$(Configuration)\ + WiX + $(ProductVersion) + $(TargetFrameworkIdentifier),Version=v$(TargetFrameworkVersion) @@ -37,7 +40,8 @@ Clide.Installer {859ed305-ee37-48d6-a1b6-f5d7b30317f1} True - True + + Binaries;Content;Satellites INSTALLFOLDER @@ -48,8 +52,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/Clide.Msi/Product.wxs b/src/Clide.Msi/Product.wxs index b28e2c1c..b44e46ad 100644 --- a/src/Clide.Msi/Product.wxs +++ b/src/Clide.Msi/Product.wxs @@ -9,6 +9,9 @@ + + + diff --git a/src/Clide.Msi/packages.config b/src/Clide.Msi/packages.config index e7b22968..20feab81 100644 --- a/src/Clide.Msi/packages.config +++ b/src/Clide.Msi/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Clide.sln b/src/Clide.sln index 701815b2..aecba51e 100644 --- a/src/Clide.sln +++ b/src/Clide.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clide.UnitTests", "Clide.UnitTests\Clide.UnitTests.csproj", "{196C432A-F34C-44E4-AAA1-E0A43DB8949C}" EndProject @@ -13,12 +13,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{BBE9 ProjectSection(SolutionItems) = preProject Package\Clide.Installer.nuspec = Package\Clide.Installer.nuspec Package\Clide.Installer.targets = Package\Clide.Installer.targets + Package\Clide.Installer.txt = Package\Clide.Installer.txt Package\Clide.nuspec = Package\Clide.nuspec Package\Clide.targets = Package\Clide.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8CE52658-6B13-425E-AA75-0B743CFD4A5A}" ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig ..\appveyor.yml = ..\appveyor.yml ..\build.cmd = ..\build.cmd ..\build.proj = ..\build.proj @@ -42,6 +44,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clide", "Clide\Clide.csproj EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Clide.Msi", "Clide.Msi\Clide.Msi.wixproj", "{F4FCA9E5-F9AB-4FB5-B239-F4274C45407B}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{8CFB0A06-5E46-48D6-B584-A35A8B9110B0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -116,4 +120,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {C9A505CA-F826-473A-8290-B36AF6BE56FB} = {8CFB0A06-5E46-48D6-B584-A35A8B9110B0} + {859ED305-EE37-48D6-A1B6-F5D7B30317F1} = {8CFB0A06-5E46-48D6-B584-A35A8B9110B0} + {F4FCA9E5-F9AB-4FB5-B239-F4274C45407B} = {8CFB0A06-5E46-48D6-B584-A35A8B9110B0} + EndGlobalSection EndGlobal diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs index 0a969106..c17268fb 100644 --- a/src/GlobalAssemblyInfo.cs +++ b/src/GlobalAssemblyInfo.cs @@ -20,7 +20,7 @@ partial class ThisAssembly { - public const string Version = ThisAssembly.Git.SemVer.Major + "." + ThisAssembly.Git.SemVer.Minor + "." + ThisAssembly.Git.SemVer.Patch; + public const string Version = Git.SemVer.Major + "." + Git.SemVer.Minor + "." + Git.SemVer.Patch; public const string InformationalVersion = Version + "-" + Git.Branch + "+" + Git.Commit; } diff --git a/src/Package/Clide.nuspec b/src/Package/Clide.nuspec index 80c87335..263835b0 100644 --- a/src/Package/Clide.nuspec +++ b/src/Package/Clide.nuspec @@ -1,21 +1,21 @@ - - Clide - 1.0.0 - Daniel Cazzulino - clariuslabs, kzu - false - Clide - Copyright 2012 Clarius Labs - - - - - - - - - - + + Clide + 1.0.0 + Daniel Cazzulino + clariuslabs, kzu + false + Clide + Copyright 2012 Clarius Labs + + + + + + + + + + \ No newline at end of file diff --git a/src/Package/Clide.targets b/src/Package/Clide.targets index 8c5f9faa..665582ee 100644 --- a/src/Package/Clide.targets +++ b/src/Package/Clide.targets @@ -1,3 +1,4 @@ - + + \ No newline at end of file