mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/tools/xbuild/Main.cs
View File

@@ -50,8 +50,10 @@ namespace Mono.XBuild.CommandLine {
Engine engine;
Project project;
ConsoleReportPrinter printer;
// this does nothing but adds strong reference to Microsoft.Build.Tasks*.dll that we need to load consistently.
Microsoft.Build.Tasks.Copy dummy;
public static void Main (string[] args)
{
MainClass mc = new MainClass ();

6
mcs/tools/xbuild/Makefile
View File

@@ -5,7 +5,7 @@ NO_TESTS = yes
include xbuild.make
LOCAL_MCS_FLAGS = -r:$(XBUILD_FRAMEWORK) -r:$(XBUILD_UTILITIES) -r:$(XBUILD_ENGINE)
LOCAL_MCS_FLAGS = -r:$(XBUILD_FRAMEWORK) -r:$(XBUILD_UTILITIES) -r:$(XBUILD_ENGINE) -r:$(XBUILD_MSTASKS)
PROGRAM = xbuild.exe
include ../../build/executable.make
@@ -105,11 +105,11 @@ EXTRA_DISTFILES = \
frameworks/net_4.5.1.xml \
targets/Microsoft.Portable.CSharp_4.0.targets \
targets/Microsoft.Portable.CSharp_4.5.targets \
targets/Microsoft.Portable.VisualBasic_4.0.targets \
targets/Microsoft.Portable.VisualBasic_4.5.targets \
targets/Microsoft.Portable.Common.targets \
targets/Microsoft.Portable.Core.targets \
targets/Microsoft.Portable.Core.props \
targets/Microsoft.WebApplication.targets \
targets/Microsoft.Portable.VisualBasic_4.0.targets \
targets/Microsoft.Portable.VisualBasic_4.5.targets \
xbuild.make \
xbuild_test.make

8
mcs/tools/xbuild/data/Microsoft.VisualBasic.targets
View File

@@ -64,6 +64,7 @@
OptionExplicit="$(OptionExplicit)"
OptionStrict="$(OptionStrict)"
OptionStrictType="$(OptionStrictType)"
OptionInfer="$(OptionInfer)"
OutputAssembly="@(IntermediateAssembly)"
Platform="$(PlatformTarget)"
References="@(ReferencePath)"
@@ -76,6 +77,7 @@
TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
UseHostCompilerIfAvailable="$(UseHostCompilerIfAvailable)"
Utf8Output="$(Utf8Output)"
VBRuntime="$(VBRuntime)"
Verbosity="$(VbcVerbosity)"
WarningsAsErrors="$(WarningsAsErrors)"
WarningsNotAsErrors="$(WarningsNotAsErrors)"
@@ -112,11 +114,7 @@
<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>
<VbcToolExe Condition="'$(VbcToolExe)' == ''">vbnc.exe</VbcToolExe>
</PropertyGroup>
</Project>

4
mcs/tools/xbuild/xbuild.make
View File

@@ -10,6 +10,10 @@ XBUILD_FRAMEWORK := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Framework.dll
XBUILD_ENGINE := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Engine.dll
XBUILD_UTILITIES := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Utilities$(NAME_SUFFIX).dll
XBUILD_TASKS := $(topdir)/class/lib/$(PROFILE)/Mono.XBuild.Tasks.dll
XBUILD_MSTASKS := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Tasks$(NAME_SUFFIX).dll
ifeq (14.0, $(XBUILD_VERSION))
XBUILD_MSTASKS := $(topdir)/class/lib/$(PROFILE)/Microsoft.Build.Tasks.Core.dll
endif
XBUILD_ASSEMBLY_VERSION = $(XBUILD_VERSION).0.0