Removed:
trunk/MySql.VisualStudio/LanguageService/SqlTokenizer.cs
Modified:
trunk/MySql.VisualStudio/MySql.VisualStudio.csproj
Log:
modified visualstudio package to be built with VS28k SDK
Deleted: trunk/MySql.VisualStudio/LanguageService/SqlTokenizer.cs
===================================================================
--- trunk/MySql.VisualStudio/LanguageService/SqlTokenizer.cs 2008-09-12 14:13:23 UTC (rev 1417)
+++ trunk/MySql.VisualStudio/LanguageService/SqlTokenizer.cs 2008-09-12 20:43:27 UTC (rev 1418)
@@ -1,83 +0,0 @@
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-
-namespace MySql.Data.VisualStudio.LanguageService
-{
- class SqlTokenizer
- {
- object tokenizer;
-
- public SqlTokenizer()
- {
- Assembly a = Assembly.LoadWithPartialName("mysql.data");
- if (a == null)
- throw new Exception("Unable to load mysql.data assembly");
- tokenizer = a.CreateInstance("MySql.Data.MySqlClient.MySqlTokenizer",
- false, System.Reflection.BindingFlags.CreateInstance, null, null,
- null, null);
- }
-
- public SqlTokenizer(string sql)
- {
- Assembly a = Assembly.LoadWithPartialName("mysql.data");
- if (a == null)
- throw new Exception("Unable to load mysql.data assembly");
- tokenizer = a.CreateInstance("MySql.Data.MySqlClient.MySqlTokenizer",
- false, System.Reflection.BindingFlags.CreateInstance, null,
- new object[] { sql }, null, null);
- }
-
- #region Properties
-
- public string Text
- {
- set
- {
- PropertyInfo pi = tokenizer.GetType().GetProperty("Text");
- pi.SetValue(tokenizer, value, null);
- }
- }
-
- public bool ReturnComments
- {
- set
- {
- PropertyInfo pi = tokenizer.GetType().GetProperty("ReturnComments");
- pi.SetValue(tokenizer, value, null);
- }
- }
-
- public bool AnsiQuotes
- {
- set
- {
- PropertyInfo pi = tokenizer.GetType().GetProperty("AnsiQuotes");
- pi.SetValue(tokenizer, value, null);
- }
- }
-
- public bool Quoted
- {
- get
- {
- PropertyInfo pi = tokenizer.GetType().GetProperty("Quoted");
- return (bool)pi.GetValue(tokenizer, null);
- }
- }
-
- public string NextToken()
- {
- return (string)tokenizer.GetType().InvokeMember("NextToken",
- System.Reflection.BindingFlags.InvokeMethod,
- null, tokenizer, null);
- }
-
- public string NextParameter()
- {
- return (string)tokenizer.GetType().InvokeMember("NextParameter",
- System.Reflection.BindingFlags.InvokeMethod,
- null, tokenizer, null);
- }
- }
-}
Modified: trunk/MySql.VisualStudio/MySql.VisualStudio.csproj
===================================================================
--- trunk/MySql.VisualStudio/MySql.VisualStudio.csproj 2008-09-12 14:13:23 UTC (rev 1417)
+++ trunk/MySql.VisualStudio/MySql.VisualStudio.csproj 2008-09-12 20:43:27 UTC (rev 1418)
@@ -39,9 +39,9 @@
<ItemGroup>
<Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <Reference Include="Microsoft.Data.ConnectionUI, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.Data.ConnectionUI, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <Reference Include="Microsoft.VisualStudio.Data, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.VisualStudio.Data, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop" />
<Reference Include="Microsoft.VisualStudio.Package.LanguageService, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.Shell.Interop" />
@@ -58,6 +58,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\MySql.Data\Provider\Source\common\MySqlTokenizer.cs">
+ <Link>LanguageService\MySqlTokenizer.cs</Link>
+ </Compile>
<Compile Include="DbObjects\CollationTypeConverter.cs" />
<Compile Include="DbObjects\CharacterSetTypeConverter.cs" />
<Compile Include="DbObjects\DataTypeConverter.cs" />
@@ -132,9 +135,6 @@
<Compile Include="Guids.cs" />
<Compile Include="LanguageService\MySqlScanner.cs" />
<Compile Include="LanguageService\Source.cs" />
- <Compile Include="LanguageService\SqlTokenizer.cs">
- <SubType>Code</SubType>
- </Compile>
<Compile Include="MyInstaller.cs">
<SubType>Component</SubType>
</Compile>
@@ -204,13 +204,17 @@
<None Include="Properties\DataSources\TableNode.datasource" />
</ItemGroup>
<PropertyGroup>
- <TargetRegistryRoot>
- </TargetRegistryRoot>
- <RegisterOutputPackage>false</RegisterOutputPackage>
- <RegisterWithCodebase>false</RegisterWithCodebase>
+ <RegisterOutputPackage>true</RegisterOutputPackage>
+ <RegisterWithCodebase>true</RegisterWithCodebase>
+ <!-- Make sure we are 2005 compatible, and don't rely on RegPkg.exe
+ of VS2008 which uses Microsoft.VisualStudio.Shell.9.0 -->
+ <UseVS2005MPF>true</UseVS2005MPF>
+ <!-- Don't try to run as a normal user (RANA),
+ create experimental hive in HKEY_LOCAL_MACHINE -->
+ <RegisterWithRanu>false</RegisterWithRanu>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <Import Project="$(VS_SDK_PATH)\VisualStudioIntegration\Tools\Build\Microsoft.VsSDK.targets" />
+ <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
| Thread |
|---|
| • Connector/NET commit: r1418 - in trunk/MySql.VisualStudio: . LanguageService | rburnett | 12 Sep |
