From 0713acea432114cbe62162fe7e35f51f03f8542b Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Sun, 14 Apr 2024 16:21:05 -0700
Subject: [PATCH] Use nsExec::Exec instead of ExecWait

Fixes #10
---
 setup/dotnet9x.nsi | 124 ++++++++++++++++++++++-----------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/setup/dotnet9x.nsi b/setup/dotnet9x.nsi
index 2a29a19..9732473 100644
--- a/setup/dotnet9x.nsi
+++ b/setup/dotnet9x.nsi
@@ -5476,7 +5476,7 @@ StrCpy $R1 $R0 3
 StrCmp $R1 "4.0" 0 Skip95Patches
 
 !macro Patch FileName PatchFile
-  ExecWait '"$WINDIR\Temp\net95patches\bspatch.exe" "${FileName}" "${FileName}" "$WINDIR\Temp\net95patches\${PatchFile}"'
+  nsExec::Exec '"$WINDIR\Temp\net95patches\bspatch.exe" "${FileName}" "${FileName}" "$WINDIR\Temp\net95patches\${PatchFile}"'
 !macroend
 SetOutPath "$WINDIR\Temp\net95patches"
 File /r "..\patches\*"
@@ -5503,71 +5503,71 @@ SetOutPath $SYSDIR
 File /r "..\wrappers\build\*.dll"
 
 ### regtlb ###
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\Microsoft.JScript.tlb"'
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\Microsoft.Vsa.tlb"'
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\Microsoft.Vsa.Vb.CodeDOMProcessor.tlb"'
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\mscoree.tlb"'
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\mscorlib.tlb"'
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\System.Drawing.tlb"'
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\System.EnterpriseServices.tlb"'
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\System.tlb"'
-ExecWait '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\System.Windows.Forms.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\Microsoft.JScript.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\Microsoft.Vsa.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\Microsoft.Vsa.Vb.CodeDOMProcessor.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\mscoree.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\mscorlib.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\System.Drawing.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\System.EnterpriseServices.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\System.tlb"'
+nsExec::Exec '"${URTInstallPath}\regtlibv12.exe" "${URTInstallPath}\System.Windows.Forms.tlb"'
 
 ### Install Assemblies ###
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.Vsa.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Vsa.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft_VsaVb.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Vsa.Vb.CodeDOMProcessor.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.EnterpriseServices.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Deployment.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\cscompmgd.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.JScript.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Build.Engine.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Build.Framework.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Build.Tasks.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Build.Utilities.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Accessibility.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Security.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\CustomMarshalers.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Configuration.Install.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.DirectoryServices.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.DirectoryServices.Protocols.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Drawing.Design.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.ServiceProcess.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Web.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Web.RegularExpressions.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Web.Services.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Windows.Forms.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.XML.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Data.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Design.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\IEExecRemote.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\IEHost.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\IIEHost.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\ISymWrapper.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\mscorlib.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Data.OracleClient.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Data.SqlXml.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Management.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Runtime.Remoting.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Runtime.Serialization.Formatters.Soap.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\sysglobl.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.configuration.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Drawing.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Messaging.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Transactions.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Web.Mobile.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.Compatibility.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.Compatibility.Data.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualC.Dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.Vsa.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Vsa.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft_VsaVb.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Vsa.Vb.CodeDOMProcessor.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.EnterpriseServices.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Deployment.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\cscompmgd.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.JScript.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Build.Engine.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Build.Framework.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Build.Tasks.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.Build.Utilities.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Accessibility.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Security.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\CustomMarshalers.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Configuration.Install.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.DirectoryServices.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.DirectoryServices.Protocols.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Drawing.Design.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.ServiceProcess.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Web.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Web.RegularExpressions.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Web.Services.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Windows.Forms.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.XML.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Data.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Design.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\IEExecRemote.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\IEHost.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\IIEHost.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\ISymWrapper.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\mscorlib.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Data.OracleClient.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Data.SqlXml.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Management.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Runtime.Remoting.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Runtime.Serialization.Formatters.Soap.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\sysglobl.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.configuration.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Drawing.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Messaging.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Transactions.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\System.Web.Mobile.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.Compatibility.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.Compatibility.Data.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualC.Dll"'
 
 # GAC v3.5
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${v35Path}\System.Web.Entity.Design.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${v35Path}\System.Web.Entity.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${v35Path}\System.Windows.Presentation.dll"'
-ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${v35Path}\System.Core.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${v35Path}\System.Web.Entity.Design.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${v35Path}\System.Web.Entity.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${v35Path}\System.Windows.Presentation.dll"'
+nsExec::Exec '"$WINDIR\Temp\gacutil.exe" /i "${v35Path}\System.Core.dll"'
 
 ### Install patched 2.0 MSIL DLLs (only on Windows 95) ###
 ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber