projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a801b37)
Improve Visual Basic build support
authorjaredpar <jaredpar@microsoft.com>
Mon, 20 Apr 2015 15:35:07 +0000 (08:35 -0700)
committerjaredpar <jaredpar@microsoft.com>
Tue, 21 Apr 2015 16:47:59 +0000 (09:47 -0700)
This fixes a couple of small issues with the Visual Basic build support:

- The VBC task now respects the $(NoStdLib) MSBuild option.
- The field @(ReferencePath) should be used for References in the VBC
target as it is for the CSC target.
- The CreateVisualBasicManifestResourceNames task is compiled and used
in the same manner as CreateCSharpManifestResourceNames hence it should
be loaded via UsingTask in the same manner as well.
- Include the VisualBasic Portable targets files.

mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs patch | blob | history
mcs/tools/xbuild/Makefile patch | blob | history
mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks patch | blob | history
mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks patch | blob | history
mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks patch | blob | history
mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks patch | blob | history
mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks patch | blob | history
mcs/tools/xbuild/data/Microsoft.VisualBasic.targets patch | blob | history
mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets [new file with mode: 0644] patch | blob
mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets [new file with mode: 0644] patch | blob

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs
index c81a12d6e773d9b8af05a675591a09e8e2ad2d47..cf56b148f117e2427363568d8a2be911ea64e807 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Vbc.cs
@@ -73,6 +73,8 @@ namespace Microsoft.Build.Tasks {
                        commandLine.AppendSwitchIfNotNull ("/main:", MainEntryPoint);
 
                        // NoStandardLib
+                       if (Bag ["NoStandardLib"] != null && NoStandardLib)
+                               commandLine.AppendSwitch ("/nostdlib");
                        
                        if (NoWarnings)
                                commandLine.AppendSwitch ("/nowarn");
diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index 949f3e59663186f07097e723e8577a8f6f4b4134..afa7c217fbd9282fdc80bd45510da0c4be81ff63 100644 (file)
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -58,9 +58,11 @@ install-pcl-targets:
        $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0
        $(INSTALL_DATA) targets/Microsoft.Portable.Common.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0/Microsoft.Portable.Common.targets
        $(INSTALL_DATA) targets/Microsoft.Portable.CSharp_4.0.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0/Microsoft.Portable.CSharp.targets
+       $(INSTALL_DATA) targets/Microsoft.Portable.VisualBasic_4.0.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.0/Microsoft.Portable.VisualBasic.targets
        $(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5
        $(INSTALL_DATA) targets/Microsoft.Portable.Common.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5/Microsoft.Portable.Common.targets
        $(INSTALL_DATA) targets/Microsoft.Portable.CSharp_4.5.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5/Microsoft.Portable.CSharp.targets
+       $(INSTALL_DATA) targets/Microsoft.Portable.VisualBasic_4.5.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/v4.5/Microsoft.Portable.VisualBasic.targets
        $(INSTALL_DATA) targets/Microsoft.Portable.Core.targets $(DESTDIR)$(PORTABLE_TARGETS_DIR)/Microsoft.Portable.Core.targets
        $(INSTALL_DATA) targets/Microsoft.Portable.Core.props $(DESTDIR)$(PORTABLE_TARGETS_DIR)/Microsoft.Portable.Core.props
 
diff --git a/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks
index 14047e5e8584240940b7a2df446782c58a872c92..2155da3f2774c3b5b148f65f1fb38082402c521a 100644 (file)
--- a/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/12.0/Microsoft.Common.tasks
@@ -8,6 +8,7 @@
        <UsingTask TaskName="Microsoft.Build.Tasks.CombinePath"         AssemblyName="Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Copy"                AssemblyName="Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateCSharpManifestResourceName"    AssemblyName="Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+       <UsingTask TaskName="Microsoft.Build.Tasks.CreateVisualBasicManifestResourceName"       AssemblyName="Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateItem"          AssemblyName="Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateProperty"      AssemblyName="Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Csc"                 AssemblyName="Microsoft.Build.Tasks.v12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
diff --git a/mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks
index b5cede2e44825f95653fc8fe21ea08728f349f3c..01964063c0f816152a271f79b580b1139aa4d190 100644 (file)
--- a/mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/14.0/Microsoft.Common.tasks
@@ -7,6 +7,7 @@
        <UsingTask TaskName="Microsoft.Build.Tasks.CombinePath"         AssemblyName="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Copy"                AssemblyName="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateCSharpManifestResourceName"    AssemblyName="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+       <UsingTask TaskName="Microsoft.Build.Tasks.CreateVisualBasicManifestResourceName"       AssemblyName="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateItem"          AssemblyName="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateProperty"      AssemblyName="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Csc"                 AssemblyName="Microsoft.Build.Tasks.Core, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
diff --git a/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks
index fadb882f9f9400fd9684c257f2bd02f30be37c6d..fc9ec9cd119d6bbab5b9ab3ab321225a375c99f9 100644 (file)
--- a/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/2.0/Microsoft.Common.tasks
@@ -7,6 +7,7 @@
        <UsingTask TaskName="Microsoft.Build.Tasks.CombinePath"         AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Copy"                AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateCSharpManifestResourceName"    AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+       <UsingTask TaskName="Microsoft.Build.Tasks.CreateVisualBasicManifestResourceName"       AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateItem"          AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateProperty"      AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Csc"                 AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
diff --git a/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks b/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks
index 68fcc7708fed1d172f3725ef6ea8041146aed5c3..7df9a2928a15ab03a0508bfbe231880262fa3217 100644 (file)
--- a/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/3.5/Microsoft.Common.tasks
@@ -8,6 +8,7 @@
        <UsingTask TaskName="Microsoft.Build.Tasks.CombinePath"         AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Copy"                AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateCSharpManifestResourceName"    AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+       <UsingTask TaskName="Microsoft.Build.Tasks.CreateVisualBasicManifestResourceName"       AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateItem"          AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateProperty"      AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Csc"                 AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
diff --git a/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks b/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks
index 1063058785d6a70ada1fab267c698e829747addd..b183750f9e2d3c504d182c263b2084a98a5c0a50 100644 (file)
--- a/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/data/4.0/Microsoft.Common.tasks
@@ -8,6 +8,7 @@
        <UsingTask TaskName="Microsoft.Build.Tasks.CombinePath"         AssemblyName="Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Copy"                AssemblyName="Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateCSharpManifestResourceName"    AssemblyName="Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+       <UsingTask TaskName="Microsoft.Build.Tasks.CreateVisualBasicManifestResourceName"       AssemblyName="Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateItem"          AssemblyName="Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.CreateProperty"      AssemblyName="Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
        <UsingTask TaskName="Microsoft.Build.Tasks.Csc"                 AssemblyName="Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
diff --git a/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets b/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets
index a94157c8584e0c600ff49e78106925cd1016a822..dc2b0e6d61f20b86ba043739a30b2e2f42230fcd 100644 (file)
--- a/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets
+++ b/mcs/tools/xbuild/data/Microsoft.VisualBasic.targets
@@ -1,5 +1,4 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-       <UsingTask TaskName="Microsoft.Build.Tasks.CreateVisualBasicManifestResourceName" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
        <PropertyGroup>
                <DefaultLanguageSourceExtension>.vb</DefaultLanguageSourceExtension>
                <Language>VB</Language>
@@ -68,7 +67,7 @@
                        OptionInfer="$(OptionInfer)"
                        OutputAssembly="@(IntermediateAssembly)"
                        Platform="$(PlatformTarget)"
-                       References="@(ResolvedFiles)"
+                       References="@(ReferencePath)"
                        RemoveIntegerChecks="$(RemoveIntegerChecks)"
                        Resources="@(ManifestResourceWithNoCulture);@(ManifestNonResxWithNoCultureOnDisk);@(CompiledLicenseFile)"
                        ResponseFiles="$(CompilerResponseFile)"
diff --git a/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets b/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets
new file mode 100644 (file)
index 0000000..bf58fee
--- /dev/null
+++ b/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets
@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <Import Project="..\Microsoft.Portable.Core.props" />
+       <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+       <Import Project="..\Microsoft.Portable.Core.targets" />
+</Project>
diff --git a/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets b/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets
new file mode 100644 (file)
index 0000000..bf58fee
--- /dev/null
+++ b/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets
@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <Import Project="..\Microsoft.Portable.Core.props" />
+       <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+       <Import Project="..\Microsoft.Portable.Core.targets" />
+</Project>
my mono mirror. check out Moved to http://github.com/mono/mono