X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftools%2Fxbuild%2Fxbuild%2FMicrosoft.VisualBasic.targets;h=4b89dfafb933b31a65a2fb50cca71c2eab40f75a;hb=61a2e43f49beceeaef895955016285478fe0f75a;hp=eb3c3fd96ad5898e25ee7d0fa799740b3ca77085;hpb=11fceb0024ac3677d86a3e5b76897e2f3fab4c47;p=mono.git

diff --git a/mcs/tools/xbuild/xbuild/Microsoft.VisualBasic.targets b/mcs/tools/xbuild/xbuild/Microsoft.VisualBasic.targets
index eb3c3fd96ad..4b89dfafb93 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.VisualBasic.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.VisualBasic.targets
@@ -23,6 +23,8 @@
 
 		<DebugSymbols Condition=" '$(DebugType)' == 'none' ">false</DebugSymbols>
 		<DebugType    Condition=" '$(DebugType)' == 'none' "></DebugType>
+
+		<CoreCompileDependsOn></CoreCompileDependsOn>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -31,8 +33,10 @@
 
 	<Target
 		Name="CoreCompile"
-		Inputs="@(Compile)"
-		Outputs="$(IntermediateAssembly)"
+		Inputs="$(MSBuildAllProjects);@(Compile);@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile);@(DocFileItem);
+			$(KeyOriginatorFile);@(ReferencePath);$(Win32Icon);$(Win32Resource)"
+		Outputs="@(IntermediateAssembly)"
+		DependsOnTargets="$(CoreCompileDependsOn)"
 	>
 		<Vbc
 			AdditionalLibPaths="$(AdditionalLibPaths)"
@@ -61,12 +65,13 @@
 			OptionExplicit="$(OptionExplicit)"
 			OptionStrict="$(OptionStrict)"
 			OptionStrictType="$(OptionStrictType)" 
-			OutputAssembly="$(IntermediateAssembly)"
+			OutputAssembly="@(IntermediateAssembly)"
 			Platform="$(PlatformTarget)"
 			References="@(ResolvedFiles)"
 			RemoveIntegerChecks="$(RemoveIntegerChecks)"
 			Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)"
 			ResponseFiles="$(CompilerResponseFile)"
+			RootNamespace="$(RootNamespace)"
 			Sources="@(Compile)"
 			TargetType="$(OutputType)"
 			TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
@@ -107,4 +112,12 @@
 
 	<Import Project="Microsoft.Common.targets" />
 
+	<PropertyGroup>
+		<VbcToolExe Condition="'$(VbcToolExe)' == '' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(OS)' != 'Windows_NT'">vbnc2</VbcToolExe>
+		<VbcToolExe Condition="'$(VbcToolExe)' == '' and '$(TargetFrameworkVersion)' != 'v4.0' and '$(OS)' == 'Windows_NT'">vbnc2.bat</VbcToolExe>
+
+		<VbcToolExe Condition="'$(VbcToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0' and '$(OS)' != 'Windows_NT'">vbnc</VbcToolExe>
+		<VbcToolExe Condition="'$(VbcToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0' and '$(OS)' == 'Windows_NT'">vbnc.bat</VbcToolExe>
+	</PropertyGroup>
+
 </Project>