Skip to content

Commit

Permalink
Version 2.5 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
TimMangan committed Mar 12, 2021
1 parent cd5542e commit 6cab3f5
Show file tree
Hide file tree
Showing 8 changed files with 110 additions and 104 deletions.
10 changes: 8 additions & 2 deletions Notes.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Version 1.2.0
Version 2.1.0
Added pause/resume to Start-PassiveSleep.
Added Overwrite switch parameter to Copy-PassiveFolder
Fix bug in New-PassiveDesktopShortcut to write new shortcut to correct location.
Add support in Remove-PassiveDesktopShortcuts and Remove-PassiveStartMenuShortcuts for URL style shortcuts.
Documentation updates
Documentation updates

Version 2.2.0
Add CurrentUser switch parameter to New-PassiveDesktopShortcut.
Fix to Remove-PassiveRegistryItem.
Documentation updates.

4 changes: 2 additions & 2 deletions PassiveInstall/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
[assembly: AssemblyVersion("2.5.0.0")]
[assembly: AssemblyFileVersion("2.5.0.0")]
Binary file modified SetupPassiveInstallx64/License.rtf
Binary file not shown.
2 changes: 1 addition & 1 deletion SetupPassiveInstallx64/PassiveInstall.psd1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@{
ModuleVersion = '1.0.0.0'
ModuleVersion = '2.5.0.0'
GUID = '7479f155-d1f0-420b-983a-a8844317896a'
Author = 'TMurgent Technologies, LLP'
CompanyName = 'TMurgent Technologies, LLP'
Expand Down
190 changes: 95 additions & 95 deletions SetupPassiveInstallx64/Product.wxs
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<?include incPlatforms.wxi ?>
<?define ProductVersion=!(bind.FileVersion.PassiveInstall.dll) ?>

<Product Id="*" Name="PassiveInstallx64" Language="1033" Version="$(var.ProductVersion)" Manufacturer="TMurgent Technologies" UpgradeCode="7479f155-d1f0-420b-983a-a8844317896a">

<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"
Comments="PassiveInstall $(var.ProductVersion) x64 PowerShell Module installer."
Description="$(var.ProductName)"
/>

<Upgrade Id="7479f155-d1f0-420b-983a-a8844317896a">
<UpgradeVersion OnlyDetect="yes" Minimum="0.0.0.0" Maximum="$(var.ProductVersion)" Property="PREVIOUSVERSIONSINSTALLED" IncludeMinimum="yes" IncludeMaximum="no" />
<UpgradeVersion OnlyDetect="yes" Minimum="$(var.ProductVersion)" Maximum="$(var.ProductVersion)" Property="SELFFOUND" IncludeMinimum="yes" IncludeMaximum="yes" />
<UpgradeVersion OnlyDetect="yes" Minimum="$(var.ProductVersion)" Maximum="99.0.0.0" Property="NEWERVERSIONSINSTALLED" IncludeMinimum="no" IncludeMaximum="yes" />
</Upgrade>

<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

<MediaTemplate EmbedCab="yes" />


<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PlatformProgramFilesFolder)">
<Directory Id="WPS_DIR" Name="WindowsPowerShell" >
<Directory Id="MODULES_DIR" Name="Modules" >
<Directory Id="INSTALLDIR" Name="PassiveInstall" >
<Directory Id="EN_US" Name="en-us">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>

<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />

<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="banner.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="LargeBanner.png" />


<Feature Id="ProductFeature" Title="SetupPassiveInstall" Level="1">
<ComponentGroupRef Id="ProductComponents" />
<ComponentGroupRef Id="HelpAboutComponents" />
</Feature>


<UI >
<UIRef Id="WixUI_InstallDir"/>
<UIRef Id="WixUI_ErrorProgressText" />
</UI>

<Icon Id="PassiveInstallIcon.ico" SourceFile="..\PassiveInstall\Icon1.ico"/>
<Property Id="ARPPRODUCTICON" Value="PassiveInstallIcon.ico" />

</Product>


