Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Correct System.Data.SQLite.Linq version and resource information. Fix for [6489c5a396] and [133daf50d6]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
9ce4a2e0442066ad44696ea841f59c4b |
| User & Date: | shaneh 2011-05-24 01:17:32 |
References
|
2011-05-24
| ||
| 01:19 | • Fixed ticket [133daf50d6]: Wrong manifest resource name: Linq segment is missing plus 3 other changes artifact: 8e99e40b32 user: shane | |
| 01:18 | • Fixed ticket [6489c5a396]: Problem with System.Data.SQLite.Linq in Entity Framework plus 2 other changes artifact: 169562e006 user: shane | |
Context
|
2011-05-24
| ||
| 01:20 | Update various assembly information settings. check-in: 606af726e9 user: shaneh tags: trunk | |
| 01:17 | Correct System.Data.SQLite.Linq version and resource information. Fix for [6489c5a396] and [133daf50d6]. check-in: 9ce4a2e044 user: shaneh tags: trunk | |
|
2011-05-23
| ||
| 04:12 | Moved log handler from SQLiteConnection object to SQLiteFactory object to prevent if from being prematurely GCed. check-in: c520cba472 user: shaneh tags: trunk | |
Changes
Changes to System.Data.SQLite.Linq/SQLiteProviderManifest.cs.
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
...
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
|
: base(SQLiteProviderManifest.GetProviderManifest())
{
_dateFormat = (SQLiteDateFormats)Enum.Parse(typeof(SQLiteDateFormats), manifestToken, true);
}
internal static XmlReader GetProviderManifest()
{
return GetXmlResource("System.Data.SQLite.Resources.SQLiteProviderServices.ProviderManifest.xml");
}
/// <summary>
/// Returns manifest information for the provider
/// </summary>
/// <param name="informationType">The name of the information to be retrieved.</param>
/// <returns>An XmlReader at the begining of the information requested.</returns>
................................................................................
default:
throw new NotSupportedException(String.Format("There is no store type corresponding to the EDM type '{0}' of primitive type '{1}'.", edmType, primitiveType.PrimitiveTypeKind));
}
}
private XmlReader GetStoreSchemaMapping()
{
return GetXmlResource("System.Data.SQLite.Resources.SQLiteProviderServices.StoreSchemaMapping.msl");
}
private XmlReader GetStoreSchemaDescription()
{
return GetXmlResource("System.Data.SQLite.Resources.SQLiteProviderServices.StoreSchemaDefinition.ssdl");
}
internal static XmlReader GetXmlResource(string resourceName)
{
Assembly executingAssembly = Assembly.GetExecutingAssembly();
Stream stream = executingAssembly.GetManifestResourceStream(resourceName);
return XmlReader.Create(stream);
|
|
|
|
|
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
...
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
|
: base(SQLiteProviderManifest.GetProviderManifest())
{
_dateFormat = (SQLiteDateFormats)Enum.Parse(typeof(SQLiteDateFormats), manifestToken, true);
}
internal static XmlReader GetProviderManifest()
{
return GetXmlResource("System.Data.SQLite.Linq.Resources.SQLiteProviderServices.ProviderManifest.xml");
}
/// <summary>
/// Returns manifest information for the provider
/// </summary>
/// <param name="informationType">The name of the information to be retrieved.</param>
/// <returns>An XmlReader at the begining of the information requested.</returns>
................................................................................
default:
throw new NotSupportedException(String.Format("There is no store type corresponding to the EDM type '{0}' of primitive type '{1}'.", edmType, primitiveType.PrimitiveTypeKind));
}
}
private XmlReader GetStoreSchemaMapping()
{
return GetXmlResource("System.Data.SQLite.Linq.Resources.SQLiteProviderServices.StoreSchemaMapping.msl");
}
private XmlReader GetStoreSchemaDescription()
{
return GetXmlResource("System.Data.SQLite.Linq.Resources.SQLiteProviderServices.StoreSchemaDefinition.ssdl");
}
internal static XmlReader GetXmlResource(string resourceName)
{
Assembly executingAssembly = Assembly.GetExecutingAssembly();
Stream stream = executingAssembly.GetManifestResourceStream(resourceName);
return XmlReader.Create(stream);
|
Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
}
[ReflectionPermission(SecurityAction.Assert, MemberAccess = true)]
private object GetSQLiteProviderServicesInstance()
{
if (_sqliteServices == null)
{
Type type = Type.GetType("System.Data.SQLite.SQLiteProviderServices, System.Data.SQLite.Linq, Version=1.0.38.1, Culture=neutral, PublicKeyToken=db937bc2d44ff139", false);
if (type != null)
{
FieldInfo field = type.GetField("Instance", BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance);
_sqliteServices = field.GetValue(null);
}
}
return _sqliteServices;
}
}
}
|
| |
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
}
[ReflectionPermission(SecurityAction.Assert, MemberAccess = true)]
private object GetSQLiteProviderServicesInstance()
{
if (_sqliteServices == null)
{
Type type = Type.GetType("System.Data.SQLite.SQLiteProviderServices, System.Data.SQLite.Linq, Version=1.0.72.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139", false);
if (type != null)
{
FieldInfo field = type.GetField("Instance", BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance);
_sqliteServices = field.GetValue(null);
}
}
return _sqliteServices;
}
}
}
|
Changes to www/build.wiki.
91
92
93
94
95
96
97
98
99
100
101
102
103
104
...
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
<ul>
<root>\SQLite.Interop\props\SQLite.Interop.vsprops<br />
<root>\SQLite.Interop\props\SQLite.Interop.props<br />
<root>\SQLite.Interop\src\win\interop.h<br />
<root>\System.Data.SQLite\AssemblyInfo.cs<br />
<root>\System.Data.SQLite.Linq\AssemblyInfo.cs<br />
</ul>
You'll need to update the SQLITE_MANIFEST_VERSION and SQLITE_RC_VERSION properties
in the .vsprops and .props files, and the INTEROP_VERSION define in interop.h.
This version number should track the release versions of the System.Data.SQLite packages
(ie. [./news.wiki | 1.0.x]).
</li>
................................................................................
<ul>
<root>\SQLite.Interop\props\SQLite.Interop.vsprops<br />
<root>\SQLite.Interop\props\SQLite.Interop.props<br />
<root>\SQLite.Interop\src\win\interop.h<br />
<root>\System.Data.SQLite\AssemblyInfo.cs<br />
<root>\System.Data.SQLite.Linq\AssemblyInfo.cs<br />
</ul>
You'll need to update the SQLITE_MANIFEST_VERSION and SQLITE_RC_VERSION properties
in the .vsprops and .props files, the INTEROP_VERSION define in interop.h,
and the VERSION environment variable in set_common.bat.
This version number should track the release versions of the System.Data.SQLite packages
(ie. [./news.wiki | 1.0.x]).
</li>
<li>Make sure the "<root>\bin" and "<root>\obj" directories are completely
free of all output files. In theory, you should be able to simply delete these directories.
</li>
|
>
>
|
<
|
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
...
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
<ul>
<root>\SQLite.Interop\props\SQLite.Interop.vsprops<br />
<root>\SQLite.Interop\props\SQLite.Interop.props<br />
<root>\SQLite.Interop\src\win\interop.h<br />
<root>\System.Data.SQLite\AssemblyInfo.cs<br />
<root>\System.Data.SQLite.Linq\AssemblyInfo.cs<br />
<root>\System.Data.SQLite\LINQ\SQLiteFactory_Linq.cs<br />
</ul>
You'll need to update the SQLITE_MANIFEST_VERSION and SQLITE_RC_VERSION properties
in the .vsprops and .props files, and the INTEROP_VERSION define in interop.h.
This version number should track the release versions of the System.Data.SQLite packages
(ie. [./news.wiki | 1.0.x]).
</li>
................................................................................
<ul>
<root>\SQLite.Interop\props\SQLite.Interop.vsprops<br />
<root>\SQLite.Interop\props\SQLite.Interop.props<br />
<root>\SQLite.Interop\src\win\interop.h<br />
<root>\System.Data.SQLite\AssemblyInfo.cs<br />
<root>\System.Data.SQLite.Linq\AssemblyInfo.cs<br />
<root>\System.Data.SQLite\LINQ\SQLiteFactory_Linq.cs<br />
</ul>
You'll need to update the SQLITE_MANIFEST_VERSION and SQLITE_RC_VERSION properties
in the .vsprops and .props files, and the INTEROP_VERSION define in interop.h.
This version number should track the release versions of the System.Data.SQLite packages
(ie. [./news.wiki | 1.0.x]).
</li>
<li>Make sure the "<root>\bin" and "<root>\obj" directories are completely
free of all output files. In theory, you should be able to simply delete these directories.
</li>
|