Merge pull request #30 from abbodi1406/master

v1.40.3
This commit is contained in:
abbodi1406 2023-09-27 18:31:16 +03:00 committed by GitHub
commit 8959eb14a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions

View File

@ -113,14 +113,18 @@ function uupGetFiles(
case 'UPDATEONLY': break; case 'UPDATEONLY': break;
case 'APP': $appEdition = 1; case 'APP': $appEdition = 1;
case 'APP_MOMENT': $appEdition = 1;
default: default:
if(!isset($genPack[$usePack][$desiredEdition])) { if(!isset($genPack[$usePack][$desiredEdition])) {
return array('error' => 'UNSUPPORTED_COMBINATION'); return array('error' => 'UNSUPPORTED_COMBINATION');
} }
$filesPacksList = $genPack[$usePack][$desiredEdition];
$fileListSource = 'GENERATEDPACKS'; $fileListSource = 'GENERATEDPACKS';
$filesPacksList = $genPack[$usePack][$desiredEdition];
if($desiredEdition == 'APP' && isset($genPack[$usePack]['APP_MOMENT'])) {
$filesPacksList = array_merge($filesPacksList, $genPack[$usePack]['APP_MOMENT']);
}
break; break;
} }
} else { } else {
@ -133,6 +137,7 @@ function uupGetFiles(
return array('error' => 'UNSUPPORTED_COMBINATION'); return array('error' => 'UNSUPPORTED_COMBINATION');
} }
if($edition == 'APP' || $edition == 'APP_MOMENT') $appEdition = 1;
$filesPacksList = array_merge($filesPacksList, $genPack[$usePack][$edition]); $filesPacksList = array_merge($filesPacksList, $genPack[$usePack][$edition]);
} }
} }

View File

@ -16,7 +16,7 @@ limitations under the License.
*/ */
function uupApiVersion() { function uupApiVersion() {
return '1.40.2'; return '1.40.3';
} }
require_once dirname(__FILE__).'/auths.php'; require_once dirname(__FILE__).'/auths.php';

View File

@ -63,6 +63,7 @@ function uupGetInfoTexts() {
$fancyEditionNames = array( $fancyEditionNames = array(
'APP' => 'Microsoft Store Inbox Apps', 'APP' => 'Microsoft Store Inbox Apps',
'APP_MOMENT' => 'Microsoft Store Moment Apps',
'FOD' => 'Features on Demand (Capabilities)', 'FOD' => 'Features on Demand (Capabilities)',
'CLOUD' => 'Windows S', 'CLOUD' => 'Windows S',
'CLOUDN' => 'Windows S N', 'CLOUDN' => 'Windows S N',

View File

@ -112,8 +112,9 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type) {
$attrib = array( $attrib = array(
'App=WU_OS', 'App=WU_OS',
'AppVer='.$build, 'AppVer='.$build,
'AttrDataVer=226', 'AttrDataVer=247',
'AllowInPlaceUpgrade=1', 'AllowInPlaceUpgrade=1',
'AllowOptionalContent=1',
'AllowUpgradesWithUnsupportedTPMOrCPU=1', 'AllowUpgradesWithUnsupportedTPMOrCPU=1',
'BlockFeatureUpdates='.$blockUpgrades, 'BlockFeatureUpdates='.$blockUpgrades,
'BranchReadinessLevel=CB', 'BranchReadinessLevel=CB',
@ -134,6 +135,7 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku, $type) {
'DataVer_RS5=2000000000', 'DataVer_RS5=2000000000',
'DefaultUserRegion=191', 'DefaultUserRegion=191',
'DeviceFamily='.$dvcFamily, 'DeviceFamily='.$dvcFamily,
'DeviceInfoGatherSuccessful=1',
'EKB19H2InstallCount=1', 'EKB19H2InstallCount=1',
'EKB19H2InstallTimeEpoch=1255000000', 'EKB19H2InstallTimeEpoch=1255000000',
'FlightingBranchName='.$fltBranch, 'FlightingBranchName='.$fltBranch,
@ -271,7 +273,6 @@ function branchFromBuild($build) {
case 20348: case 20348:
case 20349: case 20349:
case 20350:
$branch = 'fe_release'; $branch = 'fe_release';
break; break;
@ -280,6 +281,7 @@ function branchFromBuild($build) {
break; break;
case 22621: case 22621:
case 22631:
$branch = 'ni_release'; $branch = 'ni_release';
break; break;
@ -410,6 +412,8 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
$products[] = "PN=Adobe.Flash.$currArch&Repairable=1&V=0.0.0.0"; $products[] = "PN=Adobe.Flash.$currArch&Repairable=1&V=0.0.0.0";
$products[] = "PN=Microsoft.Edge.Stable.$currArch&Repairable=1&V=0.0.0.0"; $products[] = "PN=Microsoft.Edge.Stable.$currArch&Repairable=1&V=0.0.0.0";
$products[] = "PN=Microsoft.NETFX.$currArch&V=2018.12.2.0"; $products[] = "PN=Microsoft.NETFX.$currArch&V=2018.12.2.0";
$products[] = "PN=Windows.Autopilot.$currArch&Repairable=1&V=0.0.0.0";
$products[] = "PN=Windows.AutopilotOOBE.$currArch&Repairable=1&V=0.0.0.0";
$products[] = "PN=Windows.Appraiser.$currArch&Repairable=1&V=$build"; $products[] = "PN=Windows.Appraiser.$currArch&Repairable=1&V=$build";
$products[] = "PN=Windows.AppraiserData.$currArch&Repairable=1&V=$build"; $products[] = "PN=Windows.AppraiserData.$currArch&Repairable=1&V=$build";
$products[] = "PN=Windows.EmergencyUpdate.$currArch&V=$build"; $products[] = "PN=Windows.EmergencyUpdate.$currArch&V=$build";