mirror of
https://github.com/AveYo/MediaCreationTool.bat.git
synced 2025-04-05 18:40:44 +00:00
Improve script readability and robustness
- General Improvements: - Refactored code to enhance readability and maintainability with improved indentation and spacing. - Added explanatory comments throughout the code to clarify functionality, improving understanding for future developers. - Features: - Implemented a Windows version check to ensure compatibility before executing the script. - Enhanced error handling in critical sections, such as checking for the existence of files and directories, to ensure more robust execution. - Optimizations: - Grouped variable initializations for greater clarity and consistency. - Applied consistent formatting throughout the code to facilitate reading and comprehension.
This commit is contained in:
Light Yagami
parent
2f1f304652
commit
0249bec084
175
README.md
175
README.md
@ -1,128 +1,71 @@
|
||||
Not just an Universal MediaCreationTool wrapper script with ingenious support for business editions,
|
||||
<img src="preview.png">
|
||||
A powerful yet simple windows 10 / 11 deployment automation tool as well!
|
||||
*If you had no success launching the script so far, this latest version will work*
|
||||
|
||||
|
||||
|
||||
Presets
|
||||
-------
|
||||
1 ***Auto Upgrade*** with detected media, script assists setupprep for upgrading directly
|
||||
> _- can keep files and apps on more scenarios where os and target edition does not match_
|
||||
> _- can switch detected edition by adding EditionID to script name_
|
||||
> _- can troubleshoot upgrade failing by adding `no_update` to script name_
|
||||
> _- auto defaults to 11, so pass version as well for 10: `auto 21H2 MediaCreationTool.bat`_
|
||||
# Universal MediaCreationTool Wrapper Script
|
||||
|
||||
2 ***Auto ISO*** with detected media in current folder directly _(or C:\ESD if run from zip)_
|
||||
> _- can override detected media by adding edition name / language / arch to script name_
|
||||
> _- example: `21H1 Education en-US x86 iso MediaCreationTool.bat`_
|
||||
This script is an enhanced fork of [AveYo/MediaCreationTool.bat](https://github.com/AveYo/MediaCreationTool.bat). It is not only a sophisticated wrapper for the MediaCreationTool but also a comprehensive automation utility for deploying Windows 10 and 11. The enhancements include robust support for business editions and additional deployment features.
|
||||
|
||||
3 ***Auto USB*** with detected media in specified usb target
|
||||
> _- for data safety, this is not fully automated - must select the usb drive manually in GUI_
|
||||
|
||||
|
||||
4 ***Select*** with user picked Edition, Language, Arch (x86,x64,both) - on specified target
|
||||
> _- implicit choice, includes setup override files (disable by adding `def` to script name)_
|
||||
*If you have encountered issues with previous versions, this latest update should address them.*
|
||||
|
||||
5 ***MCT Defaults*** runs unassisted, creating media without script modification
|
||||
> _- no added files, script passes `products.xml` to MCT and quits without touching media_
|
||||
## Features
|
||||
|
||||
1-4 presets will modify created media in the following ways:
|
||||
> _- write `auto.cmd` to run on demand for auto upgrade with edition switch and skip tpm_
|
||||
> _- write `$ISO$` folder content (if it exists) at the root of the media_
|
||||
> _if you previously used $OEM$ content, must now place it in `$ISO$\sources\$OEM$\`_
|
||||
> _- write `sources\PID.txt` to preselect edition at media boot or within windows (if configured)_
|
||||
> _- write `sources\EI.cfg` to prevent product key prompt on Windows 11 consumer media (11 only)_
|
||||
> _- write `AutoUnattend.xml` in boot.wim to enable local account on Windows 11 Home (11 only)_
|
||||
> _- patch `winsetup.dll` in boot.wim to remove windows 11 setup checks when booting from media (11 only)_
|
||||
> _- can disable by adding `def` to script name for a default, untouched MCT media_
|
||||
### Presets
|
||||
|
||||
Simple deployment
|
||||
-----------------
|
||||
**auto.cmd** is behind ***Auto Upgrade*** preset via GUI
|
||||
Can run it fully unnatended by renaming script with `auto MediaCreationTool.bat`
|
||||
Makes it easy to upgrade keeping files and apps when the OS edition does not match the media
|
||||
Should allow upgrade from Ultimate, PosReady, Embedded, LTSC or Enterprise Eval as well
|
||||
1. **Auto Upgrade**
|
||||
- **Purpose:** Facilitates direct OS upgrades using detected media.
|
||||
- **Options:**
|
||||
- Retain files and apps even if the OS edition does not match the target edition.
|
||||
- Switch the detected edition by appending `EditionID` to the script name.
|
||||
- Troubleshoot upgrade failures by appending `no_update` to the script name.
|
||||
- Defaults to Windows 11; to target Windows 10, include the version in the script name, e.g., `auto 21H2 MediaCreationTool.bat`.
|
||||
|
||||
Generated script is added to the created media so you can run it again at any time
|
||||
It is fairly generic - it will detect available editions in install.esd, pick a suitable index,
|
||||
then set EditionID in the registry to match; can even force another edition, keeping files and apps!
|
||||
On 11, it will try to skip setup checks (can disable this behavior with script var)
|
||||
Finally, it sets recommended setup options with least amount of issues on upgrades
|
||||
2. **Auto ISO**
|
||||
- **Purpose:** Creates an ISO using detected media in the current folder (or `C:\ESD` if running from a zip).
|
||||
- **Options:**
|
||||
- Override detected media by specifying edition name, language, and architecture in the script name.
|
||||
- Example: `21H1 Education en-US x86 iso MediaCreationTool.bat`.
|
||||
|
||||
> Let's say the current OS is Enterprise LTSC 2019, and you use the business media to upgrade:
|
||||
> **auto.cmd** selects Enterprise index and adjust EditionID to Enterprise in the registry (backed up as EditionID_undo)
|
||||
> Maybe you also want to switch edition,
|
||||
> ex. by renaming the script to `ProfessionalWorkstation MediaCreationTool.bat`:
|
||||
> **auto.cmd** selects Professional index and sets EditionID to ProfessionalWorkstation in the registry.
|
||||
>
|
||||
> Let's say the OS is Windows 7 Ultimate or PosReady, and you use the consumer media to upgrade:
|
||||
> **auto.cmd** selects Professional index, and sets EditionID to Professional or Enterprise, respectively.
|
||||
> In all cases, the script tries to pick an existing index, else a compatible one to keep files and apps on upgrade.
|
||||
>
|
||||
> Let's say you have a dozen PCs spread with versions: 7, 8.1, 10 and editions: Ultimate, Home, Enterprise LTSB..
|
||||
> If you need to upgrade all to the latest 10 version and only use Pro, you could rename the script as:
|
||||
> `auto 21H2 Pro MediaCreationTool.bat`
|
||||
>
|
||||
> Can even add a VL / MAK / retail product key in the same way to take care of licensing differences.
|
||||
> The script also picks up any `$ISO$` folder in the current location - for $OEM$ branding, configuration, tweaks etc.
|
||||
3. **Auto USB**
|
||||
- **Purpose:** Creates bootable media on a specified USB drive.
|
||||
- **Note:** Manual USB drive selection is required in the GUI for data safety.
|
||||
|
||||
Changelog
|
||||
---------
|
||||
_No need to right-click Run as Admin, script will ask itself. Directly saving the Raw files no longer breaks line endings_
|
||||
_We did it! We broke [the previous gist](https://git.io/MediaCreationTool.bat)_ ;) So this is the new home. **Thank you all!**
|
||||
4. **Select**
|
||||
- **Purpose:** Manually select Edition, Language, and Architecture (x86, x64, or both) for a specified target.
|
||||
- **Options:** Includes setup override files by default (can be disabled by appending `def` to the script name).
|
||||
|
||||
[discuss on MDL](https://forums.mydigitallife.net/threads/universal-mediacreationtool-wrapper-script-create-windows-11-media-with-automatic-bypass.84168/)
|
||||
5. **MCT Defaults**
|
||||
- **Purpose:** Executes without user intervention, creating media without modifying the script.
|
||||
- **Note:** Passes `products.xml` to the MediaCreationTool and exits without altering the media.
|
||||
|
||||
```
|
||||
2018.10.10: reinstated 1809 [RS5]! using native xml patching for products.xml; fixed syntax bug with exit/b
|
||||
2018.10.12: added data loss warning for RS5
|
||||
2018.11.13: RS5 is officially back! + greatly improved choices dialog - feel free to use the small snippet in your own scripts
|
||||
2019.05.22: 1903 [19H1]
|
||||
2019.07.11: 1903 __release_svc_refresh__ and enable DynamicUpdate by default to grab latest CU
|
||||
2019.09.29: UPDATED 19H1 build 18362.356 ; RS5 build 17763.379 and show build number
|
||||
added LATEST MCT choice to dinamically download the current version (all others have hard-coded links)
|
||||
2019.11.16: 19H2 18363.418 as default choice (updated hard-coded links)
|
||||
2020.02.29: 19H2 18363.592
|
||||
2020.05.28: 2004 19041.264 first release
|
||||
2020.10.29: 20H2 and aniversary script refactoring to support all MCT versions from 1507 to 20H2!!!
|
||||
2020.10.30: hotfix utf-8, enterprise on 1909+
|
||||
2020.11.01: fix remove unsupported options in older versions code breaking when path has spaces.. pff
|
||||
2020.11.14: generate latest links for 1909,2004; all xml editing now in one go; resolved known cannot run script issues
|
||||
2020.11.15: one-time clear of cached MCT, as script generates proper 1.0 catalog for 1507,1511,1703 since last update
|
||||
fixed compatibility with naked windows 7 powershell 2.0 / IPv6 / optional import $OEM$ / 1803+ business typo
|
||||
updated executables links for 1903 and 2004
|
||||
2020.11.17: parse first commandline parameter as version, example: MediaCreationTool.bat 1909
|
||||
2020.12.01: attempt to fix reported issues with 1703; no other changes (skipping 19042.630 leaked esd because it is broken)
|
||||
2020.12.11: 20H2 19042.631; fixed pesky 1703 decryption bug on dual x86 + x64; improved cleanup; label includes version
|
||||
2021.03.20: pre-release 21H1; optional auto upgrade or create media presets importing $OEM$ folder and key as PID.txt
|
||||
2021.05.23: 21H1 release; enhanced script name args parsing, upgrade from embedded, auto.cmd / PID.txt / $OEM$ import
|
||||
2021.06.06: create iso directly; enhanced dialogs; args from script name or commandline; refactoring is complete!
|
||||
2021.08.04: done fiddling
|
||||
2021.09.03: 21H2, both 10 and 11 [unreleased]
|
||||
2021.09.25: Windows 11
|
||||
with Skip TPM Check on media boot as well as on dynamic update (standalone toggle script available)
|
||||
final touches for improved script reliability; enhanced auto upgrade preset; win 7 powershell 2.0 compatible
|
||||
2021.09.30: fix Auto Setup preset not launching.. automatically
|
||||
2021.10.04: fix for long standing tr localization quirks; Skip TPM Check v2 (ifeo-based instead of wmi)
|
||||
2021.10.05: 11 22000.194 Release (rofl W11 MCT has limited capabilities, so still using 21H1 MCT because it works fine)
|
||||
2021.10.09: outstanding refactoring around Windows 11 MCT; minimize while waiting MCT; unified 7 - 11 appearence
|
||||
2021.10.20: create generic iso if no edition arg; use Downloads folder; no 11 setup checks on boot in VirtualBox; fixes #2
|
||||
2021.10.23: 11 22000.258
|
||||
more intuitive presets; 11 setup override via AutoUnattend.xml or via boot.wim (for VirtualBox 5.x) with FIX arg
|
||||
only reliable ui automation; enhanced script output
|
||||
2021.11.03: multiple download methods; improved automation; improved auto.cmd; moved autounattend.xml to boot.wim
|
||||
revising 11 setup bypass (wip) - not being content with any methods is the reason why I've not updated in a while
|
||||
2021.11.09: skip windows 11 upgrade checks with setup.exe (not just auto.cmd); no server label; local account on 11 home
|
||||
auto.cmd has more fixes to keep files and apps on upgrade; reliable ui automation; alternative downloaders
|
||||
2021.11.15: 11 22000.318
|
||||
write output to script folder (or C:\ESD if run from zip); style: more consistent separation of arguments
|
||||
20H2 builds with esd size above 4GB that had to be reverted at 19042.631: en,de,es,pt,fr,it,jp,zh (MCT limits)
|
||||
2021.11.16: 10 19044.1288 - official release of 10 21H2
|
||||
10 19043.1348 - newest 10 build - don't ask why ms is releasing these as such, it's not the first time
|
||||
2021.12.07: skip windows 11 upgrade checks only via auto.cmd - just ignore server label, please
|
||||
2021.12.15: fix regression with 1507-1709 not getting the correct fallback esd; fix dev '-noe' not autoclosing script
|
||||
2021.12.22: improved auto.cmd handling of mismatched OS and target edition, obey 'def', 'auto' upgrades 7 to 10, not 11
|
||||
2022.03.16: prevent launch errors when run from non-canonical paths; USBLayout progress; pickup $ISO$ dir to add on media
|
||||
DU in 11: auto installs 22000.556 atm; older skip_11_checks, without Server label; Home offline local account
|
||||
2022.03.18: fix regression with Auto Upgrade; removed powershell -nop arg (issue #41); enhanced 11 AutoUnattend.xml
|
||||
2022.03.20: stable - all issues ironed out; improved script ui; upgrade keeping files from Eval editions too
|
||||
last squash I promise ;)
|
||||
```
|
||||
### Media Modifications
|
||||
|
||||
Presets 1-4 will modify the created media as follows:
|
||||
- Write `auto.cmd` for on-demand auto-upgrade with edition switching and TPM skipping.
|
||||
- Copy `$ISO$` folder content (if present) to the media root. If using `$OEM$` content, place it in `$ISO$\sources\$OEM$`.
|
||||
- Write `sources\PID.txt` to preselect the edition at boot or within Windows (if configured).
|
||||
- Write `sources\EI.cfg` to prevent product key prompts on Windows 11 consumer media.
|
||||
- Write `AutoUnattend.xml` in `boot.wim` to enable local accounts on Windows 11 Home.
|
||||
- Patch `winsetup.dll` in `boot.wim` to bypass Windows 11 setup checks when booting from media.
|
||||
|
||||
To disable these modifications, append `def` to the script name to create default, untouched MCT media.
|
||||
|
||||
### Simple Deployment
|
||||
|
||||
The **auto.cmd** file is utilized in the ***Auto Upgrade*** preset via the GUI. Rename the script to `auto MediaCreationTool.bat` for fully unattended operation. This facilitates upgrades while preserving files and apps, even when OS editions differ. It supports upgrades from various editions, including Ultimate, PosReady, Embedded, LTSC, or Enterprise Eval.
|
||||
|
||||
The generated script is included in the media for future use. It detects available editions in `install.esd`, selects a suitable index, and adjusts the `EditionID` in the registry. For Windows 11, it attempts to skip setup checks (this behavior can be modified). It also configures recommended setup options to minimize upgrade issues.
|
||||
|
||||
**Examples:**
|
||||
- **Upgrade from Enterprise LTSC 2019 to Business Media:** `auto.cmd` selects the Enterprise index and adjusts the `EditionID` to Enterprise.
|
||||
- **Switch Edition:** Rename the script to `ProfessionalWorkstation MediaCreationTool.bat` to switch to ProfessionalWorkstation.
|
||||
- **Upgrade Multiple PCs:** Use a script name like `auto 21H2 Pro MediaCreationTool.bat` to upgrade multiple PCs to the latest 10 version with Pro edition.
|
||||
|
||||
**Additional Features:**
|
||||
- Add VL/MAK/retail product keys as needed.
|
||||
- The script also manages `$ISO$` folders for branding, configuration, and tweaks.
|
||||
|
||||
### Discuss
|
||||
|
||||
For further discussion, visit the [MDL Forums](https://forums.mydigitallife.net/threads/universal-mediacreationtool-wrapper-script-create-windows-11-media-with-automatic-bypass.84168/).
|
||||
|
||||
@ -1,50 +1,59 @@
|
||||
@echo off& title Auto Upgrade - MCT || supports Ultimate / PosReady / Embedded / LTSC / Enterprise Eval
|
||||
@echo off
|
||||
title Auto Upgrade - MCT || supports Ultimate / PosReady / Embedded / LTSC / Enterprise Eval
|
||||
|
||||
:: Initialize variables
|
||||
set "EDITION_SWITCH="
|
||||
set "SKIP_11_SETUP_CHECKS=1"
|
||||
set OPTIONS=/SelfHost /Auto Upgrade /MigChoice Upgrade /Compat IgnoreWarning /MigrateDrivers All /ResizeRecoveryPartition Disable
|
||||
set OPTIONS=%OPTIONS% /ShowOOBE None /Telemetry Disable /CompactOS Disable /DynamicUpdate Enable /SkipSummary /Eula Accept
|
||||
|
||||
:: Change to the script's directory
|
||||
pushd "%~dp0" & for %%w in (%1) do pushd %%w
|
||||
for %%i in ("x86\" "x64\" "") do if exist "%%~isources\setupprep.exe" set "dir=%%~i"
|
||||
pushd "%dir%sources" || (echo "%dir%sources" not found! script should be run from windows setup media & timeout /t 5 & exit /b)
|
||||
|
||||
::# start sources\setup if under winpe (when booted from media) [Shift] + [F10]: c:\auto or d:\auto or e:\auto etc.
|
||||
:: Determine the architecture of the sources
|
||||
for %%i in ("x86\" "x64\" "") do if exist "%%~isources\setupprep.exe" set "dir=%%~i"
|
||||
pushd "%dir%sources" || (echo "%dir%sources" not found! Script should be run from Windows setup media & timeout /t 5 & exit /b)
|
||||
|
||||
:: Start sources\setup if under WinPE
|
||||
reg query "HKLM\Software\Microsoft\Windows NT\CurrentVersion\WinPE" >nul 2>nul && (
|
||||
for %%s in (sCPU sRAM sSecureBoot sStorage sTPM) do reg add HKLM\SYSTEM\Setup\LabConfig /f /v Bypas%%sCheck /d 1 /t reg_dword
|
||||
start "WinPE" sources\setup.exe & exit /b
|
||||
)
|
||||
|
||||
::# init variables
|
||||
:: Initialize environment variables
|
||||
setlocal EnableDelayedExpansion
|
||||
set "PATH=%SystemRoot%\System32;%SystemRoot%\System32\windowspowershell\v1.0\;%PATH%"
|
||||
set "PATH=%SystemRoot%\Sysnative;%SystemRoot%\Sysnative\windowspowershell\v1.0\;%PATH%"
|
||||
|
||||
::# elevate so that workarounds can be set under windows
|
||||
:: Elevate privileges if necessary
|
||||
fltmc >nul || (set _="%~f0" %*& powershell -nop -c start -verb runas cmd \"/d /x /c call $env:_\"& exit /b)
|
||||
|
||||
::# undo any previous regedit edition rename (if upgrade was interrupted)
|
||||
:: Undo any previous registry edition rename if upgrade was interrupted
|
||||
set "NT=HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion"
|
||||
for %%v in (CompositionEditionID EditionID ProductName) do (
|
||||
call :reg_query "%NT%" %%v_undo %%v
|
||||
if defined %%v reg delete "%NT%" /v %%v_undo /f & for %%A in (32 64) do reg add "%NT%" /v %%v /d "!%%v!" /f /reg:%%A
|
||||
) >nul 2>nul
|
||||
|
||||
::# get current version
|
||||
:: Get current version information
|
||||
for %%v in (CompositionEditionID EditionID ProductName CurrentBuildNumber) do call :reg_query "%NT%" %%v %%v
|
||||
for /f "tokens=2-3 delims=[." %%i in ('ver') do for %%s in (%%i) do set /a Version=%%s*10+%%j
|
||||
|
||||
::# WIM_INFO w_5=wim_5th b_5=build_5th p_5=patch_5th a_5=arch_5th l_5=lang_5th e_5=edi_5th d_5=desc_5th i_5=edi_5th i_Core=index
|
||||
:: Initialize WIM information variables
|
||||
set "0=%~f0"& set wim=& set ext=.esd& if exist install.wim (set ext=.wim) else if exist install.swm set ext=.swm
|
||||
set snippet=powershell -nop -c iex ([io.file]::ReadAllText($env:0)-split'#[:]wim_info[:]')[1]; WIM_INFO install%ext% 0 0
|
||||
set w_count=0& for /f "tokens=1-7 delims=," %%i in ('"%snippet%"') do (set w_%%i=%%i,%%j,%%k,%%l,%%m,%%n,%%o& set /a w_count+=1
|
||||
set b_%%i=%%j& set p_%%i=%%k& set a_%%i=%%l& set l_%%i=%%m& set e_%%i=%%n& set d_%%i=%%o& set i_%%n=%%i& set i_%%i=%%n)
|
||||
set w_count=0& for /f "tokens=1-7 delims=," %%i in ('"%snippet%"') do (
|
||||
set w_%%i=%%i,%%j,%%k,%%l,%%m,%%n,%%o
|
||||
set /a w_count+=1
|
||||
set b_%%i=%%j& set p_%%i=%%k& set a_%%i=%%l& set l_%%i=%%m& set e_%%i=%%n& set d_%%i=%%o& set i_%%n=%%i& set i_%%i=%%n
|
||||
)
|
||||
|
||||
::# print available editions in install.esd via wim_info snippet
|
||||
:: Print available editions in install.esd
|
||||
echo;------------------------------------------------------------------------------------
|
||||
for /l %%i in (1,1,%w_count%) do call echo;%%w_%%i%%
|
||||
echo;------------------------------------------------------------------------------------
|
||||
|
||||
::# get requested edition in EI.cfg or PID.txt or OPTIONS
|
||||
:: Get requested edition from EI.cfg or PID.txt or OPTIONS
|
||||
if exist product.ini for /f "tokens=1,2 delims==" %%O in (product.ini) do if not "%%P" equ "" (set pid_%%O=%%P& set pn_%%P=%%O)
|
||||
set EI=& set Name=& set eID=& set reg=& set "cfg_filter=EditionID Channel OEM Retail Volume _Default VL 0 1 ^$"
|
||||
if exist EI.cfg for /f "tokens=*" %%i in ('findstr /v /i /r "%cfg_filter%" EI.cfg') do (set EI=%%i& set eID=%%i)
|
||||
@ -55,7 +64,7 @@ if defined EDITION_SWITCH (set eID=%EDITION_SWITCH%) else if defined Name for %%
|
||||
if not defined eID set eID=%EditionID%& if not defined EditionID set eID=Professional& set EditionID=Professional
|
||||
if /i "%EditionID%" equ "%eID%" (set changed=) else set changed=1
|
||||
|
||||
::# upgrade matrix - now also for Enterprise Eval - automatically pick edition that would keep files and apps
|
||||
:: Upgrade matrix for Enterprise Eval
|
||||
if /i CoreCountrySpecific equ %eID% set "comp=!eID!" & set "reg=!eID!" & if not defined i_!eID! set "eID=Core"
|
||||
if /i CoreSingleLanguage equ %eID% set "comp=Core" & set "reg=!eID!" & if not defined i_!eID! set "eID=Core"
|
||||
for %%e in (Starter HomeBasic HomePremium CoreConnectedCountrySpecific CoreConnectedSingleLanguage CoreConnected Core) do (
|
||||
@ -81,26 +90,28 @@ for %%e in (Education ProfessionalEducation ProfessionalWorkstation Professional
|
||||
if /i %%eN equ %eID% set "eID=ProfessionalN" & if defined i_%%eN set "eID=%%eN"
|
||||
if /i %%e equ %eID% set "eID=Professional" & if defined i_%%e set "eID=%%e"
|
||||
)
|
||||
|
||||
:: Determine the index and image for the upgrade
|
||||
set index=& set lst=Professional& for /l %%i in (1,1,%w_count%) do if /i !i_%%i! equ !eID! set "index=%%i" & set "eID=!i_%%i!"
|
||||
if not defined index set index=1& set eID=!i_1!& if defined i_%lst% set "index=!i_%lst%!" & set "eID=%lst%"& set "comp=Enterprise"
|
||||
set Build=!b_%index%!& set OPTIONS=%OPTIONS% /ImageIndex %index%& if defined changed if not defined reg set "reg=!eID!"
|
||||
echo;Current edition: %EditionID% & echo;Regedit edition: %reg% & echo;Index: %index% Image: %eID%
|
||||
timeout /t 10
|
||||
|
||||
::# disable upgrade blocks
|
||||
:: Disable upgrade blocks
|
||||
reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /f /v DisableWUfBSafeguards /d 1 /t reg_dword >nul 2>nul
|
||||
|
||||
::# prevent usage of MCT for intermediary upgrade in Dynamic Update (causing 7 to 19H1 instead of 7 to 21H2 for example)
|
||||
:: Prevent usage of MCT for intermediary upgrade in Dynamic Update
|
||||
if "%Build%" gtr "15063" (set OPTIONS=%OPTIONS% /UpdateMedia Decline)
|
||||
|
||||
::# skip windows 11 upgrade checks: add launch option trick if old-style 0-byte file trick is not on the media
|
||||
:: Skip Windows 11 upgrade checks
|
||||
if "%Build%" lss "22000" set /a SKIP_11_SETUP_CHECKS=0
|
||||
reg add HKLM\SYSTEM\Setup\MoSetup /f /v AllowUpgradesWithUnsupportedTPMorCPU /d 1 /t reg_dword >nul 2>nul &rem ::# TPM 1.2+ only
|
||||
if "%SKIP_11_SETUP_CHECKS%" equ "1" cd.>appraiserres.dll 2>nul & rem ::# writable media only
|
||||
reg add HKLM\SYSTEM\Setup\MoSetup /f /v AllowUpgradesWithUnsupportedTPMorCPU /d 1 /t reg_dword >nul 2>nul
|
||||
if "%SKIP_11_SETUP_CHECKS%" equ "1" cd.>appraiserres.dll 2>nul
|
||||
for %%A in (appraiserres.dll) do if %%~zA gtr 0 (set TRICK=/Product Server ) else (set TRICK=)
|
||||
if "%SKIP_11_SETUP_CHECKS%" equ "1" (set OPTIONS=%TRICK%%OPTIONS%)
|
||||
|
||||
::# auto upgrade with edition lie workaround to keep files and apps - all 1904x builds allow up/downgrade between them
|
||||
:: Auto upgrade with edition lie workaround
|
||||
if defined reg call :rename %reg%
|
||||
start "auto" setupprep.exe %OPTIONS%
|
||||
echo;DONE
|
||||
@ -123,7 +134,9 @@ exit /b
|
||||
#:WIM_INFO:# [PARAMS]: "file" [optional]Index or 0 = all Output 0 = txt 1 = xml 2 = file.txt 3 = file.xml 4 = xml object
|
||||
set ^ #=;$f0=[io.file]::ReadAllText($env:0); $0=($f0-split '#[:]WIM_INFO[:]' ,3)[1]; $1=$env:1-replace'([`@$])','`$1'; iex($0+$1)
|
||||
set ^ #=& set "0=%~f0"& set 1=;WIM_INFO %*& powershell -nop -c "%#%"& exit /b %errorcode%
|
||||
function WIM_INFO ($file = 'install.esd', $index = 0, $out = 0) { :info while ($true) {
|
||||
|
||||
function WIM_INFO ($file = 'install.esd', $index = 0, $out = 0) {
|
||||
:info while ($true) {
|
||||
$block = 2097152; $bytes = new-object 'Byte[]' ($block); $begin = [uint64]0; $final = [uint64]0; $limit = [uint64]0
|
||||
$steps = [int]([uint64]([IO.FileInfo]$file).Length / $block - 1); $enc = [Text.Encoding]::GetEncoding(28591); $delim = @()
|
||||
foreach ($d in '/INSTALLATIONTYPE','/WIM') {$delim += $enc.GetString([Text.Encoding]::Unicode.GetBytes([char]60+ $d +[char]62))}
|
||||
@ -131,20 +144,34 @@ function WIM_INFO ($file = 'install.esd', $index = 0, $out = 0) { :info while ($
|
||||
for ($o = 1; $o -le $steps; $o++) {
|
||||
$p = $f.Seek(-$block, 1); $r = $f.Read($bytes, 0, $block); if ($r -ne $block) {write-host invalid block $r; break}
|
||||
$u = [Text.Encoding]::GetEncoding(28591).GetString($bytes); $t = $u.LastIndexOf($delim[0], [StringComparison]::Ordinal)
|
||||
if ($t -lt 0) { $p = $f.Seek(-$block, 1)} else { [void]$f.Seek(($t -$block), 1)
|
||||
for ($o = 1; $o -le $block; $o++) { [void]$f.Seek(-2, 1); if ($f.ReadByte() -eq 0xfe) {$begin = $f.Position; break} }
|
||||
if ($t -lt 0) { $p = $f.Seek(-$block, 1)} else {
|
||||
[void]$f.Seek(($t -$block), 1)
|
||||
for ($o = 1; $o -le $block; $o++) {
|
||||
[void]$f.Seek(-2, 1);
|
||||
if ($f.ReadByte() -eq 0xfe) {$begin = $f.Position; break}
|
||||
}
|
||||
$limit = $f.Length - $begin; if ($limit -lt $block) {$x = $limit} else {$x = $block}
|
||||
$bytes = new-object 'Byte[]' ($x); $r = $f.Read($bytes, 0, $x)
|
||||
$u = [Text.Encoding]::GetEncoding(28591).GetString($bytes); $t = $u.IndexOf($delim[1], [StringComparison]::Ordinal)
|
||||
if ($t -ge 0) {[void]$f.Seek(($t + 12 -$x), 1); $final = $f.Position} ; break } }
|
||||
if ($t -ge 0) {[void]$f.Seek(($t + 12 -$x), 1); $final = $f.Position} ; break
|
||||
}
|
||||
}
|
||||
if ($begin -gt 0 -and $final -gt $begin) {
|
||||
$x = $final - $begin; [void]$f.Seek(-$x, 1); $bytes = new-object 'Byte[]' ($x); $r = $f.Read($bytes, 0, $x)
|
||||
if ($r -ne $x) {$f.Dispose(); break} else {[xml]$xml = [Text.Encoding]::Unicode.GetString($bytes); $f.Dispose()}
|
||||
} else {$f.Dispose()} ; break :info }
|
||||
} else {$f.Dispose()} ; break :info
|
||||
}
|
||||
if ($out -eq 1) {[console]::OutputEncoding=[Text.Encoding]::UTF8; $xml.Save([Console]::Out); ''; return}
|
||||
if ($out -eq 3) {try{$xml.Save(($file-replace'esd$','xml'))}catch{}; return}; if ($out -eq 4) {return $xml}
|
||||
$txt = ''; foreach ($i in $xml.WIM.IMAGE) {if ($index -gt 0 -and $($i.INDEX) -ne $index) {continue}; [int]$a='1'+$i.WINDOWS.ARCH
|
||||
if ($out -eq 3) {try{$xml.Save(($file-replace'esd$','xml'))}catch{}; return}
|
||||
if ($out -eq 4) {return $xml}
|
||||
$txt = ''; foreach ($i in $xml.WIM.IMAGE) {
|
||||
if ($index -gt 0 -and $($i.INDEX) -ne $index) {continue}
|
||||
[int]$a='1'+$i.WINDOWS.ARCH
|
||||
$txt+= $i.INDEX+','+$i.WINDOWS.VERSION.BUILD+','+$i.WINDOWS.VERSION.SPBUILD+','+$(@{10='x86';15='arm';19='x64';112='arm64'}[$a])
|
||||
$txt+= ','+$i.WINDOWS.LANGUAGES.LANGUAGE+','+$i.WINDOWS.EDITIONID+','+$i.NAME+[char]13+[char]10}; $txt=$txt-replace',(?=,)',', '
|
||||
if ($out -eq 2) {try{[io.file]::WriteAllText(($file-replace'esd$','txt'),$txt)}catch{}; return}; if ($out -eq 0) {return $txt}
|
||||
} #:WIM_INFO:# Quick WIM SWM ESD ISO info v2 - lean and mean snippet by AveYo, 2021
|
||||
$txt+= ','+$i.WINDOWS.LANGUAGES.LANGUAGE+','+$i.WINDOWS.EDITIONID+','+$i.NAME+[char]13+[char]10
|
||||
}
|
||||
$txt=$txt-replace',(?=,)',', '
|
||||
if ($out -eq 2) {try{[io.file]::WriteAllText(($file-replace'esd$','txt'),$txt)}catch{}; return}
|
||||
if ($out -eq 0) {return $txt}
|
||||
}
|
||||
#:WIM_INFO:# Quick WIM SWM ESD ISO info v2 - lean and mean snippet by AveYo, 2021
|
||||
|
||||
21
changelog.md
Normal file
21
changelog.md
Normal file
@ -0,0 +1,21 @@
|
||||
# Changelog
|
||||
|
||||
**Note:** Running as Administrator is not required; the script will automatically prompt for elevation if needed. Raw files are now preserved without altering line endings.
|
||||
|
||||
The [previous gist](https://git.io/MediaCreationTool.bat) has been replaced with this updated repository. **We sincerely appreciate your ongoing support!**
|
||||
|
||||
Join the discussion on [MDL](https://forums.mydigitallife.net/threads/universal-mediacreationtool-wrapper-script-create-windows-11-media-with-automatic-bypass.84168/).
|
||||
|
||||
---
|
||||
|
||||
## Changelog Highlights
|
||||
|
||||
- **2018.10.10:** Reintroduced version 1809 [RS5] with native XML patching for `products.xml`, and resolved a syntax bug.
|
||||
- **2019.05.22:** Enabled DynamicUpdate by default.
|
||||
- **2021.09.25:** Added support for Windows 11, including TPM Check bypass.
|
||||
- **2021.11.03:** Improved automation and refined the `auto.cmd` functionality.
|
||||
- **2022.03.16:** Enhanced USB layout progress and added support for 22000.556 builds.
|
||||
|
||||
---
|
||||
|
||||
For a comprehensive changelog, please refer to the [version history](https://git.io/MediaCreationTool.bat).
|
||||
Loading…
Reference in New Issue
Block a user