Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Advinst as another default installer #5060

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add advinstExe switches
  • Loading branch information
Stefan Pirvulescu committed Dec 19, 2024
commit e66581bfb77618765fd0e7783987f0eb32796965
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@
"burn",
"pwa",
"portable",
"advancedInstaller"
"advinstExe"

Check warning on line 69 in schemas/JSON/manifests/v1.10.0/manifest.installer.1.10.0.json

GitHub Actions / Check Spelling

`advinst` is not a recognized word. (unrecognized-spelling)
],
"description": "Enumeration of supported installer types. InstallerType is required in either root level or individual Installer level"
},
@@ -82,7 +82,7 @@
"wix",
"burn",
"portable",
"advancedInstaller"
"advinstExe"

Check warning on line 85 in schemas/JSON/manifests/v1.10.0/manifest.installer.1.10.0.json

GitHub Actions / Check Spelling

`advinst` is not a recognized word. (unrecognized-spelling)
],
"description": "Enumeration of supported nested installer types contained inside an archive file"
},
Original file line number Diff line number Diff line change
@@ -168,7 +168,7 @@
"burn",
"pwa",
"portable",
"advancedInstaller"
"advinstExe"

Check warning on line 171 in schemas/JSON/manifests/v1.10.0/manifest.singleton.1.10.0.json

GitHub Actions / Check Spelling

`advinst` is not a recognized word. (unrecognized-spelling)
],
"description": "Enumeration of supported installer types. InstallerType is required in either root level or individual Installer level"
},
@@ -184,7 +184,7 @@
"wix",
"burn",
"portable",
"advancedInstaller"
"advinstExe"

Check warning on line 187 in schemas/JSON/manifests/v1.10.0/manifest.singleton.1.10.0.json

GitHub Actions / Check Spelling

`advinst` is not a recognized word. (unrecognized-spelling)
],
"description": "Enumeration of supported nested installer types contained inside an archive file"
},
2 changes: 1 addition & 1 deletion src/AppInstallerCLICore/Workflows/DownloadFlow.cpp
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@
case InstallerTypeEnum::Inno:
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::Portable:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:

Check warning on line 51 in src/AppInstallerCLICore/Workflows/DownloadFlow.cpp

GitHub Actions / Check Spelling

`Advinst` is not a recognized word. (unrecognized-spelling)
return L".exe"sv;
case InstallerTypeEnum::Msi:
case InstallerTypeEnum::Wix:
4 changes: 2 additions & 2 deletions src/AppInstallerCLICore/Workflows/InstallFlow.cpp
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@
case InstallerTypeEnum::Msi:
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::Wix:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:

Check warning on line 55 in src/AppInstallerCLICore/Workflows/InstallFlow.cpp

GitHub Actions / Check Spelling

`Advinst` is not a recognized word. (unrecognized-spelling)
return true;
default:
return false;
@@ -407,7 +407,7 @@
case InstallerTypeEnum::Msi:
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::Wix:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:

Check warning on line 410 in src/AppInstallerCLICore/Workflows/InstallFlow.cpp

GitHub Actions / Check Spelling

