Blind Bump

This commit is contained in:
Mario Fetka
2015-10-22 12:35:38 +02:00
parent 95f16e1ab2
commit 5a8625062c
26 changed files with 35 additions and 265 deletions

View File

@@ -1,21 +0,0 @@
<package id="net4.5" name=".NET Framework 4.5.2" 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>

View File

@@ -1,6 +1,5 @@
<settings maximized="1">
<timer value="40" enabled="1" />
<set component="net4.5" checked="1" />
<set component="net4.6" checked="1" />
<set component="msjsharp" checked="1" />
<set component="silver" checked="1" />

View File

@@ -1,17 +1,6 @@
DefVar $reboot$
Set $reboot$ = "false"
if ($sereby_dotnet4.5$ = "reinstall")
Winbatch_dotnet4.5_uninstall
opsiservicecall_dotnet4.5_reinstall
Set $reboot$ = "true"
endif
if ($sereby_dotnet4.5$ = "uninstall")
Winbatch_dotnet4.5_uninstall
opsiservicecall_dotnet4.5_uninstall
Set $reboot$ = "true"
endif
if ($sereby_dotnet4.6$ = "reinstall")
Winbatch_dotnet4.6_uninstall
opsiservicecall_dotnet4.6_reinstall
@@ -146,135 +135,6 @@ if ($reboot$ = "true")
ExitWindows /ImmediateReboot
endif
[Winbatch_dotnet1.1_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 1.0 /u"
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 1.1 /u"
[opsiservicecall_dotnet1.1_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet1.1",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet1.1_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet1.1",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet2.0_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 2.0 /u"
[opsiservicecall_dotnet2.0_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet2.0",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet2.0_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet2.0",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet3.0_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 3.0 /u"
[opsiservicecall_dotnet3.0_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet3.0",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet3.0_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet3.0",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet3.5_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 3.5 /u"
[opsiservicecall_dotnet3.5_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet3.5",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet3.5_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet3.5",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet4.0_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.0 /u"
[opsiservicecall_dotnet4.0_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.0",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet4.0_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.0",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet4.5_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5 /u"
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5.1 /u"
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5.2 /u"
[opsiservicecall_dotnet4.5_reinstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.5",
"install",
"%opsiserviceUser%"
]
[opsiservicecall_dotnet4.5_uninstall]
"method": "setProductProperty"
"params": [
"$ProductId$",
"sereby_dotnet4.5",
"none",
"%opsiserviceUser%"
]
[Winbatch_dotnet4.6_uninstall]
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.6 /u"
@@ -554,24 +414,3 @@ wmic /INTERACTIVE:OFF product where name="Adobe AIR" call uninstall
"%opsiserviceUser%"
]
; windows xp dotnet bug uninstall
; uninstall all languages and then remove .net
[Winbatch_uninstall_msi_net35_deu_32]
msiexec /x {052FDD78-A6EA-3187-8386-C82F4CA3A929} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net30_deu_32]
msiexec /x {C2C284D2-6BD7-3B34-B0C5-B2CAED168DF7} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net20_deu_32]
msiexec /x {C314CE45-3392-3B73-B4E1-139CD41CA933} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net11_deu_32]
msiexec /x {E78BFA60-5393-4C38-82AB-E8019E464EB4} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net40_extended_deu_32]
msiexec /x {C911A0C2-2236-3164-AA47-F2566C01AE5E} /qb! REBOOT=ReallySuppress
[Winbatch_uninstall_msi_net40_client_deu_32]
msiexec /x {F750C986-5310-3A5A-95F8-4EC71C8AC01C} /qb! REBOOT=ReallySuppress

View File

@@ -1,9 +1,6 @@
DosInAnIcon_init_config
if ($sereby_dotnet4.5$ = "install")
DosInAnIcon_dotnet4.5_config
endif
if ($sereby_dotnet4.6$ = "install")
DosInAnIcon_dotnet4.6_config
endif
@@ -55,10 +52,6 @@ xml ed -O -u "/settings/timer[@value=40]/@value" -v $sereby_timer_value$ "$LogDi
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $sereby_timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
[DosInAnIcon_dotnet4.5_config]
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"

View File

@@ -4,8 +4,6 @@ DefVar $sereby_timer_value$
Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "5")
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$