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

Imported Upstream version 6.0.0.278

Browse Source 
Former-commit-id: 8e546554fb8a6a1589c359278da385ff24d70cc3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-06-05 08:38:53 +00:00
parent 8bc755c196
commit 4ed14e5c30
314 changed files with 1281 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mcs/build/common/Consts.cs
View File

@@ -30,7 +30,7 @@
static partial class Consts
{
public const string MonoCorlibVersion = "9032116E-BB4E-4ED5-9C71-9E5E0B0230CA";
public const string MonoCorlibVersion = "d0aa6798-834d-11e9-b38a-3b0d70487d01";
}
#if !NETCORE
@@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.0.0.277";
public const string MonoVersion = "6.0.0.278";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

4
mcs/build/library.make
View File

@@ -387,5 +387,5 @@ ifneq ($(RESX_STRINGS),)
endif
update-corefx-sr: $(RESX_RESOURCE_STRING) $(XTEST_RESX_RESOURCE_STRING)
make SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" RESX_EXTRA_ARGUMENTS="$(RESX_EXTRA_ARGUMENTS)" update-corefx-sr-generic \
&& make SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic
$(MAKE) SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" RESX_EXTRA_ARGUMENTS="$(RESX_EXTRA_ARGUMENTS)" update-corefx-sr-generic \
&& $(MAKE) SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic

2
mcs/build/profiles/build.make
View File

@@ -147,7 +147,7 @@ export VBCS_LOCATION
start-compiler-server:
echo Attempting to start compiler server...
$(topdir)/build/start-compiler-server.sh '$(realpath $(topdir))' '$(realpath $(topdir)/build/compiler-server.log)' '$(COMPILER_SERVER_PIPENAME)'
./build/start-compiler-server.sh '$(realpath $(topdir))' '$(realpath $(topdir)/build)/compiler-server.log' '$(COMPILER_SERVER_PIPENAME)'
else
start-compiler-server:

16
mcs/build/rules.make
View File

@@ -31,13 +31,15 @@ ifndef BUILD_TOOLS_PROFILE
BUILD_TOOLS_PROFILE = build
endif
ifeq ("$(ENABLE_COMPILER_SERVER)","1")
COMPILER_SERVER_ARGS=/shared:$(COMPILER_SERVER_PIPENAME)
CSC_LOCATION=$(SERVER_CSC_LOCATION)
else
COMPILER_SERVER_ARGS:=
CSC_LOCATION=$(STANDALONE_CSC_LOCATION)
endif
# NOTE: We have to use conditional functions to branch on the state of ENABLE_COMPILER_SERVER
# because the value of this flag can change after rules.make is evaluated. If we use regular ifeq
# statements our builds will opt to use or not use the compiler server seemingly at random because
# we include rules.make many times and the last observed value from rules.make does not match the
# value used when actually executing csc. you can observe this by adding an $ ( info here and an
# echo above the csc invocation and printing the values.
COMPILER_SERVER_ENABLED_ARGS = /shared:$(COMPILER_SERVER_PIPENAME)
COMPILER_SERVER_ARGS = $(if $(findstring 1,$(ENABLE_COMPILER_SERVER)),$(COMPILER_SERVER_ENABLED_ARGS),)
CSC_LOCATION = $(if $(findstring 1,$(ENABLE_COMPILER_SERVER)),$(SERVER_CSC_LOCATION),$(STANDALONE_CSC_LOCATION))
USE_MCS_FLAGS = $(COMPILER_SERVER_ARGS) /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
USE_MBAS_FLAGS = $(COMPILER_SERVER_ARGS) /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)

4
mcs/build/tests.make
View File

@@ -207,7 +207,7 @@ MKBUNDLE_EXE = $(topdir)/class/lib/$(PROFILE)/mkbundle.exe
TEST_ASSEMBLIES:=$(sort $(patsubst .//%,%,$(filter-out %.exe.static %.dll.dll %.exe.dll %bare% %plaincore% %secxml% %Facades% %ilasm%,$(filter %.dll,$(wildcard $(topdir)/class/lib/$(PROFILE)/tests/*)))))
$(MKBUNDLE_EXE): $(topdir)/tools/mkbundle/mkbundle.cs
make -C $(topdir)/tools/mkbundle
$(MAKE) -C $(topdir)/tools/mkbundle
mkbundle-all-tests:
$(Q_AOT) $(MAKE) -C $(topdir)/class do-test
@@ -267,7 +267,7 @@ test_library = $(ASSEMBLY:$(ASSEMBLY_EXT)=)_test$(ASSEMBLY_EXT)
test_sourcefile = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(test_library).sources
$(test_sourcefile): $(test_sourcefile_base) $(wildcard *_test.dll.sources) $(wildcard *_test.dll.exclude.sources) $(depsdir)/.stamp
$(GENSOURCES) --trace:4 --basedir:./Test --strict --platformsdir:$(topdir)/build "$@" "$(test_library)" "$(PROFILE_PLATFORM)" "$(PROFILE)"
$(GENSOURCES) --basedir:./Test --strict --platformsdir:$(topdir)/build "$@" "$(test_library)" "$(PROFILE_PLATFORM)" "$(PROFILE)"
test_response = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(test_library).response
$(test_response): $(test_sourcefile) $(topdir)/build/tests.make $(depsdir)/.stamp