Revert "Add support for channels, keep compatibility with rings"
This commit is contained in:
@ -16,7 +16,7 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
function uupApiVersion() {
|
||||
return '1.30.0';
|
||||
return '1.29.0';
|
||||
}
|
||||
|
||||
require_once dirname(__FILE__).'/auths.php';
|
||||
|
@ -26,41 +26,18 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
|
||||
$arch = $arch[0];
|
||||
}
|
||||
|
||||
if($sku == 125 || $sku == 126 || $sku == 7 || $sku == 8 || $sku == 120 || $sku == 145 || $sku == 146 || $sku == 168)
|
||||
$blockUpgrades = 1;
|
||||
|
||||
$fltContent = 'Mainline';
|
||||
$fltRing = 'External';
|
||||
|
||||
if($ring == 'RETAIL') {
|
||||
$fltBranch = '';
|
||||
$fltContent = '';
|
||||
$fltRing = 'Retail';
|
||||
$flightEnabled = 0;
|
||||
$isRetail = 1;
|
||||
}
|
||||
|
||||
if($ring == 'WIF' || $ring == 'DEV') {
|
||||
$fltBranch = 'Dev';
|
||||
}
|
||||
|
||||
if($ring == 'WIS' || $ring == 'BETA') {
|
||||
$fltBranch = 'Beta';
|
||||
}
|
||||
|
||||
if($ring == 'RP' || $ring == 'RELEASEPREVIEW') {
|
||||
$fltBranch = 'ReleasePreview';
|
||||
}
|
||||
|
||||
if($ring == 'MSIT') {
|
||||
$fltBranch = 'MSIT';
|
||||
$fltRing = 'Internal';
|
||||
}
|
||||
if($sku == 125 || $sku == 126)
|
||||
$blockUpgrades = 1;
|
||||
|
||||
$attrib = array(
|
||||
'App=WU_OS',
|
||||
'AppVer='.$build,
|
||||
'AttrDataVer=99',
|
||||
'AttrDataVer=96',
|
||||
'BlockFeatureUpdates='.$blockUpgrades,
|
||||
'BranchReadinessLevel=CB',
|
||||
'CurrentBranch='.$branch,
|
||||
@ -71,9 +48,9 @@ function composeDeviceAttributes($flight, $ring, $build, $arch, $sku) {
|
||||
'DeviceFamily=Windows.Desktop',
|
||||
'EKB19H2InstallCount=1',
|
||||
'EKB19H2InstallTimeEpoch=1255000000',
|
||||
'FlightingBranchName='.$fltBranch,
|
||||
'FlightContent='.$fltContent,
|
||||
'FlightRing='.$fltRing,
|
||||
'FlightContent='.$flight,
|
||||
'FlightRing='.$ring,
|
||||
'FlightingBranchName=external',
|
||||
'Free=32to64',
|
||||
'GStatus_20H1=2',
|
||||
'GStatus_20H1Setup=2',
|
||||
@ -147,10 +124,6 @@ function branchFromBuild($build) {
|
||||
$branch = 'vb_release';
|
||||
break;
|
||||
|
||||
case 19042: //19042 is a fake build based on 19041
|
||||
$branch = 'vb_release';
|
||||
break;
|
||||
|
||||
default:
|
||||
$branch = 'rs_prerelease';
|
||||
break;
|
||||
@ -233,7 +206,7 @@ function composeFetchUpdRequest($device, $encData, $arch, $flight, $ring, $build
|
||||
|
||||
$branch = branchFromBuild($build);
|
||||
|
||||
if($sku == 7 || $sku == 8 || $sku == 120 || $sku == 145 || $sku == 146 || $sku == 168) {
|
||||
if($sku == 7 || $sku == 8) {
|
||||
$mainProduct = 'Server.OS';
|
||||
} else {
|
||||
$mainProduct = 'Client.OS.rs2';
|
||||
|
Reference in New Issue
Block a user