From 9d5e3e33beea4181da02b4b3adfc90f3f07a31bd Mon Sep 17 00:00:00 2001 From: RKrom Date: Wed, 13 Jun 2012 20:14:42 +0000 Subject: [PATCH] Fix for Bug #3534930, .NET 3.5 is actually a 2.0 with some changes, so the installation directory is nothing else as the .NET 2.0 framework location! git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1921 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- Greenshot/releases/innosetup/setup.iss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss index b347fe64f..4c5eec72b 100644 --- a/Greenshot/releases/innosetup/setup.iss +++ b/Greenshot/releases/innosetup/setup.iss @@ -425,9 +425,8 @@ begin if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4.5\Full', 'InstallPath', installPath) then begin if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Client', 'InstallPath', installPath) then begin if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full', 'InstallPath', installPath) then begin - if not RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v3.5', 'InstallPath', installPath) then begin - RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v2.0.50727', 'InstallPath', installPath); - end; + // 3.5 doesn't have NGEN and is using the .net 2.0 installation + installPath := ExpandConstant('{dotnet20}'); end; end; end;