Skip to content

Commit

Permalink
1.3.5536.36545
Browse files Browse the repository at this point in the history
  • Loading branch information
Aivier committed Feb 27, 2015
1 parent 9521ef7 commit 19fce40
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 26 deletions.
23 changes: 0 additions & 23 deletions release/iss/scripts/products/dotnetfx35sp1.iss

This file was deleted.

23 changes: 23 additions & 0 deletions release/iss/scripts/products/dotnetfx45full.iss
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// requires Windows Vista SP2, Windows 7 SP1, Windows 8, Windows 8.1, Windows Server 2008 SP2, Windows Server 2008 R2 SP1, Windows Server 2012 and Windows Server 2012 R2
// requires Windows Installer 3.1
// WARNING: express setup (downloads and installs the components depending on your OS) if you want to deploy it on cd or network download the full bootsrapper on website below
// http://www.microsoft.com/downloads/details.aspx?FamilyID=ab99342f-5d1a-413d-8319-81da479ab0d7

[CustomMessages]
dotnetfx4full_title=.NET Framework 4.5.2
dotnetfx4full_size=66.8MB

[Code]
const
dotnetfx4full_url = 'http://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe';
procedure dotnetfx4full();
begin
if (netfxspversion(NetFx40Full, '') < 1) then
AddProduct('dotnetfx4full' + GetArchitectureString() + '.exe',
'/lang:enu /passive /norestart',
CustomMessage('dotnetfx4full_title'),
CustomMessage('dotnetfx4full_size'),
dotnetfx4full_url,
false, false);
end;
5 changes: 3 additions & 2 deletions release/iss/x-wall.iss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ SetupIconFile=E:\WorkSpace\XWall\src\Icons\main.ico
UninstallDisplayIcon=E:\WorkSpace\XWall\src\Icons\main.ico
Compression=lzma/Max
SolidCompression=true
MinVersion=6.0

[Languages]
Name: "en"; MessagesFile: "compiler:Default.isl"
Expand Down Expand Up @@ -64,7 +65,7 @@ Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChang
#include "scripts\products\dotnetfxversion.iss"

#include "scripts\products\msi31.iss"
#include "scripts\products\dotnetfx35sp1.iss"
#include "scripts\products\dotnetfx45full.iss"

[Registry]
Root: "HKCR"; Subkey: "xwall"; Flags: deletekey
Expand Down Expand Up @@ -96,7 +97,7 @@ var
begin
initwinversion();
msi31('3.1');
dotnetfx35sp1();
dotnetfx4full();
Result := true;
end;
Expand Down
2 changes: 1 addition & 1 deletion release/version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1.3.5536.36545
1.3.5536.33483
1.3.5536.33483
Binary file modified release/x-wall-setup.exe
Binary file not shown.
Binary file modified src/X-Wall.v12.suo
Binary file not shown.

0 comments on commit 19fce40

Please sign in to comment.