go-opsi/sereby.aio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

First round on integrationg dotnet for win8.0 into winpkg

Browse Source
This commit is contained in:
Mario Fetka
2013-07-27 07:57:56 +02:00
parent f807b2bbe7
commit 367fdb0c38
2 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CLIENT_DATA/setup3264.ins
View File

@@ -90,17 +90,6 @@ else
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..."
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($sereby_dotnet3.5$ = "install") or ($sereby_dotnet3.0$ = "install") or ($sereby_dotnet2.0$ = "install"))
comment "Install Netframework 2.0 - 3.5 for Windows 8"
if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
Message "Install Netframework 2.0 - 3.5 for Windows 8"
Dosbatch_install_dotNet8 winst /SysNative
else
LogError "Not compatible without Netframework 3.5 for Windows 8"
isFatalError
endif
endif
Winbatch_install
Sub_check_exitcode
comment "Copy files"
@@ -115,17 +104,6 @@ else
Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..."
comment "Start setup program"
ChangeDirectory "%SCRIPTPATH%"
if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($sereby_dotnet3.5$ = "install") or ($sereby_dotnet3.0$ = "install") or ($sereby_dotnet2.0$ = "install"))
comment "Install Netframework 2.0 - 3.5 for Windows 8"
if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe"))
Message "Install Netframework 2.0 - 3.5 for Windows 8"
Dosbatch_install_dotNet8 winst /SysNative
else
LogError "Not compatible without Netframework 3.5 for Windows 8"
isFatalError
endif
endif
Winbatch_install
Sub_check_exitcode
comment "Copy files"
@@ -141,10 +119,6 @@ else
endif
[Dosbatch_install_dotNet8]
@echo off
dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Install\NET\WIN8.0 /LimitAccess
[Winbatch_install]
"%ScriptPath%\Install\opsi-WinPKG.exe"