<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLDIR">
<Component Id="ProductComponent" Guid="1A7390A3-B62E-407E-8238-11BC5A14C30C">
<File Id="License.rtf" Name="License.rtf" Source="License.rtf" Vital="no" KeyPath="no" DiskId="1" Hidden="no" />
<File Id="PassiveInstallIcon.ico" Name="PassiveInstallIcon.ico" Source="..\PassiveInstall\Icon1.ico" Vital="no" KeyPath="no" DiskId="1" Hidden="yes" />
<File Id="PassiveInstall.dll" Name="PassiveInstall.dll" Source="..\PassiveInstall\bin\x64\Release\PassiveInstall.dll"
Vital="yes" KeyPath="yes" DiskId="1" >
<netfx:NativeImage Id="PassiveInstall.ni.dll" Platform="all" Priority="1" />
</File>
<File Id="Interop.IWshRuntimeLibrary.dll" Name="Interop.IWshRuntimeLibrary.dll" Source="..\PassiveInstall\bin\x64\Release\Interop.IWshRuntimeLibrary.dll"
Vital="yes" KeyPath="no" DiskId="1" Hidden="yes" />
<File Id="Interop.Shell32.dll" Name="Interop.Shell32.dll" Source="..\PassiveInstall\bin\x64\Release\Interop.Shell32.dll"
Vital="yes" KeyPath="no" DiskId="1" Hidden="yes" />
<File Id="PassiveInstall.psd1" Name="PassiveInstall.psd1" Source="PassiveInstall.psd1" Vital="yes" KeyPath="no" DiskId="1" Hidden="no" />
<!-- Not needed since this is now a standard path
<Environment Id="SET_ENV"
Action="set"
Name="PSModulePath"
Part="last"
Permanent="no"
System="yes"
Value="[MODULES_DIR]" />
-->
</Component>
</ComponentGroup>
<ComponentGroup Id="HelpAboutComponents" Directory="EN_US">
<Component Id="HelpAboutComponent" Guid="{4E8BBA2E-90E8-44FF-A788-513546E6A903}">
<File Id="About_PassiveInstall.help.txt" Name="About_PassiveInstall.help.txt" Source="..\About_PassiveInstall.help.txt" Vital="yes" KeyPath="yes" DiskId="1" Hidden="no" />
<File Id="PassiveInstall.dll.help.xml" Name="PassiveInstall.dll-help.xml" Source="..\PassiveInstall.dll-help.xml" Vital="yes" KeyPath="no" DiskId="1" Hidden="no" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
xmlns:ps="http://scmenas.micosoft.com/wix/PSExtension">
<?include incPlatforms.wxi ?>
<?define ProductVersion=!(bind.FileVersion.PassiveInstall.dll) ?>

<Product Id="*" Name="PassiveInstallx64" Language="1033" Version="$(var.ProductVersion)" Manufacturer="TMurgent Technologies" UpgradeCode="7479f155-d1f0-420b-983a-a8844317896a">

<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"
Comments="PassiveInstall $(var.ProductVersion) x64 PowerShell Module installer."
Description="$(var.ProductName)"
/>

<Upgrade Id="7479f155-d1f0-420b-983a-a8844317896a">
<UpgradeVersion OnlyDetect="yes" Minimum="0.0.0.0" Maximum="$(var.ProductVersion)" Property="PREVIOUSVERSIONSINSTALLED" IncludeMinimum="yes" IncludeMaximum="no" />
<UpgradeVersion OnlyDetect="yes" Minimum="$(var.ProductVersion)" Maximum="$(var.ProductVersion)" Property="SELFFOUND" IncludeMinimum="yes" IncludeMaximum="yes" />
<UpgradeVersion OnlyDetect="yes" Minimum="$(var.ProductVersion)" Maximum="99.0.0.0" Property="NEWERVERSIONSINSTALLED" IncludeMinimum="no" IncludeMaximum="yes" />
</Upgrade>

<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

<MediaTemplate EmbedCab="yes" />


<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PlatformProgramFilesFolder)">
<Directory Id="WPS_DIR" Name="WindowsPowerShell" >
<Directory Id="MODULES_DIR" Name="Modules" >
<Directory Id="INSTALLDIR" Name="PassiveInstall" >
<Directory Id="EN_US" Name="en-us">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>

<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />

<WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="banner.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="LargeBanner.png" />


<Feature Id="ProductFeature" Title="SetupPassiveInstall" Level="1">
<ComponentGroupRef Id="ProductComponents" />
<ComponentGroupRef Id="HelpAboutComponents" />
</Feature>


