forked from uup-dump/api
Compare commits
3 Commits
887dcf71d3
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 0da5532141 | |||
| 6b5a6885f8 | |||
| 5000b4c4b9 |
@@ -329,8 +329,9 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
|
|||||||
$updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle);
|
$updateTitle = preg_replace('/ for .{3,5}-based/i', ' for', $updateTitle);
|
||||||
|
|
||||||
$isCumulativeUpdate = 0;
|
$isCumulativeUpdate = 0;
|
||||||
if(preg_match('/\d{4}-\d{2}.+Update|Cumulative Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) {
|
if(preg_match('/\d{4}-\d{2}.+Update|(Cumulative|Security|Preview) Update|Microsoft Edge|Windows Feature Experience Pack|Cumulative security Hotpatch/i', $updateTitle)) {
|
||||||
$isCumulativeUpdate = 1;
|
$isCumulativeUpdate = 1;
|
||||||
|
|
||||||
if($isNet) {
|
if($isNet) {
|
||||||
$updateTitle = preg_replace("/3.5 and 4.8.1 |3.5 and 4.8 | for $foundArch| for x64| \(KB.*?\)/i", '', $updateTitle);
|
$updateTitle = preg_replace("/3.5 and 4.8.1 |3.5 and 4.8 | for $foundArch| for x64| \(KB.*?\)/i", '', $updateTitle);
|
||||||
} else {
|
} else {
|
||||||
@@ -345,6 +346,11 @@ function parseFetchUpdate($updateInfo, $out, $arch, $ring, $flight, $build, $sku
|
|||||||
$updateTitle = str_replace('Windows 11', 'Windows Server', $updateTitle);
|
$updateTitle = str_replace('Windows 11', 'Windows Server', $updateTitle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(preg_match('/Windows 1\d|Server|Azure Stack HCI/i', $updateTitle) !== 1) {
|
||||||
|
$osName = $foundType != 'server' ? 'Windows 11' : 'Microsoft server operating system';
|
||||||
|
$updateTitle = str_replace('Update', "Update for $osName", $updateTitle);
|
||||||
|
}
|
||||||
|
|
||||||
if($sku == 406)
|
if($sku == 406)
|
||||||
$updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle);
|
$updateTitle = str_replace('Microsoft server operating system', 'Azure Stack HCI', $updateTitle);
|
||||||
|
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
|
|||||||
$attrib = array(
|
$attrib = array(
|
||||||
'App=WU_OS',
|
'App=WU_OS',
|
||||||
'AppVer='.$build,
|
'AppVer='.$build,
|
||||||
'AttrDataVer=281',
|
'AttrDataVer=331',
|
||||||
'AllowInPlaceUpgrade=1',
|
'AllowInPlaceUpgrade=1',
|
||||||
'AllowOptionalContent=1',
|
'AllowOptionalContent=1',
|
||||||
'AllowUpgradesWithUnsupportedTPMOrCPU=1',
|
'AllowUpgradesWithUnsupportedTPMOrCPU=1',
|
||||||
@@ -232,6 +232,11 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type, $fl
|
|||||||
'UserInPlaceUpgrade=1',
|
'UserInPlaceUpgrade=1',
|
||||||
'VBSState=2',
|
'VBSState=2',
|
||||||
'Version_RS5=2000000000',
|
'Version_RS5=2000000000',
|
||||||
|
'Win10CommercialAzureESUEligible=1',
|
||||||
|
'Win10CommercialKeybasedESUEligible=1',
|
||||||
|
'Win10CommercialW365ESUEligible=1',
|
||||||
|
'Win10ConsumerESUStatus=3',
|
||||||
|
'Win10ConsumerESUAY=9',
|
||||||
'WuClientVer='.$build,
|
'WuClientVer='.$build,
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -315,6 +320,10 @@ function branchFromBuild($build) {
|
|||||||
$branch = 'ge_release';
|
$branch = 'ge_release';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 28000:
|
||||||
|
$branch = 'br_release';
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$branch = 'rs_prerelease';
|
$branch = 'rs_prerelease';
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user