From c0353d100b24c0c9836d5a7896eb9330d70e9f51 Mon Sep 17 00:00:00 2001
From: vadym <vadym.vikulin@gmail.com>
Date: Wed, 30 Nov 2022 19:45:11 +0200
Subject: [PATCH] Fix for error CNDL0005 : The Component element contains an
 unexpected child element 'Directory'

---
 contrib/msi/build-msi-gui.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/msi/build-msi-gui.sh b/contrib/msi/build-msi-gui.sh
index df1f4434..008f40c2 100644
--- a/contrib/msi/build-msi-gui.sh
+++ b/contrib/msi/build-msi-gui.sh
@@ -161,6 +161,15 @@ cat > wix.xml << EOF
       <Directory Id="CopyWebViewUIFolder" SourceName="SourceDir"/>
       <Directory Id="${PKGINSTFOLDER}" Name="PFiles">
         <Directory Id="MeshInstallFolder" Name="RiV-mesh">
+          <Directory Id="WebViewUIFolder" Name="ui" >
+            <Component Id="WebViewReslources" Guid="a4a5a50a-a336-4789-bf61-ca76fe217e3f">
+                  <File
+                  Id="WebViewHtmlFile"
+                  Name="index.html"
+                  DiskId="1"
+                  Source="${PKGWEBVIEWFILE}" />
+            </Component>
+          </Directory>
           <Component Id="MainExecutable" Guid="c2119231-2aa3-4962-867a-9759c87beb24">
             <File
               Id="Mesh"
@@ -195,15 +204,6 @@ cat > wix.xml << EOF
               Stop="both"
               Remove="uninstall" />
           </Component>
-          <Component Id="WebViewReslources" Guid="a4a5a50a-a336-4789-bf61-ca76fe217e3f">
-            <Directory Id="WebViewUIFolder" Name="ui" >
-                <File
-                Id="WebViewHtmlFile"
-                Name="index.html"
-                DiskId="1"
-                Source="${PKGWEBVIEWFILE}" />
-            </Directory>
-          </Component>
           <Component Id="CtrlExecutable" Guid="a916b730-974d-42a1-b687-d9d504cbb86a">
             <File
               Id="Meshctl"