bzr commit into connector-net-trunk branch (reggie.burnett:885)

[Reggie Burnett]

#At file:///C:/work/bzr-connector-net/clean-trunk/ based on revid:reggie.burnett@strippedfdw8ykdjz

  885 Reggie Burnett	2010-06-25
      small updates for VS2010 version of mysql.visualstudio

    modified:
      MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj
      MySql.VisualStudio/source.extension.vsixmanifest
=== modified file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj'
=== modified file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-05-20 04:15:01 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-06-25 17:46:30 +0000
@@ -368,6 +368,7 @@
     <Content Include="Resources\sql_editor_disconnect.png" />
     <Content Include="Resources\sql_editor_runsql.png" />
     <None Include="Resources\sql_editor_validatesql.png" />
+    <None Include="source.extension.vsixmanifest" />
     <Content Include="Templates\MySQL Script.mysql">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -417,19 +418,16 @@
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <RegisterOutputPackage>false</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>
+  <PropertyGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="C:\Program Files\Visual Studio 2005 SDK\2007.02\VisualStudioIntegration\Tools\Build\Microsoft.VsSDK.targets" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets')" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets')" />
-  <Import Project="VSCT_overrides.targets" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets')" />
+  <Import Project="C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v10.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">

=== modified file 'MySql.VisualStudio/source.extension.vsixmanifest'
--- a/MySql.VisualStudio/source.extension.vsixmanifest	2010-02-09 17:04:52 +0000
+++ b/MySql.VisualStudio/source.extension.vsixmanifest	2010-06-25 17:46:30 +0000
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
   <Identifier Id="79A115C9-B133-4891-9E7B-242509DAD272">
-    <Name>MySql.VisualStudio</Name>
-    <Author>Oracle</Author>
+    <Name>MySQL Tools for Visual Studio</Name>
+    <Author>Oracle, Inc.</Author>
     <Version>6.3</Version>
-    <Description xml:space="preserve">Information about my package</Description>
+    <Description xml:space="preserve">boo</Description>
     <Locale>1033</Locale>
     <InstalledByMsi>false</InstalledByMsi>
     <SupportedProducts>
       <VisualStudio Version="10.0">
+        <Edition>Ultimate</Edition>
+        <Edition>Premium</Edition>
         <Edition>Pro</Edition>
+        <Edition>VSTS</Edition>
+        <Edition>VSTD</Edition>
       </VisualStudio>
     </SupportedProducts>
     <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
   </Identifier>
-  <References />
+  <References>
+    <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
+      <Name>Visual Studio MPF</Name>
+    </Reference>
+  </References>
   <Content>

-    <VsPackage>|MySql.VisualStudio;PkgdefProjectOutputGroup|</VsPackage>
+    <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage>
   </Content>
 </Vsix>

Attachment: [text/bzr-bundle] bzr/[e-mail]