`Advinst` is not a recognized word. (unrecognized-spelling)
if (doUninstallPrevious)
{
context <<
4 changes: 2 additions & 2 deletions src/AppInstallerCLICore/Workflows/RepairFlow.cpp
Original file line number Diff line number Diff line change
@@ -337,7 +337,7 @@ namespace AppInstaller::CLI::Workflow
case InstallerTypeEnum::Burn:
case InstallerTypeEnum::Inno:
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:
{
context <<
RunRepairForRepairBehaviorBasedInstaller;
@@ -380,7 +380,7 @@ namespace AppInstaller::CLI::Workflow
case InstallerTypeEnum::Exe:
case InstallerTypeEnum::Inno:
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:
{
context <<
GenerateRepairString;
4 changes: 2 additions & 2 deletions src/AppInstallerCLICore/Workflows/UninstallFlow.cpp
Original file line number Diff line number Diff line change
@@ -220,7 +220,7 @@ namespace AppInstaller::CLI::Workflow
case InstallerTypeEnum::Burn:
case InstallerTypeEnum::Inno:
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:
{
IPackageVersion::Metadata packageMetadata = installedPackageVersion->GetMetadata();

@@ -330,7 +330,7 @@ namespace AppInstaller::CLI::Workflow
case InstallerTypeEnum::Burn:
case InstallerTypeEnum::Inno:
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:
context <<
Workflow::ShellExecuteUninstallImpl <<
ReportUninstallerResult("UninstallString", APPINSTALLER_CLI_ERROR_EXEC_UNINSTALL_COMMAND_FAILED);
24 changes: 12 additions & 12 deletions src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
case InstallerTypeEnum::Nullsoft:
case InstallerTypeEnum::Exe:
case InstallerTypeEnum::Burn:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:
return CompatibilitySet::Exe;
case InstallerTypeEnum::Wix:
case InstallerTypeEnum::Msi:
@@ -163,9 +163,9 @@
{
result = InstallerTypeEnum::Portable;
}
else if (inStrLower == "advancedinstaller")
else if (inStrLower == "advinstexe")

Check warning on line 166 in src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp

GitHub Actions / Check Spelling

`advinstexe` is not a recognized word. (unrecognized-spelling)
{
result = InstallerTypeEnum::AdvancedInstaller;
result = InstallerTypeEnum::AdvinstExe;
}

return result;
@@ -588,8 +588,8 @@
return "msstore"sv;
case InstallerTypeEnum::Portable:
return "portable"sv;
case InstallerTypeEnum::AdvancedInstaller:
return "advancedinstaller"sv;
case InstallerTypeEnum::AdvinstExe:
return "advinstexe"sv;
}

return "unknown"sv;
@@ -896,7 +896,7 @@
installerType == InstallerTypeEnum::Wix ||
installerType == InstallerTypeEnum::Burn ||
installerType == InstallerTypeEnum::Portable ||
installerType == InstallerTypeEnum::AdvancedInstaller
installerType == InstallerTypeEnum::AdvinstExe
);
}

@@ -910,7 +910,7 @@
installerType == InstallerTypeEnum::Wix ||
installerType == InstallerTypeEnum::Burn ||
installerType == InstallerTypeEnum::Portable ||
installerType == InstallerTypeEnum::AdvancedInstaller
installerType == InstallerTypeEnum::AdvinstExe
);
}

@@ -923,7 +923,7 @@
installerType == InstallerTypeEnum::Nullsoft ||
installerType == InstallerTypeEnum::Wix ||
installerType == InstallerTypeEnum::Burn ||
installerType == InstallerTypeEnum::AdvancedInstaller
installerType == InstallerTypeEnum::AdvinstExe
);
}

@@ -950,7 +950,7 @@
installerType == InstallerTypeEnum::Inno ||
installerType == InstallerTypeEnum::Nullsoft ||
installerType == InstallerTypeEnum::Exe ||
installerType == InstallerTypeEnum::AdvancedInstaller;
installerType == InstallerTypeEnum::AdvinstExe;
}

bool IsArchiveType(InstallerTypeEnum installerType)
@@ -974,7 +974,7 @@
nestedInstallerType == InstallerTypeEnum::Burn ||
nestedInstallerType == InstallerTypeEnum::Portable ||
nestedInstallerType == InstallerTypeEnum::Msix ||
nestedInstallerType == InstallerTypeEnum::AdvancedInstaller
nestedInstallerType == InstallerTypeEnum::AdvinstExe
);
}

