Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 03:07:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Setup] Use custom prefix for WiX bootstrapper logs and collect them via BugReportTool (#17062)

Browse Source
This commit is contained in:
Andrey Nekrasov
2022-03-16 14:39:00 +03:00
committed by GitHub
parent 79d4782b23
commit 41f4d971dd
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/PowerToysSetup/PowerToys.wxs
View File

@@ -27,6 +27,8 @@
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]PowerToys" bal:Overridable="yes"/> <Variable Name="InstallFolder" Type="string" Value="[ProgramFiles64Folder]PowerToys" bal:Overridable="yes"/>
<Variable Name="MsiLogFolder" Type="string" Value="[LocalAppDataFolder]\Microsoft\PowerToys\" />
<Log Disable="no" Prefix='powertoys-bootstrapper-msi-$(var.Version)' Extension=".log" />
<!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) --> <!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
<!-- If the previous installation is a bundle installation, just let WiX run its logic. --> <!-- If the previous installation is a bundle installation, just let WiX run its logic. -->

30
tools/BugReportTool/BugReportTool/Main.cpp
View File

@@ -184,7 +184,7 @@ void ReportWindowsVersion(const filesystem::path& tmpDir)
versionReport << "MinorVersion: " << osInfo.dwMinorVersion << endl; versionReport << "MinorVersion: " << osInfo.dwMinorVersion << endl;
versionReport << "BuildNumber: " << osInfo.dwBuildNumber << endl; versionReport << "BuildNumber: " << osInfo.dwBuildNumber << endl;
} }
catch(...) catch (...)
{ {
printf("Failed to write to %s\n", versionReportPath.string().c_str()); printf("Failed to write to %s\n", versionReportPath.string().c_str());
} }
@@ -197,7 +197,7 @@ void ReportWindowsSettings(const filesystem::path& tmpDir)
try try
{ {
const auto lang = winrt::Windows::System::UserProfile::GlobalizationPreferences::Languages().GetAt(0); const auto lang = winrt::Windows::System::UserProfile::GlobalizationPreferences::Languages().GetAt(0);
userLanguage = winrt::Windows::Globalization::Language{lang}.DisplayName().c_str(); userLanguage = winrt::Windows::Globalization::Language{ lang }.DisplayName().c_str();
wchar_t localeName[LOCALE_NAME_MAX_LENGTH]{}; wchar_t localeName[LOCALE_NAME_MAX_LENGTH]{};
if (!LCIDToLocaleName(GetThreadLocale(), localeName, LOCALE_NAME_MAX_LENGTH, 0)) if (!LCIDToLocaleName(GetThreadLocale(), localeName, LOCALE_NAME_MAX_LENGTH, 0))
{ {
@@ -217,11 +217,10 @@ void ReportWindowsSettings(const filesystem::path& tmpDir)
settingsReport << "Preferred user language: " << userLanguage << endl; settingsReport << "Preferred user language: " << userLanguage << endl;
settingsReport << "User locale: " << userLocale << endl; settingsReport << "User locale: " << userLocale << endl;
} }
catch(...) catch (...)
{ {
printf("Failed to write windows settings\n"); printf("Failed to write windows settings\n");
} }
} }
void ReportDotNetInstallationInfo(const filesystem::path& tmpDir) void ReportDotNetInstallationInfo(const filesystem::path& tmpDir)
@@ -253,6 +252,27 @@ void ReportVCMLogs(const filesystem::path& tmpDir, const filesystem::path& repor
copy(tmpDir / "PowerToysVideoConference_x64.log", reportDir, ec); copy(tmpDir / "PowerToysVideoConference_x64.log", reportDir, ec);
} }
void ReportInstallerLogs(const filesystem::path& tmpDir, const filesystem::path& reportDir)
{
const char* logFilePrefix = "powertoys-bootstrapper-msi-";
for (auto& entry : directory_iterator{ tmpDir })
{
std::error_code ec;
if (entry.is_directory(ec) || !entry.path().has_filename())
{
continue;
}
const auto fileName = entry.path().filename().string();
if (!fileName.starts_with(logFilePrefix))
{
continue;
}
copy(entry.path(), reportDir / fileName, ec);
}
}
int wmain(int argc, wchar_t* argv[], wchar_t*) int wmain(int argc, wchar_t* argv[], wchar_t*)
{ {
// Get path to save zip // Get path to save zip
@@ -329,6 +349,8 @@ int wmain(int argc, wchar_t* argv[], wchar_t*)
ReportVCMLogs(tempDir, reportDir); ReportVCMLogs(tempDir, reportDir);
ReportInstallerLogs(tempDir, reportDir);
// Zip folder // Zip folder
auto zipPath = path::path(saveZipPath); auto zipPath = path::path(saveZipPath);