Bump .net and rename .net to 4.5
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<package id="net4.5.1" name=".NET Framework 4.5.1" group="Microsoft .NET Framework" priority="44">
|
||||
<package id="net4.5" name=".NET Framework 4.5" group="Microsoft .NET Framework" priority="44">
|
||||
<check type="os" condition=">" value="6.0.6002.0" />
|
||||
<check type="os" condition="<" value="6.2.9200.0" />
|
||||
<check type="file" condition="<" value="4.0.30319.18408" path="%Windir%\Microsoft.NET\Framework\v4.0.30319\System.dll" />
|
||||
@@ -56,9 +56,9 @@ if ($sereby_dotnet4.0$ = "reinstall")
|
||||
opsiservicecall_dotnet4.0_uninstall
|
||||
Set $reboot$ = "true"
|
||||
endif
|
||||
if ($sereby_dotnet4.5.1$ = "reinstall")
|
||||
Winbatch_dotnet4.5.1_uninstall
|
||||
opsiservicecall_dotnet4.5.1_uninstall
|
||||
if ($sereby_dotnet4.5$ = "reinstall")
|
||||
Winbatch_dotnet4.5_uninstall
|
||||
opsiservicecall_dotnet4.5_uninstall
|
||||
Set $reboot$ = "true"
|
||||
endif
|
||||
|
||||
@@ -196,14 +196,14 @@ endif
|
||||
"%opsiserviceUser%"
|
||||
]
|
||||
|
||||
[Winbatch_dotnet4.5.1_uninstall]
|
||||
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5.1 /u"
|
||||
[Winbatch_dotnet4.5_uninstall]
|
||||
%ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 4.5 /u"
|
||||
|
||||
[opsiservicecall_dotnet4.5.1_uninstall]
|
||||
[opsiservicecall_dotnet4.5_uninstall]
|
||||
"method": "setProductProperty"
|
||||
"params": [
|
||||
"$ProductId$",
|
||||
"sereby_dotnet4.5.1",
|
||||
"sereby_dotnet4.5",
|
||||
"install",
|
||||
"%opsiserviceUser%"
|
||||
]
|
||||
|
||||
@@ -16,8 +16,8 @@ endif
|
||||
if ($sereby_dotnet4.0$ = "install")
|
||||
DosInAnIcon_dotnet4.0_config
|
||||
endif
|
||||
if ($sereby_dotnet4.5.1$ = "install")
|
||||
DosInAnIcon_dotnet4.5.1_config
|
||||
if ($sereby_dotnet4.5$ = "install")
|
||||
DosInAnIcon_dotnet4.5_config
|
||||
endif
|
||||
if ($sereby_win8xdotnet3x$ = "install")
|
||||
DosInAnIcon_win8xdotnet3x_config
|
||||
@@ -90,9 +90,9 @@ xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v 1 "$LogDir$\WinPKG
|
||||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
|
||||
[DosInAnIcon_dotnet4.5.1_config]
|
||||
[DosInAnIcon_dotnet4.5_config]
|
||||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
xml ed -O -u "/settings/set[@component='net4.5.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml"
|
||||
|
||||
[DosInAnIcon_win8xdotnet3x_config]
|
||||
copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old"
|
||||
|
||||
@@ -14,8 +14,8 @@ DefVar $sereby_dotnet3.5$
|
||||
Set $sereby_dotnet3.5$ = GetProductProperty("sereby_dotnet3.5", "install")
|
||||
DefVar $sereby_dotnet4.0$
|
||||
Set $sereby_dotnet4.0$ = GetProductProperty("sereby_dotnet4.0", "none")
|
||||
DefVar $sereby_dotnet4.5.1$
|
||||
Set $sereby_dotnet4.5.1$ = GetProductProperty("sereby_dotnet4.5.1", "install")
|
||||
DefVar $sereby_dotnet4.5$
|
||||
Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install")
|
||||
DefVar $sereby_win8xdotnet3x$
|
||||
Set $sereby_win8xdotnet3x$ = GetProductProperty("sereby_win8xdotnet3x", "install")
|
||||
DefVar $sereby_msjsharp$
|
||||
|
||||
Reference in New Issue
Block a user