List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:December 6 2010 9:40pm
Subject:bzr commit into connector-net-trunk branch (reggie.burnett:953)
View as plain text  
#At file:///C:/Users/Reggie/work/connector-net/6.3/ based on revid:reggie.burnett@strippedl82rxyv026

  953 Reggie Burnett	2010-12-06
      using pre-build events to copy the correct targets file over to vs.targets.  You don't ever need to worry about the content of vs.targets as it is just a temp file but we include it in bzr so that it is there at the start.  VS needs the file to exist when the project is loaded.

    renamed:
      MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj => MySql.VisualStudio/MySql.VisualStudio.csproj
    modified:
      MySQLClient-VS2010.sln
      MySql.VisualStudio/Targets/VS.targets
      MySql.VisualStudio/MySql.VisualStudio.csproj
=== modified file 'MySQLClient-VS2010.sln'
=== modified file 'MySQLClient-VS2010.sln'
--- a/MySQLClient-VS2010.sln	2010-12-06 21:35:13 +0000
+++ b/MySQLClient-VS2010.sln	2010-12-06 21:40:18 +0000
@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio.VS2010", "MySql.VisualStudio\MySql.VisualStudio.VS2010.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
-EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer.VS2010", "Installer\Installer.VS2010.wixproj", "{F533FC43-6C05-4A64-8AF6-72B690EB06C3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Web", "MySql.Web\Providers\MySql.Web.csproj", "{C28B1166-1380-445D-AEC1-8A18B990DD18}"
@@ -17,6 +15,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.Data.Entity.Tests", "MySql.Data.Entity\Tests\MySql.Data.Entity.Tests.csproj", "{D37B3572-767F-4622-A835-844B0EBEFD5B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql.VisualStudio", "MySql.VisualStudio\MySql.VisualStudio.csproj", "{DC3517FF-AC26-4755-9B7A-EF658FF69593}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Commercial|Any CPU = Commercial|Any CPU
@@ -45,42 +45,6 @@
 		Release-4.0|x86 = Release-4.0|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x86.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|x64.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|x86.ActiveCfg = Debug|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x86.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.ActiveCfg = Release-4.0|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.Build.0 = Release-4.0|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Mixed Platforms.Build.0 = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|x64.ActiveCfg = Release|Any CPU
-		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|x86.ActiveCfg = Release|Any CPU
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.ActiveCfg = Commercial|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Any CPU.Build.0 = Commercial|x86
 		{F533FC43-6C05-4A64-8AF6-72B690EB06C3}.Commercial|Mixed Platforms.ActiveCfg = Commercial|x86
@@ -333,6 +297,42 @@
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|Mixed Platforms.Build.0 = Release|Any CPU
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|x64.ActiveCfg = Release|Any CPU
 		{D37B3572-767F-4622-A835-844B0EBEFD5B}.Release-4.0|x86.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Any CPU.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|Mixed Platforms.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x64.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Commercial|x86.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.ActiveCfg = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Any CPU.Build.0 = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Mixed Platforms.ActiveCfg = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|Mixed Platforms.Build.0 = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|x64.ActiveCfg = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Debug-4.0|x86.ActiveCfg = Debug-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Any CPU.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|Mixed Platforms.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x64.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.GPL|x86.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Any CPU.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Mixed Platforms.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|Mixed Platforms.Build.0 = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|x64.ActiveCfg = Release-4.0|Any CPU
+		{DC3517FF-AC26-4755-9B7A-EF658FF69593}.Release-4.0|x86.ActiveCfg = Release-4.0|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

=== renamed file 'MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj' => 'MySql.VisualStudio/MySql.VisualStudio.csproj'
--- a/MySql.VisualStudio/MySql.VisualStudio.VS2010.csproj	2010-12-06 21:35:13 +0000
+++ b/MySql.VisualStudio/MySql.VisualStudio.csproj	2010-12-06 21:40:18 +0000
@@ -48,6 +48,7 @@
     <RegisterForComInterop>false</RegisterForComInterop>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <UseVS2005MPF>true</UseVS2005MPF>
+    <PreBuildEvent>copy $(ProjectDir)\Targets\vs2008.targets $(ProjectDir)\Targets\VS.targets</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
@@ -60,6 +61,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <UseVS2005MPF>true</UseVS2005MPF>
+    <PreBuildEvent>copy $(ProjectDir)\Targets\vs2008.targets $(ProjectDir)\Targets\VS.targets</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug-4.0|AnyCPU'">
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -73,6 +75,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <PreBuildEvent>copy $(ProjectDir)\Targets\vs2010.targets $(ProjectDir)\Targets\VS.targets</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release-4.0|AnyCPU'">
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -87,6 +90,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+    <PreBuildEvent>copy $(ProjectDir)\Targets\vs2010.targets $(ProjectDir)\Targets\VS.targets</PreBuildEvent>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -458,9 +462,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="Targets\VS.targets"/>
-  <!--<PropertyGroup>
-    <PreBuildEvent>copy $(ProjectDir)\Targets\vs2010.targets $(ProjectDir)\Active.targets</PreBuildEvent>
-  </PropertyGroup>-->
+  
   <!--<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets"
           Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU' or '$(Configuration)|$(Platform)' == 'Release|AnyCPU'"/>
   

=== modified file 'MySql.VisualStudio/Targets/VS.targets'
--- a/MySql.VisualStudio/Targets/VS.targets	2010-12-06 21:35:13 +0000
+++ b/MySql.VisualStudio/Targets/VS.targets	2010-12-06 21:40:18 +0000
@@ -1,3 +1,3 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-	<Import Project="C:\Program Files (x86)\MSBuild\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets"/>
+	<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\VSSDK\Microsoft.VsSDK.targets"/>
 </Project>
\ No newline at end of file

Attachment: [text/bzr-bundle] bzr/reggie.burnett@oracle.com-20101206214018-pne2mbmejvfa90ac.bundle
Thread
bzr commit into connector-net-trunk branch (reggie.burnett:953) Reggie Burnett6 Dec