From f7af27721f5c303ff35e34655bb66ff9deb60014 Mon Sep 17 00:00:00 2001 From: oleg-shilo Date: Thu, 4 May 2017 10:43:30 +1000 Subject: [PATCH] Release v1.4.4.1 This release is identical functionality wise to v1.4.4.0. It's just re-packaged according new CI to include all binaries stamped with the same version number. --- .../WixSharp.Msi/Properties/AssemblyInfo.cs | 18 +- .../WixSharp.Msi/WixSharp.Msi.csproj | 3 + .../VSProjects/WinService_WiX.csproj | 4 +- .../Wix# Samples/WildCard Files/setup.cs | 34 +- Source/src/WixSharp.Samples/WixSharp.Lab.dll | Bin 19968 -> 18944 bytes Source/src/WixSharp.Samples/WixSharp.Lab.xml | 20 + Source/src/WixSharp.Samples/WixSharp.Msi.dll | Bin 27136 -> 27136 bytes Source/src/WixSharp.Samples/WixSharp.UI.dll | Bin 222208 -> 222208 bytes Source/src/WixSharp.Samples/WixSharp.dll | Bin 304128 -> 304128 bytes Source/src/WixSharp.Suite.Lab.sln | 1074 +---------------- Source/src/WixSharp.Suite.sln | 2 +- .../WixSharp.UI/Properties/AssemblyInfo.cs | 21 +- Source/src/WixSharp.UI/WixSharp.UI.csproj | 3 + Source/src/WixSharp/Controls/Extensions.cs | 20 + .../src/WixSharp/Properties/AssemblyInfo.cs | 12 +- .../Properties/AssemblyInfo.version.cs | 11 + Source/src/WixSharp/WixSharp.Lab.csproj | 4 +- Source/src/WixSharp/WixSharp.csproj | 1 + Source/src/aggregate.cmd | 21 + Source/src/build.cmd | 9 + 20 files changed, 121 insertions(+), 1136 deletions(-) create mode 100644 Source/src/WixSharp/Properties/AssemblyInfo.version.cs create mode 100644 Source/src/aggregate.cmd create mode 100644 Source/src/build.cmd diff --git a/Source/src/WixSharp.Msi/WixSharp.Msi/Properties/AssemblyInfo.cs b/Source/src/WixSharp.Msi/WixSharp.Msi/Properties/AssemblyInfo.cs index 0d310f97..10fea423 100644 --- a/Source/src/WixSharp.Msi/WixSharp.Msi/Properties/AssemblyInfo.cs +++ b/Source/src/WixSharp.Msi/WixSharp.Msi/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("WixSharp.Msi")] @@ -14,20 +14,10 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM componenets. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM componenets. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8afbd3fc-0a39-4db5-b592-b2981982b31d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] +[assembly: Guid("8afbd3fc-0a39-4db5-b592-b2981982b31d")] \ No newline at end of file diff --git a/Source/src/WixSharp.Msi/WixSharp.Msi/WixSharp.Msi.csproj b/Source/src/WixSharp.Msi/WixSharp.Msi/WixSharp.Msi.csproj index bea0f74d..46a9f791 100644 --- a/Source/src/WixSharp.Msi/WixSharp.Msi/WixSharp.Msi.csproj +++ b/Source/src/WixSharp.Msi/WixSharp.Msi/WixSharp.Msi.csproj @@ -80,6 +80,9 @@ + + Properties\AssemblyInfo.version.cs + SharedExtensions.cs diff --git a/Source/src/WixSharp.Samples/VSProjects/WinService_WiX.csproj b/Source/src/WixSharp.Samples/VSProjects/WinService_WiX.csproj index 7f0e80b8..fce3911a 100644 --- a/Source/src/WixSharp.Samples/VSProjects/WinService_WiX.csproj +++ b/Source/src/WixSharp.Samples/VSProjects/WinService_WiX.csproj @@ -1,4 +1,4 @@ - + Debug @@ -106,4 +106,4 @@ --> - + \ No newline at end of file diff --git a/Source/src/WixSharp.Samples/Wix# Samples/WildCard Files/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/WildCard Files/setup.cs index 800e9189..6d3d8c85 100644 --- a/Source/src/WixSharp.Samples/Wix# Samples/WildCard Files/setup.cs +++ b/Source/src/WixSharp.Samples/Wix# Samples/WildCard Files/setup.cs @@ -3,33 +3,34 @@ //css_ref System.Core; using System; using System.Linq; -using Wix = WixSharp; using WixSharp; using System.Collections.Generic; +using Wix = WixSharp; + class Script { static public void Main(string[] args) { - var project = - - new Project("MyProduct", - new Dir(@"%ProgramFiles%\MyCompany\MyProduct", - new DirFiles(@"Release\Bin\*.*"), - new Dir("GlobalResources", - new DirFiles(@"Release\Bin\GlobalResources\*.*")), - new Dir("Images", - new DirFiles(@"Release\Bin\Images\*.*")), - new ExeFileShortcut("Uninstall MyProduct", "[System64Folder]msiexec.exe", "/x [ProductCode]"))); - + var project = + + new Project("MyProduct", + new Dir(@"%ProgramFiles%\MyCompany\MyProduct", + new DirFiles(@"Release\Bin\*.*"), + new Dir("GlobalResources", + new DirFiles(@"Release\Bin\GlobalResources\*.*")), + new Dir("Images", + new DirFiles(@"Release\Bin\Images\*.*")), + new ExeFileShortcut("Uninstall MyProduct", "[System64Folder]msiexec.exe", "/x [ProductCode]"))); + project.UI = WUI.WixUI_FeatureTree; project.GUID = new Guid("{AC19C6E4-9724-4e90-8AC7-6E69B4AB7562}"); project.ResolveWildCards(); - var exeFile = project.AllFiles.Single(f=>f.Name.EndsWith("some.exe")); - - exeFile.Shortcuts = new[] { + var exeFile = project.AllFiles.Single(f => f.Name.EndsWith("some.exe")); + + exeFile.Shortcuts = new[] { new FileShortcut("some.exe", "INSTALLDIR"), new FileShortcut("some.exe", @"%Desktop%") }; @@ -38,5 +39,4 @@ static public void Main(string[] args) project.BuildMsi(); } -} - +} \ No newline at end of file diff --git a/Source/src/WixSharp.Samples/WixSharp.Lab.dll b/Source/src/WixSharp.Samples/WixSharp.Lab.dll index 12b98f013331d58c716eb8cba1b2d41e9741e7be..8f01aaee0fc5c5bed6943b0a3f69d5b78e046e52 100644 GIT binary patch literal 18944 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 literal 19968 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.Lab + + + Generic extension methods for + + + + + Copies the common properties from one to another. + + The dest control. + The source control. + + + + Converts into an instance of . + + The source control. + Type of the control. + + The WiX UI scaling factor. diff --git a/Source/src/WixSharp.Samples/WixSharp.Msi.dll b/Source/src/WixSharp.Samples/WixSharp.Msi.dll index 46b52ef2eeb0c96daa1389b131d0360368f9b7da..a2c703a484d67ac04c725c8c08138f3427f91ed1 100644 GIT binary patch delta 380 zcmZp;!q{+yaY6^PPC3`aZeOPSgpIc}WLe&EuH~B~XR+B%PDhYkfT55|*8J<$J@t}3b&itXp*5U)nLk8rzm=~#=Vig4ZSwI)%#TDJTVX9_pKj)~Av?Bd z*WBd#kH@xOF)Fusxc83D{@ce?&fl%GDV{Z_>yEuq{^m=XaxWZt1kDOB7xQfioWZ0w!(*UGFoP0MBpNJ|3?{P~9DyRm4B4CS8a-rYWo7_^&4`z6>jm^aWqG!XSG-_jSM1%a6Zx2JvP?opJr5%TyP=-3o`IeL1B2`IMRob=Dm~{j zxhxm&UH&e%YD-ty9^R|Rz6Xl!dADiFCc7&e{^shm+pMco{T=I`-xYMODaY08+2aO{ ztmMnf-IsE03G3LtJ2)^-xnz3U{^#r5TBirBd8e`{d`tURhTbFn!(6BsC`Tg%Q-H;vfyyB!Ed(HZr}~VvH0sFM}^JkEC{%(R8uV z=yxn_d)*8W=ZN<##?)R<6neWyrR0d6y2!Q@jaO#aO|Vl`B0fh}`C$bVE6ne6nn2_tp4W*u>kv^nJ zVvfW-DPKVPF>jMHMWKoQCrfXNL0VAfS*Szs58KT z>de{(A5jvFz%TRx!t(lPT)a?dgc&%IpDAui$j_u(WXIR^<%O)(bXGpzJ~%%;o{`DU z&2^?7Dcy2%&`$HN!Ykii?3lfB&FhXK=K1;ZnH+Y+)D5*hpO^n?@ZZ{gcA$Tm^-FlD zI<3h*@bq~=Ur*dI$NbP>No-XwiFu>wU2>q!Rc21wxgxOt*%b4`yKc{Y-FoKdAA{|y z?Qm;NR;=8Y;Di6ZvoV|2aNYWbcl9AHi4{JcE~`157j9(JgS0lPvz1=@@3r%86O;&$OV7h!B*hBp delta 878 zcmYk4dq@;f6vpqFnRV96O?P#2(!fWMCaf-M4`M?rwcXsxSCWC7&r&Hf1<`_ho2*jn zmWu_YiAkD>Y&8aEijn$5$MHvJ^n4KAd8o0mjp6{Of9k@)%uv5vf)Ag(L zy+zh+GEh6Gx~JqFmgSDaOb3_dV^cqLcLvT9)oVh&>rFw1KEu6j;8~Xpi@ZS(Eb0dB z%Ba1>;O9)jksQ%UjFEU!Vv58piFp!>B$gsQNR6~Ni?no)Z^7V^@p)wDggNiFakabff-6Y~NiW=S41=F!HCNO8s~gBUdR16y0B z8v!&Ht$hbt8TJ6&o9%8Yj+m)dww>?}@xDD^rYL{T_SEi1VbkjwaYW!O3s~%)3&la+ z>_vB#%$q$Q!r`DV{4bcKV|mV2IhR9W;Oczh{z#>o>?3U|H91InkVhoONjxR_X`~PR z9LdR-c!^A-Q%+>AwyK4nG8s+qvy`u-0I@Bu7!v{(ZtBJ}#&79sO~Y@h$MW=q_9DP| z0mx+t7dMegUNjU!ZWye>242CsDN9Px6|xV&G6lRfE&}pVh9Y1)%I643b?4;{*wq9o zf(ew8$2+C|;+@P$@BrY2vMBJPQCsxTE!GLqa9Gqk2FMjvaSZTzc!4_(VW`%`7+6Bt z9}61caxARC#!Wz2jXGEzqz&8MFEO%u!wM#=>L6pAt_e_<3D?zWqcW zx#s+Geat~;>Z@;z-uCs?lgD?@t!6Wxqn%3*^4Yi$?PRi#F}mu|Z*HTZeQlk5Y~;i|IQTSWME*_Sj@n{C6;f)$iSuH!@!_j!rA<8 z*7kR^7(JX>QoL8CPdB;8Xt%xM9;44mb^(S;hAU;F+fOfN5@l!f-2QMK(?^kDV}|YS zdJGH<#tagkAljOt+zUiIGqi$fZzvti&<*BCL*89 zG~E7V3X2KzcGVdyiy7;+m)$cmWK%M|(|lyMK>ClzJP+*ISA^dFJiX}oO9k0aTlO>W zP>bFB;-EUyd;YamI!oVr&-n1lV8hzI>R+d9Ui!7(R4nuaqjyRr3N8mVA2h z$>_*T-w=l6udmzJCa)CeXsq|$z2%njqixGLof%S3ia-8bTBdF5wod+WlncjNU_dYc zgMGUHEEY+DTaAUYJ!iak>^=Nx^6n32p4%&Cv52s6GBU6LAtM9h_Nnt&q8S+tw||_^ UQVyi2XD(zh2XYrKWQk`20D4rR_yM37-u4UPH`|nIK4h9BBjl~QMTw?h)j0{{FJ`4=nB^=G~ zW^I2ri_yb*y3IXC8JIMCQ)`q$L$Z-F?|#X)@I=L z)MH>^FlNZ|0@2nC6=2#KN_#WZf%(Bu`DlhdFh3b8pADsp88(5%s~PTWS3Sa%Y{RyrI%Rq?EPyNxdkJ0GLsc9&?DMV8w?Phl})=H_8! zU^mn=0YZcA$}?D&GS)l%v3VDL#mH@qiuwNRe}}{vL&+`3NwjacU^w-#=iluC>IO6P=if66 zk>%A9So`jZW|451=n{il)f=WBE)bi4HzhfssbXv7p8O@QS$i4Y&wXQ`!!ZFEAPn=K zvQPJ)#Ud%-Bh$&XYL&SAtc5cbUmrJ(* + + Properties\AssemblyInfo.version.cs + Form diff --git a/Source/src/WixSharp/Controls/Extensions.cs b/Source/src/WixSharp/Controls/Extensions.cs index e8482363..06c3a626 100644 --- a/Source/src/WixSharp/Controls/Extensions.cs +++ b/Source/src/WixSharp/Controls/Extensions.cs @@ -1,7 +1,15 @@ namespace WixSharp.Controls { + /// + /// Generic extension methods for + /// public static partial class Extensions { + /// + /// Copies the common properties from one to another. + /// + /// The dest control. + /// The source control. public static void CopyCommonPropertiesFrom(this WixSharp.Controls.Control destControl, IWixControl srcControl) { var formControl = (System.Windows.Forms.Control)srcControl; @@ -38,6 +46,12 @@ public static void CopyCommonPropertiesFrom(this WixSharp.Controls.Control destC } } + /// + /// Converts into an instance of . + /// + /// The source control. + /// Type of the control. + /// public static WixSharp.Controls.Control ConvertToWControl(this IWixControl srcControl, ControlType controlType) { var wControl = new WixSharp.Controls.Control { Type = controlType.ToString() }; @@ -68,10 +82,16 @@ internal static int WScale(this int data) #pragma warning disable 1591 public class WixControlDesigner : WixControlDesigner { } + public class WixButtonDesigner : WixControlDesigner { } + public class WixLabelDesigner : WixControlDesigner { } + public class WixFormDesigner : WixControlDesigner { } + public class WixCheckBoxDesigner : WixControlDesigner { } + public class WixTextBoxDesigner : WixControlDesigner { } + #pragma warning restore 1591 } \ No newline at end of file diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.cs b/Source/src/WixSharp/Properties/AssemblyInfo.cs index 3ceebb89..fb4dca2b 100644 --- a/Source/src/WixSharp/Properties/AssemblyInfo.cs +++ b/Source/src/WixSharp/Properties/AssemblyInfo.cs @@ -23,14 +23,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8afbd3fc-0a39-4db5-b592-b2981982b33d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.4.4.0")] -[assembly: AssemblyFileVersion("1.4.4.0")] \ No newline at end of file +[assembly: Guid("8afbd3fc-0a39-4db5-b592-b2981982b33d")] \ No newline at end of file diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.version.cs b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs new file mode 100644 index 00000000..eef4a58a --- /dev/null +++ b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs @@ -0,0 +1,11 @@ +using System.Reflection; + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.4.4.1")] +[assembly: AssemblyFileVersion("1.4.4.1")] \ No newline at end of file diff --git a/Source/src/WixSharp/WixSharp.Lab.csproj b/Source/src/WixSharp/WixSharp.Lab.csproj index 493f457a..c3f03df9 100644 --- a/Source/src/WixSharp/WixSharp.Lab.csproj +++ b/Source/src/WixSharp/WixSharp.Lab.csproj @@ -127,6 +127,7 @@ Component + @@ -163,8 +164,7 @@ --> - md "$(ProjectDir)..\..\..\bin\WixSharp" -copy "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\bin\WixSharp\$(TargetFileName)" + copy "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\bin\WixSharp\$(TargetFileName)" copy "$(TargetDir)$(TargetName).xml" "$(ProjectDir)..\..\bin\WixSharp\$(TargetName).xml" copy "$(TargetDir)$(TargetFileName)" "$(ProjectDir)..\..\src\WixSharp.Samples\$(TargetFileName)" copy "$(TargetDir)$(TargetName).xml" "$(ProjectDir)..\..\src\WixSharp.Samples\$(TargetName).xml" diff --git a/Source/src/WixSharp/WixSharp.csproj b/Source/src/WixSharp/WixSharp.csproj index 1c7604ec..fd2731ab 100644 --- a/Source/src/WixSharp/WixSharp.csproj +++ b/Source/src/WixSharp/WixSharp.csproj @@ -131,6 +131,7 @@ + diff --git a/Source/src/aggregate.cmd b/Source/src/aggregate.cmd new file mode 100644 index 00000000..6855fd30 --- /dev/null +++ b/Source/src/aggregate.cmd @@ -0,0 +1,21 @@ +echo off + +echo Aggregating all artifacts for the release package. Not all steps may succeed on all PCs (e.g. building chm) + +xcopy /S /Y "WixSharp.Samples\Wix_bin" "..\bin\WixSharp\Wix_bin\" +xcopy /S /Y "WixSharp.Samples\Wix# Samples" "..\bin\WixSharp\Samples\" +copy /Y "WixSharp.Samples\uninstall.cmd" "..\bin\WixSharp\uninstall.cmd" +copy /Y "WixSharp.Samples\install.cmd" "..\bin\WixSharp\install.cmd" +copy /Y "WixSharp.Samples\cscs.exe" "..\bin\WixSharp\cscs.exe" +copy /Y "WixSharp.Samples\nbsbuilder.exe" "..\bin\WixSharp\nbsbuilder.exe" +copy /Y "..\license.txt" "..\bin\WixSharp\license.txt" +copy /Y "..\readme.txt" "..\bin\WixSharp\readme.txt" +copy /Y "WixSharp.Samples\WixSharp.Lab.dll" "..\bin\WixSharp\WixSharp.Lab.dll" +copy /Y "WixSharp.Samples\WixSharp.Lab.xml" "..\bin\WixSharp\WixSharp.Lab.xml" + +"C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" /p:Configuration=Release "Docs\WixSharp.Docs.shfbproj" + +copy /Y "Docs\Build\WixSharp.Reference.chm" "..\bin\WixSharp\WixSharp.Reference.chm" +del "..\bin\WixSharp\WixSharp.Reference.chw" + +pause diff --git a/Source/src/build.cmd b/Source/src/build.cmd new file mode 100644 index 00000000..6a343b12 --- /dev/null +++ b/Source/src/build.cmd @@ -0,0 +1,9 @@ +echo off + +set devenv=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\devenv.com +set msbuild=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe + +"%msbuild%" /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release /p:Platform="Any CPU" WixSharp.Suite.sln +"%msbuild%" /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release /p:Platform="Any CPU" WixSharp.Suite.Lab.sln + +pause \ No newline at end of file