Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Miscellaneous cleanup and comment changes in the design-time components installer. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
2f356ea98e27c3c0fcffdaddb45bf3ca |
User & Date: | mistachkin 2014-07-31 21:43:26.000 |
Context
2014-07-31
| ||
22:35 | Clarify description for the Ngen task in the setup packages. check-in: 23e6a9b85f user: mistachkin tags: trunk | |
21:43 | Miscellaneous cleanup and comment changes in the design-time components installer. check-in: 2f356ea98e user: mistachkin tags: trunk | |
21:24 | Remove accidentally duplicated debugging code in the design-time components installer. check-in: 6bd339500c user: mistachkin tags: trunk | |
Changes
Changes to tools/install/Installer.cs.
︙ | ︙ | |||
1954 1955 1956 1957 1958 1959 1960 | private const string Ef6FactoryTypeName = "System.Data.SQLite.EF6.SQLiteProviderFactory"; #endregion /////////////////////////////////////////////////////////////////// #region Private Static Data | < < < < < | 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 | private const string Ef6FactoryTypeName = "System.Data.SQLite.EF6.SQLiteProviderFactory"; #endregion /////////////////////////////////////////////////////////////////// #region Private Static Data private static Assembly systemEf6Assembly; #endregion /////////////////////////////////////////////////////////////////// #region Private Data private AssemblyName coreAssemblyName; |
︙ | ︙ | |||
2232 2233 2234 2235 2236 2237 2238 | /////////////////////////////////////////////////////////////////// #region Public Static Methods public static void BreakIntoDebugger() { Console.WriteLine( "Attach a debugger to process {0} and press any key to " + | | | | 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 | /////////////////////////////////////////////////////////////////// #region Public Static Methods public static void BreakIntoDebugger() { Console.WriteLine( "Attach a debugger to process {0} and press any key to " + "continue.", (thisProcess != null) ? thisProcess.Id.ToString() : "<unknown>"); try { Console.ReadKey(true); /* throw */ } catch (InvalidOperationException) // Console.ReadKey { |
︙ | ︙ | |||
4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 | } #endregion #endregion /////////////////////////////////////////////////////////////////////// #region Private Constant Data private const string CoreFileName = "System.Data.SQLite.dll"; private const string LinqFileName = "System.Data.SQLite.Linq.dll"; private const string Ef6FileName = "System.Data.SQLite.EF6.dll"; private const string DesignerFileName = "SQLite.Designer.dll"; private const string ProviderName = "SQLite Data Provider"; private const string ProjectName = "System.Data.SQLite"; private const string LegacyProjectName = "SQLite"; /////////////////////////////////////////////////////////////////////// private const string Description = ".NET Framework Data Provider for SQLite"; /////////////////////////////////////////////////////////////////////// private const string CLRv2ImageRuntimeVersion = "v2.0.50727"; private const string CLRv4ImageRuntimeVersion = "v4.0.30319"; /////////////////////////////////////////////////////////////////////// | > > | 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 | } #endregion #endregion /////////////////////////////////////////////////////////////////////// #region Private Constant Data #region Package & Provider Names private const string CoreFileName = "System.Data.SQLite.dll"; private const string LinqFileName = "System.Data.SQLite.Linq.dll"; private const string Ef6FileName = "System.Data.SQLite.EF6.dll"; private const string DesignerFileName = "SQLite.Designer.dll"; private const string ProviderName = "SQLite Data Provider"; private const string ProjectName = "System.Data.SQLite"; private const string LegacyProjectName = "SQLite"; /////////////////////////////////////////////////////////////////////// private const string Description = ".NET Framework Data Provider for SQLite"; #endregion /////////////////////////////////////////////////////////////////////// private const string CLRv2ImageRuntimeVersion = "v2.0.50727"; private const string CLRv4ImageRuntimeVersion = "v4.0.30319"; /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 | private static readonly string XPathForRemoveElement = "configuration/system.data/DbProviderFactories/remove[@invariant=\"{0}\"]"; #endregion /////////////////////////////////////////////////////////////////////// #region Private Static Data private static Assembly thisAssembly = Assembly.GetExecutingAssembly(); private static string traceCategory = Path.GetFileName( | > > > > > > > > > > > > | > > > > > > > > > > > | 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 | private static readonly string XPathForRemoveElement = "configuration/system.data/DbProviderFactories/remove[@invariant=\"{0}\"]"; #endregion /////////////////////////////////////////////////////////////////////// #region Private Static Data #region Diagnostics & Logging // // NOTE: Cache the current process and assembly as they do not change // and may be needed in quite a few different places. // private static Process thisProcess = Process.GetCurrentProcess(); private static Assembly thisAssembly = Assembly.GetExecutingAssembly(); /////////////////////////////////////////////////////////////////////// // // NOTE: The trace category is the same for both the debug and trace // callbacks. // private static string traceCategory = Path.GetFileName( (thisAssembly != null) ? thisAssembly.Location : null); /////////////////////////////////////////////////////////////////////// // // NOTE: Set the debug and trace logging callbacks used by the // application. // private static TraceCallback debugCallback = AppDebug; private static TraceCallback traceCallback = AppTrace; #endregion /////////////////////////////////////////////////////////////////////// #region System Directory private static string systemDirectory = null; #if WINDOWS private static string systemDirectoryWow64 = null; #endif #endregion /////////////////////////////////////////////////////////////////////// #region Registry Statistics private static int filesCreated = 0; private static int filesModified = 0; private static int filesDeleted = 0; #endregion #endregion /////////////////////////////////////////////////////////////////////// #region Trace Handling private static string GetLogFileName( string typeName |
︙ | ︙ |