Skip to content
This repository was archived by the owner on Mar 9, 2024. It is now read-only.

Use WixPSExtension to install PowerShell extension #44

Merged
lextm merged 3 commits into from
Apr 16, 2021
Merged

Use WixPSExtension to install PowerShell extension #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5974004
Use WixPSExtension to install PowerShell extension
mbiebl Mar 31, 2021
a0dadd5
Update Powershell description
mbiebl Mar 31, 2021
d04b685
Move PowerShell module help to a different component
mbiebl Mar 31, 2021
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 Powershell/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Web.Management.PHP.Powershell")]
[assembly: AssemblyDescription("Powershell snapin for managing PHP installations on IIS 7")]
[assembly: AssemblyDescription("Powershell snapin for managing PHP installations on IIS")]
[assembly: AssemblyConfiguration("")]

// Setting ComVisible to false makes the types in this assembly not visible
Expand Down
2 changes: 1 addition & 1 deletion Powershell/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Powershell/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<value>&lt;Not set&gt;</value>
</data>
<data name="SnapInDescription" xml:space="preserve">
<value>A PowerShell snapin for managing PHP installations on IIS 7.</value>
<value>A PowerShell snapin for managing PHP installations on IIS.</value>
</data>
<data name="SnapInVendor" xml:space="preserve">
<value>PHP Manager Project</value>
Expand Down
6 changes: 5 additions & 1 deletion Setup/PHPManagerForIIS.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
<Compile Include="Product.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixPSExtension">
<HintPath>$(WixExtDir)\WixPSExtension.dll</HintPath>
<Name>WixPSExtension</Name>
</WixExtension>
<WixExtension Include="WixIIsExtension">
<HintPath>$(WixExtDir)\WixIIsExtension.dll</HintPath>
<Name>WixIIsExtension</Name>
Expand Down Expand Up @@ -64,4 +68,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
49 changes: 0 additions & 49 deletions Setup/PHPManagerSetupHelper/InstallUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ private static void Execute(string name, string type)
iisVersion == 7 ? "v3.5" : "v4.0.30319"))));
var assembly = Assembly.GetExecutingAssembly();
RegisterIIS(framework, assembly, name, type);
RegisterSnapin(framework, assembly, type);
}

private static void RegisterIIS(string framework, Assembly assembly, string name, string type)
Expand Down Expand Up @@ -100,54 +99,6 @@ private static void RegisterIIS(string framework, Assembly assembly, string name
File.Delete(program);
}

private static void RegisterSnapin(string framework, Assembly assembly, string type)
{
var compiler = Path.Combine(framework, "csc.exe");

var source = Path.GetTempFileName();
var program = source + ".powershell.exe";
using (var stream = assembly.GetManifestResourceStream("Web.Management.PHP.Setup.Program2.cs"))
using (StreamReader reader = new StreamReader(stream))
{
var content = reader.ReadToEnd();
File.WriteAllText(source, content);
}

using (var process = new Process
{
StartInfo = new ProcessStartInfo
{
FileName = compiler,
Arguments = string.Format("/out:\"{0}\" \"{1}\"", program, source),
WindowStyle = ProcessWindowStyle.Hidden,
CreateNoWindow = true
}
})
{
process.Start();
process.WaitForExit();
}

File.Delete(source);

using (var process = new Process
{
StartInfo = new ProcessStartInfo
{
FileName = program,
Arguments = type == null ? string.Format("/u \"{0}\"", assembly.Location) : string.Format("/i \"{0}\"", assembly.Location),
WindowStyle = ProcessWindowStyle.Hidden,
CreateNoWindow = true
}
})
{
process.Start();
process.WaitForExit();
}

File.Delete(program);
}

/// <summary>
/// Removes the specified UI Module by name
/// </summary>
Expand Down
1 change: 0 additions & 1 deletion Setup/PHPManagerSetupHelper/PHPManagerSetupHelper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
</Compile>
<Compile Include="InstallUtil.cs" />
<EmbeddedResource Include="Program.cs" />
<EmbeddedResource Include="Program2.cs" />
<Compile Include="SetupAction.cs">
<SubType>Component</SubType>
</Compile>
Expand Down
79 changes: 0 additions & 79 deletions Setup/PHPManagerSetupHelper/Program2.cs
View file
Open in desktop

This file was deleted.

