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

Bump and add .net 4.6

Browse Source
This commit is contained in:
Mario Fetka
2015-07-24 13:57:53 +02:00
parent ef3c3e51e9
commit 1edcab19b7
19 changed files with 123 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
CLIENT_DATA/Ricktendo_NET46_package.xml Normal file
View File

@@ -0,0 +1,21 @@
<package id="net4.6" name=".NET Framework 4.6" group="Microsoft .NET Framework" priority="44">
<check type="file" condition="<" value="4.0.30319.34209" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.dll" />
<install>
<cmd arch="x86" path="netfx_Full_LDR_x86.msi" param="/norestart /qb-!">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
</cmd>
<cmd arch="x86" path="netfx_FullLP_LDR_x86.msi" param="/norestart /qb-!">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
</cmd>
<cmd arch="x64" path="netfx_Full_LDR_x64.msi" param="/norestart /qb-!">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
</cmd>
<cmd arch="x64" path="netfx_FullLP_LDR_x64.msi" param="/norestart /qb-!">
<check type="os" condition=">" value="6.0.6002.0" />
<check type="os" condition="<" value="6.2.9200.0" />
</cmd>
</install>
</package>

32
CLIENT_DATA/cleanup3264.ins
View File

@@ -12,6 +12,17 @@ if ($sereby_dotnet4.5$ = "uninstall")
Set $reboot$ = "true"
endif
if ($sereby_dotnet4.6$ = "reinstall")
Winbatch_dotnet4.6_uninstall
opsiservicecall_dotnet4.6_reinstall
Set $reboot$ = "true"
endif
if ($sereby_dotnet4.6$ = "uninstall")
Winbatch_dotnet4.6_uninstall
opsiservicecall_dotnet4.6_uninstall
Set $reboot$ = "true"
endif
; a reboot is requred after the .net cleanup so that further uninstalls can work
if ($reboot$ = "true")
comment "uninstall done now force Reboot"
@@ -264,6 +275,27 @@ endif
"%opsiserviceUser%"
]
[Winbatch_dotnet4.6_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.6 /u"
[opsiservicecall_dotnet4.6_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.6",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet4.6_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.6",
"none",
"%opsiserviceUser%"
]
[Dosbatch_msjsharp_uninstall]
[opsiservicecall_msjsharp_reinstall]

7
CLIENT_DATA/config3264.ins
View File

@@ -4,6 +4,9 @@ DosInAnIcon_init_config
if ($sereby_dotnet4.5$ = "install")
DosInAnIcon_dotnet4.5_config
endif
if ($sereby_dotnet4.6$ = "install")
DosInAnIcon_dotnet4.6_config
endif
if ($sereby_win8xdotnet3x$ = "install")
DosInAnIcon_win8xdotnet3x_config
endif
@@ -56,6 +59,10 @@ xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_dotnet4.6_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='net4.6']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_win8xdotnet3x_config]
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/set[@component='NetWin8']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"

2
CLIENT_DATA/define3264.inc
View File

@@ -6,6 +6,8 @@ DefVar $sereby_timer_enabled$
Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1")
DefVar $sereby_dotnet4.5$
Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install")
DefVar $sereby_dotnet4.6$
Set $sereby_dotnet4.6$ = GetProductProperty("sereby_dotnet4.6", "install")
DefVar $sereby_win8xdotnet3x$
Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install")
DefVar $sereby_msjsharp$