Changeset 1990 for trunk/eraser


Ignore:
Timestamp:
4/28/2010 9:53:08 AM (5 years ago)
Author:
lowjoel
Message:

Don't check for the .NET Framework in the Installer since that prevents us from Changing the installation, instead, always check in the Bootstrapper.

Location:
trunk/eraser
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser

  • trunk/eraser/Installer/Bootstrapper/Main.cpp

    r1675 r1990  
    179179    //Install the .NET framework 
    180180    if (!HasNetFramework()) 
    181         InstallNetFramework(tempDir, quiet); 
     181        if (!InstallNetFramework(tempDir, quiet)) 
     182            return 0; 
    182183 
    183184    //Then install Eraser! 
  • trunk/eraser/Installer/Eraser.wxs

    r1975 r1990  
    3030        <Media Id="1" Cabinet="Installer.cab" CompressionLevel="none" EmbedCab="yes" /> 
    3131 
    32         <!-- Check for .NET 3.5 --> 
    33         <Property Id="FRAMEWORK35"> 
    34             <RegistrySearch Id="Framework35Registry" Type="raw" 
    35                 Root="HKLM" Key="Software\Microsoft\NET Framework Setup\NDP\v3.5" 
    36                 Name="Install" /> 
    37         </Property> 
    38         <Condition Message="Eraser requires the .NET Framework 3.5 or higher to be installed."> 
    39             FRAMEWORK35 = "#1" 
    40         </Condition> 
    41          
    4232        <!-- Prevent those pesky MSI shortcuts which prevent running as Administrator --> 
    4333        <Property Id="DISABLEADVTSHORTCUTS" Value="1" /> 
Note: See TracChangeset for help on using the changeset viewer.