13 changes: 8 additions & 5 deletions Setup/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
xmlns:iis="http://schemas.microsoft.com/wix/IisExtension"
xmlns:ps="http://schemas.microsoft.com/wix/PSExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<Product Id="*"
Name="$(var.ProductName) $(var.ProductVersion)"
Expand Down Expand Up @@ -74,11 +75,11 @@
<ComponentRef Id="Web.Management.PHP.Client.resources.dll.ru_RU.GAC_comp" />

<!-- Files installed -->
<ComponentRef Id="License.rtf" />
<ComponentRef Id="Web.Management.PHP.dll" />
<ComponentRef Id="Web.Management.PHP.Client.dll" />
<ComponentRef Id="Web.Management.PHP.Setup.dll" />
<ComponentRef Id="Web.Management.PHP.PowerShell.dll" />
<ComponentRef Id="Web.Management.PHP.PowerShell.dllHelp.xml" />
<ComponentRef Id="Web.Management.PHP.Client.resources.dll.zh_CN.comp" />
<ComponentRef Id="Web.Management.PHP.Client.resources.dll.zh_TW.comp" />
<ComponentRef Id="Web.Management.PHP.Client.resources.dll.fr_FR.comp" />
Expand All @@ -94,9 +95,8 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PlatformProgramFilesFolder)">
<Directory Id="INSTALLDIR" Name="$(var.ProductName)">
<Component Id="Web.Management.PHP.PowerShell.dllHelp.xml" Guid="{268F5728-D8FB-4397-BC1B-4922BC8FD7AD}">
<File Id="License.rtf" Name="License.rtf" Vital="no" DiskId="1" Source="License.rtf" />
<File Id="Web.Management.PHP.PowerShell.dllHelp.xml" Name="Web.Management.PHP.PowerShell.dll-Help.xml" KeyPath="yes" Vital="no" DiskId="1" Source="$(var.SourceDir)\Web.Management.PHP.PowerShell.dll-Help.xml" />
<Component Id="License.rtf" Guid="{268F5728-D8FB-4397-BC1B-4922BC8FD7AD}">
<File Id="License.rtf" Name="License.rtf" KeyPath="yes" Vital="no" DiskId="1" Source="License.rtf" />
</Component>
<Component Id="Web.Management.PHP.Client.dll" Guid="{319C1A86-58E7-45EA-9408-EFB366F2A2F4}">
<File Id="Web.Management.PHP.Client.dll" Name="Web.Management.PHP.Client.dll" KeyPath="yes" Vital="no" Assembly=".net" AssemblyApplication="Web.Management.PHP.Client.dll" DiskId="1" Source="$(var.SourceDir)\Web.Management.PHP.Client.dll" />
Expand All @@ -110,7 +110,10 @@
<File Id="Web.Management.PHP.dll" Name="Web.Management.PHP.dll" KeyPath="yes" Vital="no" Assembly=".net" AssemblyApplication="Web.Management.PHP.dll" DiskId="1" Source="$(var.SourceDir)\Web.Management.PHP.dll" />
</Component>
<Component Id="Web.Management.PHP.PowerShell.dll" Guid="{4F2601CE-2A0F-430A-ADC6-F75F318CD2E7}">
<File Id="Web.Management.PHP.PowerShell.dll" Name="Web.Management.PHP.PowerShell.dll" KeyPath="yes" Vital="no" Assembly=".net" AssemblyApplication="Web.Management.PHP.PowerShell.dll" DiskId="1" Source="$(var.SourceDir)\Web.Management.PHP.PowerShell.dll" />
<File Id="Web.Management.PHP.PowerShell.dll" Name="Web.Management.PHP.PowerShell.dll" KeyPath="yes" Vital="no" Assembly=".net" AssemblyApplication="Web.Management.PHP.PowerShell.dll" DiskId="1" Source="$(var.SourceDir)\Web.Management.PHP.PowerShell.dll">
<ps:SnapIn Id="PHPManagerSnapin" Description="PHP Manager for IIS" Vendor="PHP Manager Project" />
</File>
<File Id="Web.Management.PHP.PowerShell.dllHelp.xml" Name="Web.Management.PHP.PowerShell.dll-Help.xml" Vital="no" DiskId="1" Source="$(var.SourceDir)\Web.Management.PHP.PowerShell.dll-Help.xml" />
</Component>
<Directory Id="GACFiles_Dir" Name="GAC">
<Component Id="Web.Management.PHP.Client.dll.GAC_comp" Guid="{F576C18C-A14D-4732-B13F-24E7D80C797C}">
Expand Down