Commit eaa35d66 authored by aker@wsusoffline's avatar aker@wsusoffline
Browse files

- [UNTESTED] Support added for .NET 5 (Thanks to "aker" and "boco")

parent bbabda11
......@@ -14,7 +14,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 12.5.0)
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.5 (b3)"
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.5 (b4)"
Dim Const $title = $caption & " - Generator"
Dim Const $downloadURL = "https://gitlab.com/wsusoffline/"
Dim Const $downloadLogFile = "download.log"
......
......@@ -15,7 +15,7 @@
#pragma compile(ProductName, "WSUS Offline Update - Community Edition")
#pragma compile(ProductVersion, 12.5.0)
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.5 (b3) - Installer"
Dim Const $caption = "WSUS Offline Update - Community Edition - 12.5 (b4) - Installer"
; Registry constants
Dim Const $reg_key_wsh_hklm64 = "HKLM64\Software\Microsoft\Windows Script Host\Settings"
......
......@@ -60,6 +60,9 @@ Dim cpp2010_x86_old, cpp2010_x86_new, cpp2010_x64_old, cpp2010_x64_new
Dim cpp2012_x86_old, cpp2012_x86_new, cpp2012_x64_old, cpp2012_x64_new
Dim cpp2013_x86_old, cpp2013_x86_new, cpp2013_x64_old, cpp2013_x64_new
Dim cpp2019_x86_old, cpp2019_x86_new, cpp2019_x64_old, cpp2019_x64_new
Dim dotNET5_Runtime_x86_old, dotNET5_Runtime_x86_new, dotNET5_Runtime_x64_old, dotNET5_Runtime_x64_new
Dim dotNET5_DesktopRuntime_x86_old, dotNET5_DesktopRuntime_x86_new, dotNET5_DesktopRuntime_x64_old, dotNET5_DesktopRuntime_x64_new
Dim dotNET5_ASPNETRuntime_x86_old, dotNET5_ASPNETRuntime_x86_new, dotNET5_ASPNETRuntime_x64_old, dotNET5_ASPNETRuntime_x64_new
Private Function RegExists(objShell, strName)
Dim dummy
......@@ -635,6 +638,18 @@ cpp2019_x86_old = False
cpp2019_x86_new = False
cpp2019_x64_old = False
cpp2019_x64_new = False
dotNET5_Runtime_x86_old = False
dotNET5_Runtime_x64_old = False
dotNET5_Runtime_x86_new = False
dotNET5_Runtime_x64_new = False
dotNET5_DesktopRuntime_x86_old = False
dotNET5_DesktopRuntime_x64_old = False
dotNET5_DesktopRuntime_x86_new = False
dotNET5_DesktopRuntime_x64_new = False
dotNET5_ASPNETRuntime_x86_old = False
dotNET5_ASPNETRuntime_x64_old = False
dotNET5_ASPNETRuntime_x86_new = False
dotNET5_ASPNETRuntime_x64_new = False
Set objInstaller = CreateObject("WindowsInstaller.Installer")
For Each strProduct In objInstaller.Products
Select Case UCase(strProduct)
......@@ -759,6 +774,30 @@ For Each strProduct In objInstaller.Products
cpp2019_x86_new = True
Case "{26AF0C35-55EC-4025-8D83-349E8FB1419F}", "{7D0362D5-C699-4403-BC09-0C1DAD1D93AB}"
cpp2019_x64_new = True
Case "{364D5AED-307A-423D-AABC-E68FFDDAA513}", "{C8878F77-0D03-4303-ACBA-C114001B3261}", "{C1213BF8-6544-4AB7-A439-6ECAF59C64F2}"
dotNET5_Runtime_x86_old = True
Case "{FE6FF6ED-93DE-42E3-991D-346F0C1FC187}", "{1D88C674-5064-4E7F-BB8C-1E6F8374C35D}", "{0DA2670C-83CF-4F3A-929C-19FB3C26B094}"
dotNET5_Runtime_x64_old = True
Case "{138E0C15-7714-4E60-BCED-E3A113C82CBC}", "{C0311FD6-C773-4F5C-804A-CE7E5E03CCF3}", "{22617777-0F0E-4CB8-BDA6-9EC8F8B0E0F1}"
dotNET5_Runtime_x86_new = True
Case "{0247081A-1F68-4F20-BC87-07F5A66E5CB9}", "{1219DD98-A1A0-44BD-9ED1-B58F31F52F31}", "{96EB5175-8755-4344-B5C1-3996EB58D8A4}"
dotNET5_Runtime_x64_new = True
Case "{445166D9-79B3-4768-B515-4B7FCD43DF8E}"
dotNET5_DesktopRuntime_x86_old = True
Case "{B4FC1E81-3264-49A2-80C7-24C296546D67}"
dotNET5_DesktopRuntime_x64_old = True
Case "{11A04ABA-50D9-47DC-9AEB-DB0A0CB14D67}"
dotNET5_DesktopRuntime_x86_new = True
Case "{54424219-B505-485F-B3DA-9F1DA802FFC5}"
dotNET5_DesktopRuntime_x64_new = True
Case "{6BD7DD23-C813-3592-931C-74A5812AF305}"
dotNET5_ASPNETRuntime_x86_old = True
Case "{42FA1C47-718A-3946-9570-144D5B9FAFA9}"
dotNET5_ASPNETRuntime_x64_old = True
Case "{C30E7D63-6765-3027-8E8B-C0CEBECA99E3}"
dotNET5_ASPNETRuntime_x86_new = True
Case "{538D264D-7A4A-32F4-ADE5-A3E1A371C99D}"
dotNET5_ASPNETRuntime_x64_new = True
End Select
Next
......@@ -775,5 +814,12 @@ If (cpp2013_x64_old) And (Not cpp2013_x64_new) Then objCmdFile.WriteLine("set CP
If (cpp2019_x86_old) And (Not cpp2019_x86_new) Then objCmdFile.WriteLine("set CPP_2019_x86=1")
If (cpp2019_x64_old) And (Not cpp2019_x64_new) Then objCmdFile.WriteLine("set CPP_2019_x64=1")
If (dotNET5_Runtime_x86_old) And (Not dotNET5_Runtime_x86_new) And (Not ((dotNET5_DesktopRuntime_x86_old) And (Not dotNET5_DesktopRuntime_x86_new))) Then objCmdFile.WriteLine("set DOTNET5_RUNTIME_x86=1")
If (dotNET5_Runtime_x64_old) And (Not dotNET5_Runtime_x64_new) And (Not ((dotNET5_DesktopRuntime_x64_old) And (Not dotNET5_DesktopRuntime_x64_new))) Then objCmdFile.WriteLine("set DOTNET5_RUNTIME_x64=1")
If (dotNET5_DesktopRuntime_x86_old) And (Not dotNET5_DesktopRuntime_x86_new) Then objCmdFile.WriteLine("set DOTNET5_DESKTOPRUNTIME_x86=1")
If (dotNET5_DesktopRuntime_x64_old) And (Not dotNET5_DesktopRuntime_x64_new) Then objCmdFile.WriteLine("set DOTNET5_DESKTOPRUNTIME_x64=1")
If (dotNET5_ASPNETRuntime_x86_old) And (Not dotNET5_ASPNETRuntime_x86_new) Then objCmdFile.WriteLine("set DOTNET5_ASPNET_x86=1")
If (dotNET5_ASPNETRuntime_x64_old) And (Not dotNET5_ASPNETRuntime_x64_new) Then objCmdFile.WriteLine("set DOTNET5_ASPNET_x64=1")
objCmdFile.Close
WScript.Quit(0)
......@@ -30,7 +30,7 @@ if "%DIRCMD%" NEQ "" set DIRCMD=
cd /D "%~dp0"
set WSUSOFFLINE_VERSION=12.5 (b3)
set WSUSOFFLINE_VERSION=12.5 (b4)
title %~n0 %*
echo Starting WSUS Offline Update - Community Edition - v. %WSUSOFFLINE_VERSION% at %TIME%...
set UPDATE_LOGFILE=%SystemRoot%\wsusofflineupdate.log
......@@ -898,6 +898,266 @@ set RECALL_REQUIRED=1
:SkipWMFInst
if "%RECALL_REQUIRED%"=="1" goto Installed
rem *** .NET 5 and newer ***
echo Checking .NET 5 (and newer) installation state...
if exist %SystemRoot%\Temp\wou_dotnet5_tried.txt goto SkipDotNet5Inst
if not exist %SystemRoot%\Temp\nul md %SystemRoot%\Temp
echo. >%SystemRoot%\Temp\wou_dotnet5_tried.txt
goto InstDotNet5%OS_ARCH%
:InstDotNet5x64
if not "%DOTNET5_DESKTOPRUNTIME_x64%"=="1" goto SkipDotNet5DesktopRuntimex64
set DOTNET5_FILENAME=..\dotnet\windowsdesktop-runtime-*-win-x64.exe
dir /B %DOTNET5_FILENAME% >nul 2>&1
if errorlevel 1 (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5DesktopRuntimex64
)
for /F %%i in ('dir /B %DOTNET5_FILENAME%') do (
if not "%%i"=="" set DOTNET5_FILENAME_REAL=%%i
)
if "%DOTNET5_FILENAME_REAL%"=="" (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5DesktopRuntimex64
)
echo Installing .NET 5 (and newer) Windows Desktop Runtime (x64)...
if not exist "..\md\hashes-dotnet.txt" (
echo Warning: Hash file ..\md\hashes-dotnet.txt not found.
call :Log "Warning: Hash file ..\md\hashes-dotnet.txt not found"
goto SkipDotNet5DesktopRuntimex64Verify
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
%SystemRoot%\System32\findstr.exe /L /I /C:%% /C:## /C:"%DOTNET5_FILENAME_REAL%" ..\md\hashes-dotnet.txt >"%TEMP%\hash-ieLangPack.txt"
%HASHDEEP_PATH% -a -l -k "%TEMP%\hash-dotnet5.txt" "%DOTNET5_FILENAME_REAL%"
if errorlevel 1 (
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
echo ERROR: File hash does not match stored value ^(%DOTNET5_FILENAME_REAL%^).
call :Log "Error: File hash does not match stored value (%DOTNET5_FILENAME_REAL%)"
goto SkipDotNet5DesktopRuntimex64
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
:SkipDotNet5DesktopRuntimex64Verify
call InstallOSUpdate.cmd %DOTNET5_FILENAME_REAL% %VERIFY_MODE% /ignoreerrors /install /quiet /norestart
if errorlevel 1 (
if not exist %SystemRoot%\Temp\nul md %SystemRoot%\Temp
echo. >%SystemRoot%\Temp\wou_dotnet5_tried.txt
goto SkipDotNet5Inst
)
:SkipDotNet5DesktopRuntimex64
if "%DOTNET5_DESKTOPRUNTIME_x64%"=="1" goto SkipDotNet5Runtimex64
if not "%DOTNET5_RUNTIME_x64%"=="1" goto SkipDotNet5Runtimex64
set DOTNET5_FILENAME=..\dotnet\dotnet-runtime-*-win-x64.exe
dir /B %DOTNET5_FILENAME% >nul 2>&1
if errorlevel 1 (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5Runtimex64
)
for /F %%i in ('dir /B %DOTNET5_FILENAME%') do (
if not "%%i"=="" set DOTNET5_FILENAME_REAL=%%i
)
if "%DOTNET5_FILENAME_REAL%"=="" (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5Runtimex64
)
echo Installing .NET 5 (and newer) Windows Runtime (x64)...
if not exist "..\md\hashes-dotnet.txt" (
echo Warning: Hash file ..\md\hashes-dotnet.txt not found.
call :Log "Warning: Hash file ..\md\hashes-dotnet.txt not found"
goto SkipDotNet5Runtimex64Verify
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
%SystemRoot%\System32\findstr.exe /L /I /C:%% /C:## /C:"%DOTNET5_FILENAME_REAL%" ..\md\hashes-dotnet.txt >"%TEMP%\hash-ieLangPack.txt"
%HASHDEEP_PATH% -a -l -k "%TEMP%\hash-dotnet5.txt" "%DOTNET5_FILENAME_REAL%"
if errorlevel 1 (
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
echo ERROR: File hash does not match stored value ^(%DOTNET5_FILENAME_REAL%^).
call :Log "Error: File hash does not match stored value (%DOTNET5_FILENAME_REAL%)"
goto SkipDotNet5Runtimex64
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
:SkipDotNet5Runtimex64Verify
call InstallOSUpdate.cmd %DOTNET5_FILENAME_REAL% %VERIFY_MODE% /ignoreerrors /install /quiet /norestart
if errorlevel 1 (
if not exist %SystemRoot%\Temp\nul md %SystemRoot%\Temp
echo. >%SystemRoot%\Temp\wou_dotnet5_tried.txt
goto SkipDotNet5Inst
)
:SkipDotNet5Runtimex64
if not "%DOTNET5_ASPNET_x64%"=="1" goto SkipDotNet5AspNetx64
set DOTNET5_FILENAME=..\dotnet\aspnetcore-runtime-*-win-x64.exe
dir /B %DOTNET5_FILENAME% >nul 2>&1
if errorlevel 1 (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5AspNetx64
)
for /F %%i in ('dir /B %DOTNET5_FILENAME%') do (
if not "%%i"=="" set DOTNET5_FILENAME_REAL=%%i
)
if "%DOTNET5_FILENAME_REAL%"=="" (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5AspNetx64
)
echo Installing .NET 5 (and newer) ASP.NET Core Runtime (x64)...
if not exist "..\md\hashes-dotnet.txt" (
echo Warning: Hash file ..\md\hashes-dotnet.txt not found.
call :Log "Warning: Hash file ..\md\hashes-dotnet.txt not found"
goto SkipDotNet5AspNetx64Verify
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
%SystemRoot%\System32\findstr.exe /L /I /C:%% /C:## /C:"%DOTNET5_FILENAME_REAL%" ..\md\hashes-dotnet.txt >"%TEMP%\hash-ieLangPack.txt"
%HASHDEEP_PATH% -a -l -k "%TEMP%\hash-dotnet5.txt" "%DOTNET5_FILENAME_REAL%"
if errorlevel 1 (
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
echo ERROR: File hash does not match stored value ^(%DOTNET5_FILENAME_REAL%^).
call :Log "Error: File hash does not match stored value (%DOTNET5_FILENAME_REAL%)"
goto SkipDotNet5AspNetx64
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
:SkipDotNet5AspNetx64Verify
call InstallOSUpdate.cmd %DOTNET5_FILENAME_REAL% %VERIFY_MODE% /ignoreerrors /install /quiet /norestart
if errorlevel 1 (
if not exist %SystemRoot%\Temp\nul md %SystemRoot%\Temp
echo. >%SystemRoot%\Temp\wou_dotnet5_tried.txt
goto SkipDotNet5Inst
)
:SkipDotNet5AspNetx64
:InstDotNet5x86
if not "%DOTNET5_DESKTOPRUNTIME_x86%"=="1" goto SkipDotNet5DesktopRuntimex86
set DOTNET5_FILENAME=..\dotnet\windowsdesktop-runtime-*-win-x86.exe
dir /B %DOTNET5_FILENAME% >nul 2>&1
if errorlevel 1 (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5DesktopRuntimex86
)
for /F %%i in ('dir /B %DOTNET5_FILENAME%') do (
if not "%%i"=="" set DOTNET5_FILENAME_REAL=%%i
)
if "%DOTNET5_FILENAME_REAL%"=="" (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5DesktopRuntimex86
)
echo Installing .NET 5 (and newer) Windows Desktop Runtime (x86)...
if not exist "..\md\hashes-dotnet.txt" (
echo Warning: Hash file ..\md\hashes-dotnet.txt not found.
call :Log "Warning: Hash file ..\md\hashes-dotnet.txt not found"
goto SkipDotNet5DesktopRuntimex86Verify
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
%SystemRoot%\System32\findstr.exe /L /I /C:%% /C:## /C:"%DOTNET5_FILENAME_REAL%" ..\md\hashes-dotnet.txt >"%TEMP%\hash-ieLangPack.txt"
%HASHDEEP_PATH% -a -l -k "%TEMP%\hash-dotnet5.txt" "%DOTNET5_FILENAME_REAL%"
if errorlevel 1 (
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
echo ERROR: File hash does not match stored value ^(%DOTNET5_FILENAME_REAL%^).
call :Log "Error: File hash does not match stored value (%DOTNET5_FILENAME_REAL%)"
goto SkipDotNet5DesktopRuntimex86
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
:SkipDotNet5DesktopRuntimex86Verify
call InstallOSUpdate.cmd %DOTNET5_FILENAME_REAL% %VERIFY_MODE% /ignoreerrors /install /quiet /norestart
if errorlevel 1 (
if not exist %SystemRoot%\Temp\nul md %SystemRoot%\Temp
echo. >%SystemRoot%\Temp\wou_dotnet5_tried.txt
goto SkipDotNet5Inst
)
:SkipDotNet5DesktopRuntimex86
if "%DOTNET5_DESKTOPRUNTIME_x86%"=="1" goto SkipDotNet5Runtimex86
if not "%DOTNET5_RUNTIME_x86%"=="1" goto SkipDotNet5Runtimex86
set DOTNET5_FILENAME=..\dotnet\dotnet-runtime-*-win-x86.exe
dir /B %DOTNET5_FILENAME% >nul 2>&1
if errorlevel 1 (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5Runtimex86
)
for /F %%i in ('dir /B %DOTNET5_FILENAME%') do (
if not "%%i"=="" set DOTNET5_FILENAME_REAL=%%i
)
if "%DOTNET5_FILENAME_REAL%"=="" (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5Runtimex86
)
echo Installing .NET 5 (and newer) Windows Runtime (x86)...
if not exist "..\md\hashes-dotnet.txt" (
echo Warning: Hash file ..\md\hashes-dotnet.txt not found.
call :Log "Warning: Hash file ..\md\hashes-dotnet.txt not found"
goto SkipDotNet5Runtimex86Verify
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
%SystemRoot%\System32\findstr.exe /L /I /C:%% /C:## /C:"%DOTNET5_FILENAME_REAL%" ..\md\hashes-dotnet.txt >"%TEMP%\hash-ieLangPack.txt"
%HASHDEEP_PATH% -a -l -k "%TEMP%\hash-dotnet5.txt" "%DOTNET5_FILENAME_REAL%"
if errorlevel 1 (
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
echo ERROR: File hash does not match stored value ^(%DOTNET5_FILENAME_REAL%^).
call :Log "Error: File hash does not match stored value (%DOTNET5_FILENAME_REAL%)"
goto SkipDotNet5Runtimex86
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
:SkipDotNet5Runtimex86Verify
call InstallOSUpdate.cmd %DOTNET5_FILENAME_REAL% %VERIFY_MODE% /ignoreerrors /install /quiet /norestart
if errorlevel 1 (
if not exist %SystemRoot%\Temp\nul md %SystemRoot%\Temp
echo. >%SystemRoot%\Temp\wou_dotnet5_tried.txt
goto SkipDotNet5Inst
)
:SkipDotNet5Runtimex86
if not "%DOTNET5_ASPNET_x86%"=="1" goto SkipDotNet5AspNetx86
set DOTNET5_FILENAME=..\dotnet\aspnetcore-runtime-*-win-x86.exe
dir /B %DOTNET5_FILENAME% >nul 2>&1
if errorlevel 1 (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5AspNetx86
)
for /F %%i in ('dir /B %DOTNET5_FILENAME%') do (
if not "%%i"=="" set DOTNET5_FILENAME_REAL=%%i
)
if "%DOTNET5_FILENAME_REAL%"=="" (
echo Warning: File %DOTNET5_FILENAME% not found.
call :Log "Warning: File %DOTNET5_FILENAME% not found"
goto SkipDotNet5AspNetx86
)
echo Installing .NET 5 (and newer) ASP.NET Core Runtime (x86)...
if not exist "..\md\hashes-dotnet.txt" (
echo Warning: Hash file ..\md\hashes-dotnet.txt not found.
call :Log "Warning: Hash file ..\md\hashes-dotnet.txt not found"
goto SkipDotNet5AspNetx86Verify
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
%SystemRoot%\System32\findstr.exe /L /I /C:%% /C:## /C:"%DOTNET5_FILENAME_REAL%" ..\md\hashes-dotnet.txt >"%TEMP%\hash-ieLangPack.txt"
%HASHDEEP_PATH% -a -l -k "%TEMP%\hash-dotnet5.txt" "%DOTNET5_FILENAME_REAL%"
if errorlevel 1 (
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
echo ERROR: File hash does not match stored value ^(%DOTNET5_FILENAME_REAL%^).
call :Log "Error: File hash does not match stored value (%DOTNET5_FILENAME_REAL%)"
goto SkipDotNet5AspNetx86
)
if exist "%TEMP%\hash-dotnet5.txt" del "%TEMP%\hash-dotnet5.txt"
:SkipDotNet5AspNetx86Verify
call InstallOSUpdate.cmd %DOTNET5_FILENAME_REAL% %VERIFY_MODE% /ignoreerrors /install /quiet /norestart
if errorlevel 1 (
if not exist %SystemRoot%\Temp\nul md %SystemRoot%\Temp
echo. >%SystemRoot%\Temp\wou_dotnet5_tried.txt
goto SkipDotNet5Inst
)
:SkipDotNet5AspNetx86
:DotNet5Installed
if "%RECALL_REQUIRED%"=="1" goto Installed
:SkipDotNet5Inst
rem *** Update Windows Defender definitions ***
echo Checking Windows Defender installation state...
if "%WD_INSTALLED%" NEQ "1" goto SkipWDInst
......
......@@ -35,7 +35,7 @@ if "%DIRCMD%" NEQ "" set DIRCMD=
cd /D "%~dp0"
set WSUSOFFLINE_VERSION=12.5 (b3)
set WSUSOFFLINE_VERSION=12.5 (b4)
title %~n0 %1 %2 %3 %4 %5 %6 %7 %8 %9
echo Starting WSUS Offline Update - Community Edition - download v. %WSUSOFFLINE_VERSION% for %1 %2...
set DOWNLOAD_LOGFILE=..\log\download.log
......
......@@ -1786,3 +1786,4 @@ Community Edition 12.4 -- 06.12.2020
--------------------------------------------------------------------------------
Community Edition 12.5 -- ??.??.????
- Support removed for Windows 10 version 1903 since Microsoft discontinued support for it on December 8th, 2020
- [UNTESTED] Support added for .NET 5 (Thanks to "aker" and "boco")
http://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0fd66638cde16859462a6243a4629a50/ndp48-x86-x64-allos-enu.exe
http://download.visualstudio.microsoft.com/download/pr/7afca223-55d2-470a-8edc-6a1739ae3252/65592cace88fcfb3e14a5c4a54833794/ndp48-x86-x64-allos-deu.exe
https://download.visualstudio.microsoft.com/download/pr/f4fb5042-8134-4434-8835-499eb2f18b38/6a0d857f6f1833f5c54fbbe5ead028a7/dotnet-runtime-5.0.1-win-x86.exe
https://download.visualstudio.microsoft.com/download/pr/93095e51-be33-4b28-99c8-5ae0ebba753d/501f77f4b95d2e9c3481246a3eff9956/dotnet-runtime-5.0.1-win-x64.exe
https://download.visualstudio.microsoft.com/download/pr/55bb1094-db40-411d-8a37-21186e9495ef/1a045e29541b7516527728b973f0fdef/windowsdesktop-runtime-5.0.1-win-x86.exe
https://download.visualstudio.microsoft.com/download/pr/c6a74d6b-576c-4ab0-bf55-d46d45610730/f70d2252c9f452c2eb679b8041846466/windowsdesktop-runtime-5.0.1-win-x64.exe
https://download.visualstudio.microsoft.com/download/pr/7d6ed29e-5c0d-47b4-8436-7f1d21a0bca4/e8609f033ad936c117f2d90b86fd05c4/aspnetcore-runtime-5.0.1-win-x86.exe
https://download.visualstudio.microsoft.com/download/pr/48dd125b-b9ca-4fc7-b26c-558bff5bee13/214be31c3239444d4a9cfdf0574f3cd8/aspnetcore-runtime-5.0.1-win-x64.exe
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment