Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add remaining changes for the design-time installer tool to support the .NET Framework 4.6.2 that were missing from the previous check-in. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
5461676a9d6e6ffd6eb477f752fec9f4 |
| User & Date: | mistachkin 2016-08-29 23:14:44.098 |
Context
|
2016-08-29
| ||
| 23:15 | Add another diagnostic message to the native library pre-loader. check-in: 8e1eb0e6a2 user: mistachkin tags: trunk | |
| 23:14 | Add remaining changes for the design-time installer tool to support the .NET Framework 4.6.2 that were missing from the previous check-in. check-in: 5461676a9d user: mistachkin tags: trunk | |
| 22:30 | Add preliminary support for the .NET Framework 4.6.2. check-in: 18b90474f6 user: mistachkin tags: trunk | |
Changes
Changes to tools/install/Installer.cs.
| ︙ | ︙ | |||
198 199 200 201 202 203 204 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region Installer Class
| | | 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region Installer Class
#if NET_40 || NET_45 || NET_451 || NET_452 || NET_46 || NET_461 || NET_462
[SecurityCritical()]
#else
[SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
#endif
internal static class Installer
{
#region Unsafe Native Methods Class
|
| ︙ | ︙ | |||
2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 |
bool noNetFx35,
bool noNetFx40,
bool noNetFx45,
bool noNetFx451,
bool noNetFx452,
bool noNetFx46,
bool noNetFx461,
bool noVs2005,
bool noVs2008,
bool noVs2010,
bool noVs2012,
bool noVs2013,
bool noVs2015,
bool noTrace,
| > | 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 |
bool noNetFx35,
bool noNetFx40,
bool noNetFx45,
bool noNetFx451,
bool noNetFx452,
bool noNetFx46,
bool noNetFx461,
bool noNetFx462,
bool noVs2005,
bool noVs2008,
bool noVs2010,
bool noVs2012,
bool noVs2013,
bool noVs2015,
bool noTrace,
|
| ︙ | ︙ | |||
2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 |
this.noNetFx35 = noNetFx35;
this.noNetFx40 = noNetFx40;
this.noNetFx45 = noNetFx45;
this.noNetFx451 = noNetFx451;
this.noNetFx452 = noNetFx452;
this.noNetFx46 = noNetFx46;
this.noNetFx461 = noNetFx461;
this.noVs2005 = noVs2005;
this.noVs2008 = noVs2008;
this.noVs2010 = noVs2010;
this.noVs2012 = noVs2012;
this.noVs2013 = noVs2013;
this.noVs2015 = noVs2015;
this.noTrace = noTrace;
| > | 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 |
this.noNetFx35 = noNetFx35;
this.noNetFx40 = noNetFx40;
this.noNetFx45 = noNetFx45;
this.noNetFx451 = noNetFx451;
this.noNetFx452 = noNetFx452;
this.noNetFx46 = noNetFx46;
this.noNetFx461 = noNetFx461;
this.noNetFx462 = noNetFx462;
this.noVs2005 = noVs2005;
this.noVs2008 = noVs2008;
this.noVs2010 = noVs2010;
this.noVs2012 = noVs2012;
this.noVs2013 = noVs2013;
this.noVs2015 = noVs2015;
this.noTrace = noTrace;
|
| ︙ | ︙ | |||
2298 2299 2300 2301 2302 2303 2304 |
thisAssembly, null, directory, coreFileName, linqFileName,
ef6FileName, designerFileName, null, null, null,
TraceOps.DebugFormat, TraceOps.TraceFormat,
InstallFlags.Default, ProviderFlags.Default,
TracePriority.Default, TracePriority.Default, false, true,
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
| | | | 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 |
thisAssembly, null, directory, coreFileName, linqFileName,
ef6FileName, designerFileName, null, null, null,
TraceOps.DebugFormat, TraceOps.TraceFormat,
InstallFlags.Default, ProviderFlags.Default,
TracePriority.Default, TracePriority.Default, false, true,
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, false, false,
false, false, false, false, false, false, true, true,
false, false, false);
}
///////////////////////////////////////////////////////////////////
[MethodImpl(MethodImplOptions.NoInlining)]
public static bool FromArgs(
string[] args,
|
| ︙ | ︙ | |||
2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 |
if (strict)
return false;
continue;
}
configuration.noNetFx461 = (bool)value;
}
else if (MatchOption(newArg, "noRuntimeVersion"))
{
bool? value = ParseBoolean(text);
if (value == null)
{
| > > > > > > > > > > > > > > > > > > > > > | 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 |
if (strict)
return false;
continue;
}
configuration.noNetFx461 = (bool)value;
}
else if (MatchOption(newArg, "noNetFx462"))
{
bool? value = ParseBoolean(text);
if (value == null)
{
error = TraceOps.DebugAndTrace(
TracePriority.Lowest, debugCallback,
traceCallback, String.Format(
"Invalid {0} boolean value: {1}",
ForDisplay(arg), ForDisplay(text)),
traceCategory);
if (strict)
return false;
continue;
}
configuration.noNetFx462 = (bool)value;
}
else if (MatchOption(newArg, "noRuntimeVersion"))
{
bool? value = ParseBoolean(text);
if (value == null)
{
|
| ︙ | ︙ | |||
3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 |
//
configuration.noNetFx40 = true;
configuration.noNetFx45 = true;
configuration.noNetFx451 = true;
configuration.noNetFx452 = true;
configuration.noNetFx46 = true;
configuration.noNetFx461 = true;
configuration.noVs2010 = true;
configuration.noVs2012 = true;
configuration.noVs2013 = true;
configuration.noVs2015 = true;
TraceOps.DebugAndTrace(TracePriority.Medium,
debugCallback, traceCallback, String.Format(
| > | 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 |
//
configuration.noNetFx40 = true;
configuration.noNetFx45 = true;
configuration.noNetFx451 = true;
configuration.noNetFx452 = true;
configuration.noNetFx46 = true;
configuration.noNetFx461 = true;
configuration.noNetFx462 = true;
configuration.noVs2010 = true;
configuration.noVs2012 = true;
configuration.noVs2013 = true;
configuration.noVs2015 = true;
TraceOps.DebugAndTrace(TracePriority.Medium,
debugCallback, traceCallback, String.Format(
|
| ︙ | ︙ | |||
3685 3686 3687 3688 3689 3690 3691 |
// NOTE: Return non-zero if the System.Data.SQLite.Linq
// assembly should be processed during the install.
// If the target is Visual Studio 2005, this must
// return zero.
//
return !noNetFx35 || !noNetFx40 || !noNetFx45 ||
!noNetFx451 || !noNetFx452 || !noNetFx46 ||
| | | 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 |
// NOTE: Return non-zero if the System.Data.SQLite.Linq
// assembly should be processed during the install.
// If the target is Visual Studio 2005, this must
// return zero.
//
return !noNetFx35 || !noNetFx40 || !noNetFx45 ||
!noNetFx451 || !noNetFx452 || !noNetFx46 ||
!noNetFx461 || !noNetFx462;
}
///////////////////////////////////////////////////////////////////
public bool IsEf6Supported(
bool trace
)
|
| ︙ | ︙ | |||
3738 3739 3740 3741 3742 3743 3744 |
// NOTE: Return non-zero if the System.Data.SQLite.EF6
// assembly should be processed during the install.
// If the target is Visual Studio 2005 or Visual
// Studio 2008, this must return zero.
//
if (noNetFx40 &&
noNetFx45 && noNetFx451 && noNetFx452 && noNetFx46 &&
| | | 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 |
// NOTE: Return non-zero if the System.Data.SQLite.EF6
// assembly should be processed during the install.
// If the target is Visual Studio 2005 or Visual
// Studio 2008, this must return zero.
//
if (noNetFx40 &&
noNetFx45 && noNetFx451 && noNetFx452 && noNetFx46 &&
noNetFx461 && noNetFx462)
{
return false;
}
//
// NOTE: Also, if the EF6 core assembly is unavailable, this
// must return zero.
|
| ︙ | ︙ | |||
4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 |
traceCallback(String.Format(NameAndValueFormat,
"NoNetFx46", ForDisplay(noNetFx46)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"NoNetFx461", ForDisplay(noNetFx461)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"NoVs2005", ForDisplay(noVs2005)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"NoVs2008", ForDisplay(noVs2008)),
| > > > > | 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 |
traceCallback(String.Format(NameAndValueFormat,
"NoNetFx46", ForDisplay(noNetFx46)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"NoNetFx461", ForDisplay(noNetFx461)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"NoNetFx462", ForDisplay(noNetFx462)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"NoVs2005", ForDisplay(noVs2005)),
traceCategory);
traceCallback(String.Format(NameAndValueFormat,
"NoVs2008", ForDisplay(noVs2008)),
|
| ︙ | ︙ | |||
4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 |
private bool noNetFx461;
public bool NoNetFx461
{
get { return noNetFx461; }
set { noNetFx461 = value; }
}
///////////////////////////////////////////////////////////////////
private bool noVs2005;
public bool NoVs2005
{
get { return noVs2005; }
| > > > > > > > > > | 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 |
private bool noNetFx461;
public bool NoNetFx461
{
get { return noNetFx461; }
set { noNetFx461 = value; }
}
///////////////////////////////////////////////////////////////////
private bool noNetFx462;
public bool NoNetFx462
{
get { return noNetFx462; }
set { noNetFx462 = value; }
}
///////////////////////////////////////////////////////////////////
private bool noVs2005;
public bool NoVs2005
{
get { return noVs2005; }
|
| ︙ | ︙ |