diff --git a/image-builder/dependency.list b/image-builder/dependency.list index 9e03d09a..f2277162 100644 --- a/image-builder/dependency.list +++ b/image-builder/dependency.list @@ -31,13 +31,14 @@ path = $BUILD_ROOT/share/files url = http://www.farmanager.com/files/Far30b3525.x64.20130717.msi [mSysGit] +mandatory = true name = msysgit-1.8.3.exe path = $BUILD_ROOT/share/files url = https://msysgit.googlecode.com/files/Git-1.8.3-preview20130601.exe [Sysinternals Suite] -skip = true -name = sysinternals_suite.zip +mandatory = true +name = SysinternalsSuite.zip path = $BUILD_ROOT/share/files url = http://download.sysinternals.com/files/SysinternalsSuite.zip @@ -47,22 +48,26 @@ name = unzip.exe path = $BUILD_ROOT/share/files url = https://www.dropbox.com/sh/zthldcxnp6r4flm/W-lgLFo7Fz/unzip.exe -#[PowerShell V3] -#mandatory = true -#path = $BUILD_ROOT/share/files -#url = http://www.microsoft.com/en-us/download/confirmation.aspx?id=34595 +[PowerShell V3] +mandatory = true +path = $BUILD_ROOT/share/files +url = http://download.microsoft.com/download/E/7/6/E76850B8-DA6E-4FF5-8CCE-A24FC513FD16/Windows6.1-KB2506143-x64.msu +name = Windows6.1-KB2506143-x64.msu -#[.NET 4.0] -#mandatory = true -#path = $BUILD_ROOT/share/files -#url = http://www.microsoft.com/en-us/download/confirmation.aspx?id=17718 +[.NET 4.0] +mandatory = true +path = $BUILD_ROOT/share/files +url = http://download.microsoft.com/download/9/5/A/95A9616B-7A37-4AF6-BC36-D6EA96C8DAAE/dotNetFx40_Full_x86_x64.exe +name = dotNetFx40_Full_x86_x64.exe -#[.NET 4.5] -#mandatory = true -#path = $BUILD_ROOT/share/files -#url = http://www.microsoft.com/en-us/download/confirmation.aspx?id=30653 +[.NET 4.5] +mandatory = true +path = $BUILD_ROOT/share/files +url = http://download.microsoft.com/download/B/A/4/BA4A7E71-2906-4B2D-A0E1-80CF16844F5F/dotNetFx45_Full_setup.exe +name = dotNetFx45_Full_setup.exe [Murano Agent] mandatory = true path = $BUILD_ROOT/share/files url = https://www.dropbox.com/sh/zthldcxnp6r4flm/COFiuwTi5d/MuranoAgent.zip +name = MuranoAgent.zip diff --git a/image-builder/share/scripts/wpi.ps1 b/image-builder/share/scripts/wpi.ps1 index d13aa493..2f2edec3 100755 --- a/image-builder/share/scripts/wpi.ps1 +++ b/image-builder/share/scripts/wpi.ps1 @@ -239,7 +239,7 @@ foreach($file in $srcFiles) { switch($file.Name) { - "Git-1.8.1.2-preview20130201.exe" + "msysgit-1.8.3.exe" { $gitInstDir="$ENV:ProgramData\git"; runexeinstaller $file.FullName "/verysilent /setuptype=custom /components=icons,ext,ext\cheetah,assoc,assoc_sh /bash_context=1 /autocrlf=0 /dir=$gitInstDir"; diff --git a/image-builder/share/scripts/ws-2008r2-core/wpi.ps1 b/image-builder/share/scripts/ws-2008r2-core/wpi.ps1 index 5ba02256..ef5f8326 100644 Binary files a/image-builder/share/scripts/ws-2008r2-core/wpi.ps1 and b/image-builder/share/scripts/ws-2008r2-core/wpi.ps1 differ diff --git a/image-builder/share/scripts/ws-2008r2-std/wpi.ps1 b/image-builder/share/scripts/ws-2008r2-std/wpi.ps1 index adf305d6..272a4a59 100644 Binary files a/image-builder/share/scripts/ws-2008r2-std/wpi.ps1 and b/image-builder/share/scripts/ws-2008r2-std/wpi.ps1 differ diff --git a/image-builder/share/scripts/ws-2012-core/wpi.ps1 b/image-builder/share/scripts/ws-2012-core/wpi.ps1 index 0f5c8ba5..41593d9b 100644 Binary files a/image-builder/share/scripts/ws-2012-core/wpi.ps1 and b/image-builder/share/scripts/ws-2012-core/wpi.ps1 differ diff --git a/image-builder/share/scripts/ws-2012-std/wpi.ps1 b/image-builder/share/scripts/ws-2012-std/wpi.ps1 index 02a778d9..398444c4 100644 Binary files a/image-builder/share/scripts/ws-2012-std/wpi.ps1 and b/image-builder/share/scripts/ws-2012-std/wpi.ps1 differ