@@ -1033,13 +1033,13 @@
{InstallerSwitchType::Log, ManifestInstaller::string_t("/LOG=\"" + std::string(ARG_TOKEN_LOGPATH) + "\"")},
{InstallerSwitchType::InstallLocation, ManifestInstaller::string_t("/DIR=\"" + std::string(ARG_TOKEN_INSTALLPATH) + "\"")}
};
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:
return
{
{InstallerSwitchType::Silent, ManifestInstaller::string_t("/exenoui /quiet /norestart")},

Check warning on line 1039 in src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp

GitHub Actions / Check Spelling

`exenoui` is not a recognized word. (unrecognized-spelling)
{InstallerSwitchType::SilentWithProgress, ManifestInstaller::string_t("/exenoui /passive /norestart")},
{InstallerSwitchType::Log, ManifestInstaller::string_t("/l*v \"" + std::string(ARG_TOKEN_LOGPATH) + "\"")},
{InstallerSwitchType::InstallLocation, ManifestInstaller::string_t("APPDIR=\"" + std::string(ARG_TOKEN_INSTALLPATH) + "\"")}

Check warning on line 1042 in src/AppInstallerCommonCore/Manifest/ManifestCommon.cpp

GitHub Actions / Check Spelling

`APPDIR` is not a recognized word. (unrecognized-spelling)
};
default:
return {};
@@ -1074,7 +1074,7 @@
case InstallerTypeEnum::Burn:
case InstallerTypeEnum::Wix:
case InstallerTypeEnum::Msi:
case InstallerTypeEnum::AdvancedInstaller:
case InstallerTypeEnum::AdvinstExe:
// See https://docs.microsoft.com/windows/win32/msi/error-codes
return
{
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ namespace AppInstaller::Manifest
Burn,
MSStore,
Portable,
AdvancedInstaller,
AdvinstExe,
};

enum class UpdateBehaviorEnum
Original file line number Diff line number Diff line change
@@ -531,9 +531,9 @@ namespace AppInstaller::Repository::Rest::Schema::V1_0::Json
{
return InstallerTypeEnum::Burn;
}
else if (inStrLower == "advancedinstaller")
else if (inStrLower == "advinstexe")
{
return InstallerTypeEnum::AdvancedInstaller;
return InstallerTypeEnum::AdvinstExe;
}

return InstallerTypeEnum::Unknown;
8 changes: 4 additions & 4 deletions src/Microsoft.Management.Deployment/Converters.cpp
Original file line number Diff line number Diff line change
@@ -285,8 +285,8 @@ namespace winrt::Microsoft::Management::Deployment::implementation
return Microsoft::Management::Deployment::PackageInstallerType::Wix;
case ::AppInstaller::Manifest::InstallerTypeEnum::Zip:
return Microsoft::Management::Deployment::PackageInstallerType::Zip;
case ::AppInstaller::Manifest::InstallerTypeEnum::AdvancedInstaller:
return Microsoft::Management::Deployment::PackageInstallerType::AdvancedInstaller;
case ::AppInstaller::Manifest::InstallerTypeEnum::AdvinstExe:
return Microsoft::Management::Deployment::PackageInstallerType::AdvinstExe;
case ::AppInstaller::Manifest::InstallerTypeEnum::Unknown:
return Microsoft::Management::Deployment::PackageInstallerType::Unknown;
}
@@ -318,8 +318,8 @@ namespace winrt::Microsoft::Management::Deployment::implementation
return ::AppInstaller::Manifest::InstallerTypeEnum::Wix;
case Microsoft::Management::Deployment::PackageInstallerType::Zip:
return ::AppInstaller::Manifest::InstallerTypeEnum::Zip;
case Microsoft::Management::Deployment::PackageInstallerType::AdvancedInstaller:
return ::AppInstaller::Manifest::InstallerTypeEnum::AdvancedInstaller;
case Microsoft::Management::Deployment::PackageInstallerType::AdvinstExe:
return ::AppInstaller::Manifest::InstallerTypeEnum::AdvinstExe;
case Microsoft::Management::Deployment::PackageInstallerType::Unknown:
return ::AppInstaller::Manifest::InstallerTypeEnum::Unknown;
}
4 changes: 2 additions & 2 deletions src/Microsoft.Management.Deployment/PackageManager.idl
Original file line number Diff line number Diff line change
@@ -467,8 +467,8 @@ namespace Microsoft.Management.Deployment
MSStore,
/// Portable type.
Portable,
/// AdvancedInstaller type.
AdvancedInstaller
/// AdvancedInstaller exe type.
AdvinstExe,
};

/// The package installer scope.
Loading