<UI >
<UIRef Id="WixUI_InstallDir"/>
<UIRef Id="WixUI_ErrorProgressText" />
</UI>

<Icon Id="PassiveInstallIcon.ico" SourceFile="..\PassiveInstall\Icon1.ico"/>
<Property Id="ARPPRODUCTICON" Value="PassiveInstallIcon.ico" />

</Product>


<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLDIR">
<Component Id="ProductComponent" Guid="1A7390A3-B62E-407E-8238-11BC5A14C30C">
<File Id="License.rtf" Name="License.rtf" Source="License.rtf" Vital="no" KeyPath="no" DiskId="1" Hidden="no" />
<File Id="PassiveInstallIcon.ico" Name="PassiveInstallIcon.ico" Source="..\PassiveInstall\Icon1.ico" Vital="no" KeyPath="no" DiskId="1" Hidden="yes" />
<File Id="PassiveInstall.dll" Name="PassiveInstall.dll" Source="..\PassiveInstall\bin\x64\Release\PassiveInstall.dll"
Vital="yes" KeyPath="yes" DiskId="1" >
<netfx:NativeImage Id="PassiveInstall.ni.dll" Platform="all" Priority="1" />
</File>
<File Id="Interop.IWshRuntimeLibrary.dll" Name="Interop.IWshRuntimeLibrary.dll" Source="..\PassiveInstall\bin\x64\Release\Interop.IWshRuntimeLibrary.dll"
Vital="yes" KeyPath="no" DiskId="1" Hidden="yes" />
<File Id="Interop.Shell32.dll" Name="Interop.Shell32.dll" Source="..\PassiveInstall\bin\x64\Release\Interop.Shell32.dll"
Vital="yes" KeyPath="no" DiskId="1" Hidden="yes" />
<File Id="PassiveInstall.psd1" Name="PassiveInstall.psd1" Source="PassiveInstall.psd1" Vital="yes" KeyPath="no" DiskId="1" Hidden="no" />

<Environment Id="SET_ENV"
Action="set"
Name="PSModulePath"
Part="last"
Permanent="no"
System="yes"
Value="[INSTALLDIR]" />
</Component>
</ComponentGroup>
<ComponentGroup Id="HelpAboutComponents" Directory="EN_US">
<Component Id="HelpAboutComponent" Guid="{4E8BBA2E-90E8-44FF-A788-513546E6A903}">
<File Id="About_PassiveInstall.help.txt" Name="About_PassiveInstall.help.txt" Source="..\About_PassiveInstall.help.txt" Vital="yes" KeyPath="yes" DiskId="1" Hidden="no" />
<File Id="PassiveInstall.dll.help.xml" Name="PassiveInstall.dll-help.xml" Source="..\PassiveInstall.dll-help.xml" Vital="yes" KeyPath="no" DiskId="1" Hidden="no" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
Binary file modified SetupPassiveInstallx86/License.rtf
Binary file not shown.
2 changes: 1 addition & 1 deletion SetupPassiveInstallx86/PassiveInstall.psd1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@{
ModuleVersion = '1.0.0.0'
ModuleVersion = '2.5.0.0'
GUID = '7479f155-d1f0-420b-983a-a8844317896a'
Author = 'TMurgent Technologies, LLP'
CompanyName = 'TMurgent Technologies, LLP'
Expand Down
6 changes: 3 additions & 3 deletions SetupPassiveInstallx86/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@
<File Id="Interop.Shell32.dll" Name="Interop.Shell32.dll" Source="..\PassiveInstall\bin\x86\Release\Interop.Shell32.dll"
Vital="yes" KeyPath="no" DiskId="1" Hidden="yes" />
<File Id="PassiveInstall.psd1" Name="PassiveInstall.psd1" Source="PassiveInstall.psd1" Vital="yes" KeyPath="no" DiskId="1" Hidden="no" />
<!-- Not needed since this is now a standard path

<Environment Id="SET_ENV"
Action="set"
Name="PSModulePath"
Part="last"
Permanent="no"
System="yes"
Value="[MODULES_DIR]" />
-->
Value="[INSTALLDIR]" />

</Component>
</ComponentGroup>
<ComponentGroup Id="HelpAboutComponents" Directory="EN_US">
Expand Down

0 comments on commit 6cab3f5

Please sign in to comment.