From 1a60b0b5a172fc9b95f9ffa07c8c1c254382dffe Mon Sep 17 00:00:00 2001
From: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:51:25 -0700
Subject: [PATCH] gac install some v3.5 DLLs

Doesn't install all of them yet, but installs a few
---
 setup/dotnet9x.nsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/setup/dotnet9x.nsi b/setup/dotnet9x.nsi
index 940d475..c20b4be 100644
--- a/setup/dotnet9x.nsi
+++ b/setup/dotnet9x.nsi
@@ -27,6 +27,7 @@ OutFile "dotnet9x.exe"
 !define SharedFolder "$COMMONFILES\Microsoft Shared"
 !define DWFolder "${SharedFolder}\DW"
 !define wbemFolder "$SYSDIR\WBEM"
+!define v35Path "${FrameworkPath}v3.5"
 
 #Section
 
@@ -64,6 +65,9 @@ File /nonfatal /r "..\bin\dotnetfx20\Win\*"
 SetOutPath "${URTInstallPath}"
 File /r "..\bin\dotnetfx20\URTInstallPath\*"
 
+SetOutPath "${v35Path}"
+File /r "..\bin\dotnetfx35\*"
+
 # Write registry entries
 WriteRegDword HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\SharedDLLs" "$SYSDIR\msvcr80.dll" 3
 WriteRegDword HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\SharedDLLs" "$SYSDIR\msvcp80.dll" 3
@@ -5563,6 +5567,11 @@ ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic
 ExecWait '"$WINDIR\Temp\gacutil.exe" /i "${URTInstallPath}\Microsoft.VisualBasic.Compatibility.Data.dll"'
 ExecWait '"$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"'
+
 ### Install patched MSIL DLLs ###
 SetOutPath $WINDIR\assembly\GAC_MSIL\System.Windows.Forms\2.0.0.0__b77a5c561934e089
 File "..\msil\System.Windows.Forms.dll"