Skip to content

Dev #4

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.

Sign up for GitHub

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

Merged
jcasale merged 2 commits into from
May 18, 2025
Merged

Dev #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e834e6
Updates nuget packages.
jcasale May 18, 2025
2da855f
Restores installer dialog type.
jcasale May 18, 2025
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 src/PSDataProtection/PSDataProtection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.PowerShell.5.1.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.4" PrivateAssets="All" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.5" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup>
Expand Down
51 changes: 26 additions & 25 deletions src/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Package Name="PowerShell Data Protection Module"
Language="1033"
Version="$(var.ProductVersion)"
Manufacturer="Joseph L. Casale"
UpgradeCode="12d8a258-6fad-4f0e-9f1d-6062ded1e8e9">
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Package Name="PowerShell Data Protection Module" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Joseph L. Casale" UpgradeCode="12d8a258-6fad-4f0e-9f1d-6062ded1e8e9">
<SummaryInformation Description="A PowerShell module that utilizes Microsoft Data Protection to encrypt and decrypt secrets." Comments="PSDataProtection v$(var.ProductVersion)" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<Media Id="1" Cabinet="Data.cab" EmbedCab="yes" CompressionLevel="high" />

<Feature Id="Product"
Description="PowerShell Data Protection Module"
Title="PSDataProtection"
AllowAbsent="no">
<Feature Id="Product" Description="PowerShell Data Protection Module" Title="PSDataProtection" AllowAbsent="no">
<ComponentGroupRef Id="ProductComponents" />
</Feature>

<UI>
<ui:WixUI Id="WixUI_FeatureTree_NoLicense" />
<ui:WixUI Id="WixUI_InstallDir_NoLicense" InstallDirectory="INSTALLFOLDER" />
</UI>

<StandardDirectory Id="ProgramFiles6432Folder">
<Directory Id="WindowsPowerShell" Name="WindowsPowerShell">
<Directory Id="Modules" Name="Modules">
<Directory Id="PSDataProtection" Name="PSDataProtection">
<Directory Id="INSTALLDIR" Name="$(var.ProductVersion)" />
<Directory Id="INSTALLFOLDER" Name="$(var.ProductVersion)" />
</Directory>
</Directory>
</Directory>
</StandardDirectory>

<ComponentGroup Id="ProductComponents" Directory="INSTALLDIR">
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Files Include="$(var.ProductSource)\**" />
</ComponentGroup>
</Package>

<?foreach WIXUIARCH in X86;X64;A64?>
<Fragment>
<UI Id="WixUI_FeatureTree_NoLicense_$(WIXUIARCH)" />
<UIRef Id="WixUI_FeatureTree_NoLicense" />
</Fragment>
<Fragment>
<UI Id="WixUI_InstallDir_NoLicense_$(WIXUIARCH)">
<Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="3" />
<Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath_$(WIXUIARCH)" Order="2" />
</UI>

<UIRef Id="WixUI_InstallDir_NoLicense" />
</Fragment>
<?endforeach?>

<Fragment>
<UI Id="file WixUI_FeatureTree_NoLicense">
<UI Id="file WixUI_InstallDir_NoLicense">
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
Expand All @@ -63,26 +61,29 @@

<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />

<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="CustomizeDlg" Condition="NOT Installed" />
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Condition="NOT Installed" />
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />

<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1" Condition="Installed" />
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="NOT Installed" />
<Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" />
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
<Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="3" />
<Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4" />
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1" />
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2" />

<Publish Dialog="BrowseDlg" Control="OK" Event="SetTargetPath" Value="[_BrowseProperty]" Order="3" />
<Publish Dialog="BrowseDlg" Control="OK" Event="EndDialog" Value="Return" Order="4" />

<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1" Condition="NOT Installed OR WixUI_InstallMode = &quot;Change&quot;" />
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1" Condition="NOT Installed" />
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3" Condition="Installed AND PATCH" />
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" Condition="Installed AND PATCH" />

<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />

<Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg" />
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />

<Property Id="ARPNOMODIFY" Value="1" />
</UI>

<UIRef Id="WixUI_Common" />
Expand Down
2 changes: 1 addition & 1 deletion src/Tests/Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="Microsoft.PowerShell.5.1.ReferenceAssemblies" Version="1.0.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.4" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.5" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down