Fixed building of VB compact framework projects (SD2-1196)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@2047 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets

@@ -24,6 +24,15 @@
 		<SharpDevelopUseMicrosoftFramework>true</SharpDevelopUseMicrosoftFramework>		
 	</PropertyGroup>
 	
+	<PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'CF 1.0' ">
+		<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
+		<SharpDevelopUseCompactFramework>true</SharpDevelopUseCompactFramework>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'CF 2.0' ">
+		<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+		<SharpDevelopUseCompactFramework>true</SharpDevelopUseCompactFramework>
+	</PropertyGroup>
+	
 	<!-- Use Microsoft's VB standard targets -->
 	<Import Condition=" '$(SharpDevelopUseMicrosoftFramework)' == 'true' " Project="$(MSBuildBinPath)\Microsoft.VisualBasic.targets" />
 	
@@ -141,12 +150,14 @@
 	<Import Condition=" '$(TargetFrameworkVersion)' == 'Mono v2.0' " Project="$(SharpDevelopBinPath)\SharpDevelop.Build.Mono.Mbas.targets"/>
 	
 	<!-- Compact framework default platform values -->
-	<PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'CF 1.0' Or '$(TargetFrameworkVersion)' == 'CF 2.0' ">
+	<PropertyGroup Condition=" '$(SharpDevelopUseCompactFramework)' == 'true' ">
 		<PlatformFamilyName Condition=" '$(PlatformFamilyName)' == '' ">PocketPC</PlatformFamilyName>
     	<PlatformID Condition=" '$(PlatformID)' == '' ">WinCE</PlatformID>
 	</PropertyGroup>
 	
 	<!-- Compact framework imports -->
-	<Import Condition=" '$(TargetFrameworkVersion)' == 'CF 1.0' " Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.v1.targets"/>
-	<Import Condition=" '$(TargetFrameworkVersion)' == 'CF 2.0' " Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets"/>
+	<Import Condition=" ('$(TargetFrameworkVersion)' == 'v1.0') And ('$(SharpDevelopUseCompactFramework)' == 'true') "
+	        Project="$(MSBuildBinPath)\Microsoft.CompactFramework.VisualBasic.v1.targets"/>
+	<Import Condition=" ('$(TargetFrameworkVersion)' == 'v2.0') And ('$(SharpDevelopUseCompactFramework)' == 'true') "
+	        Project="$(MSBuildBinPath)\Microsoft.CompactFramework.VisualBasic.targets"/>
 </Project>

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs

@@ -251,7 +251,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 							break;
 						}
 					} else {
-						if (extendedTargets.Equals(import.EvaluatedProjectPath, StringComparison.InvariantCultureIgnoreCase)) {
+						if (extendedTargets.Equals(import.ProjectPath, StringComparison.InvariantCultureIgnoreCase)) {
 							//import.ProjectPath = defaultTargets;
 							MSBuildInternals.SetImportProjectPath(project.MSBuildProject, import, defaultTargets);
 							break;