Skip to content
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.

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

[#27712] PowerToys New+ v0.1 #33136

Merged
merged 81 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
71dfed2
Very early v0.1 of New+
cgaarden May 16, 2024
fc2f58d
Merge branch 'main' into NewPlus-v0.1
cgaarden May 27, 2024
81039dc
Update PowerToysInstaller.wixproj
cgaarden May 27, 2024
35b7ee1
Restore installer
cgaarden May 28, 2024
db932c3
Update theme_helpers.h
cgaarden May 29, 2024
6ef1a3f
Delete New.wxs
cgaarden May 29, 2024
5490c65
Update logger_helper.h
cgaarden May 29, 2024
bae2a19
Removing unintended changes after merge
cgaarden May 29, 2024
9d951d1
Update Resources.resw
cgaarden May 29, 2024
19c5197
Update Resources.resw
cgaarden May 29, 2024
27e064f
Fixed GPO support
cgaarden May 29, 2024
738e926
Update ESRPSigning_core.json
cgaarden May 29, 2024
dbff411
Removed clang-format
cgaarden May 29, 2024
af738db
Update GPO setting name to reference NewPlus rather than just New - A…
cgaarden May 29, 2024
0e42492
Added additional words to expect.txt
cgaarden May 30, 2024
c33a84c
Initial Installer Changes
cgaarden Jun 8, 2024
a72529b
Fixed installer of New+
cgaarden Jun 8, 2024
07e8174
Removed non-used constant and catch if failing to load json state
cgaarden Jun 9, 2024
cd91840
New+ should be disabled by default
cgaarden Jun 11, 2024
2bb29b3
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Jun 22, 2024
985b50a
Added a couple of examples templates to the project
cgaarden Jun 28, 2024
0bff942
Merge branch 'NewPlus-v0.1' of https://github.com/cgaarden/PowerToys …
cgaarden Jun 28, 2024
a9faa1c
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Jun 28, 2024
adf1254
Updated example templates and initial work on installer (not working …
cgaarden Jun 29, 2024
b98dd4d
Made example templates installable
cgaarden Jun 30, 2024
c994257
Updated installer to install NewPlus Example Templates
cgaarden Jun 30, 2024
5e81c76
Renamed New to NewPlus throughout
cgaarden Jun 30, 2024
5af3cb7
Fixed spelling error
cgaarden Jun 30, 2024
7cb88c5
Additional NewPlus renaming
cgaarden Jun 30, 2024
18e9d61
Initial performance improvement - always enable ignoring selection count
cgaarden Jul 5, 2024
c9e4e11
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Jul 5, 2024
75f7575
Tie dark icon to app theme
cgaarden Jul 7, 2024
8f8bc03
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Jul 13, 2024
62d17a2
Added setting window param support
cgaarden Jul 13, 2024
3e2071e
Added NewPlus enable / disable dsc.yaml files
cgaarden Jul 13, 2024
44a3df0
Fixed over logging of New+ is_enabled + and fixed New+ order in the f…
cgaarden Jul 13, 2024
f03fbb3
Added aka.ms links and renamed file
cgaarden Jul 13, 2024
ba079b7
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Jul 13, 2024
4d0dd1d
Added option to hide starting digits, spaces and dots
cgaarden Jul 13, 2024
6c20efa
Don't copy prefixed numbers when option is on
cgaarden Jul 13, 2024
80bb671
Quick hack to be able to complile on 17.3
cgaarden Jul 14, 2024
05d8659
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Jul 19, 2024
7b722e9
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Jul 20, 2024
2663070
Merge branch 'main' into NewPlus-v0.1
jaimecbernardo Jul 23, 2024
3ea9cef
Fix user installer
jaimecbernardo Jul 23, 2024
9d8d86e
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Jul 25, 2024
96b835b
Address initial PR feedback
cgaarden Jul 25, 2024
a221b1e
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Aug 24, 2024
b7a50be
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Aug 24, 2024
d5652f6
Fixed merge errors
cgaarden Aug 24, 2024
e60e527
NewPlus - Updated handling of Example Templates, and updated example …
cgaarden Aug 25, 2024
7092d52
NewPlus - Updated handling of Example Templates, and updated example …
cgaarden Aug 25, 2024
d2297ce
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Aug 25, 2024
4c5892c
Spelling: Added wcsncpy to expect.txt
cgaarden Aug 25, 2024
ccd460f
New+ Fixed light and dark mode on explorer context menu
cgaarden Aug 26, 2024
251bc01
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Aug 26, 2024
96f8af3
Fix build - align WIL version
stefansjfw Aug 29, 2024
ca11ebb
Fix bad merge
stefansjfw Aug 29, 2024
6db4a0f
Cleanup vcxproj to fix ARM build
stefansjfw Aug 29, 2024
bedb0ff
Revert "Cleanup vcxproj to fix ARM build"
stefansjfw Aug 29, 2024
f2071f8
Cleanup vcxproj to fix ARM build - working one
stefansjfw Aug 29, 2024
ce23521
Revert installer PostBuildEvent
stefansjfw Aug 30, 2024
8a73961
Copy example templates also when enabling New+ via Dashboard
cgaarden Aug 31, 2024
f3c0cbe
Merge branch 'NewPlus-v0.1' of https://github.com/cgaarden/PowerToys …
cgaarden Aug 31, 2024
4825acc
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Aug 31, 2024
af8be7e
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Sep 6, 2024
046dc4c
Addressing feedback from Stefan - take 1
cgaarden Sep 7, 2024
8a2a249
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Sep 7, 2024
0239daa
Merge branch 'NewPlus-v0.1' of https://github.com/cgaarden/PowerToys …
cgaarden Sep 7, 2024
af2f134
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Sep 12, 2024
6fba6a8
Merge remote-tracking branch 'upstream/main' into NewPlus-v0.1
cgaarden Sep 15, 2024
2b7b1b7
Merge branch 'main' into pr33136
jaimecbernardo Sep 18, 2024
a57a0d5
Update GPO files
jaimecbernardo Sep 18, 2024
c98b80a
Fix building with WinRT
jaimecbernardo Sep 18, 2024
a5403e6
Remove unneeded entries to spellcheck
jaimecbernardo Sep 19, 2024
2e07256
Fix issue - samples copied again if all templates are folders
jaimecbernardo Sep 19, 2024
c69d94b
Don't send user templates from default location on bug reports
jaimecbernardo Sep 19, 2024
bcfbac2
Add warning that it doesn't work on Windows 10
jaimecbernardo Sep 19, 2024
e872654
Fix spellcheck
jaimecbernardo Sep 19, 2024
56610a5
Add warning that backup and restore won't copy templates
jaimecbernardo Sep 19, 2024
dda6cec
More specific telemetry event names
jaimecbernardo Sep 19, 2024
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
28 changes: 27 additions & 1 deletion .github/actions/spell-check/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ advapi
advfirewall
AFeature
AFFINETRANSFORM
AFolder
AFX
AGGREGATABLE
AHybrid
Expand Down Expand Up @@ -80,6 +81,8 @@ asf
AShortcut
ASingle
ASSOCCHANGED
ASSOCF
ASSOCSTR
ASYNCWINDOWPLACEMENT
ASYNCWINDOWPOS
atl
Expand Down Expand Up @@ -208,6 +211,7 @@ cne
CNF
coclass
codeofconduct
codepaths
codereview
Codespaces
codicon
Expand Down Expand Up @@ -317,6 +321,7 @@ Dedup
DEFAULTBOOTSTRAPPERINSTALLFOLDER
DEFAULTCOLOR
DEFAULTFLAGS
DEFAULTICON
DEFAULTONLY
DEFAULTTONEAREST
DEFAULTTONULL
Expand All @@ -331,6 +336,7 @@ deletethis
DENORMAL
depersist
deprioritized
DESELECTOTHERS
DESKTOPABSOLUTEEDITING
DESKTOPABSOLUTEPARSING
desktopshorcutinstalled
Expand Down Expand Up @@ -427,6 +433,7 @@ encodedlaunch
encryptor
endpointvolume
ENDSESSION
ENSUREVISIBLE
ENTERSIZEMOVE
ENU
EOAC
Expand Down Expand Up @@ -473,6 +480,7 @@ exsb
exstyle
EXTENDEDKEY
EXTENDEDVERBS
extention
EXTRINSICPROPERTIES
eyetracker
FANCYZONESDRAWLAYOUTTEST
Expand Down Expand Up @@ -508,13 +516,15 @@ FOLDERID
folderpath
FORCEMINIMIZE
formatetc
FORPARSING
FRAMECHANGED
frm
Froml
FROMTOUCH
fsmgmt
Functiondiscoverykeys
FZE
gaardmark
gacutil
Gaeilge
Gaidhlig
Expand Down Expand Up @@ -562,6 +572,7 @@ Hashset
hashtag
HASHVAL
HASSTRINGS
HASSUBCOMMANDS
hbitmap
hbm
hbmp
Expand Down Expand Up @@ -640,6 +651,7 @@ IBeam
ICapture
IClass
ICONERROR
ICONLOCATION
IData
IDD
IDesktop
Expand All @@ -657,6 +669,7 @@ IFACEMETHOD
IFACEMETHODIMP
IFile
IFilter
IGNOREUNKNOWN
IGraphics
iid
Iindex
Expand Down Expand Up @@ -718,6 +731,7 @@ ISettings
IShell
isocpp
iss
ISSEPARATOR
ITask
ith
ITHUMBNAIL
Expand Down Expand Up @@ -993,6 +1007,8 @@ newdev
NEWDIALOGSTYLE
newitem
newpath
newplus
NEWPLUSCONTEXTMENU
newrow
newsgroups
NIF
Expand All @@ -1005,14 +1021,18 @@ NOAGGREGATION
NOASYNC
NOCLOSEPROCESS
NOCOALESCE
NOCOMM
NOCONFIRMMKDIR
NOCOPYBITS
NOCOPYSECURITYATTRIBS
nodeca
nodoc
NODRAWCAPTION
NODRAWICON
NOINHERITLAYOUT
NOINTERFACE
NOLINKINFO
NOMCX
NOMINMAX
NOMIRRORBITMAP
NOMOVE
Expand Down Expand Up @@ -1413,13 +1433,16 @@ SHELLEXECUTEINFO
SHELLEXECUTEINFOW
shellscalingapi
SHFILEINFO
SHFILEOPSTRUCT
SHGDN
SHGDNF
SHGFI
shinfo
shldisp
shlobj
shlwapi
shmem
SHNAMEMAPPING
shobjidl
SHORTCUTATLEAST
shortcutcontrol
Expand Down Expand Up @@ -1524,7 +1547,7 @@ stringtable
stringval
Strm
Strmiids
Strret
strret
strsafe
strutil
sttngs
Expand All @@ -1540,6 +1563,7 @@ svchost
SVGIn
SVGIO
svgz
SVSI
SWC
SWFO
SWP
Expand Down Expand Up @@ -1744,6 +1768,7 @@ VSTHRD
VSTT
vswhere
Vtbl
WANTMAPPINGHANDLE
WANTPALM
wbem
Wbemidl
Expand All @@ -1755,6 +1780,7 @@ WCE
wcex
WClass
wcsicmp
wcsncpy
wcsnicmp
WDA
wdp
Expand Down
3 changes: 3 additions & 0 deletions .pipelines/ESRPSigning_core.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@
"PowerToys.MouseWithoutBordersHelper.dll",
"PowerToys.MouseWithoutBordersHelper.exe",

"WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
"WinUI3Apps\\NewPlusPackage.msix",

"PowerAccent.Core.dll",
"PowerToys.PowerAccent.dll",
"PowerToys.PowerAccent.exe",
Expand Down
15 changes: 15 additions & 0 deletions PowerToys.sln
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerToys.Settings.DSC.Sche
{020A7474-3601-4160-A159-D7B70B77B15F} = {020A7474-3601-4160-A159-D7B70B77B15F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension", "src\modules\NewPlus\NewShellExtensionContextMenu\NewShellExtensionContextMenu.vcxproj", "{8ACB33D9-C95B-47D4-8363-9731EE0930A0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "New+", "New+", "{CA716AE6-FE5C-40AC-BB8F-2C87912687AC}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.Interop", "src\common\interop\PowerToys.Interop.vcxproj", "{F055103B-F80B-4D0C-BF48-057C55620033}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workspaces", "Workspaces", "{A2221D7E-55E7-4BEA-90D1-4F162D670BBF}"
Expand Down Expand Up @@ -2621,6 +2624,16 @@ Global
{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x64.Build.0 = Release|x64
{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.ActiveCfg = Release|x64
{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.Build.0 = Release|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|ARM64.Build.0 = Debug|ARM64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x64.ActiveCfg = Debug|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x64.Build.0 = Debug|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x86.ActiveCfg = Debug|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|ARM64.ActiveCfg = Release|ARM64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|ARM64.Build.0 = Release|ARM64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x64.ActiveCfg = Release|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x64.Build.0 = Release|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x86.ActiveCfg = Release|x64
{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.ActiveCfg = Debug|ARM64
{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.Build.0 = Debug|ARM64
{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x64.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -2920,6 +2933,8 @@ Global
{3A9A791E-94A9-49F8-8401-C11CE288D5FB} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
{C0974915-8A1D-4BF0-977B-9587D3807AB7} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
{1D6893CB-BC0C-46A8-A76C-9728706CA51A} = {557C4636-D7E1-4838-A504-7D19B725EE95}
{8ACB33D9-C95B-47D4-8363-9731EE0930A0} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
{CA716AE6-FE5C-40AC-BB8F-2C87912687AC} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
{F055103B-F80B-4D0C-BF48-057C55620033} = {5A7818A8-109C-4E1C-850D-1A654E234B0E}
{A2221D7E-55E7-4BEA-90D1-4F162D670BBF} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
{BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
Expand Down
2 changes: 2 additions & 0 deletions installer/PowerToysSetup/Core.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@
<RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall"/>
<RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall"/>
<RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall"/>
<RemoveFolder Id="RemoveLocalAppDataProductFolder" Directory="LocalAppDataProductFolder" On="uninstall"/>
<RemoveFolder Id="RemoveLocalAppDataManufacturerFolder" Directory="LocalAppDataManufacturerFolder" On="uninstall"/>
</Component>
<ComponentRef Id="powertoys_exe" />
<ComponentRef Id="PowerToysStartMenuShortcut"/>
Expand Down
32 changes: 32 additions & 0 deletions installer/PowerToysSetup/NewPlus.wxs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >

<?include $(sys.CURRENTDIR)\Common.wxi?>

<?define NewPlusAssetsFiles=?>
<?define NewPlusAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\?>

<Fragment>

<!-- Assets -->
<DirectoryRef Id="WinUI3AppsAssetsFolder">
<Directory Id="NewPlusAssetsInstallFolder" Name="NewPlus" />
</DirectoryRef>
<DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
<!-- Generated by generateFileComponents.ps1 -->
<!--NewPlusAssetsFiles_Component_Def-->
</DirectoryRef>


<ComponentGroup Id="NewPlusComponentGroup">
<Component Id="RemoveNewPlusFolder" Guid="4189C789-56EB-409D-912E-3F4F3F4F1FFA" Directory="NewPlusAssetsInstallFolder" >
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="RemoveNewPlusFolder" Value="" KeyPath="yes"/>
</RegistryKey>
<RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
</Component>
</ComponentGroup>

</Fragment>
</Wix>
51 changes: 51 additions & 0 deletions installer/PowerToysSetup/NewPlusTemplates.wxs
cgaarden marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >

<?include $(sys.CURRENTDIR)\Common.wxi?>

<?define NewPlusTemplateFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\?>
<?define NewPlusTemplateSubFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\Example folder\?>

<Fragment>
<!-- Example templates -->
<DirectoryRef Id="WinUI3AppsAssetsFolder">
<Directory Id="NewPlusInstallFolder" Name="NewPlus">
<Directory Id="NewPlusTemplatesInstallFolder" Name="Templates">
<Directory Id="NewPlusTemplatesSubInstallFolder" Name="Example folder"/>
</Directory>
</Directory>
</DirectoryRef>
<DirectoryRef Id="NewPlusTemplatesInstallFolder" FileSource="$(var.NewPlusTemplateFilesPath)">
<Component Id="NewPlusTemplateFiles_Component" Win64="yes" Guid="39264075-4B7F-40E3-A76F-21E68576D43E">
<RegistryKey Root="HKCU" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="NewPlusTemplateFiles_Component" Value="" KeyPath="yes"/>
</RegistryKey>
<File Id="NewPlusTemplateFiles_File_1.md" Source="$(var.NewPlusTemplateFilesPath)Any files or folders placed in the template folder are available via New+.txt" />
</Component>
</DirectoryRef>
<DirectoryRef Id="NewPlusTemplatesSubInstallFolder" FileSource="$(var.NewPlusTemplateSubFilesPath)">
<Component Id="NewPlusTemplateSubFiles_Component" Win64="yes" Guid="7618E61C-CCB8-492F-B284-E1AE2954AF0B">
<RegistryKey Root="HKCU" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="NewPlusTemplateSubFiles_Component" Value="" KeyPath="yes"/>
</RegistryKey>
<File Id="NewPlusTemplateSubFiles_File_1.md" Source="$(var.NewPlusTemplateSubFilesPath)Example txt file.txt" />
<File Id="NewPlusTemplateSubFiles_File_2.md" Source="$(var.NewPlusTemplateSubFilesPath)Another example txt file.txt" />
</Component>
</DirectoryRef>

<ComponentGroup Id="NewPlusTemplatesComponentGroup">
<Component Id="RemoveNewPlusTemplateFolder" Guid="3E9B15CA-A50C-42DA-977F-5E9914562FE7" Directory="NewPlusInstallFolder" >
<RegistryKey Root="HKCU" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="RemoveNewPlusTemplateFolder" Value="" KeyPath="yes"/>
</RegistryKey>
<RemoveFolder Id="RemoveFolderNewPlusInstallFolder" Directory="NewPlusInstallFolder" On="uninstall"/>
<RemoveFolder Id="RemoveFolderNewPlusTemplatesInstallFolder" Directory="NewPlusTemplatesInstallFolder" On="uninstall"/>
<RemoveFolder Id="RemoveFolderNewPlusTemplatesSubInstallFolder" Directory="NewPlusTemplatesSubInstallFolder" On="uninstall"/>
</Component>
<ComponentRef Id="NewPlusTemplateFiles_Component" />
<ComponentRef Id="NewPlusTemplateSubFiles_Component" />
</ComponentGroup>

</Fragment>
</Wix>
Loading
Loading