Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

powershell_exec mixin support for ChefDK MSI installer #1528

Merged
merged 3 commits into from
Mar 29, 2018
Merged

powershell_exec mixin support for ChefDK MSI installer #1528

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
843c298
Adding powershell_exec supporting files to chef-dk CI and installer
Mar 14, 2018
3b2b215
Fixing path in Appveyor config
Mar 14, 2018
a713e10
Test against 64-bit only
Mar 14, 2018
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
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.reg text eol=crlf
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ cache:
environment:
matrix:
- ruby_version: "24-x64"
- ruby_version: "24"

clone_folder: c:\projects\chefdk
clone_depth: 1
Expand All @@ -22,6 +21,7 @@ branches:
install:
- systeminfo
- winrm quickconfig -q
- regedit /s c:\projects\chefdk\appveyor_registry.reg
- SET FORCE_FFI_YAJL=ext
- SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
- echo %PATH%
Expand Down
29 changes: 29 additions & 0 deletions appveyor_registry.reg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
REGEDIT4

[HKEY_CLASSES_ROOT\Chef.PowerShell]
@="Chef.PowerShell"

[HKEY_CLASSES_ROOT\Chef.PowerShell\CLSID]
@="{9008CA83-83E4-41FF-9C07-696E2CC47B52}"

[HKEY_CLASSES_ROOT\CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}]
@="Chef.PowerShell"

[HKEY_CLASSES_ROOT\CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\InprocServer32]
@="c:\\windows\\system32\\mscoree.dll"
"ThreadingModel"="Both"
"Class"="Chef.PowerShell"
"Assembly"="Chef.PowerShell, Version=1.0.14.0, Culture=neutral, PublicKeyToken=7def9f799d039a95"
"RuntimeVersion"="v4.0.30319"
"CodeBase"="file:///C:/projects/chefdk/distro/powershell/chef/Chef.PowerShell.dll"

[HKEY_CLASSES_ROOT\CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\InprocServer32\1.0.0.0]
"Class"="Chef.PowerShell"
"Assembly"="Chef.PowerShell, Version=1.0.14.0, Culture=neutral, PublicKeyToken=7def9f799d039a95"
"RuntimeVersion"="v4.0.30319"
"CodeBase"="file:///C:/projects/chefdk/distro/powershell/chef/Chef.PowerShell.dll"

[HKEY_CLASSES_ROOT\CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\ProgId]
@="Chef.PowerShell"

[HKEY_CLASSES_ROOT\CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\Implemented Categories\{62C8FE65-4EBB-45E7-B440-6E39B2CDBF29}]
30 changes: 30 additions & 0 deletions omnibus/resources/chefdk/msi/source.wxs.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,35 @@
<Environment Id="ChefPSModulePathEnvironment"
Name="PSModulePath" Action="set" Part="last" System="yes" Value="[PSMODULES]" />
</Component>
<Component Id="ChefPowerShellRegistryEntries" Guid="{6D33C736-DA7F-415C-AE19-375CDDD8A40A}">
<RegistryKey Root="HKCR" Key="Chef.PowerShell">
<RegistryValue Type="string" Value="Chef.PowerShell" />
</RegistryKey>
<RegistryKey Root="HKCR" Key="Chef.PowerShell\CLSID">
<RegistryValue Type="string" Value="{9008CA83-83E4-41FF-9C07-696E2CC47B52}" />
</RegistryKey>
<RegistryKey Root="HKCR" Key="CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}">
<RegistryValue Type="string" Value="Chef.PowerShell" />
</RegistryKey>
<RegistryKey Root="HKCR" Key="CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\InprocServer32">
<RegistryValue Type="string" Value="[System64Folder]mscoree.dll" />
<RegistryValue Type="string" Name="ThreadingModel" Value="Both" />
<RegistryValue Type="string" Name="Class" Value="Chef.PowerShell" />
<RegistryValue Type="string" Name="Assembly" Value="Chef.PowerShell, Version=1.0.14.0, Culture=neutral, PublicKeyToken=7def9f799d039a95" />
<RegistryValue Type="string" Name="RuntimeVersion" Value="v4.0.30319" />
<RegistryValue Type="string" Name="CodeBase" Value="[PSMODULES]chef\Chef.PowerShell.dll" />
</RegistryKey>
<RegistryKey Root="HKCR" Key="CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\InprocServer32\1.0.0.0">
<RegistryValue Type="string" Name="Class" Value="Chef.PowerShell" />
<RegistryValue Type="string" Name="Assembly" Value="Chef.PowerShell, Version=1.0.14.0, Culture=neutral, PublicKeyToken=7def9f799d039a95" />
<RegistryValue Type="string" Name="RuntimeVersion" Value="v4.0.30319" />
<RegistryValue Type="string" Name="CodeBase" Value="[PSMODULES]chef\Chef.PowerShell.dll" />
</RegistryKey>
<RegistryKey Root="HKCR" Key="CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\ProgId">
<RegistryValue Type="string" Value="Chef.PowerShell" />
</RegistryKey>
<RegistryKey Root="HKCR" Key="CLSID\{9008CA83-83E4-41FF-9C07-696E2CC47B52}\Implemented Categories\{62C8FE65-4EBB-45E7-B440-6E39B2CDBF29}" />
</Component>
</Directory>
<Directory Id="EMBEDDED" Name="embedded" >
<Directory Id="EMBEDDEDBIN" Name="bin" >
Expand Down Expand Up @@ -132,6 +161,7 @@
<ComponentGroupRef Id="ProjectDir" />
<ComponentRef Id="ChefDkPath" />
<ComponentRef Id="ChefPSModulePath" />
<ComponentRef Id="ChefPowerShellRegistryEntries" />
</Feature>

<Feature Id="ChefDkStartMenuShortcutFeature" Title="!(loc.FeatureChefDkStartMenuShortcut)" Description="!(loc.FeatureChefDkStartMenuShortcutDescription)" Level="1" AllowAdvertise="no" >
Expand Down