Update metadata and generated packs

shared/main.php

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

shared/packs/metadata.json

@@ -1 +1 @@
-{"knownIds":{"bf76a14e-af2b-4537-ae05-ecaec8db1931":"5188aee94c443f1a676c15b15803b6f6c15c3f53","522f9ab4-1673-483a-831f-826728309f8f":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","efe98f1a-ad45-4dee-84df-8637ead19928":"2861eb9f3c650b613c63d3adb8716377cc67bd01","9c0f0052-90f2-4ae4-8887-812a181f2e9b":"5188aee94c443f1a676c15b15803b6f6c15c3f53","ec7101a2-8023-4869-80a8-705933deab38":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","fd27a88a-c9f8-4c11-83ec-f67e2e78fc10":"2861eb9f3c650b613c63d3adb8716377cc67bd01","37280f97-8d77-4cdb-9727-b6b90115a1f8":"5188aee94c443f1a676c15b15803b6f6c15c3f53","9ad2535b-1f6e-4c5b-9507-77c2691c4b14":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","35b19440-ff7e-4846-8f14-7069f20d4c3d":"2861eb9f3c650b613c63d3adb8716377cc67bd01","cf92df2c-210f-44c7-85e3-bae94249a763":"5188aee94c443f1a676c15b15803b6f6c15c3f53","f0e84350-ff04-4f6a-bd4b-c0e88aca6d4b":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","21ea97cb-7157-4327-9d91-40f19f0b464d":"2861eb9f3c650b613c63d3adb8716377cc67bd01","916193c0-342b-48c9-bd82-ec125ae006af":"5188aee94c443f1a676c15b15803b6f6c15c3f53","5da00f29-260f-40a3-9c26-0d779856ce37":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","e453ad44-4ff9-4956-b3d2-4b80d95899c4":"2861eb9f3c650b613c63d3adb8716377cc67bd01","90865e6e-fa25-43d5-ad2a-e8a8de78229e":"5188aee94c443f1a676c15b15803b6f6c15c3f53","ad4e4ce7-91c1-4905-9800-98e98190a6af":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","3b07e412-b61d-4847-bd3c-15ce97b25a21":"2861eb9f3c650b613c63d3adb8716377cc67bd01","975c61f2-80dc-4a64-9f0c-ffab809b8cc9":"5188aee94c443f1a676c15b15803b6f6c15c3f53","de53d05d-ca80-4652-9649-fe6db244e82b":"9d2d3ac7e366b36fd5f0ff5280b07e0b4633bea5","920265a2-992a-4706-af2f-a491c2c40e8d":"2861eb9f3c650b613c63d3adb8716377cc67bd01","8865774c-0cb0-4858-9400-947ffba71abf":"ce78d1195e98375737eb4782e02f105eefc23ed2","acd1319c-d8da-469a-a2a3-43ce5fa54d2e":"ce78d1195e98375737eb4782e02f105eefc23ed2","716cc43e-64bd-488d-abe8-46b30143dd9e":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","16431a29-87b3-4fb0-bfec-041adf6d332c":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","2a8958cc-a747-4e7a-a48c-5eebc46c81b0":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","fa88b32f-4fbd-47e7-937c-43a2acdeba58":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","78c19a77-700a-4a46-9e3e-45a04fab1578":"ce78d1195e98375737eb4782e02f105eefc23ed2","143c0bae-f51a-46b1-ad58-04e677e477ae":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","2eec9de2-8fbb-4178-b2b2-2918c27c3733":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","564b2583-dcf5-43e3-a16c-57e776a3fe49":"ce78d1195e98375737eb4782e02f105eefc23ed2","eee04005-f15a-4609-85ae-d2c51333b2cd":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","c195ddf1-10fa-49cf-b15b-1798dd69082b":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","99248ec1-02fa-4392-9089-2d676604ba8a":"ce78d1195e98375737eb4782e02f105eefc23ed2","78a730e2-2147-4b21-bd77-f4fbf64d2391":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","c3814484-8c56-4010-858c-38131903c05f":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","e473da16-643d-4ed7-823f-397545633dcc":"ce78d1195e98375737eb4782e02f105eefc23ed2","8b4dcecc-56f2-438e-a6cd-6f721f6cf761":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","31badd82-f715-43f4-8bb3-dc7ee17f561d":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","d3a6af86-214e-4421-a38b-bd4ede09d74e":"ce78d1195e98375737eb4782e02f105eefc23ed2","bac477dd-1f24-48d9-a87c-f59dd3599405":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","b1b78220-6b59-4c2b-b7a1-1692b566d2fe":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","c5ac8794-836b-4887-999a-ba81c0bccb7c":"ce78d1195e98375737eb4782e02f105eefc23ed2","0fdc79e8-a02c-44b7-9360-158736272dcf":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","a04d5462-71ce-4eb3-9d04-c66b9a30a067":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","9b7e2541-8f97-4655-ab8f-f0feec07af92":"ce78d1195e98375737eb4782e02f105eefc23ed2","e79328b3-662b-4d3a-860d-e2bb3a4fd228":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","eb7bccc5-20d6-4017-92ee-ca51d5fe3d19":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","5d210d95-33ef-469f-95a7-2d5355257d04":"ce78d1195e98375737eb4782e02f105eefc23ed2","0909208a-44ac-4f5a-80a9-fc80a82374a1":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","90cfbc0c-7ace-4440-9b88-51e8358a139c":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","703c5f00-5616-45d2-a88a-ca5e2c186d17":"ce78d1195e98375737eb4782e02f105eefc23ed2","6c708015-c93a-4b5e-83c9-8501bd2a3f61":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","1d4d951d-2416-43e1-9efc-a75671467483":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","a9dc2d7f-f94b-4d55-b3df-7d9311acf933":"ce78d1195e98375737eb4782e02f105eefc23ed2","53718ab0-38ac-497e-af33-945228f35a09":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","6381d959-11f1-450d-9dea-e5482372bb7a":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","e6915eab-9799-46f0-9d90-9e2916af3bf3":"ce78d1195e98375737eb4782e02f105eefc23ed2","e66718c2-515b-4da1-b0aa-aa3152e54054":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","41df715d-ed19-4553-965f-39a2d5bdefb5":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","80246a31-938d-47d2-855d-2ba108425e7c":"b68097855871261b43d32baba1Line truncated
+{"knownIds":{"bf76a14e-af2b-4537-ae05-ecaec8db1931":"5188aee94c443f1a676c15b15803b6f6c15c3f53","522f9ab4-1673-483a-831f-826728309f8f":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","efe98f1a-ad45-4dee-84df-8637ead19928":"2861eb9f3c650b613c63d3adb8716377cc67bd01","9c0f0052-90f2-4ae4-8887-812a181f2e9b":"5188aee94c443f1a676c15b15803b6f6c15c3f53","ec7101a2-8023-4869-80a8-705933deab38":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","fd27a88a-c9f8-4c11-83ec-f67e2e78fc10":"2861eb9f3c650b613c63d3adb8716377cc67bd01","37280f97-8d77-4cdb-9727-b6b90115a1f8":"5188aee94c443f1a676c15b15803b6f6c15c3f53","9ad2535b-1f6e-4c5b-9507-77c2691c4b14":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","35b19440-ff7e-4846-8f14-7069f20d4c3d":"2861eb9f3c650b613c63d3adb8716377cc67bd01","cf92df2c-210f-44c7-85e3-bae94249a763":"5188aee94c443f1a676c15b15803b6f6c15c3f53","f0e84350-ff04-4f6a-bd4b-c0e88aca6d4b":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","21ea97cb-7157-4327-9d91-40f19f0b464d":"2861eb9f3c650b613c63d3adb8716377cc67bd01","916193c0-342b-48c9-bd82-ec125ae006af":"5188aee94c443f1a676c15b15803b6f6c15c3f53","5da00f29-260f-40a3-9c26-0d779856ce37":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","e453ad44-4ff9-4956-b3d2-4b80d95899c4":"2861eb9f3c650b613c63d3adb8716377cc67bd01","90865e6e-fa25-43d5-ad2a-e8a8de78229e":"5188aee94c443f1a676c15b15803b6f6c15c3f53","ad4e4ce7-91c1-4905-9800-98e98190a6af":"b61434beb5fbc3cbc90dc44252aea2b2ae469174","3b07e412-b61d-4847-bd3c-15ce97b25a21":"2861eb9f3c650b613c63d3adb8716377cc67bd01","975c61f2-80dc-4a64-9f0c-ffab809b8cc9":"5188aee94c443f1a676c15b15803b6f6c15c3f53","de53d05d-ca80-4652-9649-fe6db244e82b":"9d2d3ac7e366b36fd5f0ff5280b07e0b4633bea5","920265a2-992a-4706-af2f-a491c2c40e8d":"2861eb9f3c650b613c63d3adb8716377cc67bd01","71cd47f8-e9b2-422b-b289-103a76016851":"e130e44c6a02c08e7f7e02fb19b3b8f8e7d2d309","a5a14c1d-2d0d-40c8-ab97-883703b6b67c":"4f5ee2c4623d9e0165c5a735d8675edfcc4902fd","2faff704-ac88-4b3f-a3d2-11e6a63f0b67":"e130e44c6a02c08e7f7e02fb19b3b8f8e7d2d309","9ba2384a-5eb1-4ca4-95da-0c1222281233":"5f43da91211a27967f6711488b7844bb789b3009","3d401b52-605e-4f68-9f85-9b2e5b0169cd":"6ebbc6ec5a2b6b090bd3f6c7bd0c1b6a778f89da","094b8bdb-f3ef-42a1-b311-2f192600278d":"6ebbc6ec5a2b6b090bd3f6c7bd0c1b6a778f89da","e17febfd-42bc-490d-bcff-e07f3d5c1d51":"6ebbc6ec5a2b6b090bd3f6c7bd0c1b6a778f89da","6399ac8e-7fcd-415d-8b6a-b8715e651898":"6ebbc6ec5a2b6b090bd3f6c7bd0c1b6a778f89da","fe1f4dc3-a596-495d-ad9a-810da62d7ddc":"20636b9f7802215ae681e3f37d8f9b2a557012ca","64d024fd-1637-496b-8794-70e9c157150d":"ee8697e8066bb013b70741824d4dad7b0d4171b5","03c8abd1-2967-47c7-ad6e-eeedfc11db19_rev.2":"23fb6d223a9d0712b19d80f5f814587863fdc9ca","3494a496-e0d1-40c5-961a-46faedfca8c1":"24df4f734aa360eceab6ecb725b00a6a76abc8d6","8865774c-0cb0-4858-9400-947ffba71abf":"ce78d1195e98375737eb4782e02f105eefc23ed2","acd1319c-d8da-469a-a2a3-43ce5fa54d2e":"ce78d1195e98375737eb4782e02f105eefc23ed2","716cc43e-64bd-488d-abe8-46b30143dd9e":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","16431a29-87b3-4fb0-bfec-041adf6d332c":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","2a8958cc-a747-4e7a-a48c-5eebc46c81b0":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","fa88b32f-4fbd-47e7-937c-43a2acdeba58":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","78c19a77-700a-4a46-9e3e-45a04fab1578":"ce78d1195e98375737eb4782e02f105eefc23ed2","143c0bae-f51a-46b1-ad58-04e677e477ae":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","2eec9de2-8fbb-4178-b2b2-2918c27c3733":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","564b2583-dcf5-43e3-a16c-57e776a3fe49":"ce78d1195e98375737eb4782e02f105eefc23ed2","eee04005-f15a-4609-85ae-d2c51333b2cd":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","c195ddf1-10fa-49cf-b15b-1798dd69082b":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","4309cd7b-629b-4743-bc63-144fb6f10288":"ce78d1195e98375737eb4782e02f105eefc23ed2","36a2141e-3b32-4198-8db3-a333e8c64950":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","85439155-16ef-48d3-b1fd-d21aaa7ccb61_rev.2":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","99248ec1-02fa-4392-9089-2d676604ba8a":"ce78d1195e98375737eb4782e02f105eefc23ed2","78a730e2-2147-4b21-bd77-f4fbf64d2391":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","c3814484-8c56-4010-858c-38131903c05f":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","e473da16-643d-4ed7-823f-397545633dcc":"ce78d1195e98375737eb4782e02f105eefc23ed2","8b4dcecc-56f2-438e-a6cd-6f721f6cf761":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","31badd82-f715-43f4-8bb3-dc7ee17f561d":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","d3a6af86-214e-4421-a38b-bd4ede09d74e":"ce78d1195e98375737eb4782e02f105eefc23ed2","bac477dd-1f24-48d9-a87c-f59dd3599405":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","b1b78220-6b59-4c2b-b7a1-1692b566d2fe":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","c5ac8794-836b-4887-999a-ba81c0bccb7c":"ce78d1195e98375737eb4782e02f105eefc23ed2","0fdc79e8-a02c-44b7-9360-158736272dcf":"255c210f4e5eb09ab8e92a634ebdbb3a8037e4f6","a04d5462-71ce-4eb3-9d04-c66b9a30a067":"c054f6ca03936fe8c9a24118309d1576b6cb9cc5","9b7e2541-8f97-4655-ab8f-f0feec07af92":"ce78d1195e9837Line truncated

shared/requests.php

@@ -18,19 +18,23 @@ limitations under the License.
 // Composes DeviceAttributes parameter needed to fetch data
 function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
     $branch = branchFromBuild($build);
+    $blockUpgrades = 0;
+    $flightEnabled = 1;
+    $isRetail = 0;
 
     if($ring == 'RETAIL') {
         $flightEnabled = 0;
         $isRetail = 1;
-    } else {
-        $flightEnabled = 1;
-        $isRetail = 0;
     }
 
+    if($sku == 125 || $sku == 126)
+        $blockUpgrades = 1;
+
     $attrib = array(
         'App=WU_OS',
         'AppVer='.$build,
-        'AttrDataVer=60',
+        'AttrDataVer=61',
+        'BlockFeatureUpdates='.$blockUpgrades,
         'BranchReadinessLevel=CB',
         'CurrentBranch='.$branch,
         'DefaultUserRegion=191',
@@ -90,6 +94,10 @@ function branchFromBuild($build) {
             $branch = 'rs5_release';
             break;
 
+        case 18362:
+            $branch = '19h1_release';
+            break;
+
         default:
             $branch = 'rs_prerelease';
             break;
@@ -176,7 +184,7 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
     }
 
     $products = array(
-        'PN='.$mainProduct.'.'.$arch.'&Branch='.$branch.'&PrimaryOSProduct=1&Repairable=1&V='.$build,
+        'PN='.$mainProduct.'.'.$arch.'&Branch='.$branch.'&PrimaryOSProduct=1&Repairable=1&V='.$build.'&ReofferUpdate=1',
         'PN=Windows.Appraiser.'.$arch.'&Repairable=1&V='.$build,
         'PN=Windows.AppraiserData.'.$arch.'&Repairable=1&V='.$build,
         'PN=Windows.EmergencyUpdate.'.$arch.'&Repairable=1&V='.$build,