Index: Setup/SQLite.iss ================================================================== --- Setup/SQLite.iss +++ Setup/SQLite.iss @@ -205,12 +205,24 @@ Components: Application\LINQ and Application\Symbols; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.Linq.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete #endif #if Year != "2005" && Year != "2008" #if Pos("NativeOnly", AppConfiguration) == 0 +#if Year == "2010" +Components: Application\EF6; Tasks: gac; Source: ..\Externals\EntityFramework\lib\net40\EntityFramework.dll; DestDir: {app}\GAC; StrongAssemblyName: "EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall +#elif Year == "2012" || Year == "2013" +Components: Application\EF6; Tasks: gac; Source: ..\Externals\EntityFramework\lib\net45\EntityFramework.dll; DestDir: {app}\GAC; StrongAssemblyName: "EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall +#endif + Components: Application\EF6; Tasks: gac; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.EF6.dll; DestDir: {app}\GAC; StrongAssemblyName: "System.Data.SQLite.EF6, Version={#AppVersion}, Culture=neutral, PublicKeyToken={#AppPublicKey}, ProcessorArchitecture=MSIL"; Flags: restartreplace uninsrestartdelete uninsnosharedfileprompt sharedfile gacinstall #endif + +#if Year == "2010" +Components: Application\EF6; Source: ..\Externals\EntityFramework\lib\net40\EntityFramework.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete +#elif Year == "2012" || Year == "2013" +Components: Application\EF6; Source: ..\Externals\EntityFramework\lib\net45\EntityFramework.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete +#endif Components: Application\EF6; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.EF6.dll; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete Components: Application\EF6 and Application\Symbols; Source: ..\bin\{#Year}\{#BaseConfiguration}\bin\System.Data.SQLite.EF6.pdb; DestDir: {app}\bin; Flags: restartreplace uninsrestartdelete #endif Index: Setup/verify.lst ================================================================== --- Setup/verify.lst +++ Setup/verify.lst @@ -747,10 +747,11 @@ # standard setup archives (i.e. those not containing the mixed-mode # assembly) that support EF6 (i.e. available with the desktop .NET # Framework 4.0 and later). # set sds_manifests(setupEf6Interop) { + {{app}\bin\EntityFramework.dll} {{app}\bin\System.Data.SQLite.EF6.dll} } ############################################################################### # @@ -758,10 +759,11 @@ # setup archives (i.e. those containing the mixed-mode assembly) that # support EF6 (i.e. available with the desktop .NET Framework 4.0 and # later). # set sds_manifests(setupEf6Bundle) { + {{app}\GAC\EntityFramework.dll} {{app}\GAC\System.Data.SQLite.EF6.dll} } ############################################################################### #