Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
--self-contained true
--verbosity minimal

- name: Build GUI App (BootstrapMate.exe)
- name: Build GUI App (Managed Bootstrap Install.exe)
run: >
dotnet publish src/BootstrapMate.App/BootstrapMate.App.csproj
--configuration Release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
--self-contained true
--verbosity minimal

- name: Build GUI App (BootstrapMate.exe)
- name: Build GUI App (Managed Bootstrap Install.exe)
run: >
dotnet publish src/BootstrapMate.App/BootstrapMate.App.csproj
--configuration Release
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
$zipDir = Join-Path $env:RUNNER_TEMP "zip-$arch"
New-Item -ItemType Directory -Path $zipDir -Force | Out-Null
Copy-Item "publish/executables/$arch/managedbootstrapinstall.exe" $zipDir/
if (Test-Path "publish/app/$arch/BootstrapMate.exe") {
if (Test-Path "publish/app/$arch/Managed Bootstrap Install.exe") {
Copy-Item "publish/app/$arch/*" $zipDir/ -Recurse
}
Compress-Archive -Path "$zipDir/*" -DestinationPath "$staging/BootstrapMate-$arch-$version.zip" -Force
Expand Down
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ function Build-AppArchitecture {
throw "dotnet publish failed for App with exit code: $LASTEXITCODE"
}

$executablePath = Join-Path $outputDir "BootstrapMate.exe"
$executablePath = Join-Path $outputDir "Managed Bootstrap Install.exe"

if (-not (Test-Path $executablePath)) {
throw "Expected App executable not found: $executablePath"
Expand Down Expand Up @@ -2027,7 +2027,7 @@ try {
Architecture = $arch
Success = ($appSuccess -eq $true)
Unsigned = ($appSuccess -eq "unsigned")
Path = "publish\app\$arch\BootstrapMate.exe"
Path = "publish\app\$arch\Managed Bootstrap Install.exe"
}
}

Expand Down
6 changes: 3 additions & 3 deletions installer/BootstrapMate.Installer.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
than the harvester script's stack trace. -->
<Target Name="GenerateGuiAppFiles"
BeforeTargets="BeforeBuild"
Condition="Exists('$(AppDir)\BootstrapMate.exe')">
Condition="Exists('$(AppDir)\Managed Bootstrap Install.exe')">
<MakeDir Directories="$(IntermediateOutputPath)" />
<Exec Command="pwsh -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\Generate-GuiAppFiles.ps1&quot; -AppDir &quot;$(AppDir)&quot; -OutputPath &quot;$(IntermediateOutputPath)GuiAppFiles.wxs&quot;" />
<ItemGroup>
Expand All @@ -54,8 +54,8 @@
<Target Name="BeforeBuild">
<Error Text="BootstrapMate executable not found at $(BinDir)\managedbootstrapinstall.exe. Please run build.ps1 first."
Condition="!Exists('$(BinDir)\managedbootstrapinstall.exe')" />
<Error Text="BootstrapMate GUI app executable not found at $(AppDir)\BootstrapMate.exe. Run build.ps1 to publish the GUI before building the MSI."
Condition="!Exists('$(AppDir)\BootstrapMate.exe')" />
<Error Text="BootstrapMate GUI app executable not found at $(AppDir)\Managed Bootstrap Install.exe. Run build.ps1 to publish the GUI before building the MSI."
Condition="!Exists('$(AppDir)\Managed Bootstrap Install.exe')" />
</Target>

</Project>
16 changes: 10 additions & 6 deletions installer/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<?define ProductVersion = "0.0.0"?>
<?endif?>
<!-- Package Definition -->
<Package Name="BootstrapMate"
<Package Name="Managed Bootstrap Install"
Version="$(var.ProductVersion)"
Manufacturer="Windows Admins Open Source"
UpgradeCode="{87654321-4321-8765-CBA9-BA0987654321}"
Expand All @@ -32,12 +32,16 @@
Cabinet="bootstrapmate.cab"
EmbedCab="yes" />

<!-- Add/Remove Programs icon, sourced from the published GUI app output -->
<Icon Id="AppIcon.ico" SourceFile="$(var.APP_DIR)\Assets\BootstrapMate.ico" />
<Property Id="ARPPRODUCTICON" Value="AppIcon.ico" />

<!-- Directory Structure -->
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="INSTALLDIR" Name="BootstrapMate" />
</StandardDirectory>
<StandardDirectory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="BootstrapMate" />
<Directory Id="ApplicationProgramsFolder" Name="Managed Bootstrap Install" />
</StandardDirectory>

<!-- Main Application Files -->
Expand All @@ -49,7 +53,7 @@
<RemoveFile Id="RemoveLegacyExecutable" Name="installapplications.exe" On="both" />
</Component>

<!-- GUI Application files (BootstrapMate.exe + WinUI 3 dependencies) are
<!-- GUI Application files (Managed Bootstrap Install.exe + WinUI 3 dependencies) are
harvested from $(var.APP_DIR) into the GuiAppFiles ComponentGroup by
the Generate-GuiAppFiles.ps1 pre-build target in the wixproj. -->

Expand Down Expand Up @@ -111,14 +115,14 @@
</Component>

<!-- Start Menu shortcut for the BootstrapMate GUI app. Target is the
BootstrapMate.exe harvested into INSTALLDIR by Generate-GuiAppFiles.ps1;
Managed Bootstrap Install.exe harvested into INSTALLDIR by Generate-GuiAppFiles.ps1;
we don't bind to its File Id since the deterministic id may change if
the source path ever moves. -->
<Component Id="StartMenuShortcut" Directory="ApplicationProgramsFolder" Guid="3F8B9D2A-7C4E-4B1A-9D2F-1A3B5C7E9D1F">
<Shortcut Id="BootstrapMateStartMenuShortcut"
Name="BootstrapMate"
Name="Managed Bootstrap Install"
Description="MDM-agnostic bootstrapping tool for Windows"
Target="[INSTALLDIR]BootstrapMate.exe"
Target="[INSTALLDIR]Managed Bootstrap Install.exe"
WorkingDirectory="INSTALLDIR" />
<RemoveFolder Id="CleanupApplicationProgramsFolder" Directory="ApplicationProgramsFolder" On="uninstall" />
<!-- HKCU KeyPath required by MSI for shortcut-only components (ICE38/43/57). -->
Expand Down
5 changes: 4 additions & 1 deletion src/BootstrapMate.App/BootstrapMate.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
<RootNamespace>BootstrapMate.App</RootNamespace>
<AssemblyName>BootstrapMate</AssemblyName>
<AssemblyName>Managed Bootstrap Install</AssemblyName>
<Product>Managed Bootstrap Install</Product>
<Description>Managed Bootstrap Install</Description>
<ApplicationIcon>Assets\BootstrapMate.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<PublishSingleFile>false</PublishSingleFile>
<SelfContained>true</SelfContained>
Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapMate.App/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:views="using:BootstrapMate.App.Views"
Title="BootstrapMate">
Title="Managed Bootstrap Install">

<Grid>
<Grid.RowDefinitions>
Expand All @@ -14,7 +14,7 @@
<!-- Custom title bar region (drag target) -->
<Grid x:Name="AppTitleBar" Grid.Row="0" Height="32"
Background="Transparent">
<TextBlock Text="BootstrapMate" VerticalAlignment="Center"
<TextBlock Text="Managed Bootstrap Install" VerticalAlignment="Center"
Margin="16,0,0,0" Style="{StaticResource CaptionTextBlockStyle}" />
</Grid>

Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapMate.App/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public MainWindow()
{
InitializeComponent();

Title = "BootstrapMate";
Title = "Managed Bootstrap Install";

// DPI-aware sizing clamped to available screen work area
var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
Expand Down
6 changes: 3 additions & 3 deletions src/BootstrapMate.App/ViewModels/RunViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ private async Task RunAsync(PrefsViewModel prefs)
var cliPath = FindCliExecutable();
if (cliPath is null)
{
AppendLine("[ERROR] CLI executable not found. Install BootstrapMate or check the install path.", LogLevel.Error);
AppendLine("[ERROR] CLI executable not found. Install Managed Bootstrap Install or check the install path.", LogLevel.Error);
IsRunning = false;
return;
}
Expand Down Expand Up @@ -101,7 +101,7 @@ private async Task RunAsync(PrefsViewModel prefs)
return;
}

AppendLine($"[i] BootstrapMate started (PID: {_cliProcess.Id})", LogLevel.Info);
AppendLine($"[i] Managed Bootstrap Install started (PID: {_cliProcess.Id})", LogLevel.Info);

// Tail the log file in background
var tailTask = TailLogFileAsync(logDir, existingLogs, _cts.Token);
Expand All @@ -121,7 +121,7 @@ private async Task RunAsync(PrefsViewModel prefs)
}
catch (System.ComponentModel.Win32Exception)
{
AppendLine("[ERROR] Elevation denied — BootstrapMate requires administrator privileges.", LogLevel.Error);
AppendLine("[ERROR] Elevation denied — Managed Bootstrap Install requires administrator privileges.", LogLevel.Error);
}
catch (Exception ex)
{
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapMate.App/Views/PrefsPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<StackPanel HorizontalAlignment="Center" Spacing="8" Margin="0,8,0,4">
<Image x:Name="AppIcon" Width="64" Height="64" HorizontalAlignment="Center" />

<TextBlock Text="BootstrapMate"
<TextBlock Text="Managed Bootstrap Install"
Style="{StaticResource TitleTextBlockStyle}"
HorizontalAlignment="Center" />

Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapMate.App/Views/RunPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<Button x:Name="RunButton" Grid.Column="0" Click="RunButton_Click" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal" Spacing="8">
<FontIcon x:Name="RunIcon" Glyph="&#xE768;" FontSize="16" />
<TextBlock x:Name="RunText" Text="Run BootstrapMate" />
<TextBlock x:Name="RunText" Text="Run Managed Bootstrap Install" />
</StackPanel>
</Button>

Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapMate.App/Views/RunPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private void UpdateRunningState()
else
{
RunIcon.Glyph = "\uE768"; // Play icon
RunText.Text = "Run BootstrapMate";
RunText.Text = "Run Managed Bootstrap Install";
RunButton.Background = null; // Reset to default
RunningProgress.IsActive = false;
RunningLabel.Visibility = Visibility.Collapsed;
Expand Down
Loading