Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Design-time installer changes for EF6. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | ef6 |
| Files: | files | file ages | folders |
| SHA1: |
5b9a23110460a929e34f590268678a0c |
| User & Date: | mistachkin 2014-01-10 23:58:51.770 |
Context
|
2014-01-11
| ||
| 00:16 | More automation changes. check-in: 74e7a42df7 user: mistachkin tags: ef6 | |
|
2014-01-10
| ||
| 23:58 | Design-time installer changes for EF6. check-in: 5b9a231104 user: mistachkin tags: ef6 | |
| 23:58 | Initial test suite changes for EF6 (incomplete). check-in: df2f4392a1 user: mistachkin tags: ef6 | |
Changes
Changes to tools/install/Installer.cs.
| ︙ | ︙ | |||
1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 |
#region Private Constructors
private Configuration(
Assembly assembly,
string logFileName,
string directory,
string coreFileName,
string linqFileName,
string designerFileName,
string registryVersion,
string configVersion,
string vsVersionSuffix,
string debugFormat,
string traceFormat,
InstallFlags installFlags,
| > | 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 |
#region Private Constructors
private Configuration(
Assembly assembly,
string logFileName,
string directory,
string coreFileName,
string linqFileName,
string ef6FileName,
string designerFileName,
string registryVersion,
string configVersion,
string vsVersionSuffix,
string debugFormat,
string traceFormat,
InstallFlags installFlags,
|
| ︙ | ︙ | |||
1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 |
)
{
this.assembly = assembly;
this.logFileName = logFileName;
this.directory = directory;
this.coreFileName = coreFileName;
this.linqFileName = linqFileName;
this.designerFileName = designerFileName;
this.registryVersion = registryVersion;
this.configVersion = configVersion;
this.vsVersionSuffix = vsVersionSuffix;
this.debugFormat = debugFormat;
this.traceFormat = traceFormat;
this.installFlags = installFlags;
| > | 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 |
)
{
this.assembly = assembly;
this.logFileName = logFileName;
this.directory = directory;
this.coreFileName = coreFileName;
this.linqFileName = linqFileName;
this.ef6FileName = ef6FileName;
this.designerFileName = designerFileName;
this.registryVersion = registryVersion;
this.configVersion = configVersion;
this.vsVersionSuffix = vsVersionSuffix;
this.debugFormat = debugFormat;
this.traceFormat = traceFormat;
this.installFlags = installFlags;
|
| ︙ | ︙ | |||
1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 |
///////////////////////////////////////////////////////////////////
#region Private Static Methods
private static void GetDefaultFileNames(
ref string directory,
ref string coreFileName,
ref string linqFileName,
ref string designerFileName
)
{
if (thisAssembly == null)
return;
directory = Path.GetDirectoryName(thisAssembly.Location);
if (String.IsNullOrEmpty(directory))
return;
coreFileName = Path.Combine(directory,
Installer.CoreFileName);
linqFileName = Path.Combine(directory,
Installer.LinqFileName);
designerFileName = Path.Combine(directory,
Installer.DesignerFileName);
}
///////////////////////////////////////////////////////////////////
| > > > > | 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 |
///////////////////////////////////////////////////////////////////
#region Private Static Methods
private static void GetDefaultFileNames(
ref string directory,
ref string coreFileName,
ref string linqFileName,
ref string ef6FileName,
ref string designerFileName
)
{
if (thisAssembly == null)
return;
directory = Path.GetDirectoryName(thisAssembly.Location);
if (String.IsNullOrEmpty(directory))
return;
coreFileName = Path.Combine(directory,
Installer.CoreFileName);
linqFileName = Path.Combine(directory,
Installer.LinqFileName);
ef6FileName = Path.Combine(directory,
Installer.Ef6FileName);
designerFileName = Path.Combine(directory,
Installer.DesignerFileName);
}
///////////////////////////////////////////////////////////////////
|
| ︙ | ︙ | |||
2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 |
#region Public Static Methods
public static Configuration CreateDefault()
{
string directory = null;
string coreFileName = null;
string linqFileName = null;
string designerFileName = null;
GetDefaultFileNames(
ref directory, ref coreFileName, ref linqFileName,
| > | | > | | | 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 |
#region Public Static Methods
public static Configuration CreateDefault()
{
string directory = null;
string coreFileName = null;
string linqFileName = null;
string ef6FileName = null;
string designerFileName = null;
GetDefaultFileNames(
ref directory, ref coreFileName, ref linqFileName,
ref ef6FileName, ref designerFileName);
return new Configuration(
thisAssembly, null, directory, coreFileName, linqFileName,
ef6FileName, designerFileName, null, null, null,
TraceOps.DebugFormat, TraceOps.TraceFormat,
InstallFlags.Default, TracePriority.Default,
TracePriority.Default, false, true, false, false, false,
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, true, true,
false, false, false);
}
|
| ︙ | ︙ | |||
2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 |
linqFileName = Path.GetFileName(linqFileName);
if (String.IsNullOrEmpty(linqFileName))
linqFileName = Installer.LinqFileName;
configuration.linqFileName = Path.Combine(
configuration.directory, linqFileName);
string designerFileName = configuration.designerFileName;
if (!String.IsNullOrEmpty(designerFileName))
designerFileName = Path.GetFileName(designerFileName);
if (String.IsNullOrEmpty(designerFileName))
designerFileName = Installer.DesignerFileName;
configuration.designerFileName = Path.Combine(
configuration.directory, designerFileName);
}
else if (MatchOption(newArg, "install"))
{
bool? value = ParseBoolean(text);
if (value == null)
{
| > > > > > > > > > > > > > > > | 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 |
linqFileName = Path.GetFileName(linqFileName);
if (String.IsNullOrEmpty(linqFileName))
linqFileName = Installer.LinqFileName;
configuration.linqFileName = Path.Combine(
configuration.directory, linqFileName);
string ef6FileName = configuration.ef6FileName;
if (!String.IsNullOrEmpty(ef6FileName))
ef6FileName = Path.GetFileName(ef6FileName);
if (String.IsNullOrEmpty(ef6FileName))
ef6FileName = Installer.Ef6FileName;
configuration.ef6FileName = Path.Combine(
configuration.directory, ef6FileName);
string designerFileName = configuration.designerFileName;
if (!String.IsNullOrEmpty(designerFileName))
designerFileName = Path.GetFileName(designerFileName);
if (String.IsNullOrEmpty(designerFileName))
designerFileName = Installer.DesignerFileName;
configuration.designerFileName = Path.Combine(
configuration.directory, designerFileName);
}
else if (MatchOption(newArg, "ef6FileName"))
{
configuration.ef6FileName = text;
}
else if (MatchOption(newArg, "install"))
{
bool? value = ParseBoolean(text);
if (value == null)
{
|
| ︙ | ︙ | |||
3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 |
// Visual Studio 2005, this should return zero.
//
return !noNetFx35 || !noNetFx40 || !noNetFx45 || !noNetFx451;
}
///////////////////////////////////////////////////////////////////
public void Dump(
TraceCallback traceCallback
)
{
if (traceCallback != null)
{
traceCallback(String.Format(NameAndValueFormat,
| > > > > > > > > > > > > > | 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 |
// Visual Studio 2005, this should return zero.
//
return !noNetFx35 || !noNetFx40 || !noNetFx45 || !noNetFx451;
}
///////////////////////////////////////////////////////////////////
public bool IsEf6Supported()
{
//
// NOTE: Return non-zero if the EF6 assembly should be
// processed during the install. If the target is
// Visual Studio 2005 or Visual Studio 2008, this
// should return zero.
//
return !noNetFx40 || !noNetFx45 || !noNetFx451;
}
///////////////////////////////////////////////////////////////////
public void Dump(
TraceCallback traceCallback
)
{
if (traceCallback != null)
{
traceCallback(String.Format(NameAndValueFormat,
|
| ︙ | ︙ | |||
3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 |
traceCallback(String.Format(NameAndValueFormat,
"CoreFileName", ForDisplay(coreFileName)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"LinqFileName", ForDisplay(linqFileName)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"DesignerFileName", ForDisplay(designerFileName)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"RegistryVersion", ForDisplay(registryVersion)),
| > > > > | 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 |
traceCallback(String.Format(NameAndValueFormat,
"CoreFileName", ForDisplay(coreFileName)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"LinqFileName", ForDisplay(linqFileName)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"Ef6FileName", ForDisplay(ef6FileName)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"DesignerFileName", ForDisplay(designerFileName)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"RegistryVersion", ForDisplay(registryVersion)),
|
| ︙ | ︙ | |||
3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 |
private string linqFileName;
public string LinqFileName
{
get { return linqFileName; }
set { linqFileName = value; }
}
///////////////////////////////////////////////////////////////////
private string designerFileName;
public string DesignerFileName
{
get { return designerFileName; }
| > > > > > > > > > | 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 |
private string linqFileName;
public string LinqFileName
{
get { return linqFileName; }
set { linqFileName = value; }
}
///////////////////////////////////////////////////////////////////
private string ef6FileName;
public string Ef6FileName
{
get { return ef6FileName; }
set { ef6FileName = value; }
}
///////////////////////////////////////////////////////////////////
private string designerFileName;
public string DesignerFileName
{
get { return designerFileName; }
|
| ︙ | ︙ | |||
3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 |
#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 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 InvariantName = "System.Data.SQLite";
private const string FactoryTypeName = "System.Data.SQLite.SQLiteFactory";
private const string Description = ".NET Framework Data Provider for SQLite";
| > | 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 |
#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 InvariantName = "System.Data.SQLite";
private const string FactoryTypeName = "System.Data.SQLite.SQLiteFactory";
private const string Description = ".NET Framework Data Provider for SQLite";
|
| ︙ | ︙ | |||
6555 6556 6557 6558 6559 6560 6561 6562 6563 6564 6565 6566 6567 6568 |
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"GacInstall: assemblyPath = {0}",
ForDisplay(configuration.LinqFileName)),
traceCategory);
}
if (configuration.HasFlags(
InstallFlags.VsPackageGlobalAssemblyCache, true))
{
if (!configuration.WhatIf)
/* throw */
publish.GacInstall(configuration.DesignerFileName);
| > > > > > > > > > > > > > | 6605 6606 6607 6608 6609 6610 6611 6612 6613 6614 6615 6616 6617 6618 6619 6620 6621 6622 6623 6624 6625 6626 6627 6628 6629 6630 6631 |
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"GacInstall: assemblyPath = {0}",
ForDisplay(configuration.LinqFileName)),
traceCategory);
}
if (configuration.IsEf6Supported())
{
if (!configuration.WhatIf)
/* throw */
publish.GacInstall(configuration.Ef6FileName);
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"GacInstall: assemblyPath = {0}",
ForDisplay(configuration.Ef6FileName)),
traceCategory);
}
if (configuration.HasFlags(
InstallFlags.VsPackageGlobalAssemblyCache, true))
{
if (!configuration.WhatIf)
/* throw */
publish.GacInstall(configuration.DesignerFileName);
|
| ︙ | ︙ | |||
6585 6586 6587 6588 6589 6590 6591 6592 6593 6594 6595 6596 6597 6598 |
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"GacRemove: assemblyPath = {0}",
ForDisplay(configuration.DesignerFileName)),
traceCategory);
}
if (configuration.IsLinqSupported())
{
if (!configuration.WhatIf)
/* throw */
publish.GacRemove(configuration.LinqFileName);
| > > > > > > > > > > > > > | 6648 6649 6650 6651 6652 6653 6654 6655 6656 6657 6658 6659 6660 6661 6662 6663 6664 6665 6666 6667 6668 6669 6670 6671 6672 6673 6674 |
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"GacRemove: assemblyPath = {0}",
ForDisplay(configuration.DesignerFileName)),
traceCategory);
}
if (configuration.IsEf6Supported())
{
if (!configuration.WhatIf)
/* throw */
publish.GacRemove(configuration.Ef6FileName);
TraceOps.DebugAndTrace(TracePriority.Highest,
debugCallback, traceCallback, String.Format(
"GacRemove: assemblyPath = {0}",
ForDisplay(configuration.Ef6FileName)),
traceCategory);
}
if (configuration.IsLinqSupported())
{
if (!configuration.WhatIf)
/* throw */
publish.GacRemove(configuration.LinqFileName);
|
| ︙ | ︙ |