mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 17:10:20 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
722ef8f64f | ||
|
|
1e5b4df5b8 |
No files matched your search
@@ -1,152 +0,0 @@
|
||||
# Mono Code Owners File
|
||||
#
|
||||
# GitHub uses this file to determine who to assign for reviews
|
||||
# on pull requests. Please keep this file alphabetically sorted.
|
||||
#
|
||||
# References:
|
||||
#
|
||||
# https://github.com/blog/2392-introducing-code-owners
|
||||
# https://help.github.com/articles/about-codeowners
|
||||
|
||||
|
||||
# These owners will be the default owners for everything in the repo.
|
||||
* @luhenry @marek-safar
|
||||
|
||||
# Order is important. The last matching pattern has the most precedence.
|
||||
|
||||
/acceptance-tests @akoeplinger @kg
|
||||
/acceptance-tests/profiler-stress* @alexrp @akoeplinger
|
||||
|
||||
/data @marek-safar @akoeplinger @luhenry
|
||||
/data/gdb @vargaz @luhenry
|
||||
/data/lldb @lewurm @vargaz
|
||||
|
||||
/docs @luhenry @marek-safar @akoeplinger
|
||||
/docs/riscv.md @alexrp @lewurm
|
||||
/docs/sources/mono-api-profiler.html @alexrp
|
||||
|
||||
/external @akoeplinger @marek-safar
|
||||
/external/api-snapshot @marek-safar @akoeplinger
|
||||
/external/binary-reference-assemblies @marek-safar @akoeplinger
|
||||
/external/bockbuild @akoeplinger @alexischr
|
||||
/external/boringssl @baulig
|
||||
/external/cecil @marek-safar @akoeplinger
|
||||
/external/corefx @akoeplinger @marek-safar @egorbo @alexischr
|
||||
/external/corert @akoeplinger @marek-safar @egorbo @alexischr
|
||||
/external/linker @marek-safar
|
||||
/external/llvm @luhenry @vargaz
|
||||
/external/nuget-buildtasks @radical @akoeplinger
|
||||
/external/roslyn-binaries @kg @marek-safar @akoeplinger
|
||||
|
||||
/libgc @BrzVlad @vargaz @luhenry
|
||||
|
||||
/llvm @vargaz @luhenry
|
||||
|
||||
/man @marek-safar @miguel @luhenry
|
||||
/man/*prof* @alexrp
|
||||
|
||||
/mcs @marek-safar @luhenry
|
||||
|
||||
/mcs/build @marek-safar @akoeplinger
|
||||
|
||||
/mcs/class @marek-safar @akoeplinger
|
||||
/mcs/class/corlib/System.Reflection*/ @vargaz @lambdageek
|
||||
/mcs/class/corlib/System.Security.Cryptography.X509Certificates @baulig @marek-safar
|
||||
/mcs/class/Mono.Btls.Interface @bauligg @marek-safar
|
||||
/mcs/class/Mono.Data.Tds @egorbo
|
||||
/mcs/class/Mono.Debugger.Soft @vargaz
|
||||
/mcs/class/Mono.Options @jonpryor @marek-safar
|
||||
/mcs/class/Mono.Profiler.Log @alexrp @luhenry
|
||||
/mcs/class/Mono.Security/Mono.Security/Interface @baulig @marek-safar
|
||||
/mcs/class/System/Mono.AppleTls @baulig @rolf
|
||||
/mcs/class/System/Mono.Btls @baulig @marek-safar
|
||||
/mcs/class/System/Mono.Net.Security @baulig @marek-safar
|
||||
/mcs/class/System/Mono.Security.Interface @baulig @marek-safar
|
||||
/mcs/class/System/System.Security.Cryptography.X509Certificates @baulig @marek-safar
|
||||
/mcs/class/System.Data* @egorbo @marek-safar
|
||||
|
||||
/mcs/errors @marek-safar @lewurm
|
||||
/mcs/ilasm @marek-safar @lewurm
|
||||
/mcs/jay @marek-safar @lewurm
|
||||
/mcs/mcs @marek-safar @lewurm
|
||||
/mcs/tests @marek-safar @lewurm
|
||||
|
||||
/mcs/tools @marek-safar @akoeplinger
|
||||
/mcs/tools/gensources @kg @akoeplinger
|
||||
/mcs/tools/upload-to-sentry @alexanderkyte @akoeplinger
|
||||
|
||||
/mono/arch @vargaz @lewurm
|
||||
|
||||
/mono/btls @baulig @luhenry @marek-safar
|
||||
/mono/dis @lambdageek @vargaz
|
||||
/mono/eglib @vargaz @luhenry
|
||||
|
||||
/mono/benchmark @alexanderkyte @luhenry
|
||||
|
||||
/mono/metadata @vargaz @lambdageek
|
||||
/mono/metadata/*verify* @lambdageek @luhenry
|
||||
/mono/metadata/*profiler* @alexrp @luhenry
|
||||
/mono/metadata/handle* @jaykrell @lambdageek
|
||||
/mono/metadata/monitor* @brzvlad @vargaz
|
||||
/mono/metadata/sgen* @brzvlad @vargaz
|
||||
/mono/metadata/thread* @luhenry @lateralusX
|
||||
/mono/metadata/w32* @luhenry @lateralusX @jaykrell
|
||||
/mono/metadata/*-win* @lateralusX @luhenry @luhenry
|
||||
|
||||
/mono/mini @vargaz @lewurm
|
||||
/mono/mini/*cfgdump* @lewurm @luhenry
|
||||
/mono/mini/*exceptions* @lewurm @luhenry
|
||||
/mono/mini/*ppc* @lewurm @vargaz
|
||||
/mono/mini/*riscv* @alexrp @lewurm
|
||||
/mono/mini/*type-check* @lewurm @lambdageek
|
||||
/mono/mini/interp/* @lewurm @BrzVlad
|
||||
/mono/mini/*profiler* @alexrp @luhenry
|
||||
/mono/mini/debugger-agent.c @vargaz @lewurm @DavidKarlas
|
||||
|
||||
/mono/native @baulig @luhenry @marek-safar
|
||||
|
||||
/mono/profiler @alexrp @luhenry
|
||||
|
||||
/mono/sgen @BrzVlad @luhenry
|
||||
|
||||
/mono/utils @vargaz @lewurm
|
||||
/mono/utils/atomic* @lewurm @luhenry
|
||||
/mono/utils/mono-hwcap* @lewurm @luhenry
|
||||
/mono/utils/mono-mem* @lewurm @luhenry
|
||||
/mono/utils/mono-threads* @luhenry @vargaz
|
||||
/mono/utils/*-win* @lateralusX @jay
|
||||
|
||||
/msvc @lateralusX @luhenry
|
||||
/msvc/*profiler* @alexrp @luhenry
|
||||
/msvc/scripts @akoeplinger @kg
|
||||
|
||||
/packaging @alexischr @akoeplinger @luhenry @directhex
|
||||
/packaging/MacSDK/msbuild.py @radical @akoeplinger
|
||||
|
||||
/runtime @akoeplinger @marek-safar @luhenry
|
||||
|
||||
/samples @luhenry @lewurm
|
||||
/samples/profiler @alexrp @luhenry
|
||||
/samples/size @alexrp @luhenry
|
||||
|
||||
/scripts @akoeplinger @luhenry
|
||||
/scripts/ci @akoeplinger @alexischr
|
||||
|
||||
/sdks @marek-safar @luhenry @vargaz
|
||||
/sdks/builds/android* @luhenry @jonpryor
|
||||
/sdks/builds/mxe* @luhenry @jonpryor
|
||||
/sdks/builds/ios* @vargaz @rolfbjarne
|
||||
/sdks/builds/wasm* @vargaz @kjpou1
|
||||
/sdks/wasm @vargaz @kjpou1 @kg
|
||||
/sdks/ios @vargaz @rolfbjarne
|
||||
/sdks/android @luhenry @jonpryor
|
||||
|
||||
/support @luhenry @vargaz
|
||||
|
||||
/tools @luhenry @vargaz
|
||||
/tools/locale-builder @marek-safar @egorbo
|
||||
/tools/monograph @vargaz @vargaz
|
||||
/tools/nuget-hash-extractor @marek-safar @radical
|
||||
/tools/offsets-tool @lewurm @rolfbjarne
|
||||
/tools/pedump @lambdageek @lewurm
|
||||
/tools/sgen @brzvlad @vargaz
|
||||
@@ -89,7 +89,6 @@ stamp-h.in
|
||||
*~
|
||||
*.swp
|
||||
*.o
|
||||
*.dylib
|
||||
.deps
|
||||
.libs
|
||||
|
||||
@@ -133,5 +132,3 @@ tmpinst-dir.stamp
|
||||
msvc/scripts/inputs/
|
||||
extensions-config.h
|
||||
*.mlpd
|
||||
llvm/build/
|
||||
llvm/usr/
|
||||
@@ -58,10 +58,3 @@
|
||||
[submodule "external/api-snapshot"]
|
||||
path = external/api-snapshot
|
||||
url = git://github.com/mono/api-snapshot.git
|
||||
[submodule "external/llvm"]
|
||||
path = external/llvm
|
||||
url = git://github.com/mono/llvm.git
|
||||
branch = release_60
|
||||
[submodule "external/helix-binaries"]
|
||||
path = external/helix-binaries
|
||||
url = git://github.com/mono/helix-binaries.git
|
||||
+140
@@ -0,0 +1,140 @@
|
||||
# Mono Code Owners File
|
||||
#
|
||||
# GitHub uses this file to determine who to assign for reviews
|
||||
# on pull requests. Please keep this file alphabetically sorted.
|
||||
#
|
||||
# References:
|
||||
#
|
||||
# https://github.com/blog/2392-introducing-code-owners
|
||||
# https://help.github.com/articles/about-codeowners
|
||||
|
||||
|
||||
# These owners will be the default owners for everything in the repo.
|
||||
* @luhenry @marek-safar
|
||||
|
||||
# Order is important. The last matching pattern has the most precedence.
|
||||
|
||||
/acceptance-tests @akoeplinger
|
||||
/acceptance-tests/profiler-stress* @alexrp
|
||||
|
||||
/data @marek-safar @akoeplinger @luhenry
|
||||
/data/gdb @vargaz
|
||||
/data/lldb @lewurm @vargaz
|
||||
|
||||
/docs @luhenry @marek-safar
|
||||
/docs/riscv.md @alexrp
|
||||
/docs/sources/mono-api-profiler.html @alexrp
|
||||
|
||||
/external @marek-safar @luhenry
|
||||
/external/binary-reference-assemblies @marek-safar @akoeplinger
|
||||
/external/bockbuild @akoeplinger @alexischr
|
||||
/external/boringssl @baulig
|
||||
/external/nuget-buildtasks @radical @akoeplinger
|
||||
|
||||
/libgc @BrzVlad @vargaz @luhenry
|
||||
|
||||
/llvm @vargaz @luhenry
|
||||
|
||||
/man @marek-safar @miguel @luhenry
|
||||
/man/*prof* @alexrp
|
||||
|
||||
/mcs @marek-safar @luhenry
|
||||
|
||||
/mcs/build @marek-safar @akoeplinger
|
||||
|
||||
/mcs/class @marek-safar @akoeplinger
|
||||
/mcs/class/corlib/System.Reflection*/ @vargaz @lambdageek
|
||||
/mcs/class/Mono.Btls.Interface @baulig
|
||||
/mcs/class/Mono.Data.Tds @egorbo
|
||||
/mcs/class/Mono.Debugger.Soft @vargaz
|
||||
/mcs/class/Mono.Options @jonpryor
|
||||
/mcs/class/Mono.Profiler.Log @alexrp
|
||||
/mcs/class/Mono.Security/Mono.Security/Interface @baulig
|
||||
/mcs/class/System/Mono.AppleTls @baulig
|
||||
/mcs/class/System/Mono.Btls @baulig
|
||||
/mcs/class/System/Mono.Net.Security @baulig
|
||||
/mcs/class/System/Mono.Security.Interface @baulig
|
||||
/mcs/class/System.Data* @egorbo
|
||||
|
||||
/mcs/errors @marek-safar
|
||||
/mcs/ilasm @marek-safar
|
||||
/mcs/jay @marek-safar
|
||||
/mcs/mcs @marek-safar @lewurm
|
||||
/mcs/tests @marek-safar
|
||||
/mcs/tools @marek-safar @akoeplinger
|
||||
|
||||
/mono @luhenry
|
||||
|
||||
/mono/arch/riscv @alexrp
|
||||
|
||||
/mono/btls @baulig
|
||||
/mono/dis @lambdageek @vargaz
|
||||
/mono/eglib @kumpera @vargaz @luhenry
|
||||
|
||||
/mono/metadata @vargaz @kumpera
|
||||
/mono/metadata/*verify* @kumpera
|
||||
/mono/metadata/*profiler* @alexrp
|
||||
/mono/metadata/monitor* @brzvlad
|
||||
/mono/metadata/sgen* @brzvlad
|
||||
/mono/metadata/threads* @luhenry @kumpera
|
||||
/mono/metadata/threadpool* @luhenry
|
||||
/mono/metadata/w32* @luhenry
|
||||
/mono/metadata/*-win* @lateralusX @luhenry
|
||||
|
||||
/mono/mini @vargaz @kumpera
|
||||
/mono/mini/*cfgdump* @lewurm
|
||||
/mono/mini/*exceptions* @lewurm
|
||||
/mono/mini/*ppc* @lewurm
|
||||
/mono/mini/*riscv* @alexrp
|
||||
/mono/mini/*type-check* @lewurm
|
||||
/mono/mini/interp/* @lewurm @BrzVlad
|
||||
/mono/mini/*profiler* @alexrp
|
||||
/mono/mini/debugger-agent.c @DavidKarlas
|
||||
|
||||
/mono/profiler @alexrp @kumpera
|
||||
|
||||
/mono/sgen @BrzVlad @kumpera
|
||||
|
||||
/mono/utils @kumpera @vargaz
|
||||
/mono/utils/atomic* @alexrp
|
||||
/mono/utils/mono-hwcap* @alexrp
|
||||
/mono/utils/mono-mem* @alexrp
|
||||
/mono/utils/mono-threads* @luhenry @kumpera
|
||||
/mono/utils/*-win* @lateralusX @kumpera
|
||||
|
||||
/msvc @lateralusX @luhenry
|
||||
/msvc/*profiler* @alexrp
|
||||
/msvc/scripts @akoeplinger @kg
|
||||
|
||||
/packaging/ @alexischr @akoeplinger @luhenry @directhex
|
||||
/packaging/MacSDK/msbuild.py @radical @akoeplinger
|
||||
|
||||
/runtime @akoeplinger @marek-safar @luhenry
|
||||
|
||||
/samples @luhenry
|
||||
/samples/profiler @alexrp
|
||||
/samples/size @alexrp
|
||||
|
||||
/scripts @akoeplinger @luhenry
|
||||
/scripts/ci @akoeplinger @alexischr
|
||||
/scripts/ci/run-test-profiler-stress-tests.sh @alexrp
|
||||
|
||||
/sdks @marek-safar @luhenry
|
||||
/sdks/builds/android* @luhenry @jonpryor
|
||||
/sdks/builds/mxe* @luhenry @jonpryor
|
||||
/sdks/builds/ios* @vargaz @rolfbjarne
|
||||
/sdks/wasm @kumpera @lrz
|
||||
/sdks/ios @vargaz @rolfbjarne
|
||||
/sdks/android @luhenry @jonpryor
|
||||
|
||||
/support @luhenry @vargaz
|
||||
|
||||
/tools @kumpera @luhenry
|
||||
/tools/checker @tritao
|
||||
/tools/crash-bisector @kumpera
|
||||
/tools/locale-builder @marek-safar
|
||||
/tools/monograph @vargaz
|
||||
/tools/nuget-hash-extractor @marek-safar
|
||||
/tools/offsets-tool @lewurm @rolfbjarne
|
||||
/tools/pedump @kumpera @lambdageek
|
||||
/tools/sgen @brzvlad
|
||||
+4
-25
@@ -11,17 +11,9 @@ else
|
||||
tools_dir = tools
|
||||
endif
|
||||
|
||||
if ENABLE_MSVC
|
||||
build_with_msvc = msvc
|
||||
build_without_msvc =
|
||||
else
|
||||
build_with_msvc =
|
||||
build_without_msvc = msvc
|
||||
endif
|
||||
|
||||
SUBDIRS = $(build_with_msvc) mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) $(build_without_msvc) $(docs_dir) acceptance-tests
|
||||
SUBDIRS = mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests
|
||||
# Keep in sync with SUBDIRS
|
||||
DIST_SUBDIRS = $(build_with_msvc) m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools $(build_without_msvc) docs acceptance-tests
|
||||
DIST_SUBDIRS = m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
|
||||
|
||||
all: update_submodules
|
||||
|
||||
@@ -50,15 +42,8 @@ dist-hook:
|
||||
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
|
||||
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -rf `find $(top_distdir)/external -path '*\.libs'`
|
||||
rm -rf `find $(top_distdir)/external -path '*\.deps'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.o'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.so'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.lo'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.Plo'`
|
||||
rm -f `find $(top_distdir)/external -name '\.dirstamp'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*' -not -path '*/helix-binaries/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
|
||||
rm -rf "$(top_distdir)/external/linker/linker/Tests"
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
@@ -74,15 +59,9 @@ if BITCODE
|
||||
BITCODE_CHECK=yes
|
||||
endif
|
||||
|
||||
if DEFAULT_TESTS
|
||||
CI_TEST_SCRIPT=$(srcdir)/scripts/ci/run-test-default.sh
|
||||
else
|
||||
CI_TEST_SCRIPT=$(srcdir)/scripts/ci/run-test-$(TEST_PROFILE).sh
|
||||
endif
|
||||
|
||||
.PHONY: check-ci
|
||||
check-ci:
|
||||
MONO_LLVMONLY=$(BITCODE_CHECK) $(CI_TEST_SCRIPT)
|
||||
MONO_LLVMONLY=$(BITCODE_CHECK) $(srcdir)/scripts/ci/run-test-$(TEST_PROFILE).sh
|
||||
|
||||
.PHONY: validate do-build-mono-mcs mcs-do-clean mcs-do-tests
|
||||
validate: do-build-mono-mcs
|
||||
|
||||
@@ -4,4 +4,3 @@ Makefile
|
||||
*.dll
|
||||
*.mdb
|
||||
coreclr-testlist.txt
|
||||
microbench-perf.sh
|
||||
@@ -3,10 +3,9 @@ BENCHMARKER_PATH=$(ACCEPTANCE_TESTS_PATH)/benchmarker
|
||||
ROSLYN_PATH=$(ACCEPTANCE_TESTS_PATH)/roslyn
|
||||
CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr
|
||||
MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite
|
||||
DEBIANSHOOTOUTMONO_PATH=$(ACCEPTANCE_TESTS_PATH)/DebianShootoutMono
|
||||
|
||||
CLEANFILES = *.dll *.exe *.mdb
|
||||
EXTRA_DIST=README.md SUBMODULES.json microbench.mk versions.mk profiler-stress.mk roslyn.mk coreclr.mk ms-test-suite.mk
|
||||
EXTRA_DIST=README.md SUBMODULES.json versions.mk profiler-stress.mk roslyn.mk coreclr.mk ms-test-suite.mk
|
||||
|
||||
CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
|
||||
TOOLS_CLASS=$(mcs_topdir)/class/lib/build
|
||||
@@ -18,7 +17,6 @@ ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe
|
||||
XUNIT = $(RUNTIME) $(abs_top_builddir)/external/xunit-binaries/xunit.console.exe
|
||||
|
||||
include versions.mk
|
||||
include microbench.mk
|
||||
include profiler-stress.mk
|
||||
include roslyn.mk
|
||||
include coreclr.mk
|
||||
|
||||
@@ -30,13 +30,5 @@
|
||||
"remote-branch": "origin/master",
|
||||
"branch": "master",
|
||||
"directory": "benchmarker"
|
||||
},
|
||||
{
|
||||
"name": "DebianShootoutMono",
|
||||
"url": "https://github.com/alexanderkyte/DebianShootoutMono.git",
|
||||
"rev": "3fde2ced806c1fe7eed81120a40d99474fa009f0",
|
||||
"remote-branch": "origin/release_11_15_2018",
|
||||
"branch": "release_11_15_2018",
|
||||
"directory": "DebianShootoutMono"
|
||||
}
|
||||
]
|
||||
@@ -1,17 +0,0 @@
|
||||
#! /bin/sh
|
||||
r='@mono_build_root@'
|
||||
aotpattern="--aot="
|
||||
|
||||
# if this is an aot invoke
|
||||
if [[ $@ =~ $aotpattern ]];
|
||||
then
|
||||
# just aot the code
|
||||
echo "$r/runtime/mono-wrapper $@"
|
||||
exec $r/runtime/mono-wrapper $@
|
||||
else
|
||||
# else run it under perf
|
||||
echo "$MONO_PERF_BINARY record -o $r/acceptance-tests/perf.data -v -s -g -- $r/mono/mini/mono-sgen $@"
|
||||
exec $MONO_PERF_BINARY record -o $r/acceptance-tests/perf.data -v -s -g $r/mono/mini/mono-sgen $@
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
check-microbench: DebianShootoutMono.stamp
|
||||
@$(MAKE) test-run-microbench
|
||||
|
||||
DebianShootoutMono.stamp:
|
||||
@$(MAKE) validate-DebianShootoutMono RESET_VERSIONS=1
|
||||
@$(MAKE) prepare-dlls
|
||||
@touch $@
|
||||
|
||||
abs_top_srcdir = $(abspath $(top_srcdir))
|
||||
TEST_EXE_PATH=$(abs_top_srcdir)/acceptance-tests/external/DebianShootoutMono/release/
|
||||
NET_4_X_RUNTIME=MONO_PATH=$(TEST_EXE_PATH):$(abs_top_srcdir)/mcs/class/lib/net_4_x $(abs_top_srcdir)/runtime/mono-wrapper
|
||||
FULL_AOT_RUNTIME=MONO_PATH=$(abs_top_srcdir)/mcs/class/lib/testing_aot_full $(abs_top_srcdir)/runtime/mono-wrapper
|
||||
|
||||
PERF_BINARY=$(if $(MONO_PERF_BINARY),$(MONO_PERF_BINARY),perf)
|
||||
PERF_RUNTIME=$(abs_top_srcdir)/acceptance-tests/microbench-perf.sh
|
||||
|
||||
define BenchmarkDotNetTemplate
|
||||
|
||||
run-microbench-$(1):: DebianShootoutMono.stamp
|
||||
MONO_BENCH_AOT_RUN="$(AOT_RUN_FLAGS)" \
|
||||
MONO_BENCH_AOT_BUILD="$(AOT_BUILD_FLAGS)" \
|
||||
MONO_BENCH_EXECUTABLE="$(abs_top_srcdir)/runtime/mono-wrapper" \
|
||||
MONO_BENCH_PATH="$(abs_top_srcdir)/mcs/class/lib/$(TEST_PROFILE)" \
|
||||
MONO_BENCH_INPUT="$(2)" \
|
||||
$(NET_4_X_RUNTIME) \
|
||||
$(TEST_EXE_PATH)/DebianShootoutMono.exe $(1)
|
||||
|
||||
test-run-microbench:: run-microbench-$(1)
|
||||
|
||||
run-microbench-debug-$(1):: DebianShootoutMono.stamp
|
||||
echo MONO_PATH="$(abs_top_srcdir)/mcs/class/lib/$(TEST_PROFILE)" $(abs_top_srcdir)/runtime/mono-wrapper $(AOT_BUILD_FLAGS) $(TEST_EXE_PATH)/DebianShootoutMono.exe
|
||||
MONO_BENCH_INPUT="$(2)" \
|
||||
MONO_PATH="$(abs_top_srcdir)/mcs/class/lib/$(TEST_PROFILE)" \
|
||||
$(abs_top_srcdir)/runtime/mono-wrapper $(AOT_RUN_FLAGS) $(TEST_EXE_PATH)/DebianShootoutMono.exe Run $(1)
|
||||
|
||||
test-run-microbench-debug:: run-microbench-debug-$(1)
|
||||
|
||||
if HOST_LINUX
|
||||
run-microbench-profiled-$(1):: microbench-results/$(1).perf.data
|
||||
|
||||
microbench-results/$(1).perf.data: DebianShootoutMono.stamp
|
||||
mkdir -p microbench-results
|
||||
MONO_PERF_BINARY="$(PERF_BINARY)" \
|
||||
MONO_BENCH_EXECUTABLE="$(PERF_RUNTIME)" \
|
||||
MONO_BENCH_AOT_RUN="$(AOT_RUN_FLAGS)"\
|
||||
MONO_BENCH_AOT_BUILD="$(AOT_BUILD_FLAGS)"\
|
||||
MONO_BENCH_PATH="$(abs_top_srcdir)/mcs/class/lib/$(TEST_PROFILE)" \
|
||||
MONO_BENCH_INPUT="$(2)" \
|
||||
$(NET_4_X_RUNTIME) \
|
||||
$(TEST_EXE_PATH)/DebianShootoutMono.exe $(1) $(2)
|
||||
mv perf.data microbench-results/$(1).perf.data
|
||||
|
||||
microbench-results/$(1).tmp.perf: microbench-results/$(1).perf.data
|
||||
$(PERF_BINARY) script -i microbench-results/$(1).perf.data > microbench-results/$(1).tmp.perf
|
||||
|
||||
microbench-results/$(1).perf-flame.svg: microbench-results/$(1).tmp.perf
|
||||
cat microbench-results/$(1).tmp.perf | ./external/DebianShootoutMono/FlameGraph/stackcollapse-perf.pl > microbench-results/$(1).perf-folded
|
||||
./external/DebianShootoutMono/FlameGraph/flamegraph.pl microbench-results/$(1).perf-folded > microbench-results/$(1).perf-flame.svg
|
||||
rm microbench-results/$(1).tmp.perf
|
||||
rm microbench-results/$(1).perf-folded
|
||||
|
||||
MONO_PERF_FLAGS=--show-cpu-utilization -n --hierarchy -T $(MONO_PERF_ADDITIONAL_FLAGS)
|
||||
|
||||
microbench-results/$(1).perf.report: microbench-results/$(1).perf.data
|
||||
$(PERF_BINARY) report -i microbench-results/$(1).perf.data $(MONO_PERF_FLAGS) > microbench-results/$(1).perf.report
|
||||
|
||||
test-run-microbench-profiled:: run-microbench-profiled-$(1)
|
||||
|
||||
test-run-microbench-publish-collect:: microbench-results/$(1).perf.data microbench-results/$(1).perf.report microbench-results/$(1).perf-flame.svg
|
||||
|
||||
endif
|
||||
|
||||
endef
|
||||
|
||||
if HOST_LINUX
|
||||
|
||||
test-run-microbench-perf-check:
|
||||
$(PERF_BINARY) record -a -o perf.data -- echo "testing"
|
||||
rm perf.data
|
||||
|
||||
microbench-results/perf-data.zip:
|
||||
zip microbench-results/perf-data.zip microbench-results/*.perf.data
|
||||
rm microbench-results/*.perf.data
|
||||
|
||||
perf-report: microbench-results/perf-data.zip
|
||||
|
||||
perf-report-total: test-run-microbench-publish-collect
|
||||
@$(MAKE) perf-report
|
||||
|
||||
endif
|
||||
|
||||
.PHONY: prepare-dlls
|
||||
|
||||
if FULL_AOT_TESTS
|
||||
prepare-dlls:
|
||||
$(FULL_AOT_RUNTIME) $(AOT_BUILD_FLAGS) $(TEST_EXE_PATH)/*.{dll,exe}
|
||||
|
||||
else
|
||||
|
||||
prepare-dlls:
|
||||
|
||||
endif
|
||||
|
||||
FIXTURE_DIR=$(abs_top_srcdir)/acceptance-tests/external/DebianShootoutMono/fixtures
|
||||
|
||||
$(eval $(call BenchmarkDotNetTemplate,Mandelbrot,))
|
||||
$(eval $(call BenchmarkDotNetTemplate,RegexRedux,$(FIXTURE_DIR)/regexredux-input.txt))
|
||||
$(eval $(call BenchmarkDotNetTemplate,KNucleotide,$(FIXTURE_DIR)/knucleotide-input.txt))
|
||||
|
||||
$(eval $(call BenchmarkDotNetTemplate,BinaryTrees,))
|
||||
$(eval $(call BenchmarkDotNetTemplate,NBodyTest,))
|
||||
$(eval $(call BenchmarkDotNetTemplate,SpectralNorm,))
|
||||
$(eval $(call BenchmarkDotNetTemplate,Fannkuchredux,))
|
||||
$(eval $(call BenchmarkDotNetTemplate,Fasta,))
|
||||
|
||||
$(eval $(call BenchmarkDotNetTemplate,RevComp,$(FIXTURE_DIR)/revcomp-input.txt))
|
||||
|
||||
#$(eval $(call BenchmarkDotNetTemplate,GistBenchmark,$(MONO_BENCH_GIST_URL))) broken in BDN, bug filed
|
||||
|
||||
@@ -7,7 +7,6 @@ $(eval $(call ValidateVersionTemplate,benchmarker,BENCHMARKER))
|
||||
$(eval $(call ValidateVersionTemplate,roslyn,ROSLYN))
|
||||
$(eval $(call ValidateVersionTemplate,coreclr,CORECLR))
|
||||
$(eval $(call ValidateVersionTemplate,ms-test-suite,MSTESTSUITE))
|
||||
$(eval $(call ValidateVersionTemplate,DebianShootoutMono,DEBIANSHOOTOUTMONO))
|
||||
|
||||
# Bump the given submodule to the revision given by the REV make variable
|
||||
# If COMMIT is 1, commit the change
|
||||
@@ -15,7 +14,6 @@ bump-benchmarker: __bump-benchmarker
|
||||
bump-roslyn: __bump-version-roslyn
|
||||
bump-coreclr: __bump-version-coreclr
|
||||
bump-ms-test-suite: __bump-version-ms-test-suite
|
||||
bump-DebianShootoutMono: __bump-version-DebianShootoutMono
|
||||
|
||||
# Bump the given submodule to the branch given by the BRANCH/REMOTE_BRANCH make variables
|
||||
# If COMMIT is 1, commit the change
|
||||
@@ -23,7 +21,6 @@ bump-branch-benchmarker: __bump-branch-benchmarker
|
||||
bump-branch-roslyn: __bump-branch-roslyn
|
||||
bump-branch-coreclr: __bump-branch-coreclr
|
||||
bump-branch-ms-test-suite: __bump-branch-ms-test-suite
|
||||
bump-branch-DebianShootoutMono: __bump-branch-DebianShootoutMono
|
||||
|
||||
# Bump the given submodule to its current GIT version
|
||||
# If COMMIT is 1, commit the change
|
||||
@@ -31,7 +28,6 @@ bump-current-benchmarker: __bump-current-benchmarker
|
||||
bump-current-roslyn: __bump-current-version-roslyn
|
||||
bump-current-coreclr: __bump-current-version-coreclr
|
||||
bump-current-ms-test-suite: __bump-current-version-ms-test-suite
|
||||
bump-current-DebianShootoutMono: __bump-current-version-DebianShootoutMono
|
||||
|
||||
commit-bump-benchmarker:
|
||||
$(MAKE) bump-benchmarker COMMIT=1
|
||||
@@ -45,9 +41,6 @@ commit-bump-coreclr:
|
||||
commit-bump-ms-test-suite:
|
||||
$(MAKE) bump-ms-test-suite COMMIT=1
|
||||
|
||||
commit-bump-DebianShootoutMono:
|
||||
$(MAKE) bump-DebianShootoutMono COMMIT=1
|
||||
|
||||
commit-bump-current-benchmarker:
|
||||
$(MAKE) bump-current-benchmarker COMMIT=1
|
||||
|
||||
@@ -59,6 +52,3 @@ commit-bump-current-coreclr:
|
||||
|
||||
commit-bump-current-ms-test-suite:
|
||||
$(MAKE) bump-current-ms-test-suite COMMIT=1
|
||||
|
||||
commit-bump-current-DebianShootoutMono:
|
||||
$(MAKE) bump-current-DebianShootoutMono COMMIT=1
|
||||
+1
-1
@@ -120,7 +120,7 @@ for PARAM; do
|
||||
done
|
||||
|
||||
if test x$has_ext_mod = xtrue; then
|
||||
pushd $top_srcdir../mono-extensions/scripts
|
||||
pushd ../mono-extensions/scripts
|
||||
sh ./prepare-repo.sh $ext_mod_args || exit 1
|
||||
popd
|
||||
else
|
||||
|
||||
@@ -188,7 +188,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Mdb", "mcs/class
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.CSharp", "mcs/class/Mono.CSharp/Mono.CSharp.csproj", "{817CE046-07E8-409D-84BF-A6EA4F2879DE}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj", "{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj", "{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.C5", "mcs/class/Mono.C5/Mono.C5.csproj", "{A9F5A575-3725-4691-A7A6-0ABDEA3994CE}"
|
||||
EndProject
|
||||
@@ -302,6 +302,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Tasks", "mc
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build", "mcs/class/Microsoft.Build/Microsoft.Build.csproj", "{86E2C258-C0D8-48D0-BA76-0280A981CEE0}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_System.Drawing.Primitives", "mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj", "{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_netstandard", "mcs/class/Facades/netstandard/Facades_netstandard.csproj", "{E4596A34-AFBC-4744-8352-E6996AC34C16}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_System.Collections.Concurrent", "mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj", "{DE0D7286-1F09-4ACC-BC43-75342349FFC1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_System.Collections", "mcs/class/Facades/System.Collections/Facades_System.Collections.csproj", "{758C73D3-F04B-40BD-B55B-057F529053CA}"
|
||||
@@ -564,10 +568,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_System.Runtime.Seri
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_System.Security.Cryptography.Algorithms", "mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj", "{942F9B7C-3245-4F5A-A4ED-140013DCCE2C}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_netstandard", "mcs/class/Facades/netstandard/Facades_netstandard.csproj", "{E4596A34-AFBC-4744-8352-E6996AC34C16}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_System.Drawing.Primitives", "mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj", "{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facades_System.Net.Http.Rtc", "mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj", "{786AAD60-DBEA-4F9B-BF1B-C3486CE000D0}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnit.Framework", "mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj", "{5A1007E5-0FDA-42F5-98AC-D61E11C4B3AB}"
|
||||
@@ -3366,32 +3366,30 @@ Global
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|wasm.ActiveCfg = Release|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|winaot.ActiveCfg = Debug|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|winaot.ActiveCfg = Release|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.ActiveCfg = Debug|xammac
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.Build.0 = Debug|xammac
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.ActiveCfg = Release|xammac
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.Build.0 = Release|xammac
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|net_4_x.Build.0 = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|monodroid.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|monodroid.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|monotouch.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|monotouch.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|monotouch_tv.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|monotouch_tv.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|monotouch_watch.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|monotouch_watch.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|orbis.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|orbis.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|unreal.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|unreal.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|wasm.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|wasm.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|winaot.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|winaot.ActiveCfg = Release|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Debug|xammac.ActiveCfg = Debug|net_4_x
|
||||
{767CAD15-F8B5-4EAC-8B3D-4EF75F768015}.Release|xammac.ActiveCfg = Release|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.ActiveCfg = Debug|net_4_x
|
||||
{817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|net_4_x.Build.0 = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|monodroid.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|monodroid.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|monotouch.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|monotouch.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|monotouch_tv.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|monotouch_tv.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|monotouch_watch.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|monotouch_watch.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|orbis.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|orbis.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|unreal.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|unreal.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|wasm.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|wasm.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|winaot.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|winaot.ActiveCfg = Release|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|xammac.ActiveCfg = Debug|net_4_x
|
||||
{8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|xammac.ActiveCfg = Release|net_4_x
|
||||
{A9F5A575-3725-4691-A7A6-0ABDEA3994CE}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{A9F5A575-3725-4691-A7A6-0ABDEA3994CE}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{A9F5A575-3725-4691-A7A6-0ABDEA3994CE}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
@@ -4772,6 +4770,86 @@ Global
|
||||
{86E2C258-C0D8-48D0-BA76-0280A981CEE0}.Release|winaot.ActiveCfg = Release|net_4_x
|
||||
{86E2C258-C0D8-48D0-BA76-0280A981CEE0}.Debug|xammac.ActiveCfg = Debug|net_4_x
|
||||
{86E2C258-C0D8-48D0-BA76-0280A981CEE0}.Release|xammac.ActiveCfg = Release|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|net_4_x.Build.0 = Release|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monodroid.ActiveCfg = Debug|monodroid
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monodroid.Build.0 = Debug|monodroid
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monodroid.ActiveCfg = Release|monodroid
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monodroid.Build.0 = Release|monodroid
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch.ActiveCfg = Debug|monotouch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch.Build.0 = Debug|monotouch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch.ActiveCfg = Release|monotouch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch.Build.0 = Release|monotouch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch_tv.ActiveCfg = Debug|monotouch_tv
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch_tv.Build.0 = Debug|monotouch_tv
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch_tv.ActiveCfg = Release|monotouch_tv
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch_tv.Build.0 = Release|monotouch_tv
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch_watch.ActiveCfg = Debug|monotouch_watch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch_watch.Build.0 = Debug|monotouch_watch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch_watch.ActiveCfg = Release|monotouch_watch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch_watch.Build.0 = Release|monotouch_watch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|orbis.ActiveCfg = Debug|orbis
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|orbis.Build.0 = Debug|orbis
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|orbis.ActiveCfg = Release|orbis
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|orbis.Build.0 = Release|orbis
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|unreal.ActiveCfg = Debug|unreal
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|unreal.Build.0 = Debug|unreal
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|unreal.ActiveCfg = Release|unreal
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|unreal.Build.0 = Release|unreal
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|wasm.ActiveCfg = Debug|wasm
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|wasm.Build.0 = Debug|wasm
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|wasm.ActiveCfg = Release|wasm
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|wasm.Build.0 = Release|wasm
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|winaot.ActiveCfg = Debug|winaot
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|winaot.Build.0 = Debug|winaot
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|winaot.ActiveCfg = Release|winaot
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|winaot.Build.0 = Release|winaot
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|xammac.ActiveCfg = Debug|xammac
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|xammac.Build.0 = Debug|xammac
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|xammac.ActiveCfg = Release|xammac
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|xammac.Build.0 = Release|xammac
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|net_4_x.Build.0 = Release|net_4_x
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monodroid.ActiveCfg = Debug|monodroid
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monodroid.Build.0 = Debug|monodroid
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monodroid.ActiveCfg = Release|monodroid
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monodroid.Build.0 = Release|monodroid
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch.ActiveCfg = Debug|monotouch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch.Build.0 = Debug|monotouch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch.ActiveCfg = Release|monotouch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch.Build.0 = Release|monotouch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch_tv.ActiveCfg = Debug|monotouch_tv
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch_tv.Build.0 = Debug|monotouch_tv
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch_tv.ActiveCfg = Release|monotouch_tv
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch_tv.Build.0 = Release|monotouch_tv
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch_watch.ActiveCfg = Debug|monotouch_watch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch_watch.Build.0 = Debug|monotouch_watch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch_watch.ActiveCfg = Release|monotouch_watch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch_watch.Build.0 = Release|monotouch_watch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|orbis.ActiveCfg = Debug|orbis
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|orbis.Build.0 = Debug|orbis
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|orbis.ActiveCfg = Release|orbis
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|orbis.Build.0 = Release|orbis
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|unreal.ActiveCfg = Debug|unreal
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|unreal.Build.0 = Debug|unreal
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|unreal.ActiveCfg = Release|unreal
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|unreal.Build.0 = Release|unreal
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|wasm.ActiveCfg = Debug|wasm
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|wasm.Build.0 = Debug|wasm
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|wasm.ActiveCfg = Release|wasm
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|wasm.Build.0 = Release|wasm
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|winaot.ActiveCfg = Debug|winaot
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|winaot.Build.0 = Debug|winaot
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|winaot.ActiveCfg = Release|winaot
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|winaot.Build.0 = Release|winaot
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|xammac.ActiveCfg = Debug|xammac
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|xammac.Build.0 = Debug|xammac
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|xammac.ActiveCfg = Release|xammac
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|xammac.Build.0 = Release|xammac
|
||||
{DE0D7286-1F09-4ACC-BC43-75342349FFC1}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{DE0D7286-1F09-4ACC-BC43-75342349FFC1}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{DE0D7286-1F09-4ACC-BC43-75342349FFC1}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
@@ -10012,86 +10090,6 @@ Global
|
||||
{942F9B7C-3245-4F5A-A4ED-140013DCCE2C}.Debug|xammac.Build.0 = Debug|xammac
|
||||
{942F9B7C-3245-4F5A-A4ED-140013DCCE2C}.Release|xammac.ActiveCfg = Release|xammac
|
||||
{942F9B7C-3245-4F5A-A4ED-140013DCCE2C}.Release|xammac.Build.0 = Release|xammac
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|net_4_x.Build.0 = Release|net_4_x
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monodroid.ActiveCfg = Debug|monodroid
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monodroid.Build.0 = Debug|monodroid
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monodroid.ActiveCfg = Release|monodroid
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monodroid.Build.0 = Release|monodroid
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch.ActiveCfg = Debug|monotouch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch.Build.0 = Debug|monotouch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch.ActiveCfg = Release|monotouch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch.Build.0 = Release|monotouch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch_tv.ActiveCfg = Debug|monotouch_tv
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch_tv.Build.0 = Debug|monotouch_tv
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch_tv.ActiveCfg = Release|monotouch_tv
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch_tv.Build.0 = Release|monotouch_tv
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch_watch.ActiveCfg = Debug|monotouch_watch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|monotouch_watch.Build.0 = Debug|monotouch_watch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch_watch.ActiveCfg = Release|monotouch_watch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|monotouch_watch.Build.0 = Release|monotouch_watch
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|orbis.ActiveCfg = Debug|orbis
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|orbis.Build.0 = Debug|orbis
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|orbis.ActiveCfg = Release|orbis
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|orbis.Build.0 = Release|orbis
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|unreal.ActiveCfg = Debug|unreal
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|unreal.Build.0 = Debug|unreal
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|unreal.ActiveCfg = Release|unreal
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|unreal.Build.0 = Release|unreal
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|wasm.ActiveCfg = Debug|wasm
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|wasm.Build.0 = Debug|wasm
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|wasm.ActiveCfg = Release|wasm
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|wasm.Build.0 = Release|wasm
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|winaot.ActiveCfg = Debug|winaot
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|winaot.Build.0 = Debug|winaot
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|winaot.ActiveCfg = Release|winaot
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|winaot.Build.0 = Release|winaot
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|xammac.ActiveCfg = Debug|xammac
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Debug|xammac.Build.0 = Debug|xammac
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|xammac.ActiveCfg = Release|xammac
|
||||
{E4596A34-AFBC-4744-8352-E6996AC34C16}.Release|xammac.Build.0 = Release|xammac
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|net_4_x.Build.0 = Release|net_4_x
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monodroid.ActiveCfg = Debug|monodroid
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monodroid.Build.0 = Debug|monodroid
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monodroid.ActiveCfg = Release|monodroid
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monodroid.Build.0 = Release|monodroid
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch.ActiveCfg = Debug|monotouch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch.Build.0 = Debug|monotouch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch.ActiveCfg = Release|monotouch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch.Build.0 = Release|monotouch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch_tv.ActiveCfg = Debug|monotouch_tv
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch_tv.Build.0 = Debug|monotouch_tv
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch_tv.ActiveCfg = Release|monotouch_tv
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch_tv.Build.0 = Release|monotouch_tv
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch_watch.ActiveCfg = Debug|monotouch_watch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|monotouch_watch.Build.0 = Debug|monotouch_watch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch_watch.ActiveCfg = Release|monotouch_watch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|monotouch_watch.Build.0 = Release|monotouch_watch
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|orbis.ActiveCfg = Debug|orbis
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|orbis.Build.0 = Debug|orbis
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|orbis.ActiveCfg = Release|orbis
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|orbis.Build.0 = Release|orbis
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|unreal.ActiveCfg = Debug|unreal
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|unreal.Build.0 = Debug|unreal
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|unreal.ActiveCfg = Release|unreal
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|unreal.Build.0 = Release|unreal
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|wasm.ActiveCfg = Debug|wasm
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|wasm.Build.0 = Debug|wasm
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|wasm.ActiveCfg = Release|wasm
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|wasm.Build.0 = Release|wasm
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|winaot.ActiveCfg = Debug|winaot
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|winaot.Build.0 = Debug|winaot
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|winaot.ActiveCfg = Release|winaot
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|winaot.Build.0 = Release|winaot
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|xammac.ActiveCfg = Debug|xammac
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Debug|xammac.Build.0 = Debug|xammac
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|xammac.ActiveCfg = Release|xammac
|
||||
{1961C6D4-5B4D-4D82-A9AF-C6134D346B63}.Release|xammac.Build.0 = Release|xammac
|
||||
{786AAD60-DBEA-4F9B-BF1B-C3486CE000D0}.Debug|net_4_x.ActiveCfg = Debug|net_4_x
|
||||
{786AAD60-DBEA-4F9B-BF1B-C3486CE000D0}.Debug|net_4_x.Build.0 = Debug|net_4_x
|
||||
{786AAD60-DBEA-4F9B-BF1B-C3486CE000D0}.Release|net_4_x.ActiveCfg = Release|net_4_x
|
||||
|
||||
+63
-505
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [5.22.1],
|
||||
AC_INIT(mono, [5.19.0],
|
||||
[https://github.com/mono/mono/issues/new])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -20,8 +20,6 @@ AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign subdir-objects]
|
||||
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AM_MAINTAINER_MODE
|
||||
m4_ifdef([AM_EXTRA_RECURSIVE_TARGETS], AM_EXTRA_RECURSIVE_TARGETS([test]))
|
||||
m4_ifdef([AM_EXTRA_RECURSIVE_TARGETS], AM_EXTRA_RECURSIVE_TARGETS([test-bundle]))
|
||||
|
||||
API_VER=2.0
|
||||
AC_SUBST(API_VER)
|
||||
@@ -48,7 +46,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3`
|
||||
# There is no ordering of corlib versions, no old or new,
|
||||
# the runtime expects an exact match.
|
||||
#
|
||||
MONO_CORLIB_VERSION=72AAF33F-CAFE-477B-9F74-C7ADBB6E28F2
|
||||
MONO_CORLIB_VERSION=BEAF66F4-BA36-44C5-974E-83C6F627DF8C
|
||||
|
||||
#
|
||||
# Put a quoted #define in config.h.
|
||||
@@ -59,7 +57,7 @@ AC_SUBST(MONO_CORLIB_VERSION)
|
||||
|
||||
case $host_os in
|
||||
*cygwin* )
|
||||
echo "Run configure using ./configure --host=i686-w64-mingw32 or --host=x86_64-w64-mingw32"
|
||||
echo "Run configure using ./configure --host=i686-pc-mingw32"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
@@ -146,12 +144,9 @@ case "$host" in
|
||||
fi
|
||||
fi
|
||||
HOST_CC="gcc"
|
||||
|
||||
# Windows 7 or later is required
|
||||
WIN32_CPPFLAGS="-DWINVER=0x0601 -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
|
||||
CPPFLAGS="$CPPFLAGS $WIN32_CPPFLAGS"
|
||||
WIN32_LDFLAGS="-lbcrypt -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32 -liphlpapi"
|
||||
LDFLAGS="$LDFLAGS $WIN32_LDFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS -DWINVER=0x0601 -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
|
||||
LDFLAGS="$LDFLAGS -lbcrypt -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32 -liphlpapi"
|
||||
libmono_cflags="-mms-bitfields -mwindows"
|
||||
libmono_ldflags="-mms-bitfields -mwindows"
|
||||
libdl=
|
||||
@@ -188,8 +183,6 @@ case "$host" in
|
||||
with_sgen_default_concurrent=yes
|
||||
;;
|
||||
*-*-*freebsd*)
|
||||
dnl For close_my_fds
|
||||
LDFLAGS="$LDFLAGS -lutil"
|
||||
if test "x$PTHREAD_CFLAGS" = "x"; then
|
||||
CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
|
||||
libmono_cflags=
|
||||
@@ -204,23 +197,13 @@ case "$host" in
|
||||
LDFLAGS="$LDFLAGS $PTHREAD_LIBS -L/usr/local/lib"
|
||||
libmono_ldflags="$PTHREAD_LIBS"
|
||||
fi
|
||||
CPPFLAGS="$CPPFLAGS -DHOST_BSD -D_WITH_GETLINE"
|
||||
CPPFLAGS="$CPPFLAGS -DHOST_BSD"
|
||||
need_link_unlink=yes
|
||||
AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
|
||||
libdl=
|
||||
libgc_threads=pthreads
|
||||
use_sigposix=yes
|
||||
has_dtrace=yes
|
||||
case "$host" in
|
||||
aarch64-*)
|
||||
support_boehm=no
|
||||
with_gc=sgen
|
||||
;;
|
||||
riscv*)
|
||||
support_boehm=no
|
||||
with_gc=sgen
|
||||
;;
|
||||
esac
|
||||
with_sgen_default_concurrent=yes
|
||||
;;
|
||||
*-*-*openbsd*)
|
||||
@@ -543,8 +526,6 @@ AC_PROG_LD_GNU
|
||||
|
||||
AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h sys/sysctl.h libproc.h sys/prctl.h copyfile.h)
|
||||
AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h arpa/inet.h complex.h unwind.h)
|
||||
AC_CHECK_HEADER(unistd.h, [HAVE_UNISTD_H=1], [HAVE_UNISTD_H=0])
|
||||
AC_SUBST(HAVE_UNISTD_H)
|
||||
AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h],
|
||||
[], [], [#include <stddef.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -601,7 +582,6 @@ AC_CHECK_HEADERS(linux/magic.h)
|
||||
if test x$platform_android = xyes; then
|
||||
AC_CHECK_HEADERS(machine/endian.h sys/endian.h)
|
||||
AC_CHECK_HEADERS(android/legacy_signal_inlines.h, [have_android_signal_inlines=yes], [have_android_signal_inlines=no])
|
||||
AC_CHECK_HEADERS(android/ndk-version.h)
|
||||
|
||||
# Make sure SIGRT{MIN,MAX} work - they will fail to work with unified headers if building for
|
||||
# API level < 21 *and* android/legacy_signal_inlines.h doesn't declare (and define) the required
|
||||
@@ -611,8 +591,7 @@ if test x$platform_android = xyes; then
|
||||
if test x$have_android_signal_inlines = xyes; then
|
||||
AC_MSG_CHECKING([Whether Android SIGRTMIN/SGRTMAX macros are valid])
|
||||
AC_COMPILE_IFELSE([
|
||||
AC_LANG_PROGRAM([#include <signal.h>
|
||||
#include <android/legacy_signal_inlines.h>],[
|
||||
AC_LANG_PROGRAM([#include <android/legacy_signal_inlines.h>],[
|
||||
int i;
|
||||
for (i = SIGRTMIN + 1; i < SIGRTMAX; ++i) {
|
||||
}
|
||||
@@ -1036,13 +1015,6 @@ AC_ARG_ENABLE(cxx, [ --enable-cxx compile some code as C++])
|
||||
CXXFLAGS_COMMON=' -std=gnu++0x -fno-exceptions -fno-rtti '
|
||||
# "c++0x" instead of C++11, for compat with Centos6/gcc4.4
|
||||
|
||||
# -stdlib=libc++ is needed by clang for iOS 6.0 (-miphoneos-version-min=6.0)
|
||||
# to support C++11 headers but it does not seem to harm elsewhere, so over-approximate
|
||||
# and add it whenever we're running clang on Darwin.
|
||||
if test "x$mono_cv_clang" = xyes -a x$host_darwin = xyes; then
|
||||
CXXFLAGS_COMMON="$CXXFLAGS_COMMON -stdlib=libc++"
|
||||
fi
|
||||
|
||||
AC_SUBST(CXXFLAGS_COMMON)
|
||||
|
||||
if test "x$enable_cxx" = "xyes"; then
|
||||
@@ -1089,7 +1061,6 @@ AC_ARG_WITH(monotouch_watch, [ --with-monotouch_watch=yes,no If you w
|
||||
AC_ARG_WITH(monotouch_tv, [ --with-monotouch_tv=yes,no If you want to build the Xamarin.TVOS assemblies (defaults to no)], [], [with_monotouch_tv=default])
|
||||
AC_ARG_WITH(bitcode, [ --with-bitcode=yes,no If bitcode is enabled (defaults to no)], [], [with_bitcode=default])
|
||||
AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=default])
|
||||
AC_ARG_WITH(testing_aot_full_interp, [ --with-testing_aot_full_interp=yes,no If you want to build the testing_aot_full_interp assemblies (defaults to no)], [], [with_testing_aot_full_interp=default])
|
||||
AC_ARG_WITH(testing_aot_hybrid, [ --with-testing_aot_hybrid=yes,no If you want to build the testing_aot_hybrid assemblies (defaults to no)], [], [with_testing_aot_hybrid=default])
|
||||
AC_ARG_WITH(testing_aot_full, [ --with-testing_aot_full=yes,no If you want to build the testing_aot_full assemblies (defaults to no)], [], [with_testing_aot_full=default])
|
||||
AC_ARG_WITH(winaot, [ --with-winaot=yes,no If you want to build the Windows friendly AOT assemblies (defaults to no)], [], [with_winaot=default])
|
||||
@@ -1098,7 +1069,7 @@ AC_ARG_WITH(unreal, [ --with-unreal=yes,no If you w
|
||||
AC_ARG_WITH(wasm, [ --with-wasm=yes,no If you want to build the WebAssembly (defaults to no)], [], [with_wasm=default])
|
||||
|
||||
|
||||
AC_ARG_WITH(runtime-preset, [ --with-runtime-preset=net_4_x,all,aot,aot_llvm,hybridaot,hybridaot_llvm,fullaot,fullaot_llvm,bitcode,unreal,fullaotinterp Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
|
||||
AC_ARG_WITH(runtime-preset, [ --with-runtime-preset=net_4_x,all,aot,aot_llvm,hybridaot,hybridaot_llvm,fullaot,fullaot_llvm,bitcode,unreal Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
|
||||
AC_ARG_WITH(spectre-mitigation, [ --with-spectre-mitigation=yes,no If you want to build the runtime with compiler flags that enable Spectre mitigation (defaults to no)], [], [with_spectre_mitigation=default])
|
||||
AC_ARG_WITH(spectre-indirect-branch-choice, [ --with-spectre-indirect-branch-choice=keep,thunk,inline,extern Convert indirect branches to the specified kind of thunk (defaults to inline)], [], [with_spectre_indirect_branch_choice=inline])
|
||||
AC_ARG_WITH(spectre-function-return-choice, [ --with-spectre-function-return-choice=keep,thunk,inline,extern Convert function return instructions to the specified kind of thunk (defaults to inline)], [], [with_spectre_function_return_choice=inline])
|
||||
@@ -1158,7 +1129,6 @@ with_monotouch_default=no
|
||||
with_monotouch_watch_default=no
|
||||
with_monotouch_tv_default=no
|
||||
with_xammac_default=no
|
||||
with_testing_aot_full_interp_default=no
|
||||
with_testing_aot_hybrid_default=no
|
||||
with_testing_aot_full_default=no
|
||||
with_winaot_default=no
|
||||
@@ -1170,7 +1140,7 @@ with_bitcode_default=no
|
||||
enable_cooperative_suspend_default=no
|
||||
enable_hybrid_suspend_default=no
|
||||
|
||||
INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=10000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4000,nftnptr-arg-trampolines=4000
|
||||
INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=10000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4000
|
||||
|
||||
AOT_BUILD_ATTRS=$INVARIANT_AOT_OPTIONS
|
||||
|
||||
@@ -1178,7 +1148,6 @@ if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
|
||||
DISABLE_MCS_DOCS_default=yes
|
||||
elif test x$with_runtime_preset = xnet_4_x; then
|
||||
with_profile4_x_default=yes
|
||||
TEST_PROFILE=net_4_x
|
||||
elif test x$with_runtime_preset = xall; then
|
||||
with_profile4_x_default=yes
|
||||
with_monodroid_default=yes
|
||||
@@ -1190,10 +1159,8 @@ elif test x$with_runtime_preset = xall; then
|
||||
with_orbis_default=yes
|
||||
with_unreal_default=yes
|
||||
with_wasm_default=yes
|
||||
with_testing_aot_full_interp_default=yes
|
||||
with_testing_aot_hybrid_default=yes
|
||||
with_testing_aot_full_default=yes
|
||||
TEST_PROFILE=net_4_x
|
||||
elif test x$with_runtime_preset = xbitcode; then
|
||||
DISABLE_MCS_DOCS_default=yes
|
||||
with_testing_aot_full_default=yes
|
||||
@@ -1253,15 +1220,6 @@ elif test x$with_runtime_preset = xhybridaot_llvm; then
|
||||
|
||||
AOT_BUILD_FLAGS="--runtime=mobile --llvm --aot=hybrid,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--runtime=mobile --hybrid-aot"
|
||||
elif test x$with_runtime_preset = xfullaotinterp; then
|
||||
with_testing_aot_full_interp_default=yes
|
||||
TEST_PROFILE=testing_aot_full_interp
|
||||
|
||||
# mscorlib.dll aot compilation crashes
|
||||
mono_feature_disable_com='yes'
|
||||
|
||||
AOT_BUILD_FLAGS="--aot=full,interp,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--full-aot-interp"
|
||||
elif test x$with_runtime_preset = xaot; then
|
||||
with_profile4_x_default=yes
|
||||
|
||||
@@ -1329,7 +1287,6 @@ elif test x$with_runtime_preset = xwasm; then
|
||||
AOT_BUILD_FLAGS="--runtime=mobile --aot=full,$INVARIANT_AOT_OPTIONS"
|
||||
AOT_RUN_FLAGS="--runtime=mobile --full-aot"
|
||||
else
|
||||
TEST_PROFILE=net_4_x
|
||||
with_profile4_x_default=yes
|
||||
fi
|
||||
|
||||
@@ -1363,9 +1320,6 @@ fi
|
||||
if test "x$with_xammac" = "xdefault"; then
|
||||
with_xammac=$with_xammac_default
|
||||
fi
|
||||
if test "x$with_testing_aot_full_interp" = "xdefault"; then
|
||||
with_testing_aot_full_interp=$with_testing_aot_full_interp_default
|
||||
fi
|
||||
if test "x$with_testing_aot_hybrid" = "xdefault"; then
|
||||
with_testing_aot_hybrid=$with_testing_aot_hybrid_default
|
||||
fi
|
||||
@@ -1393,7 +1347,6 @@ AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"]
|
||||
AM_CONDITIONAL(INSTALL_MONOTOUCH_TV, [test "x$with_monotouch_tv" != "xno"])
|
||||
AM_CONDITIONAL(BITCODE, test "x$with_bitcode" = "xyes")
|
||||
AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL_INTERP, [test "x$with_testing_aot_full_interp" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_TESTING_AOT_HYBRID, [test "x$with_testing_aot_hybrid" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_TESTING_AOT_FULL, [test "x$with_testing_aot_full" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_WINAOT, [test "x$with_winaot" != "xno"])
|
||||
@@ -1402,8 +1355,6 @@ AM_CONDITIONAL(INSTALL_UNREAL, [test "x$with_unreal" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_WASM, [test "x$with_wasm" != "xno"])
|
||||
AM_CONDITIONAL(FULL_AOT_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_full"] || [test "x$TEST_PROFILE" = "xwinaot"] || [test "x$TEST_PROFILE" = "xorbis"] || [test "x$TEST_PROFILE" = "xwasm"])
|
||||
AM_CONDITIONAL(HYBRID_AOT_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_hybrid"] || [test "x$TEST_PROFILE" = "xunreal"])
|
||||
AM_CONDITIONAL(AOT_FULL_INTERP_TESTS, [test "x$TEST_PROFILE" = "xtesting_aot_full_interp"])
|
||||
AM_CONDITIONAL(DEFAULT_TESTS, [test "x$TEST_PROFILE" = "xnet_4_x"])
|
||||
|
||||
default_profile=net_4_x
|
||||
if test -z "$INSTALL_MONODROID_TRUE"; then :
|
||||
@@ -1415,9 +1366,6 @@ fi
|
||||
if test -z "$INSTALL_XAMMAC_TRUE"; then :
|
||||
default_profile=xammac
|
||||
fi
|
||||
if test -z "$INSTALL_TESTING_AOT_FULL_INTERP_TRUE"; then :
|
||||
default_profile=testing_aot_full_interp
|
||||
fi
|
||||
if test -z "$INSTALL_TESTING_AOT_HYBRID_TRUE"; then :
|
||||
default_profile=testing_aot_hybrid
|
||||
fi
|
||||
@@ -1467,7 +1415,7 @@ fi
|
||||
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
|
||||
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier,
|
||||
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, interpreter, simd, soft_debug, perfcounters, normalization, desktop_loader, shared_perfcounters, remoting,
|
||||
security, lldb, mdb, assert_messages, sgen_marksweep_conc, sgen_split_nursery, sgen_gc_bridge, sgen_debug_helpers.],
|
||||
security, lldb, mdb, sgen_marksweep_conc, sgen_split_nursery, sgen_gc_bridge, sgen_debug_helpers.],
|
||||
[
|
||||
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
|
||||
eval "mono_feature_disable_$feature='yes'"
|
||||
@@ -1638,11 +1586,6 @@ if test "x$mono_feature_disable_mdb" = "xyes"; then
|
||||
AC_MSG_NOTICE([Disabled support for .mdb symbol files.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_assert_messages" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_ASSERT_MESSAGES, 1, [Disable assertion messages.])
|
||||
AC_MSG_NOTICE([Disabled assertion messages.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_sgen_marksweep_conc" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_CONC, 1, [Disable concurrent gc support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled concurrent gc support in SGEN.])
|
||||
@@ -1862,9 +1805,6 @@ AC_TRY_COMPILE([
|
||||
|
||||
AM_CONDITIONAL(ENABLE_GSS, test x$enable_gss = xyes)
|
||||
|
||||
# `target_ios=yes` does not detect watch devices and fails when cross-compiling
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_IPHONE, [mono_native_platform_ios=yes])
|
||||
|
||||
if test x$host_win32 = xno; then
|
||||
dnl *************************************
|
||||
dnl *** Checks for time capabilities ***
|
||||
@@ -2487,7 +2427,7 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_HEADERS(pthread.h)
|
||||
AC_CHECK_HEADERS(pthread_np.h)
|
||||
AC_CHECK_FUNCS(pthread_mutex_timedlock)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_getname_np pthread_setname_np pthread_cond_timedwait_relative_np)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_setname_np pthread_cond_timedwait_relative_np)
|
||||
AC_CHECK_FUNCS(pthread_kill)
|
||||
AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
|
||||
AC_TRY_COMPILE([ #include <pthread.h>], [
|
||||
@@ -2911,7 +2851,6 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_FUNCS(setpgid)
|
||||
AC_CHECK_FUNCS(system)
|
||||
AC_CHECK_FUNCS(fork execv execve)
|
||||
AC_CHECK_FUNCS(waitpid)
|
||||
AC_CHECK_FUNCS(accept4)
|
||||
AC_CHECK_FUNCS(localtime_r)
|
||||
AC_CHECK_FUNCS(mkdtemp)
|
||||
@@ -3027,7 +2966,7 @@ if test x$host_win32 = xno; then
|
||||
fi
|
||||
|
||||
dnl *********************************
|
||||
dnl *** Checks for Mono.Native ***
|
||||
dnl *** Checks for System.Native ***
|
||||
dnl *********************************
|
||||
|
||||
AC_MSG_CHECKING(for linux/in.h)
|
||||
@@ -3080,16 +3019,11 @@ if test x$host_win32 = xno; then
|
||||
AC_CHECK_TYPES([struct flock64], [AC_DEFINE(HAVE_FLOCK64, 1, struct flock64)], , [#include <fcntl.h>])
|
||||
fi
|
||||
|
||||
if test x$mono_native_platform_ios = xno; then
|
||||
# On iOS, `stat64()` is deprecated and there is no `struct stat64` and `stat()`
|
||||
# is either 32-bit or 64-bit based on the device / simulator that you're running on.
|
||||
AC_CHECK_FUNC(stat64, [AC_DEFINE(HAVE_STAT64, 1, [stat64])])
|
||||
fi
|
||||
|
||||
AC_CHECK_FUNC(lseek64, [AC_DEFINE(HAVE_LSEEK64, 1, [lseek64])])
|
||||
AC_CHECK_FUNC(mmap64, [AC_DEFINE(HAVE_MMAP64, 1, [mmap64])])
|
||||
AC_CHECK_FUNC(ftruncate64, [AC_DEFINE(HAVE_FTRUNCATE64, 1, [ftruncate64])])
|
||||
AC_CHECK_FUNC(posix_fadvise64, [AC_DEFINE(HAVE_POSIX_FADVISE64, 1, [posix_fadvise64])])
|
||||
AC_CHECK_FUNC(stat64, [AC_DEFINE(HAVE_STAT64, 1, [stat64])])
|
||||
AC_CHECK_DECL(pipe2, [AC_DEFINE(HAVE_PIPE2, 1, [pipe2])])
|
||||
AC_CHECK_FUNC(getmntinfo, [AC_DEFINE(HAVE_GETMNTINFO, 1, [getmntinfo])], [], [[#include <unistd.h>]])
|
||||
AC_CHECK_FUNC(strcpy_s, [AC_DEFINE(HAVE_STRCPY_S, 1, [strcpy_s])])
|
||||
@@ -3285,9 +3219,6 @@ if test x$host_win32 = xno; then
|
||||
AC_MSG_CHECKING(for shm_open that works well enough with mmap)
|
||||
if test "x$ac_cv_func_shm_open" = "xno" -o "x$ac_cv_func_shm_open_working_with_mmap" = "xno" ; then
|
||||
AC_MSG_RESULT(no)
|
||||
elif test "x$cross_compiling" = "xyes"; then
|
||||
AC_MSG_RESULT(cross compiling, assuming yes)
|
||||
AC_DEFINE(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP, 1, [shm_open that works well enough with mmap])
|
||||
else
|
||||
AC_TRY_RUN([
|
||||
#include <sys/mman.h>
|
||||
@@ -3654,6 +3585,18 @@ ac_cv_c_socklen_t=yes
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
AC_MSG_CHECKING(for array element initializer support)
|
||||
AC_TRY_COMPILE([#include <sys/socket.h>], [
|
||||
const int array[] = {[1] = 2,};
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_ARRAY_ELEM_INIT,1,[Supports C99 array initialization])
|
||||
], [
|
||||
# We'll have to use signals
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
AC_CHECK_FUNCS(execvp)
|
||||
|
||||
dnl ****************************
|
||||
@@ -3862,11 +3805,7 @@ if test "x$enable_llvm" = "xyes"; then
|
||||
|
||||
AC_SUBST(LLVM_CODEGEN_LIBS)
|
||||
AC_SUBST(EXTERNAL_LLVM_CONFIG)
|
||||
|
||||
if test "x$host_win32" = "xyes" && test "x$cross_compiling" = "xno" && test "x$internal_llvm" = "xno"; then
|
||||
EXTERNAL_LLVM_CONFIG_WIN32=$(cygpath -m $EXTERNAL_LLVM_CONFIG)
|
||||
AC_SUBST(EXTERNAL_LLVM_CONFIG_WIN32)
|
||||
fi
|
||||
|
||||
AC_DEFINE(ENABLE_LLVM, 1, [Enable the LLVM back end])
|
||||
fi # ENABLE_LLVM
|
||||
|
||||
@@ -3966,9 +3905,7 @@ case "$host" in
|
||||
have_visibility_hidden=no
|
||||
;;
|
||||
mingw*|cygwin*)
|
||||
have_visibility_hidden=no
|
||||
BTLS_SUPPORTED=no
|
||||
BTLS_PLATFORM=i386
|
||||
have_visibility_hidden=no
|
||||
;;
|
||||
haiku*)
|
||||
LIBC=libroot.so
|
||||
@@ -3995,7 +3932,7 @@ case "$host" in
|
||||
TARGET=AMD64;
|
||||
arch_target=amd64;
|
||||
if test "x$ac_cv_sizeof_void_p" = "x4"; then
|
||||
AC_DEFINE(MONO_ARCH_ILP32, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
fi
|
||||
case $host_os in
|
||||
@@ -4016,9 +3953,7 @@ case "$host" in
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=x86_64
|
||||
;;
|
||||
mingw*|cygwin*)
|
||||
BTLS_SUPPORTED=no
|
||||
BTLS_PLATFORM=x86_64
|
||||
mingw*)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -4115,14 +4050,6 @@ case "$host" in
|
||||
ACCESS_UNALIGNED="no"
|
||||
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
|
||||
;;
|
||||
aarch64-*darwin*ilp32)
|
||||
TARGET=ARM6432
|
||||
arch_target=arm64
|
||||
AC_DEFINE(MONO_ARCH_ILP32, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
# assuming no other target other than watchOS is using aarch64*darwin triple
|
||||
TARGET_SYS=WATCHOS
|
||||
;;
|
||||
aarch64-*)
|
||||
# https://lkml.org/lkml/2012/7/15/133
|
||||
TARGET=ARM64
|
||||
@@ -4195,7 +4122,7 @@ if test "x$host" != "x$target"; then
|
||||
# It would be better to just use TARGET_POWERPC64, but lots of code already
|
||||
# uses this define
|
||||
AC_DEFINE(__mono_ppc64__, 1, [...])
|
||||
AC_DEFINE(MONO_ARCH_ILP32, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
target_byte_order=G_BIG_ENDIAN
|
||||
;;
|
||||
@@ -4232,10 +4159,8 @@ if test "x$host" != "x$target"; then
|
||||
CPPFLAGS="$CPPFLAGS"
|
||||
target_win32=no
|
||||
;;
|
||||
aarch64*darwin*_ilp32)
|
||||
TARGET=ARM6432;
|
||||
AC_DEFINE(MONO_ARCH_ILP32, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
AC_DEFINE(TARGET_WATCHOS, 1, [...])
|
||||
aarch64*-linux-*)
|
||||
TARGET=ARM64;
|
||||
;;
|
||||
aarch64-*)
|
||||
TARGET=ARM64
|
||||
@@ -4274,10 +4199,12 @@ case "$TARGET" in
|
||||
WASM)
|
||||
AC_DEFINE(TARGET_WASM, 1, [...])
|
||||
arch_target=wasm
|
||||
target_sizeof_void_p=4
|
||||
;;
|
||||
X86)
|
||||
AC_DEFINE(TARGET_X86, 1, [...])
|
||||
arch_target=x86
|
||||
target_sizeof_void_p=4
|
||||
;;
|
||||
AMD64)
|
||||
AC_DEFINE(TARGET_AMD64, 1, [...])
|
||||
@@ -4287,8 +4214,9 @@ ARM)
|
||||
AC_DEFINE(TARGET_ARM, 1, [...])
|
||||
arch_target=arm
|
||||
ACCESS_UNALIGNED="no"
|
||||
target_sizeof_void_p=4
|
||||
;;
|
||||
ARM64|ARM6432)
|
||||
ARM64)
|
||||
AC_DEFINE(TARGET_ARM64, 1, [...])
|
||||
arch_target=arm64
|
||||
;;
|
||||
@@ -4321,18 +4249,6 @@ RISCV64)
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$TARGET" in
|
||||
*32* | ARM | X86 | POWERPC | MIPS | SPARC | WASM | ARM6432)
|
||||
target_sizeof_void_p=4
|
||||
;;
|
||||
*64* | S390X)
|
||||
target_sizeof_void_p=8
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([unknown target])
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$HOST" in
|
||||
WASM)
|
||||
AC_DEFINE(HOST_WASM, 1, [...])
|
||||
@@ -4431,7 +4347,7 @@ fi
|
||||
dnl Use GCC atomic ops if they work on the target.
|
||||
if test x$GCC = "xyes"; then
|
||||
case $TARGET in
|
||||
X86 | AMD64 | ARM | ARM64 | ARM6432 | POWERPC | POWERPC64 | MIPS | S390X | SPARC | SPARC64 | RISCV32 | RISCV64)
|
||||
X86 | AMD64 | ARM | ARM64 | POWERPC | POWERPC64 | MIPS | S390X | SPARC | SPARC64 | RISCV32 | RISCV64)
|
||||
AC_DEFINE(USE_GCC_ATOMIC_OPS, 1, [...])
|
||||
;;
|
||||
esac
|
||||
@@ -4444,12 +4360,11 @@ if test "x$target_mach" = "xyes"; then
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_WATCHOS"
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_WATCHOS"
|
||||
BTLS_SUPPORTED=no
|
||||
elif test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64" -o "x$TARGET" = "xARM6432"; then
|
||||
elif test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64"; then
|
||||
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
BTLS_SUPPORTED=no
|
||||
target_ios=yes
|
||||
else
|
||||
AC_TRY_COMPILE([#include "TargetConditionals.h"],[
|
||||
#if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
|
||||
@@ -4483,14 +4398,19 @@ else
|
||||
AC_DEFINE(TARGET_BYTE_ORDER,G_BYTE_ORDER,[byte order of target])
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(TARGET_SIZEOF_VOID_P,${target_sizeof_void_p},[wordsize of target])
|
||||
|
||||
if test "x$sizeof_register" = "x4"; then
|
||||
AC_DEFINE(SIZEOF_REGISTER,4,[size of target machine integer registers])
|
||||
elif test "x$sizeof_register" = "x8"; then
|
||||
AC_DEFINE(SIZEOF_REGISTER,8,[size of target machine integer registers])
|
||||
if test "x$target_sizeof_void_p" != "x"; then
|
||||
AC_DEFINE_UNQUOTED(TARGET_SIZEOF_VOID_P,${target_sizeof_void_p},[wordsize of target])
|
||||
# This is true for all the current cross-compiling targets
|
||||
AC_DEFINE(SIZEOF_REGISTER,TARGET_SIZEOF_VOID_P,[size of target machine integer registers])
|
||||
else
|
||||
AC_DEFINE_UNQUOTED(SIZEOF_REGISTER,${target_sizeof_void_p},[size of target machine integer registers])
|
||||
AC_DEFINE(TARGET_SIZEOF_VOID_P,SIZEOF_VOID_P,[wordsize of target])
|
||||
if test "x$sizeof_register" = "x4"; then
|
||||
AC_DEFINE(SIZEOF_REGISTER,4,[size of target machine integer registers])
|
||||
elif test "x$sizeof_register" = "x8"; then
|
||||
AC_DEFINE(SIZEOF_REGISTER,8,[size of target machine integer registers])
|
||||
else
|
||||
AC_DEFINE(SIZEOF_REGISTER,SIZEOF_VOID_P,[size of target machine integer registers])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$have_visibility_hidden" = "xyes"; then
|
||||
@@ -4658,7 +4578,6 @@ AC_DEFINE(HAVE_UWP_WINAPI_SUPPORT, 0, [Don't use UWP Windows API support])
|
||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
|
||||
AC_CHECK_FUNCS(getrlimit)
|
||||
AC_CHECK_FUNCS(fork execv execve)
|
||||
AC_CHECK_FUNCS(waitpid)
|
||||
|
||||
AC_ARG_WITH([overridable-allocators], [ --with-overridable-allocators allow g_*alloc/g_free to call custom allocators set via g_mem_set_vtable])
|
||||
|
||||
@@ -4682,6 +4601,8 @@ elif test x$target_ios = xno; then
|
||||
AC_CHECK_FUNCS(strndup getpwuid_r)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(NEED_VASPRINTF, test x$ac_cv_func_vasprintf = xno || test x$with_overridable_allocators = xyes)
|
||||
|
||||
AC_SEARCH_LIBS(sqrtf, m)
|
||||
|
||||
# nanosleep may not be part of libc, also search it in other libraries
|
||||
@@ -5236,35 +5157,11 @@ AM_CONDITIONAL([ENABLE_HYBRID_SUSPEND], [test x$enable_hybrid_suspend != xno])
|
||||
|
||||
dnl End of thread suspend policy
|
||||
|
||||
dnl ***************************
|
||||
dnl *** feature experiments ***
|
||||
dnl ***************************
|
||||
|
||||
dnl When adding experiments, also add to mono/utils/mono-experiments.def
|
||||
AC_ARG_ENABLE(experiment, [ --enable-experiment=LIST Enable experimental fatures from the comma-separate LIST. Available experiments: null],[
|
||||
|
||||
if test x$enable_experiment != x ; then
|
||||
AC_DEFINE(ENABLE_EXPERIMENTS,1,[Enable feature experiments])
|
||||
fi
|
||||
for feature in `echo "$enable_experiment" | sed -e "s/,/ /g"`; do
|
||||
eval "mono_experiment_test_enable_$feature='yes'"
|
||||
done
|
||||
|
||||
if test "x$mono_experiment_test_enable_all" = "xyes"; then
|
||||
eval "mono_experiment_test_enable_null='yes'"
|
||||
true
|
||||
fi
|
||||
|
||||
if test "x$mono_experiment_test_enable_null" = "xyes"; then
|
||||
AC_DEFINE(ENABLE_EXPERIMENT_null, 1, [Enable experiment 'null'])
|
||||
fi
|
||||
],[])
|
||||
|
||||
dnl **********************
|
||||
dnl *** checked builds ***
|
||||
dnl **********************
|
||||
|
||||
AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable checked build (expensive asserts), configure with a comma-separated LIST of checked build modules and then include that same list in the environment variable MONO_CHECK_MODE at runtime. Recognized checked build modules: all, gc, metadata, thread, private_types, crash_reporting],[
|
||||
AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable checked build (expensive asserts), configure with a comma-separated LIST of checked build modules and then include that same list in the environment variable MONO_CHECK_MODE at runtime. Recognized checked build modules: all, gc, metadata, thread, private_types],[
|
||||
|
||||
if test x$enable_checked_build != x ; then
|
||||
AC_DEFINE(ENABLE_CHECKED_BUILD,1,[Enable checked build])
|
||||
@@ -5278,7 +5175,6 @@ AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable check
|
||||
eval "mono_checked_build_test_enable_metadata='yes'"
|
||||
eval "mono_checked_build_test_enable_thread='yes'"
|
||||
eval "mono_checked_build_test_enable_private_types='yes'"
|
||||
eval "mono_checked_build_test_enable_crash_reporting='yes'"
|
||||
fi
|
||||
|
||||
if test "x$mono_checked_build_test_enable_gc" = "xyes"; then
|
||||
@@ -5296,20 +5192,10 @@ AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable check
|
||||
if test "x$mono_checked_build_test_enable_private_types" = "xyes"; then
|
||||
AC_DEFINE(ENABLE_CHECKED_BUILD_PRIVATE_TYPES, 1, [Enable private types checked build])
|
||||
fi
|
||||
|
||||
if test "x$mono_checked_build_test_enable_crash_reporting" = "xyes"; then
|
||||
# Required
|
||||
with_overridable_allocators=yes
|
||||
AC_DEFINE(ENABLE_OVERRIDABLE_ALLOCATORS,1,[Overridable allocator support enabled])
|
||||
|
||||
AC_DEFINE(ENABLE_CHECKED_BUILD_CRASH_REPORTING, 1, [Enable private types checked build])
|
||||
fi
|
||||
], [])
|
||||
|
||||
dnl End of checked builds
|
||||
|
||||
AM_CONDITIONAL(NEED_VASPRINTF, test x$ac_cv_func_vasprintf = xno || test x$with_overridable_allocators = xyes)
|
||||
|
||||
AC_CHECK_HEADER([malloc.h],
|
||||
[AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1],
|
||||
[Define to 1 if you have /usr/include/malloc.h.])],,)
|
||||
@@ -5342,26 +5228,6 @@ dnl **************
|
||||
AC_ARG_ENABLE(btls, [ --disable-btls Disable the BoringTls provider], enable_btls=$enableval, enable_btls=$BTLS_SUPPORTED)
|
||||
AC_ARG_ENABLE(btls-lib, [ --disable-btls-lib Disable building the BTLS native library], enable_btls_lib=$enableval, enable_btls_lib=$BTLS_SUPPORTED)
|
||||
AC_ARG_WITH(btls_android_ndk, [ --with-btls-android-ndk Android NDK for BoringTls])
|
||||
AC_ARG_WITH(btls_android_api, [ --with-btls-android-api Android NDK API level for BTLS build])
|
||||
AC_ARG_WITH(btls_android_cmake_toolchain, [ --with-btls-android-cmake-toolchain Path to the cmake toolchain file for Android])
|
||||
AC_ARG_WITH(btls_android_ndk_asm_workaround, [ --with-btls-android-ndk-asm-workaround Work around a problem with NDK r18+ clang compiler when compiling some AES assembly for ARM])
|
||||
|
||||
if test "x$with_btls_android_api" = "x" ; then
|
||||
case "$BTLS_PLATFORM" in
|
||||
android-armv5)
|
||||
with_btls_android_api=16" ;;
|
||||
android-armv6)
|
||||
with_btls_android_api=16" ;;
|
||||
android-armv7)
|
||||
with_btls_android_api=16 ;;
|
||||
android-v8a)
|
||||
with_btls_android_api=21 ;;
|
||||
android-x86)
|
||||
with_btls_android_api=16 ;;
|
||||
android-x64)
|
||||
with_btls_android_api=21 ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "x$enable_btls" = "xno"; then
|
||||
enable_btls_lib=no
|
||||
@@ -5383,10 +5249,6 @@ if test "x$enable_btls" = "xyes"; then
|
||||
btls_cflags=
|
||||
BTLS_CMAKE_ARGS=
|
||||
|
||||
if test "x$host_win32" = "xyes"; then
|
||||
AC_CHECK_PROG(HAVE_YASM, yasm, yes, no)
|
||||
fi
|
||||
|
||||
case "$BTLS_PLATFORM" in
|
||||
i386)
|
||||
btls_arch=i386
|
||||
@@ -5394,25 +5256,10 @@ if test "x$enable_btls" = "xyes"; then
|
||||
case $host_os in
|
||||
darwin*)
|
||||
btls_cflags="$btls_cflags -arch i386"
|
||||
;;
|
||||
mingw*|cygwin*)
|
||||
btls_cflags="-DNOCRYPT $WIN32_CPPFLAGS"
|
||||
if test "x$HAVE_YASM" != "xyes"; then
|
||||
BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
x86_64)
|
||||
btls_arch=x86_64
|
||||
case $host_os in
|
||||
mingw*|cygwin*)
|
||||
btls_cflags="-DNOCRYPT $WIN32_CPPFLAGS"
|
||||
if test "x$HAVE_YASM" != "xyes"; then
|
||||
BTLS_CMAKE_ARGS="-DOPENSSL_NO_ASM=1"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
arm)
|
||||
btls_arch=arm
|
||||
@@ -5438,22 +5285,22 @@ if test "x$enable_btls" = "xyes"; then
|
||||
esac
|
||||
;;
|
||||
android-armv5)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
android-armv6)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
android-armv7)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi-v7a\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi-v7a\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
android-v8a)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"arm64-v8a\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"arm64-v8a\" -DANDROID_NATIVE_API_LEVEL=21"
|
||||
;;
|
||||
android-x86)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
android-x64)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86_64\" -DANDROID_NATIVE_API_LEVEL=$with_btls_android_api"
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"x86_64\" -DANDROID_NATIVE_API_LEVEL=21"
|
||||
;;
|
||||
riscv32)
|
||||
btls_arch=riscv32
|
||||
@@ -5466,16 +5313,8 @@ if test "x$enable_btls" = "xyes"; then
|
||||
esac
|
||||
|
||||
if test "x$platform_android" = "xyes"; then
|
||||
if test "x$with_btls_android_cmake_toolchain" = "x"; then
|
||||
with_btls_android_cmake_toolchain="$BTLS_ROOT/util/android-cmake/android.toolchain.cmake"
|
||||
fi
|
||||
|
||||
if test "x$with_btls_android_ndk_asm_workaround" != "x"; then
|
||||
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DENABLE_NDK_ARM_WORKAROUND=ON"
|
||||
fi
|
||||
|
||||
btls_android=yes
|
||||
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=$with_btls_android_cmake_toolchain"
|
||||
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=$BTLS_ROOT/util/android-cmake/android.toolchain.cmake"
|
||||
if test "x$with_btls_android_ndk" != "x"; then
|
||||
BTLS_CMAKE_ARGS="$BTLS_CMAKE_ARGS -DANDROID_NDK=\"$with_btls_android_ndk\""
|
||||
else
|
||||
@@ -5523,7 +5362,7 @@ AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
|
||||
AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
|
||||
AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64)
|
||||
AM_CONDITIONAL(ARM, test x$TARGET = xARM)
|
||||
AM_CONDITIONAL(ARM64, test x$TARGET = xARM64 -o x$TARGET = xARM6432)
|
||||
AM_CONDITIONAL(ARM64, test x$TARGET = xARM64)
|
||||
AM_CONDITIONAL(S390X, test x$TARGET = xS390X)
|
||||
AM_CONDITIONAL([RISCV], [test x$TARGET = xRISCV32 -o x$TARGET = xRISCV64])
|
||||
AM_CONDITIONAL([RISCV32], [test x$TARGET = xRISCV32])
|
||||
@@ -5560,37 +5399,7 @@ AC_DEFINE(MONO_INSIDE_RUNTIME,1, [Disable banned functions from being used by th
|
||||
mono_build_root=`pwd`
|
||||
AC_SUBST(mono_build_root)
|
||||
|
||||
AC_ARG_ENABLE(msvc,[ --enable-msvc Build with Visual Studio (msvc) (defaults to no)], enable_msvc=$enableval, enable_msvc=no)
|
||||
if test x$host_win32 = xno; then
|
||||
if test x$enable_msvc = xyes; then
|
||||
echo "Error, --enable-msvc only supported for Windows builds."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_MSVC, test x$enable_msvc = xyes)
|
||||
|
||||
if test "x$enable_msvc" = "xyes"; then
|
||||
if test "x$support_boehm" = "xyes"; then
|
||||
echo "Error, Boehm GC is not supported when using --enable-msvc."
|
||||
exit 1
|
||||
fi
|
||||
mono_msvc_build_dir='$(top_srcdir)'/msvc/build/sgen
|
||||
if test "x$host_cpu" = "xi686"; then
|
||||
mono_msvc_build_lib_dir='$(mono_msvc_build_dir)'/Win32/lib/Release
|
||||
mono_msvc_build_bin_dir='$(mono_msvc_build_dir)'/Win32/bin/Release
|
||||
mono_runtime=msvc/build/sgen/Win32/bin/Release/mono-sgen.exe
|
||||
else
|
||||
mono_msvc_build_lib_dir='$(mono_msvc_build_dir)'/x64/lib/Release
|
||||
mono_msvc_build_bin_dir='$(mono_msvc_build_dir)'/x64/bin/Release
|
||||
mono_runtime=msvc/build/sgen/x64/bin/Release/mono-sgen.exe
|
||||
fi
|
||||
AC_SUBST(mono_msvc_build_dir)
|
||||
AC_SUBST(mono_msvc_build_lib_dir)
|
||||
AC_SUBST(mono_msvc_build_bin_dir)
|
||||
else
|
||||
mono_runtime=mono/mini/mono
|
||||
fi
|
||||
|
||||
mono_runtime=mono/mini/mono
|
||||
AC_SUBST(mono_runtime)
|
||||
|
||||
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.8.2/tools/csc.exe
|
||||
@@ -5621,7 +5430,6 @@ AC_SUBST(CSC)
|
||||
|
||||
AC_CONFIG_FILES([po/mcs/Makefile.in])
|
||||
|
||||
AC_CONFIG_FILES([acceptance-tests/microbench-perf.sh],[chmod +x acceptance-tests/microbench-perf.sh])
|
||||
AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
|
||||
AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
|
||||
|
||||
@@ -5801,236 +5609,6 @@ if test x"$GCC" = xyes; then
|
||||
])
|
||||
fi
|
||||
|
||||
#
|
||||
# Mono.Native Support
|
||||
# -------------------
|
||||
# Mono.Native is the new name for both System.Native and System.Security.Cryptography.Apple.
|
||||
# It is built as a stand-alone shared library and not bundled with the runtime because we
|
||||
# may need to build two different versions of it.
|
||||
#
|
||||
# Starting with macOS 10.12+ and iOS 10+, Apple introduced a new Unified API for some of the
|
||||
# crypto primitives that we're using as part of System.Security.Cryptography.Apple.
|
||||
#
|
||||
# On Desktop, we can check at runtime whether the OS version is recent enough and switch
|
||||
# implementation accordingly. We build a single `libmono-native` shared library.
|
||||
#
|
||||
# However, on Mobile we cannot have any undefined symbols as this would break Bitcode.
|
||||
#
|
||||
# During the mobile build, we are called with `CFLAGS` containing an explicit minium version flag,
|
||||
# which is eiter `-mmacosx-version-min=`, `-mios-simulator-version-min=` or `-miphoneos-version-min=`
|
||||
# depending on platform.
|
||||
#
|
||||
# We build two versions of the shared library:
|
||||
# - `libmono-native-compat` is built with whichever minimum version is passed to us via `CFLAGS`.
|
||||
# - `libmono-native-unifed` is built with the minimum version set to macOS 10.12+ / iOS 10+.
|
||||
#
|
||||
# For testing purpuses, there is a function called `mono_native_get_platform_type ()`
|
||||
# (see mono/native/mono-native-platform.c), which returns a `MonoNativePlatformType` enum value.
|
||||
# There is also `Mono.MonoNativePlatform.GetPlatformType ()` (see mcs/class/corlib/Test/Mono/MonoNativePlatform.cs).
|
||||
#
|
||||
# This can be called by automated tests both to ensure that the library has been correctly installed and also
|
||||
# to verify that it's the correct version of it.
|
||||
#
|
||||
|
||||
AC_MSG_CHECKING([Mono.Native support])
|
||||
sed_version_pattern='[[0-9]]\{1,2\}\(\.[[0-9]]\{1,2\}\)'
|
||||
if test x$target_osx = xyes; then
|
||||
MONO_NATIVE_CC=$CC
|
||||
MONO_NATIVE_CXX=$CXX
|
||||
MONO_NATIVE_CCASFLAGS=$CCASFLAGS
|
||||
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
|
||||
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
|
||||
MONO_NATIVE_CFLAGS=$CFLAGS
|
||||
MONO_NATIVE_LDFLAGS=$LDFLAGS
|
||||
|
||||
mono_native=yes
|
||||
MONO_NATIVE_PLATFORM=macos
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_MACOS"
|
||||
|
||||
AC_MONO_APPLE_AVAILABLE(mono_native_compat, [whether we need the compatibility layer],
|
||||
[!(MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12)])
|
||||
|
||||
if test x$mono_native_compat = xyes; then
|
||||
mono_native_compat=yes
|
||||
mono_native_text="Mac OSX (compat + unified v10.12)"
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS=$MONO_NATIVE_CCASFLAGS
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS=$MONO_NATIVE_CPPFLAGS
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS=$MONO_NATIVE_CXXFLAGS
|
||||
MONO_NATIVE_COMPAT_CFLAGS=$MONO_NATIVE_CFLAGS
|
||||
MONO_NATIVE_COMPAT_LDFLAGS=$MONO_NATIVE_LDFLAGS
|
||||
|
||||
sed_remove_mac_version_pattern="s/-mmacosx-version-min=$sed_version_pattern//g"
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS="`echo $CCASFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS="`echo $CPPFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS="`echo $CXXFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
MONO_NATIVE_UNIFIED_CFLAGS="`echo $CFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS="`echo $LDFLAGS | sed -e $sed_remove_mac_version_pattern` -mmacosx-version-min=10.12"
|
||||
else
|
||||
mono_native_compat=no
|
||||
mono_native_text="Mac OSX"
|
||||
fi
|
||||
elif test x$mono_native_platform_ios = xyes; then
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_SIMULATOR, [mono_native_ios_sim=yes], [mono_native_ios_sim=no])
|
||||
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_IOS, [
|
||||
if test x$mono_native_ios_sim = xyes; then
|
||||
mono_native_ios_target=ios-simulator
|
||||
mono_native_text="iOS Simulator"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_IPHONE | MONO_NATIVE_PLATFORM_TYPE_SIMULATOR"
|
||||
else
|
||||
mono_native_ios_target=iphoneos
|
||||
mono_native_text="iOS Device"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_IPHONE | MONO_NATIVE_PLATFORM_TYPE_DEVICE"
|
||||
fi
|
||||
mono_native_unified_version="10.0"
|
||||
mono_native_compat_check="__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_10_0"
|
||||
], [
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_TV, [
|
||||
if test x$mono_native_ios_sim = xyes; then
|
||||
mono_native_ios_target=tvos-simulator
|
||||
mono_native_text="AppleTV Simulator"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_TV | MONO_NATIVE_PLATFORM_TYPE_SIMULATOR"
|
||||
else
|
||||
mono_native_ios_target=tvos
|
||||
mono_native_text="AppleTV Device"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_TV | MONO_NATIVE_PLATFORM_TYPE_DEVICE"
|
||||
fi
|
||||
mono_native_unified_version="10.0"
|
||||
mono_native_compat_check="__TV_OS_VERSION_MIN_REQUIRED >= __TVOS_10_0"
|
||||
], [
|
||||
AC_MONO_APPLE_TARGET(TARGET_OS_WATCH, [
|
||||
if test x$mono_native_ios_sim = xyes; then
|
||||
mono_native_ios_target=watchos-simulator
|
||||
mono_native_text="Apple Watch Simulator"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_WATCH | MONO_NATIVE_PLATFORM_TYPE_SIMULATOR"
|
||||
else
|
||||
mono_native_ios_target=watchos
|
||||
mono_native_text="Apple Watch Device"
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_IOS | MONO_NATIVE_PLATFORM_TYPE_WATCH | MONO_NATIVE_PLATFORM_TYPE_DEVICE"
|
||||
fi
|
||||
mono_native_unified_version="5.0"
|
||||
mono_native_compat_check="__WATCH_OS_VERSION_MIN_REQUIRED >= __WATCHOS_5_0"
|
||||
], [
|
||||
AC_MSG_ERROR([Unknown iOS Target])
|
||||
])
|
||||
])
|
||||
])
|
||||
|
||||
AC_MONO_APPLE_AVAILABLE(mono_native_compat, [whether we need the compatibility layer], [!($mono_native_compat_check)])
|
||||
|
||||
if test x$with_bitcode = xyes; then
|
||||
mono_native_ldflags="-framework CoreFoundation -framework Foundation -no-undefined -fatal_warnings"
|
||||
MONO_NATIVE_LIBADD="../mini/$LIBMONO_LA"
|
||||
else
|
||||
mono_native_ldflags="-framework CoreFoundation -framework Foundation -fatal_warnings"
|
||||
fi
|
||||
|
||||
if test x$enable_gss = xyes; then
|
||||
mono_native_ldflags="$mono_native_ldflags -framework GSS"
|
||||
fi
|
||||
|
||||
MONO_NATIVE_CC=$CC
|
||||
MONO_NATIVE_CXX=$CXX
|
||||
MONO_NATIVE_CCASFLAGS=$CCASFLAGS
|
||||
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
|
||||
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
|
||||
MONO_NATIVE_CFLAGS=$CFLAGS
|
||||
MONO_NATIVE_LDFLAGS="$LDFLAGS $mono_native_ldflags"
|
||||
|
||||
if test x$mono_native_compat = xyes; then
|
||||
mono_native_text="$mono_native_text (compat + unified v$mono_native_unified_version)"
|
||||
MONO_NATIVE_COMPAT_CCASFLAGS=$MONO_NATIVE_CCASFLAGS
|
||||
MONO_NATIVE_COMPAT_CPPFLAGS=$MONO_NATIVE_CPPFLAGS
|
||||
MONO_NATIVE_COMPAT_CXXFLAGS=$MONO_NATIVE_CXXFLAGS
|
||||
MONO_NATIVE_COMPAT_CFLAGS=$MONO_NATIVE_CFLAGS
|
||||
MONO_NATIVE_COMPAT_LDFLAGS=$MONO_NATIVE_LDFLAGS
|
||||
|
||||
sed_remove_ios_version_pattern="s/-m\(.*\)-version-min=$sed_version_pattern//g"
|
||||
MONO_NATIVE_UNIFIED_CCASFLAGS="`echo $CCASFLAGS | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
MONO_NATIVE_UNIFIED_CPPFLAGS="`echo $CPPFLAGS | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
MONO_NATIVE_UNIFIED_CXXFLAGS="`echo $CXXFLAGS | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
MONO_NATIVE_UNIFIED_CFLAGS="`echo $CFLAGS | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
MONO_NATIVE_UNIFIED_LDFLAGS="`echo $LDFLAGS $mono_native_ldflags | sed -e $sed_remove_ios_version_pattern` -m$mono_native_ios_target-version-min=$mono_native_unified_version"
|
||||
fi
|
||||
|
||||
mono_native=yes
|
||||
MONO_NATIVE_PLATFORM=ios
|
||||
elif test x$host_linux = xyes; then
|
||||
mono_native_text="Linux"
|
||||
MONO_NATIVE_CC=$CC
|
||||
MONO_NATIVE_CXX=$CXX
|
||||
MONO_NATIVE_CCASFLAGS=$CCASFLAGS
|
||||
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
|
||||
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
|
||||
MONO_NATIVE_CFLAGS=$CFLAGS
|
||||
MONO_NATIVE_LDFLAGS=$LDFLAGS
|
||||
|
||||
mono_native=yes
|
||||
mono_native_compat=no
|
||||
MONO_NATIVE_PLATFORM=linux
|
||||
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_LINUX"
|
||||
elif case $host_os in aix*|os400*) true;; *) false;; esac; then
|
||||
mono_native_text="AIX"
|
||||
MONO_NATIVE_CC=$CC
|
||||
MONO_NATIVE_CXX=$CXX
|
||||
MONO_NATIVE_CCASFLAGS=$CCASFLAGS
|
||||
MONO_NATIVE_CPPFLAGS=$CPPFLAGS
|
||||
MONO_NATIVE_CXXFLAGS=$CXXFLAGS
|
||||
MONO_NATIVE_CFLAGS=$CFLAGS
|
||||
MONO_NATIVE_LDFLAGS=$LDFLAGS
|
||||
|
||||
mono_native=yes
|
||||
mono_native_compat=no
|
||||
MONO_NATIVE_PLATFORM=aix
|
||||
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_AIX"
|
||||
else
|
||||
mono_native=no
|
||||
mono_native_text="no"
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT($mono_native_text)
|
||||
|
||||
if test x$mono_native_compat = xyes; then
|
||||
MONO_NATIVE_LIBRARY_NAME=libmono-native-compat
|
||||
else
|
||||
MONO_NATIVE_LIBRARY_NAME=libmono-native
|
||||
fi
|
||||
|
||||
AC_SUBST(MONO_NATIVE_PLATFORM)
|
||||
AC_SUBST(MONO_NATIVE_CC)
|
||||
AC_SUBST(MONO_NATIVE_CXX)
|
||||
AC_SUBST(MONO_NATIVE_CCASFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_CCASFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_CCASFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_CPPFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_CPPFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_CPPFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_CXXFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_CXXFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_CXXFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_CFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_CFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_CFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_LDFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_COMPAT_LDFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_UNIFIED_LDFLAGS)
|
||||
AC_SUBST(MONO_NATIVE_LIBRARY_NAME)
|
||||
AC_SUBST(MONO_NATIVE_LIBADD)
|
||||
|
||||
AM_CONDITIONAL(MONO_NATIVE, test x$mono_native = xyes)
|
||||
AM_CONDITIONAL(MONO_NATIVE_COMPAT, test x$mono_native_compat = xyes)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_MACOS, test x$MONO_NATIVE_PLATFORM = xmacos)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_IOS, test x$MONO_NATIVE_PLATFORM = xios)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_LINUX, test x$MONO_NATIVE_PLATFORM = xlinux)
|
||||
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_AIX, test x$MONO_NATIVE_PLATFORM = xaix)
|
||||
|
||||
MONO_NATIVE_PLATFORM_TYPE_COMPAT="$MONO_NATIVE_PLATFORM_TYPE | MONO_NATIVE_PLATFORM_TYPE_COMPAT"
|
||||
MONO_NATIVE_PLATFORM_TYPE_UNIFIED="$MONO_NATIVE_PLATFORM_TYPE | MONO_NATIVE_PLATFORM_TYPE_UNIFIED"
|
||||
AC_SUBST(MONO_NATIVE_PLATFORM_TYPE)
|
||||
AC_SUBST(MONO_NATIVE_PLATFORM_TYPE_COMPAT)
|
||||
AC_SUBST(MONO_NATIVE_PLATFORM_TYPE_UNIFIED)
|
||||
|
||||
# Update all submodules recursively to ensure everything is checked out
|
||||
(cd $srcdir && scripts/update_submodules.sh)
|
||||
|
||||
@@ -6044,7 +5622,6 @@ scripts/mono-find-requires
|
||||
mk/Makefile
|
||||
mono/Makefile
|
||||
mono/btls/Makefile
|
||||
mono/native/Makefile
|
||||
mono/utils/Makefile
|
||||
mono/utils/jemalloc/Makefile
|
||||
mono/metadata/Makefile
|
||||
@@ -6061,9 +5638,6 @@ mono/arch/arm64/Makefile
|
||||
mono/arch/mips/Makefile
|
||||
mono/arch/riscv/Makefile
|
||||
mono/sgen/Makefile
|
||||
mono/native/platform-type.c
|
||||
mono/native/platform-type-compat.c
|
||||
mono/native/platform-type-unified.c
|
||||
mono/tests/Makefile
|
||||
mono/tests/assembly-load-reference/Makefile
|
||||
mono/tests/tests-config
|
||||
@@ -6245,21 +5819,6 @@ fi
|
||||
echo "HAVE_BTLS=1" >> $srcdir/$mcsdir/build/config.make
|
||||
fi
|
||||
|
||||
if test "x$mono_native" = "xyes"; then
|
||||
echo "MONO_NATIVE_SUPPORTED=true" >> $srcdir/$mcsdir/build/config.make
|
||||
else
|
||||
echo "MONO_NATIVE_SUPPORTED=false" >> $srcdir/$mcsdir/build/config.make
|
||||
fi
|
||||
|
||||
if test x$mono_native_compat = xyes; then
|
||||
echo "MONO_NATIVE_USING_COMPAT=true" >> $srcdir/$mcsdir/build/config.make
|
||||
else
|
||||
echo "MONO_NATIVE_USING_COMPAT=false" >> $srcdir/$mcsdir/build/config.make
|
||||
fi
|
||||
|
||||
echo "MONO_NATIVE_PLATFORM_TYPE=$MONO_NATIVE_PLATFORM_TYPE" >> $srcdir/$mcsdir/build/config.make
|
||||
echo "MONO_NATIVE_PLATFORM=$MONO_NATIVE_PLATFORM" >> $srcdir/$mcsdir/build/config.make
|
||||
|
||||
fi
|
||||
|
||||
)
|
||||
@@ -6302,7 +5861,6 @@ echo "
|
||||
DTrace: $enable_dtrace
|
||||
LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm, built in-tree: $internal_llvm, assertions: $enable_llvm_asserts)
|
||||
Spectre: $spectre_mitigation_status
|
||||
Mono.Native: $mono_native_text
|
||||
|
||||
Libraries:
|
||||
.NET 4.x: $with_profile4_x
|
||||
@@ -6321,7 +5879,7 @@ echo "
|
||||
zlib: $zlib_msg
|
||||
BTLS: $enable_btls$btls_platform_string
|
||||
jemalloc: $with_jemalloc (always use: $with_jemalloc_always)
|
||||
crash reporting: $crash_reporting (private crashes: $with_crash_privacy)
|
||||
crash reporting: $crash_reporting
|
||||
$disabled
|
||||
"
|
||||
if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then
|
||||
|
||||
+2
-3
@@ -11,9 +11,8 @@
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Net.Security.Native" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Security.Cryptography.Native.Apple" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="osx" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/libmono-system-native@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Net.Security.Native" target="$mono_libdir/libmono-system-net-security-native@libsuffix@" os="!windows" />
|
||||
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
|
||||
+2
-3
@@ -52,8 +52,7 @@ EXTRA_DIST = \
|
||||
|
||||
-include $(mcs_topdir)/build/config.make
|
||||
|
||||
DOC_PROFILE:=net_4_x
|
||||
CLASS=$(mcs_topdir)/class/lib/$(DOC_PROFILE)
|
||||
CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
|
||||
|
||||
dist-hook:
|
||||
$(mkdir_p) $(distdir)/sources
|
||||
@@ -69,7 +68,7 @@ clean-local:
|
||||
-rm -f deploy/* convert.exe* AgilityPack.dll*
|
||||
-rm -f $(ASSEMBLED_DOCS)
|
||||
|
||||
TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir) PROFILE=$(DOC_PROFILE)
|
||||
TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir)
|
||||
|
||||
monoapi.zip: monoapi.tree
|
||||
|
||||
|
||||
+1
-8
@@ -42,7 +42,7 @@ export QEMU_LD_PREFIX=$RISCV/sysroot
|
||||
Install some dependencies needed to build the toolchain:
|
||||
|
||||
```console
|
||||
# apt install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev libusb-1.0-0-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev device-tree-compiler pkg-config libexpat-dev libglib2.0-dev libpixman-1-dev
|
||||
# apt install sudo apt-get install autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev libusb-1.0-0-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev device-tree-compiler pkg-config libexpat-dev
|
||||
```
|
||||
|
||||
Now you can build the toolchain:
|
||||
@@ -92,13 +92,6 @@ You can run Mono with QEMU like this:
|
||||
$ qemu-riscv64 $RISCV/sysroot/bin/mono hello.exe
|
||||
```
|
||||
|
||||
## Debugging
|
||||
|
||||
```console
|
||||
$ qemu-riscv64 -g 12345 ./mono/mini/mono-sgen --interp basic.exe &
|
||||
$ riscv64-unknown-elf-gdb -ex 'target remote localhost:12345' -ex 'b main' -ex 'c' ./mono/mini/mono-sgen
|
||||
```
|
||||
|
||||
## Things to be done
|
||||
|
||||
In no particular order:
|
||||
|
||||
Vendored
+1
-1
Submodule external/api-snapshot updated: cad071b690...ddf8f364be.
Vendored
+1
-1
Submodule external/binary-reference-assemblies updated: ede573102c...bdc6cdaabf.
Vendored
+1
-1
Submodule external/bockbuild updated: 0f9e88d46a...4d68269934.
Vendored
+1
-1
Submodule external/boringssl updated: 3d87996698...41221b45aa.
Vendored
+1
-1
Submodule external/cecil updated: e5d5fa4a73...b6c50e3d34.
Vendored
+1
-1
Submodule external/corefx updated: ac21f570f9...492f805884.
Vendored
+1
-1
Submodule external/corert updated: 1b7d4a1e4b...efd29b5cf8.
Vendored
-1
Submodule external/helix-binaries deleted from b4f5d25ecc.
Vendored
+1
-1
Submodule external/linker updated: 84a79a11a9...db6d1a3246.
Vendored
-1
Submodule external/llvm deleted from 1aaaaa5246.
Vendored
+1
-1
Submodule external/nunit-lite updated: 0029561453...e64e0197a8.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: 249709faa5...09a97af42a.
Vendored
+1
-1
Submodule external/xunit-binaries updated: 8f6e62e1c0...3c3659bc0f.
@@ -185,6 +185,3 @@ EXTRA_DIST += configure.host
|
||||
.S.s:
|
||||
if $(CPP) $< >$@ ; then :; else rm -f $@; fi
|
||||
|
||||
test:
|
||||
|
||||
test-bundle:
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
|
||||
EXTRA_DIST=build.mk build_llvm_config.sh
|
||||
EXTRA_DIST=SUBMODULES.json build.mk build_llvm_config.sh
|
||||
|
||||
if ENABLE_LLVM
|
||||
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
[
|
||||
{
|
||||
"name": "llvm",
|
||||
"url": "git://github.com/mono/llvm.git",
|
||||
"rev": "81376d161cb6c2230834b2dc096ccbdae8d93020",
|
||||
"remote-branch": "origin/release_60",
|
||||
"branch": "release_60",
|
||||
"directory": "llvm"
|
||||
}
|
||||
]
|
||||
+39
-12
@@ -1,24 +1,53 @@
|
||||
abs_top_srcdir ?= $(abspath $(CURDIR)/..)
|
||||
#
|
||||
# Conditional submodule for llvm
|
||||
#
|
||||
# make reset-llvm will checkout a version of llvm which is suitable for this version of mono
|
||||
# into $top_srcdir/llvm/llvm.
|
||||
#
|
||||
# Input variables
|
||||
# - LLVM_TARGET: if set to wasm32 will trigger a 32bits build that enable the experimental WebAssembly backend
|
||||
#
|
||||
|
||||
LLVM_BUILD ?= $(abspath $(abs_top_srcdir)/llvm/build)
|
||||
LLVM_PREFIX ?= $(abspath $(abs_top_srcdir)/llvm/usr)
|
||||
top_srcdir ?= $(abspath $(CURDIR)/..)
|
||||
|
||||
# LLVM_BRANCH := $(shell git -C "$(abs_top_srcdir)/external/llvm" rev-parse --abbrev-ref HEAD)
|
||||
LLVM_VERSION := $(shell git -C "$(abs_top_srcdir)/external/llvm" rev-parse HEAD)
|
||||
LLVM_PATH ?= $(abspath $(top_srcdir)/external/llvm)
|
||||
LLVM_BUILD ?= $(abspath $(top_srcdir)/llvm/build)
|
||||
LLVM_PREFIX ?= $(abspath $(top_srcdir)/llvm/usr)
|
||||
|
||||
# FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(LLVM_BRANCH)/llvm-osx64-$(LLVM_VERSION).tar.gz
|
||||
LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(LLVM_VERSION).tar.gz"
|
||||
# FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(NEEDED_LLVM_BRANCH)/llvm-osx64-$(NEEDED_LLVM_VERSION).tar.gz
|
||||
LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(NEEDED_LLVM_VERSION).tar.gz"
|
||||
|
||||
CMAKE := $(or $(CMAKE),$(shell which cmake))
|
||||
NINJA := $(shell which ninja)
|
||||
|
||||
SUBMODULES_CONFIG_FILE = $(top_srcdir)/llvm/SUBMODULES.json
|
||||
include $(top_srcdir)/scripts/submodules/versions.mk
|
||||
|
||||
$(eval $(call ValidateVersionTemplate,llvm,LLVM))
|
||||
|
||||
# Bump the given submodule to the revision given by the REV make variable
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-llvm: __bump-version-llvm
|
||||
|
||||
# Bump the given submodule to the branch given by the BRANCH/REMOTE_BRANCH make variables
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-branch-llvm: __bump-branch-llvm
|
||||
|
||||
# Bump the given submodule to its current GIT version
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-current-llvm: __bump-current-version-llvm
|
||||
|
||||
$(LLVM_BUILD) $(LLVM_PREFIX):
|
||||
mkdir -p $@
|
||||
|
||||
$(LLVM_PATH):
|
||||
$(MAKE) -f build.mk reset-llvm
|
||||
|
||||
$(LLVM_PATH)/CMakeLists.txt: | $(LLVM_PATH)
|
||||
|
||||
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",)
|
||||
|
||||
# -DLLVM_ENABLE_LIBXML2=Off is needed because xml2 is not used and it breaks 32-bit builds on 64-bit Linux hosts
|
||||
$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(abs_top_srcdir)/external/llvm/CMakeLists.txt | $(LLVM_BUILD) $(LLVM_PREFIX)
|
||||
$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(LLVM_PATH)/CMakeLists.txt | $(LLVM_BUILD)
|
||||
cd $(LLVM_BUILD) && $(CMAKE) \
|
||||
$(if $(NINJA),-G Ninja) \
|
||||
-DCMAKE_INSTALL_PREFIX="$(LLVM_PREFIX)" \
|
||||
@@ -31,10 +60,8 @@ $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(abs_top_srcdir)/external/ll
|
||||
-DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \
|
||||
$(EXTRA_LLVM_ARGS) \
|
||||
-DLLVM_ENABLE_ASSERTIONS=$(if $(INTERNAL_LLVM_ASSERTS),On,Off) \
|
||||
-DLLVM_ENABLE_LIBXML2=Off \
|
||||
-DHAVE_FUTIMENS=0 \
|
||||
$(LLVM_CMAKE_ARGS) \
|
||||
$(abs_top_srcdir)/external/llvm
|
||||
$(dir $<)
|
||||
|
||||
.PHONY: configure-llvm
|
||||
configure-llvm: $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile)
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
# Usage:
|
||||
# AC_MONO_APPLE_TARGET(target-name, action-if-found, action-if-not-found)
|
||||
#
|
||||
# Checks whether `target-name` is defined in "TargetConditionals.h"
|
||||
#
|
||||
AC_DEFUN([AC_MONO_APPLE_TARGET], [
|
||||
AC_MONO_APPLE_AVAILABLE([$1], [for $1], [$1 == 1], $2, $3)
|
||||
])
|
||||
|
||||
|
||||
# Usage:
|
||||
# AC_MONO_APPLE_AVAILABLE(name, message, conditional, action-if-found, action-if-not-found)
|
||||
#
|
||||
# Checks for `conditional` using "TargetConditionals.h" and "AvailabilityMacros.h"
|
||||
#
|
||||
AC_DEFUN([AC_MONO_APPLE_AVAILABLE], [
|
||||
# cache the compilation check
|
||||
AC_CACHE_CHECK([$2], [ac_cv_apple_available_[]$1], [
|
||||
AC_TRY_COMPILE([
|
||||
#include "TargetConditionals.h"
|
||||
#include "AvailabilityMacros.h"
|
||||
],[
|
||||
#if !($3)
|
||||
#error failed
|
||||
#endif
|
||||
], [
|
||||
ac_cv_apple_available_[]$1=yes
|
||||
], [
|
||||
ac_cv_apple_available_[]$1=no
|
||||
])
|
||||
])
|
||||
# keep the actions out of the cache check because they need to be always executed.
|
||||
if test x$ac_cv_apple_available_[]$1 = xyes; then
|
||||
$1=yes
|
||||
[$4]
|
||||
else
|
||||
$1=no
|
||||
[$5]
|
||||
fi
|
||||
])
|
||||
+4
-4
@@ -215,14 +215,14 @@ and
|
||||
options. This feature is experimental.
|
||||
.TP
|
||||
.I llvmopts=[options]
|
||||
Use this option to add more flags to the built-in set of flags passed to the
|
||||
Use this option to override the built-in set of flags passed to the
|
||||
LLVM optimizer. The list of possible flags that can be passed can be
|
||||
obtained by calling the bundled
|
||||
.I opt
|
||||
program that comes with Mono.
|
||||
.TP
|
||||
.I llvmllc=[options]
|
||||
Use this option to add more flags to the built-in set of flags passed to the
|
||||
Use this option to override the built-in set of flags passed to the
|
||||
LLVM static compiler (llc). The list of possible flags that can be passed can be
|
||||
obtained by calling the bundled
|
||||
.I llc
|
||||
@@ -830,7 +830,7 @@ This compiles a method (namespace.name:methodname), this is used for
|
||||
testing the compiler performance or to examine the output of the code
|
||||
generator.
|
||||
.TP
|
||||
\fB--compile-all\fR
|
||||
\fB--compileall\fR
|
||||
Compiles all the methods in an assembly. This is used to test the
|
||||
compiler performance or to examine the output of the code generator
|
||||
.TP
|
||||
@@ -854,7 +854,7 @@ on.
|
||||
.TP
|
||||
\fB--ncompile\fR
|
||||
Instruct the runtime on the number of times that the method specified
|
||||
by --compile (or all the methods if --compile-all is used) to be
|
||||
by --compile (or all the methods if --compileall is used) to be
|
||||
compiled. This is used for testing the code generator performance.
|
||||
.TP
|
||||
\fB--stats\fR
|
||||
|
||||
@@ -15,6 +15,7 @@ apidiff/*
|
||||
csprojdiff/*
|
||||
errors/*.log
|
||||
errors/dummy.xml
|
||||
class/Mono.Data.Sqlite/test.db
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs
|
||||
|
||||
+11
-17
@@ -4,7 +4,8 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs packages
|
||||
|
||||
# Resgen is corlib specific tool
|
||||
|
||||
build_SUBDIRS := build jay tools/gensources class class/aot-compiler tools
|
||||
basic_SUBDIRS := build jay class
|
||||
build_SUBDIRS := build class class/aot-compiler tools ilasm
|
||||
monodroid_SUBDIRS := build class tools
|
||||
monodroid_tools_SUBDIRS := build class tools
|
||||
monotouch_SUBDIRS := build class tools
|
||||
@@ -13,9 +14,7 @@ monotouch_tv_SUBDIRS := build class
|
||||
monotouch_runtime_SUBDIRS := build class
|
||||
monotouch_watch_runtime_SUBDIRS := build class
|
||||
monotouch_tv_runtime_SUBDIRS := build class
|
||||
monotouch_tools_SUBDIRS := build class tools
|
||||
xammac_SUBDIRS := build class
|
||||
testing_aot_full_interp_SUBDIRS := build class
|
||||
testing_aot_hybrid_SUBDIRS := build class
|
||||
testing_aot_full_SUBDIRS := build class
|
||||
binary_reference_assemblies_SUBDIRS := build class
|
||||
@@ -27,7 +26,6 @@ winaot_SUBDIRS := build class
|
||||
orbis_SUBDIRS := build class
|
||||
unreal_SUBDIRS := build class
|
||||
wasm_SUBDIRS := build class
|
||||
wasm_tools_SUBDIRS := build class tools
|
||||
|
||||
include build/rules.make
|
||||
|
||||
@@ -38,14 +36,14 @@ all-local $(STD_TARGETS:=-local):
|
||||
@:
|
||||
|
||||
dir-check:
|
||||
@if [ "$(NO_DIR_CHECK)" = "" ]; then $(MAKE) -C ../runtime; fi
|
||||
@if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then $(MAKE) -C ../runtime; fi
|
||||
|
||||
# fun specialty targets
|
||||
|
||||
PROFILES = net_4_x binary_reference_assemblies xbuild_12 xbuild_14
|
||||
|
||||
.PHONY: all-profiles compiler-test-profiles run-compiler-test-profiles $(STD_TARGETS:=-profiles)
|
||||
all-profiles compiler-test-profiles run-compiler-test-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
|
||||
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
|
||||
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
|
||||
@:
|
||||
|
||||
profiles-do--%:
|
||||
@@ -77,25 +75,21 @@ $(_boot_:%=profile-do--monotouch_tv--%): profile-do--monotouch_tv--%:
|
||||
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monotouch_watch_runtime--%): profile-do--monotouch_watch_runtime--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monotouch_tv_runtime--%): profile-do--monotouch_tv_runtime--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monotouch_tools--%): profile-do--monotouch_tools--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--xammac_net_4_5--%): profile-do--xammac_net_4_5--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--testing_aot_full_interp--%): profile-do--testing_aot_full_interp--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--testing_aot_hybrid--%): profile-do--testing_aot_hybrid--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--testing_aot_full--%): profile-do--testing_aot_full--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--winaot--%): profile-do--winaot--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--orbis--%): profile-do--orbis--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--unreal--%): profile-do--unreal--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--wasm--%): profile-do--wasm--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--wasm_tools--%): profile-do--wasm_tools--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
|
||||
|
||||
compiler-test:
|
||||
$(MAKE) -C tests test
|
||||
$(MAKE) -C errors test
|
||||
testcorlib:
|
||||
@cd class/corlib && $(MAKE) test run-test
|
||||
|
||||
run-compiler-test:
|
||||
$(MAKE) -C tests run-test
|
||||
$(MAKE) -C errors run-test
|
||||
compiler-tests:
|
||||
$(MAKE) TEST_SUBDIRS="tests errors" run-test-profiles
|
||||
|
||||
package := mcs-$(VERSION)
|
||||
|
||||
@@ -152,7 +146,7 @@ distcheck: dist-tarball
|
||||
# Targets for creating API diffs of the framework
|
||||
|
||||
MONO_API_SNAPSHOT_PATH := $(topdir)../external/api-snapshot/
|
||||
GENAPI := $(MONO_API_SNAPSHOT_PATH)tools/genapi/Microsoft.DotNet.GenAPI.exe
|
||||
GENAPI := $(MONO_API_SNAPSHOT_PATH)tools/genapi/GenAPI.exe
|
||||
MONO_API_SNAPSHOT_PROFILE_PATH := $(MONO_API_SNAPSHOT_PATH)profiles/$(PROFILE)/
|
||||
MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll Mono.Profiler.Log.dll)
|
||||
MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll)
|
||||
|
||||
+4
-9
@@ -2,7 +2,7 @@ thisdir = build
|
||||
SUBDIRS =
|
||||
include ../build/rules.make
|
||||
|
||||
BUILT_FILES = common/Consts.cs $(topdir)/class/lib/$(PROFILE_DIRECTORY)/Consts.cs common/sourcelink.json
|
||||
BUILT_FILES = common/Consts.cs
|
||||
|
||||
all-local install-local test-local run-test-local csproj-local run-test-ondotnet-local uninstall-local doc-update-local: $(BUILT_FILES)
|
||||
@:
|
||||
@@ -10,19 +10,14 @@ all-local install-local test-local run-test-local csproj-local run-test-ondotnet
|
||||
clean-local:
|
||||
-rm -f $(BUILT_FILES) deps/*
|
||||
|
||||
$(topdir)/class/lib/$(PROFILE_DIRECTORY):
|
||||
mkdir -p $@
|
||||
|
||||
common/Consts.cs $(topdir)/class/lib/$(PROFILE_DIRECTORY)/Consts.cs: common/Consts.cs.in $(wildcard config.make) | $(topdir)/class/lib/$(PROFILE_DIRECTORY)
|
||||
common/Consts.cs: common/Consts.cs.in $(wildcard config.make)
|
||||
test -n '$(MONO_VERSION)'
|
||||
test -n '$(MONO_CORLIB_VERSION)'
|
||||
sed -e 's,@''MONO_VERSION@,$(MONO_VERSION),' -e 's,@''MONO_CORLIB_VERSION@,$(MONO_CORLIB_VERSION),' $< > $@
|
||||
|
||||
common/sourcelink.json: common/sourcelink.json.in $(wildcard config.make) | $(topdir)/class/lib/$(PROFILE_DIRECTORY)
|
||||
sed -e 's,@mono_topdir@,$(shell cd $(topdir)/.. && pwd),' -e 's,@mono_commit_hash@,$(shell cd $(topdir)/.. && git rev-parse HEAD),' -e 's,@corefx_commit_hash@,$(shell cd $(topdir)/../external/corefx && git rev-parse HEAD),' -e 's,@corert_commit_hash@,$(shell cd $(topdir)/../external/corert && git rev-parse HEAD),' -e 's,@cecil_commit_hash@,$(shell cd $(topdir)/../external/cecil && git rev-parse HEAD),' $< > $@
|
||||
|
||||
PLATFORMS = macos linux win32 unix
|
||||
PROFILES = \
|
||||
basic \
|
||||
build \
|
||||
binary_reference_assemblies \
|
||||
net_4_x \
|
||||
@@ -31,7 +26,6 @@ PROFILES = \
|
||||
|
||||
COMMON_SRCS = \
|
||||
Consts.cs.in \
|
||||
sourcelink.json.in \
|
||||
Locale.cs \
|
||||
MonoTODOAttribute.cs \
|
||||
basic-profile-check.cs \
|
||||
@@ -46,6 +40,7 @@ DISTFILES = \
|
||||
corcompare.make \
|
||||
corcompare-api.xsl \
|
||||
executable.make \
|
||||
gensources.cs \
|
||||
library.make \
|
||||
rules.make \
|
||||
tests.make \
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
/Consts.cs
|
||||
/sourcelink.json
|
||||
@@ -98,7 +98,7 @@ static class Consts
|
||||
public const string AssemblyMono_Security = "Mono.Security, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
|
||||
public const string AssemblyMono_Messaging_RabbitMQ = "Mono.Messaging.RabbitMQ, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
|
||||
public const string AssemblyCorlib = "mscorlib, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=" + PublicKeyToken;
|
||||
public const string AssemblySystem = "System, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=" + PublicKeyToken;
|
||||
public const string AssemblySystem = "System, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
public const string AssemblySystem_Data = "System.Data, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
public const string AssemblySystem_Design = "System.Design, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblySystem_DirectoryServices = "System.DirectoryServices, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
@@ -109,13 +109,17 @@ static class Consts
|
||||
public const string AssemblySystem_ServiceProcess = "System.ServiceProcess, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblySystem_Web = "System.Web, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblySystem_Windows_Forms = "System.Windows.Forms, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
#if NET_4_0
|
||||
public const string AssemblySystem_2_0 = "System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
public const string AssemblySystemCore_3_5 = "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=" + PublicKeyToken;
|
||||
public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
public const string WindowsBase_3_0 = "WindowsBase, Version=3.0.0.0, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblyWindowsBase = "WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblyPresentationCore_3_5 = "PresentationCore, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblyPresentationCore_4_0 = "PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblyPresentationFramework_3_5 = "PresentationFramework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
#elif MOBILE
|
||||
public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
|
||||
#endif
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
{
|
||||
"documents": {
|
||||
"@mono_topdir@/external/corefx/*": "https://raw.githubusercontent.com/mono/corefx/@corefx_commit_hash@/*",
|
||||
"@mono_topdir@/external/corert/*": "https://raw.githubusercontent.com/mono/corert/@corert_commit_hash@/*",
|
||||
"@mono_topdir@/external/cecil/*": "https://raw.githubusercontent.com/mono/cecil/@cecil_commit_hash@/*",
|
||||
"@mono_topdir@/*": "https://raw.githubusercontent.com/mono/mono/@mono_commit_hash@/*"
|
||||
}
|
||||
}
|
||||
@@ -32,10 +32,10 @@ mono_libdir = $(exec_prefix)/lib
|
||||
sysconfdir = $(prefix)/etc
|
||||
#RUNTIME = mono
|
||||
RUNTIME = false
|
||||
MONO_PATH_TOP = $(topdir)/class/lib/$(PROFILE_DIRECTORY)
|
||||
MONO_PATH_TOP = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/
|
||||
MONO_PATH_TESTS = $(MONO_PATH_TOP)/tests
|
||||
TEST_MONO_PATH = $(MONO_PATH_TOP)$(PLATFORM_PATH_SEPARATOR)$(MONO_PATH_TESTS)$(PLATFORM_PATH_SEPARATOR).
|
||||
TEST_RUNTIME = MONO_PATH="$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
|
||||
TEST_MONO_PATH = $(MONO_PATH_TOP)$(PLATFORM_PATH_SEPARATOR)$(MONO_PATH_TESTS)
|
||||
TEST_RUNTIME = MONO_PATH="$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR).$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
|
||||
|
||||
# In case you want to add MCS_FLAGS, this lets you not have to
|
||||
# keep track of the default value
|
||||
|
||||
@@ -10,7 +10,6 @@ public static class Program {
|
||||
var args = new List<string> (_args);
|
||||
bool useStdout = false, showHelp = false, strictMode = false;
|
||||
string baseDir = null;
|
||||
string platformsDir = null;
|
||||
|
||||
for (int i = 0; i < args.Count; i++) {
|
||||
var arg = args[i];
|
||||
@@ -45,9 +44,6 @@ public static class Program {
|
||||
case "--basedir":
|
||||
baseDir = argValue;
|
||||
break;
|
||||
case "--platformsdir":
|
||||
platformsDir = argValue;
|
||||
break;
|
||||
default:
|
||||
Console.Error.WriteLine ($"// Unrecognized switch {arg}. Aborting.");
|
||||
return 1;
|
||||
@@ -75,9 +71,6 @@ public static class Program {
|
||||
Console.Error.WriteLine (" Produces an error exit code if files or directories are invalid/missing or other warnings occur");
|
||||
Console.Error.WriteLine ("--basedir:<dir>");
|
||||
Console.Error.WriteLine (" Sets the base directory when reading a single sources/exclusions pair (default is the directory containing the sources file)");
|
||||
Console.Error.WriteLine ("--platformsdir:<dir>");
|
||||
Console.Error.WriteLine (" Location of platforms directory with configurations");
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -88,8 +81,8 @@ public static class Program {
|
||||
|
||||
var outFile = Path.GetFullPath (args[0]);
|
||||
|
||||
var platformsFolder = Path.Combine (platformsDir ?? executableDirectory, "platforms");
|
||||
var profilesFolder = Path.Combine (platformsDir ?? executableDirectory, "profiles");
|
||||
var platformsFolder = Path.Combine (executableDirectory, "platforms");
|
||||
var profilesFolder = Path.Combine (executableDirectory, "profiles");
|
||||
if (!Directory.Exists (platformsFolder) || !Directory.Exists (profilesFolder)) {
|
||||
Console.Error.WriteLine ($"// Platforms and/or profiles folders are missing: '{platformsFolder}' '{profilesFolder}'. Aborting.");
|
||||
return 1;
|
||||
+12
-9
@@ -60,9 +60,11 @@ endif
|
||||
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE_DIRECTORY)/$(if $(LIBRARY_SUBDIR),$(LIBRARY_SUBDIR)/)
|
||||
|
||||
ifdef RESOURCE_STRINGS
|
||||
ifneq (basic, $(PROFILE))
|
||||
RESOURCE_STRINGS_FILES += $(RESOURCE_STRINGS:%=--resourcestrings:%)
|
||||
IL_REPLACE_FILES += $(IL_REPLACE:%=--ilreplace:%)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef ENFORCE_LIBRARY_WARN_AS_ERROR
|
||||
ifeq ($(LIBRARY_WARN_AS_ERROR),yes)
|
||||
@@ -72,11 +74,6 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# add sourcelink information if we're building a portable PDB
|
||||
ifneq (, $(findstring debug:portable, $(PROFILE_MCS_FLAGS)))
|
||||
LIB_MCS_FLAGS += -sourcelink:$(topdir)/build/common/sourcelink.json
|
||||
endif
|
||||
|
||||
the_libdir = $(the_libdir_base)$(intermediate)
|
||||
|
||||
ifdef LIBRARY_USE_INTERMEDIATE_FILE
|
||||
@@ -289,12 +286,18 @@ endif
|
||||
# The library
|
||||
|
||||
# If the directory contains the per profile include file, generate list file.
|
||||
# TODO: depend on all *.sources (except tests) for now and figure out how to list only needed files later
|
||||
PROFILE_sources = $(filter-out %test.dll.exclude.sources %test.dll.sources, $(wildcard *.sources))
|
||||
# TODO: depend on all *.sources for now and figure out how to list only needed files later
|
||||
PROFILE_sources = $(wildcard *.sources)
|
||||
|
||||
ifneq "x" "x$(PROFILE_RUNTIME)"
|
||||
GENSOURCES_RUNTIME=$(PROFILE_RUNTIME)
|
||||
else
|
||||
GENSOURCES_RUNTIME=MONO_PATH="$(GENSOURCES_LIBDIR)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME)
|
||||
endif
|
||||
|
||||
sourcefile = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).sources
|
||||
$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(depsdir)/.stamp
|
||||
$(GENSOURCES) --strict --platformsdir:$(topdir)/build "$@" "$(LIBRARY)" "$(PROFILE_PLATFORM)" "$(PROFILE)"
|
||||
$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(depsdir)/.stamp $(GENSOURCES_CS)
|
||||
$(GENSOURCES_RUNTIME) --debug $(GENSOURCES_EXE) --strict "$@" "$(LIBRARY)" "$(PROFILE_PLATFORM)" "$(PROFILE)"
|
||||
|
||||
library_CLEAN_FILES += $(sourcefile)
|
||||
|
||||
|
||||
@@ -0,0 +1,129 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
monolite_path := $(topdir)/class/lib/monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)
|
||||
|
||||
with_mono_path_monolite = MONO_PATH="$(monolite_path)$(PLATFORM_PATH_SEPARATOR)$(monolite_path)/Facades$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
|
||||
|
||||
monolite_flag := $(depsdir)/use-monolite
|
||||
use_monolite := $(wildcard $(monolite_flag))
|
||||
|
||||
MONOLITE_MSCORLIB = $(monolite_path)/mscorlib.dll
|
||||
|
||||
ifdef use_monolite
|
||||
ifdef MCS_MODE
|
||||
CSC_LOCATION = $(monolite_path)/mcs.exe
|
||||
endif
|
||||
|
||||
PROFILE_RUNTIME = $(with_mono_path_monolite) $(RUNTIME)
|
||||
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
|
||||
else
|
||||
PROFILE_RUNTIME = $(EXTERNAL_RUNTIME)
|
||||
ifdef MCS_MODE
|
||||
BOOTSTRAP_MCS = mcs
|
||||
else
|
||||
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
endif
|
||||
endif
|
||||
|
||||
ILASM = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/ilasm.exe
|
||||
STRING_REPLACER = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/tmp/cil-stringreplacer.exe
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
GENSOURCES_CS = $(topdir)/build/gensources.cs
|
||||
GENSOURCES_DIR = $(topdir)/build
|
||||
GENSOURCES_EXE = $(GENSOURCES_DIR)/gensources.exe
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
|
||||
# Compiler all using same bootstrap compiler
|
||||
LIBRARY_COMPILE = $(BOOT_COMPILE)
|
||||
|
||||
# Verbose basic only
|
||||
# V = 1
|
||||
|
||||
#
|
||||
# Copy from rules.make because I don't know how to unset MCS_FLAGS
|
||||
#
|
||||
USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
|
||||
|
||||
.PHONY: profile-check do-profile-check
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
ifeq (.,$(thisdir))
|
||||
all-recursive: do-profile-check
|
||||
all-local: post-profile-cleanup
|
||||
clean-local: clean-profile
|
||||
endif
|
||||
|
||||
clean-profile:
|
||||
-rm -f $(PROFILE_EXE) $(PROFILE_OUT) $(monolite_flag)
|
||||
|
||||
post-profile-cleanup:
|
||||
@rm -f $(monolite_flag)
|
||||
|
||||
PROFILE_EXE = $(depsdir)/basic-profile-check.exe
|
||||
PROFILE_OUT = $(PROFILE_EXE:.exe=.out)
|
||||
|
||||
MAKE_Q=$(if $(V),,-s)
|
||||
|
||||
do-profile-check: $(depsdir)/.stamp
|
||||
@ok=:; \
|
||||
rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
|
||||
if [ -z '$(MAKE_Q)' ] && [ -n '$(PROFILE_RUNTIME)' ]; then $(PROFILE_RUNTIME) --version; fi; \
|
||||
$(MAKE) $(MAKE_Q) $(PROFILE_OUT) || ok=false; \
|
||||
if $$ok; then rm -f $(PROFILE_EXE) $(PROFILE_OUT); else \
|
||||
if test ! -s $(MONOLITE_MSCORLIB); then \
|
||||
$(MAKE) $(MAKE_Q) do-get-monolite ; \
|
||||
fi; \
|
||||
if test -f $(MONOLITE_MSCORLIB); then \
|
||||
$(MAKE) $(MAKE_Q) do-profile-check-monolite ; \
|
||||
else \
|
||||
echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2; \
|
||||
echo "*** Check README for information on how to bootstrap a Mono installation." 1>&2 ; \
|
||||
exit 1; fi; fi
|
||||
|
||||
|
||||
ifdef use_monolite
|
||||
|
||||
do-get-monolite:
|
||||
|
||||
do-profile-check-monolite:
|
||||
@echo "*** The contents of your 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)' directory may be out-of-date" 1>&2
|
||||
@echo "*** You may want to try 'make get-monolite-latest'" 1>&2
|
||||
rm -f $(monolite_flag)
|
||||
exit 1
|
||||
|
||||
else
|
||||
|
||||
do-get-monolite:
|
||||
@echo "*** Downloading bootstrap required 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)'" 1>&2
|
||||
$(MAKE) $(MAKE_Q) -C $(topdir)/class get-monolite-latest
|
||||
|
||||
do-profile-check-monolite: $(depsdir)/.stamp
|
||||
@echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2
|
||||
@echo "*** Trying the 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)' directory." 1>&2
|
||||
@echo dummy > $(monolite_flag)
|
||||
$(MAKE) do-profile-check
|
||||
|
||||
endif
|
||||
|
||||
$(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs $(GENSOURCES_CS)
|
||||
$(MAKE) $(MAKE_Q) -C $(topdir)/packages
|
||||
$(BOOTSTRAP_MCS) /warn:0 /noconfig /langversion:latest /r:System.dll /r:mscorlib.dll /out:[email protected] $<
|
||||
$(BOOTSTRAP_MCS) /noconfig /langversion:latest /r:mscorlib.dll /r:System.dll /r:System.Core.dll /out:$(GENSOURCES_EXE).tmp $(GENSOURCES_CS)
|
||||
- rm $(GENSOURCES_EXE)
|
||||
mv $(GENSOURCES_EXE).tmp $(GENSOURCES_EXE)
|
||||
- rm -f $@
|
||||
mv [email protected] $@
|
||||
|
||||
$(PROFILE_OUT): $(PROFILE_EXE)
|
||||
$(PROFILE_RUNTIME) $< > $@ 2>&1
|
||||
+10
-114
@@ -1,129 +1,25 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
monolite_path := $(topdir)/class/lib/monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)
|
||||
|
||||
with_mono_path_monolite = MONO_PATH="$(monolite_path)$(PLATFORM_PATH_SEPARATOR)$(monolite_path)/Facades$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
|
||||
|
||||
monolite_flag := $(depsdir)/use-monolite
|
||||
use_monolite := $(wildcard $(monolite_flag))
|
||||
|
||||
MONOLITE_MSCORLIB = $(monolite_path)/mscorlib.dll
|
||||
|
||||
ifdef use_monolite
|
||||
ifdef MCS_MODE
|
||||
CSC_LOCATION = $(monolite_path)/mcs.exe
|
||||
endif
|
||||
|
||||
PROFILE_RUNTIME = $(with_mono_path_monolite) $(RUNTIME)
|
||||
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
|
||||
else
|
||||
PROFILE_RUNTIME = $(EXTERNAL_RUNTIME)
|
||||
ifdef MCS_MODE
|
||||
BOOTSTRAP_MCS = mcs
|
||||
else
|
||||
BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# Special setup for boostrap tools which we want to run with system/monolite core libraries
|
||||
# for all libraries build as part of this profile
|
||||
#
|
||||
ILASM = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/tmp/ilasm.exe
|
||||
STRING_REPLACER = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/tmp/cil-stringreplacer.exe
|
||||
GENSOURCES =$(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/tmp/gensources.exe
|
||||
BOOTSTRAP_PROFILE = basic
|
||||
BUILD_TOOLS_PROFILE = basic
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
PLATFORMS = macos linux win32 unix
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
# nuttzing!
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
BOOTSTRAP_BIN_PROFILE = v4.7
|
||||
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
|
||||
# Compiler all using same bootstrap compiler
|
||||
LIBRARY_COMPILE = $(BOOT_COMPILE)
|
||||
|
||||
# Verbose basic only
|
||||
# V = 1
|
||||
|
||||
#
|
||||
# Copy from rules.make because I don't know how to unset MCS_FLAGS
|
||||
#
|
||||
USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
|
||||
|
||||
.PHONY: profile-check do-profile-check
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
ifeq (.,$(thisdir))
|
||||
all-recursive: do-profile-check
|
||||
all-local: post-profile-cleanup
|
||||
clean-local: clean-profile
|
||||
endif
|
||||
|
||||
clean-profile:
|
||||
-rm -f $(PROFILE_EXE) $(PROFILE_OUT) $(monolite_flag)
|
||||
|
||||
post-profile-cleanup:
|
||||
@rm -f $(monolite_flag)
|
||||
|
||||
PROFILE_EXE = $(depsdir)/basic-profile-check.exe
|
||||
PROFILE_OUT = $(PROFILE_EXE:.exe=.out)
|
||||
|
||||
MAKE_Q=$(if $(V),,-s)
|
||||
|
||||
do-profile-check: $(depsdir)/.stamp
|
||||
@ok=:; \
|
||||
rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
|
||||
if [ -z '$(MAKE_Q)' ] && [ -n '$(PROFILE_RUNTIME)' ]; then $(PROFILE_RUNTIME) --version; fi; \
|
||||
$(MAKE) $(MAKE_Q) $(PROFILE_OUT) || ok=false; \
|
||||
if $$ok; then rm -f $(PROFILE_EXE) $(PROFILE_OUT); else \
|
||||
if test ! -s $(MONOLITE_MSCORLIB); then \
|
||||
$(MAKE) $(MAKE_Q) do-get-monolite ; \
|
||||
fi; \
|
||||
if test -f $(MONOLITE_MSCORLIB); then \
|
||||
$(MAKE) $(MAKE_Q) do-profile-check-monolite ; \
|
||||
else \
|
||||
echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2; \
|
||||
echo "*** Check README for information on how to bootstrap a Mono installation." 1>&2 ; \
|
||||
exit 1; fi; fi
|
||||
|
||||
|
||||
ifdef use_monolite
|
||||
|
||||
do-get-monolite:
|
||||
|
||||
do-profile-check-monolite:
|
||||
@echo "*** The contents of your 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)' directory may be out-of-date" 1>&2
|
||||
@echo "*** You may want to try 'make get-monolite-latest'" 1>&2
|
||||
rm -f $(monolite_flag)
|
||||
exit 1
|
||||
|
||||
else
|
||||
|
||||
do-get-monolite:
|
||||
@echo "*** Downloading bootstrap required 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)'" 1>&2
|
||||
$(MAKE) $(MAKE_Q) -C $(topdir)/class get-monolite-latest
|
||||
|
||||
do-profile-check-monolite: $(depsdir)/.stamp
|
||||
@echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2
|
||||
@echo "*** Trying the 'monolite-$(BUILD_PLATFORM)/$(MONO_CORLIB_VERSION)' directory." 1>&2
|
||||
@echo dummy > $(monolite_flag)
|
||||
$(MAKE) do-profile-check
|
||||
|
||||
endif
|
||||
|
||||
$(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs
|
||||
$(BOOTSTRAP_MCS) /warn:0 /noconfig /langversion:latest /r:System.dll /r:mscorlib.dll /out:$@ $<
|
||||
|
||||
$(PROFILE_OUT): $(PROFILE_EXE)
|
||||
$(PROFILE_RUNTIME) $< > $@ 2>&1
|
||||
@@ -2,5 +2,3 @@ include $(topdir)/build/profiles/monotouch_runtime.make
|
||||
|
||||
PROFILE_MCS_FLAGS += \
|
||||
-d:FULL_AOT_RUNTIME
|
||||
|
||||
NO_SRE=1
|
||||
@@ -1,18 +0,0 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
TARGET_NET_REFERENCE = v4.6
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
|
||||
NO_INSTALL = yes
|
||||
@@ -7,5 +7,3 @@ NO_THREAD_ABORT=1
|
||||
NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_MULTIPLE_APPDOMAINS=1
|
||||
NO_PROCESS_START=1
|
||||
NO_VTS_TEST=1
|
||||
NO_GSS=1
|
||||
@@ -8,5 +8,3 @@ NO_THREAD_SUSPEND_RESUME=1
|
||||
# The binding generator (btv) still needs to execute processes,
|
||||
# so we need a System.dll that can do that.
|
||||
#NO_PROCESS_START=1
|
||||
|
||||
NO_GSS=1
|
||||
@@ -9,8 +9,6 @@ NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_MULTIPLE_APPDOMAINS=1
|
||||
NO_PROCESS_START=1
|
||||
NO_MONO_SECURITY=1
|
||||
NO_GSS=1
|
||||
MONO_FEATURE_APPLETLS=
|
||||
ONLY_APPLETLS=
|
||||
MONO_FEATURE_APPLE_X509=1
|
||||
NO_VTS_TEST=1
|
||||
@@ -6,7 +6,6 @@ PROFILE_MCS_FLAGS += \
|
||||
|
||||
NO_THREAD_ABORT=1
|
||||
NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_GSS=1
|
||||
# The binding generator (bwatch) still needs to execute processes,
|
||||
# so we need a System.dll that can do that.
|
||||
#NO_PROCESS_START=1
|
||||
|
||||
@@ -34,13 +34,11 @@ FRAMEWORK_VERSION = 2.1
|
||||
# the tuner takes care of the install
|
||||
NO_INSTALL = yes
|
||||
AOT_FRIENDLY_PROFILE = yes
|
||||
ALWAYS_AOT_BCL = yes
|
||||
ALWAYS_AOT_TESTS = yes
|
||||
ALWAYS_AOT = yes
|
||||
MOBILE_PROFILE = yes
|
||||
NO_VTS_TEST = yes
|
||||
NO_CONSOLE = yes
|
||||
PROFILE_DISABLE_BTLS = yes
|
||||
NO_SRE=1
|
||||
|
||||
# Note need for trailing comma. If you add, keep it
|
||||
PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,
|
||||
@@ -1,34 +0,0 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MONO \
|
||||
-d:MOBILE,MOBILE_LEGACY \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
NO_INSTALL = yes
|
||||
NO_CONSOLE = yes
|
||||
MOBILE_PROFILE = yes
|
||||
|
||||
# Note need for trailing comma. If you add, keep it
|
||||
PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,
|
||||
@@ -1,16 +1,44 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
include $(topdir)/build/profiles/testing_aot_common.make
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
PROFILE_MCS_FLAGS += \
|
||||
-d:FULL_AOT_DESKTOP \
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MONO \
|
||||
-d:MOBILE,MOBILE_LEGACY \
|
||||
-d:FULL_AOT_DESKTOP \
|
||||
-d:FULL_AOT_RUNTIME \
|
||||
-d:DISABLE_REMOTING \
|
||||
-d:DISABLE_COM
|
||||
-d:DISABLE_COM \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
# the tuner takes care of the install
|
||||
NO_INSTALL = yes
|
||||
AOT_FRIENDLY_PROFILE = yes
|
||||
MOBILE_PROFILE = yes
|
||||
NO_VTS_TEST = yes
|
||||
NO_SRE = yes
|
||||
NO_CONSOLE = yes
|
||||
|
||||
# Note need for trailing comma. If you add, keep it
|
||||
PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,
|
||||
|
||||
ALWAYS_AOT = yes
|
||||
|
||||
ALWAYS_AOT_BCL = yes
|
||||
ALWAYS_AOT_TESTS = yes
|
||||
@@ -1,9 +0,0 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
include $(topdir)/build/profiles/testing_aot_common.make
|
||||
|
||||
PROFILE_MCS_FLAGS += \
|
||||
-d:FULL_AOT_INTERP \
|
||||
-d:DISABLE_COM
|
||||
|
||||
ALWAYS_AOT_BCL = yes
|
||||
@@ -1,8 +1,33 @@
|
||||
#! -*- makefile -*-
|
||||
|
||||
include $(topdir)/build/profiles/testing_aot_common.make
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
PROFILE_MCS_FLAGS += \
|
||||
-d:MOBILE_DYNAMIC
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:MOBILE,MOBILE_LEGACY \
|
||||
-d:MOBILE_DYNAMIC \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MONO \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
NO_INSTALL = yes
|
||||
MOBILE_DYNAMIC = yes
|
||||
MOBILE_PROFILE = yes
|
||||
NO_CONSOLE = yes
|
||||
@@ -35,12 +35,7 @@ FRAMEWORK_VERSION = 2.1
|
||||
# the tuner takes care of the install
|
||||
NO_INSTALL = yes
|
||||
AOT_FRIENDLY_PROFILE = yes
|
||||
ALWAYS_AOT_BCL = yes
|
||||
ALWAYS_AOT_TESTS = yes
|
||||
ALWAYS_AOT = yes
|
||||
MOBILE_PROFILE = yes
|
||||
NO_VTS_TEST = yes
|
||||
NO_CONSOLE = yes
|
||||
NO_SRE=1
|
||||
NO_MULTIPLE_APPDOMAINS = yes
|
||||
NO_THREAD_ABORT = yes
|
||||
NO_THREAD_SUSPEND_RESUME = yes
|
||||
@@ -1,18 +0,0 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
TARGET_NET_REFERENCE = v4.6
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
|
||||
NO_INSTALL = yes
|
||||
@@ -34,11 +34,9 @@ FRAMEWORK_VERSION = 2.1
|
||||
# the tuner takes care of the install
|
||||
NO_INSTALL = yes
|
||||
AOT_FRIENDLY_PROFILE = yes
|
||||
ALWAYS_AOT_BCL = yes
|
||||
ALWAYS_AOT_TESTS = yes
|
||||
ALWAYS_AOT = yes
|
||||
MOBILE_PROFILE = yes
|
||||
NO_VTS_TEST = yes
|
||||
NO_SRE=1
|
||||
|
||||
# Note need for trailing comma. If you add, keep it
|
||||
PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,
|
||||
+16
-15
@@ -27,8 +27,12 @@ Q_MCS=$(if $(V),,@echo "$(if $(MCS_MODE),MCS,CSC) [$(intermediate)$(PROFILE_
|
||||
Q_AOT=$(if $(V),,@echo "AOT [$(intermediate)$(PROFILE_DIRECTORY)] $(notdir $(@))";)
|
||||
|
||||
ifndef BUILD_TOOLS_PROFILE
|
||||
ifeq ($(PROFILE),basic)
|
||||
BUILD_TOOLS_PROFILE = basic
|
||||
else
|
||||
BUILD_TOOLS_PROFILE = build
|
||||
endif
|
||||
endif
|
||||
|
||||
USE_MCS_FLAGS = /codepage:$(CODEPAGE) /nologo /noconfig /deterministic $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
|
||||
USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
|
||||
@@ -52,7 +56,9 @@ INTERNAL_CSC = CSC_SDK_PATH_DISABLED= $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_
|
||||
RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resgen.exe
|
||||
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/cil-stringreplacer.exe
|
||||
ILASM = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/ilasm.exe
|
||||
GENSOURCES = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/gensources.exe
|
||||
GENSOURCES_LIBDIR = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)
|
||||
GENSOURCES_CS = $(topdir)/build/gensources.cs
|
||||
GENSOURCES_EXE = $(topdir)/build/gensources.exe
|
||||
|
||||
depsdir = $(topdir)/build/deps
|
||||
|
||||
@@ -68,6 +74,9 @@ export MKINSTALLDIRS
|
||||
export BOOTSTRAP_MCS
|
||||
export DESTDIR
|
||||
export RESGEN
|
||||
export GENSOURCES_LIBDIR
|
||||
export GENSOURCES_CS
|
||||
export GENSOURCES_EXE
|
||||
|
||||
# Get this so the platform.make platform-check rule doesn't become the
|
||||
# default target
|
||||
@@ -136,11 +145,11 @@ endif
|
||||
# mcs/class/lib/$(PROFILE)/
|
||||
ifndef TOP_LEVEL_DO
|
||||
|
||||
ifneq ($(or $(ALWAYS_AOT_BCL), $(ALWAYS_AOT_TESTS)),)
|
||||
ifdef ALWAYS_AOT
|
||||
TOP_LEVEL_DO = do-all-aot
|
||||
else
|
||||
TOP_LEVEL_DO = do-all
|
||||
endif
|
||||
endif # ALWAYS_AOT
|
||||
|
||||
endif # !TOP_LEVEL_DO
|
||||
|
||||
@@ -172,23 +181,15 @@ do-all-aot:
|
||||
# be able to evaluate the .dylibs to make
|
||||
ifneq ("$(wildcard $(topdir)/class/lib/$(PROFILE))","")
|
||||
|
||||
ifdef ALWAYS_AOT_BCL
|
||||
AOT_PROFILE_ASSEMBLIES := $(sort $(patsubst .//%,%,$(filter-out %.dll.dll %.exe.dll %bare% %plaincore% %secxml% %Facades% %ilasm%,$(filter %.dll %.exe,$(wildcard $(topdir)/class/lib/$(PROFILE)/*)))))
|
||||
AOT_PROFILE_ASSEMBLIES_OUT := $(patsubst %,%$(PLATFORM_AOT_SUFFIX),$(AOT_PROFILE_ASSEMBLIES))
|
||||
|
||||
AOT_PROFILE_FACADES := $(sort $(patsubst .//%,%,$(filter-out %.dll.dll %.exe.dll %bare% %plaincore% %secxml% %Facades% %ilasm%,$(filter %.dll %.exe,$(wildcard $(topdir)/class/lib/$(PROFILE)/Facades/*)))))
|
||||
AOT_PROFILE_FACADES_OUT := $(patsubst %,%$(PLATFORM_AOT_SUFFIX),$(AOT_PROFILE_FACADES))
|
||||
endif
|
||||
|
||||
ifdef ALWAYS_AOT_TESTS
|
||||
AOT_PROFILE_TESTS := $(sort $(patsubst .//%,%,$(filter-out %.dll.dll %.exe.dll %bare% %plaincore% %secxml% %Facades% %ilasm%,$(filter %.dll %.exe,$(wildcard $(topdir)/class/lib/$(PROFILE)/tests/*)))))
|
||||
AOT_PROFILE_ASSEMBLIES_OUT := $(patsubst %,%$(PLATFORM_AOT_SUFFIX),$(AOT_PROFILE_ASSEMBLIES))
|
||||
AOT_PROFILE_TESTS_OUT := $(patsubst %,%$(PLATFORM_AOT_SUFFIX),$(AOT_PROFILE_TESTS))
|
||||
endif
|
||||
|
||||
# This can run in parallel
|
||||
.PHONY: aot-all-profile
|
||||
ifdef AOT_BUILD_FLAGS
|
||||
aot-all-profile: $(AOT_PROFILE_ASSEMBLIES_OUT) $(AOT_PROFILE_TESTS_OUT) $(AOT_PROFILE_FACADES_OUT)
|
||||
aot-all-profile: $(AOT_PROFILE_ASSEMBLIES_OUT) $(AOT_PROFILE_TESTS_OUT)
|
||||
else
|
||||
aot-all-profile:
|
||||
echo AOT_BUILD_FLAGS not set, skipping AOT.
|
||||
@@ -339,7 +340,7 @@ dist-default:
|
||||
## Documentation stuff
|
||||
|
||||
Q_MDOC =$(if $(V),,@echo "MDOC [$(PROFILE_DIRECTORY)] $(notdir $(@))";)
|
||||
MDOC =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(PROFILE_DIRECTORY)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(PROFILE_DIRECTORY)/mdoc.exe
|
||||
MDOC =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe
|
||||
|
||||
Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE_DIRECTORY)] $(notdir $(@))";)
|
||||
MDOC_UP =$(Q_MDOC_UP) MONO_PATH="$(topdir)/class/lib/$(PROFILE_DIRECTORY)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(PROFILE_DIRECTORY)/mdoc.exe update --delete -o Documentation/en
|
||||
MDOC_UP =$(Q_MDOC_UP) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe update --delete -o Documentation/en
|
||||
+37
-41
@@ -19,22 +19,13 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
|
||||
## Unit test support
|
||||
ifndef NO_TEST
|
||||
|
||||
test_lib_dir = $(topdir)/class/lib/$(PROFILE)/tests
|
||||
|
||||
test_nunit_lib = nunitlite.dll
|
||||
xunit_core := xunit.core xunit.execution.dotnet xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_deps := netstandard System.Runtime
|
||||
xunit_src := $(patsubst %,$(topdir)/../external/xunit-binaries/%,BenchmarkAttribute.cs BenchmarkDiscover.cs) $(topdir)/../mcs/class/test-helpers/PlatformDetection.cs
|
||||
|
||||
ifeq ($(USE_XTEST_REMOTE_EXECUTOR), YES)
|
||||
XTEST_REMOTE_EXECUTOR = $(test_lib_dir)/RemoteExecutorConsoleApp.exe
|
||||
|
||||
ifeq ($(BUILD_PLATFORM), win32)
|
||||
XTEST_REMOTE_EXECUTOR_ABSPATH = $(shell cygpath -w $(abspath $(XTEST_REMOTE_EXECUTOR)))
|
||||
else
|
||||
XTEST_REMOTE_EXECUTOR_ABSPATH = $(abspath $(XTEST_REMOTE_EXECUTOR))
|
||||
endif
|
||||
|
||||
XTEST_REMOTE_EXECUTOR = $(topdir)/class/lib/$(PROFILE)/RemoteExecutorConsoleApp.exe
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/AdminHelper.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/IO/FileCleanupTestBase.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs \
|
||||
@@ -44,15 +35,8 @@ $(topdir)/../external/corefx/src/Common/src/System/PasteArguments.Unix.cs
|
||||
ifeq ($(PROFILE),monodroid)
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
|
||||
else
|
||||
ifeq ($(PROFILE),monotouch_tv)
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
|
||||
else
|
||||
ifeq ($(PROFILE),monotouch_watch)
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
|
||||
else
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs
|
||||
endif
|
||||
endif
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -78,7 +62,6 @@ test_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll.sources)
|
||||
endif
|
||||
|
||||
test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll)
|
||||
test_lib_output = $(test_lib_dir)/$(test_lib)
|
||||
|
||||
test_sourcefile_excludes = $(test_lib).exclude.sources
|
||||
|
||||
@@ -90,13 +73,12 @@ ifndef NO_BUILD
|
||||
test_flags += -r:$(the_assembly)
|
||||
test_assembly_dep = $(the_assembly)
|
||||
endif
|
||||
tests_CLEAN_FILES += $(test_lib_output) $(test_lib_output:$(ASSEMBLY_EXT)=.pdb) $(test_response) $(test_makefrag)
|
||||
tests_CLEAN_FILES += $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.dll) $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.pdb) $(test_response) $(test_makefrag)
|
||||
|
||||
xtest_sourcefile = $(PROFILE_PLATFORM)_$(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
xtest_sourcefile_excludes = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.exclude.sources)
|
||||
|
||||
xunit_test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xunit-test.dll)
|
||||
xtest_lib_output = $(test_lib_dir)/$(xunit_test_lib)
|
||||
|
||||
xtest_response = $(depsdir)/$(xunit_test_lib).response
|
||||
xtest_makefrag = $(depsdir)/$(xunit_test_lib).makefrag
|
||||
@@ -104,7 +86,7 @@ xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LI
|
||||
|
||||
ifeq ($(wildcard $(xtest_sourcefile)),)
|
||||
xtest_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
tests_CLEAN_FILES += $(xtest_lib_output) $(xtest_response) $(xtest_makefrag)
|
||||
tests_CLEAN_FILES += $(xunit_test_lib) $(xtest_response) $(xtest_makefrag)
|
||||
endif
|
||||
|
||||
ifndef HAVE_CS_TESTS
|
||||
@@ -131,6 +113,10 @@ endif
|
||||
|
||||
test_assemblies :=
|
||||
|
||||
test_lib_dir = $(topdir)/class/lib/$(PROFILE)/tests
|
||||
|
||||
test_lib_output = $(topdir)/class/lib/$(PROFILE)/tests/$(test_lib)
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
test_assemblies += $(test_lib_output)
|
||||
|
||||
@@ -150,25 +136,25 @@ TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PRO
|
||||
NOSHADOW_FLAG =
|
||||
|
||||
ifdef FIXTURE
|
||||
FIXTURE_ARG = -test=$(FIXTURE)
|
||||
FIXTURE_ARG = -test=MonoTests.$(FIXTURE)
|
||||
endif
|
||||
|
||||
ifdef TESTNAME
|
||||
TESTNAME_ARG = -test=$(TESTNAME)
|
||||
TESTNAME_ARG = -test=MonoTests.$(TESTNAME)
|
||||
endif
|
||||
|
||||
ifdef TEST_HARNESS_VERBOSE
|
||||
LABELS_ARG = -labels
|
||||
endif
|
||||
|
||||
ifdef ALWAYS_AOT_TESTS
|
||||
ifdef ALWAYS_AOT
|
||||
test-local-aot-compile: $(topdir)/build/deps/nunit-$(PROFILE).stamp $(test_assemblies)
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" MONO_REGISTRY_PATH="$(HOME)/.mono/registry" MONO_TESTS_IN_PROGRESS="yes" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(AOT_BUILD_FLAGS) $(test_assemblies)
|
||||
|
||||
else
|
||||
test-local-aot-compile: $(topdir)/build/deps/nunit-$(PROFILE).stamp $(test_assemblies)
|
||||
|
||||
endif # ALWAYS_AOT_TESTS
|
||||
endif # ALWAYS_AOT
|
||||
|
||||
ifdef COVERAGE
|
||||
TEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(PROFILE_DIRECTORY)/coverage_nunit_$(ASSEMBLY).xml
|
||||
@@ -176,7 +162,7 @@ endif
|
||||
|
||||
NUNITLITE_CONFIG_FILE=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)nunit-lite-console.exe.config
|
||||
|
||||
$(test_lib_output).nunitlite.config: $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(TEST_NUNITLITE_APP_CONFIG_GLOBAL) $(TEST_NUNITLITE_APP_CONFIG_RUNTIME) $(TEST_NUNITLITE_APP_CONFIG_SUPPLEMENTAL) | $(test_lib_dir)
|
||||
$(test_lib_output).nunitlite.config: $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(TEST_NUNITLITE_APP_CONFIG_GLOBAL) $(TEST_NUNITLITE_APP_CONFIG_RUNTIME) $(TEST_NUNITLITE_APP_CONFIG_SUPPLEMENTAL)
|
||||
cp -f $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(test_lib_output).nunitlite.config
|
||||
ifdef TEST_NUNITLITE_APP_CONFIG_GLOBAL
|
||||
sed -i -e "/__INSERT_CUSTOM_APP_CONFIG_GLOBAL__/r $(TEST_NUNITLITE_APP_CONFIG_GLOBAL)" $(test_lib_output).nunitlite.config
|
||||
@@ -262,15 +248,25 @@ ifdef HAVE_CS_TESTS
|
||||
$(test_lib_dir):
|
||||
mkdir -p $@
|
||||
|
||||
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_output).nunitlite.config | $(test_lib_dir)
|
||||
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_dir) $(test_lib_output).nunitlite.config
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
|
||||
|
||||
test_response_preprocessed = $(test_response)_preprocessed
|
||||
|
||||
ifneq "x" "x$(PROFILE_RUNTIME)"
|
||||
GENSOURCES_RUNTIME=$(PROFILE_RUNTIME)
|
||||
else
|
||||
ifneq "x" "x$(TEST_RUNTIME)"
|
||||
GENSOURCES_RUNTIME=$(TEST_RUNTIME)
|
||||
else
|
||||
GENSOURCES_RUNTIME=MONO_PATH="$(GENSOURCES_LIBDIR)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME)
|
||||
endif
|
||||
endif
|
||||
|
||||
# This handles .excludes/.sources pairs, as well as resolving the
|
||||
# includes that occur in .sources files
|
||||
$(test_response_preprocessed): $(test_sourcefile) $(wildcard *_test.dll.sources) $(wildcard *_test.dll.exclude.sources)
|
||||
$(GENSOURCES) --basedir:./Test --strict --platformsdir:$(topdir)/build "$@" "$(test_sourcefile)" "$(test_sourcefile_excludes)"
|
||||
$(test_response_preprocessed): $(test_sourcefile) $(wildcard $(test_sourcefile_excludes)) $(GENSOURCES_CS)
|
||||
$(GENSOURCES_RUNTIME) --debug $(GENSOURCES_EXE) --basedir:./Test --strict "$@" "$(test_sourcefile)" "$(test_sourcefile_excludes)"
|
||||
|
||||
$(test_response): $(test_response_preprocessed)
|
||||
# @echo Creating $@ ...
|
||||
@@ -315,35 +311,35 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
|
||||
endif
|
||||
|
||||
check: run-xunit-test-local
|
||||
xunit-test-local: $(xtest_lib_output)
|
||||
xunit-test-local: $(xunit_test_lib)
|
||||
run-xunit-test-local: run-xunit-test-lib
|
||||
|
||||
# cp -rf is a HACK for xunit runner to require xunit.execution.dOTNET.dll file in local folder on .net only
|
||||
run-xunit-test-lib: xunit-test-local
|
||||
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll $(test_lib_dir)/xunit.execution.dotnet.dll
|
||||
run-xunit-test-lib: xunit-test-local $(XTEST_REMOTE_EXECUTOR)
|
||||
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll xunit.execution.dotnet.dll
|
||||
ok=:; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR="$(XTEST_REMOTE_EXECUTOR_ABSPATH)" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xtest_lib_output) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR=$(XTEST_REMOTE_EXECUTOR) $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \
|
||||
if [ -n "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE" ]; then echo "$(abspath $(XTEST_RESULT_FILE))" >> "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE"; fi; \
|
||||
$$ok
|
||||
@rm -f $(test_lib_dir)/xunit.execution.dotnet.dll
|
||||
@rm -f xunit.execution.dotnet.dll
|
||||
|
||||
# Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase)
|
||||
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs | $(test_lib_dir)
|
||||
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs
|
||||
$(TEST_COMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll $< -out:$@
|
||||
|
||||
$(xtest_lib_output): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src) $(XTEST_REMOTE_EXECUTOR) | $(test_lib_dir)
|
||||
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) $(xunit_src)
|
||||
|
||||
xtest_response_preprocessed = $(xtest_response)_preprocessed
|
||||
|
||||
# This handles .excludes/.sources pairs, as well as resolving the
|
||||
# includes that occur in .sources files
|
||||
$(xtest_response): $(xtest_sourcefile) $(wildcard *xtest.dll.sources) $(wildcard $(xtest_sourcefile_excludes))
|
||||
$(GENSOURCES) --strict --platformsdir:$(topdir)/build "$@" "$(xtest_sourcefile)" "$(xtest_sourcefile_excludes)"
|
||||
$(xtest_response): $(xtest_sourcefile) $(wildcard *xtest.dll.sources) $(wildcard $(xtest_sourcefile_excludes)) $(GENSOURCES_CS)
|
||||
$(GENSOURCES_RUNTIME) --debug $(GENSOURCES_EXE) --strict "$@" "$(xtest_sourcefile)" "$(xtest_sourcefile_excludes)"
|
||||
|
||||
$(xtest_makefrag): $(xtest_response)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,$(xtest_lib_output): ,' $< >$@
|
||||
@sed 's,^,$(xunit_test_lib): ,' $< >$@
|
||||
|
||||
-include $(xtest_makefrag)
|
||||
|
||||
|
||||
@@ -39,8 +39,8 @@ doc-update-recursive:
|
||||
|
||||
System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Numerics.Vectors System.Runtime.Serialization System.Transactions System.Xml \
|
||||
System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem System.Runtime.InteropServices.RuntimeInformation \
|
||||
System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression System.IdentityModel System.Web \
|
||||
Facades/System.Drawing.Primitives System.Drawing System.Web.Services:
|
||||
System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression System.IdentityModel \
|
||||
System.Web.Services:
|
||||
|
||||
all-local-aot:
|
||||
|
||||
@@ -98,7 +98,6 @@
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
|
||||
@@ -12,7 +12,7 @@ LIBRARY = System.Drawing.Common.dll
|
||||
KEYFILE = ../../Open.snk
|
||||
LIBRARY_SNK = $(KEYFILE)
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_REFS =
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
|
||||
|
||||
ifdef false # we'll enable this at a later point
|
||||
@@ -26,7 +26,7 @@ EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hyb
|
||||
ifndef EMBEDDED_DRAWING_DEP
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal testing_aot_full wasm, $(PROFILE))
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal wasm, $(PROFILE))
|
||||
|
||||
ifdef REPO_DRAWING_DEP
|
||||
LIB_REFS += System.Drawing
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
+10
-16
@@ -71,11 +71,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN;NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'orbis' ">
|
||||
<OutputPath>./../../../class/lib/orbis/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -154,30 +149,30 @@
|
||||
<ProjectReference Include="../../System.Drawing/System.Drawing.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.iOS.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.iOS.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.WatchOS.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.WatchOS.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.TVOS.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.TVOS.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
@@ -186,15 +181,14 @@
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Drawing/System.Drawing.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<ProjectReference Include="../../System.Drawing/System.Drawing.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.Mac.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.Mac.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
@@ -14,32 +14,27 @@ SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
|
||||
|
||||
ifeq ($(PROFILE),monodroid)
|
||||
# XA implements System.Drawing API inside Mono.Android
|
||||
API_BIN_REFS := Mono.Android
|
||||
endif
|
||||
# xammac_net_4_5 and the testing_* profiles are special, they don't build
|
||||
# System.Drawing.dll or equivalent neither in Mono nor in the XM repo.
|
||||
# For now we embed the types directly here.
|
||||
# TODO: find a better solution.
|
||||
EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE))
|
||||
|
||||
ifeq ($(PROFILE),monotouch)
|
||||
API_BIN_REFS := Xamarin.iOS
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),monotouch_tv)
|
||||
API_BIN_REFS := Xamarin.TVOS
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),monotouch_watch)
|
||||
API_BIN_REFS := Xamarin.WatchOS
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),xammac)
|
||||
API_BIN_REFS := Xamarin.Mac
|
||||
endif
|
||||
ifndef EMBEDDED_DRAWING_DEP
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis testing_aot_full winaot unreal wasm, $(PROFILE))
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal wasm, $(PROFILE))
|
||||
|
||||
ifdef REPO_DRAWING_DEP
|
||||
LIB_REFS += System.Drawing
|
||||
else
|
||||
# When System.Drawing.dll is not built in the Mono repo but in
|
||||
# the product repo like in the XI/XA case we need to pass in a reference
|
||||
# to the assembly containing drawing types like Rectangle etc. from there.
|
||||
# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE.
|
||||
LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE)
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
+9
-15
@@ -1,18 +1,12 @@
|
||||
AssemblyInfo.cs
|
||||
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Color.cs
|
||||
../../../../external/corefx/src/Common/src/System/Numerics/Hashing/HashHelpers.cs
|
||||
../../../../external/corefx/src/Common/src/System/Drawing/KnownColorTable.cs
|
||||
../../../../external/corefx/src/Common/src/System/Drawing/KnownColor.cs
|
||||
../../System.Drawing/System.Drawing/Point.cs
|
||||
../../System.Drawing/System.Drawing/PointF.cs
|
||||
../../System.Drawing/System.Drawing/Rectangle.cs
|
||||
../../System.Drawing/System.Drawing/RectangleF.cs
|
||||
../../System.Drawing/System.Drawing/Size.cs
|
||||
../../System.Drawing/System.Drawing/SizeF.cs
|
||||
|
||||
../../System.Drawing/System.Drawing/Color.cs
|
||||
../../System.Drawing/System.Drawing/KnownColor.cs
|
||||
../../System.Drawing/System.Drawing/KnownColors.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Point.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/PointF.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Rectangle.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/RectangleF.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/Size.cs
|
||||
../../../../external/corefx/src/System.Drawing.Primitives/src/System/Drawing/SizeF.cs
|
||||
../../../../external/corefx/src/Common/src/System/Drawing/ColorUtil.netcoreapp21.cs
|
||||
../../../../external/corefx/src/Common/src/System/Drawing/ColorTable.cs
|
||||
../../System.Drawing/corefx/SR.cs
|
||||
../../System.Drawing/System.Drawing/SR.cs
|
||||
../../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/SystemColors.cs
|
||||
@@ -106,54 +106,21 @@
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!--Per-profile files-->
|
||||
<Choose>
|
||||
<When Condition="'$(Platform)' == 'xammac'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'winaot'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'wasm'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'unreal'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'orbis'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'net_4_x'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'monotouch_watch'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'monotouch_tv'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'monotouch'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
<When Condition="'$(Platform)' == 'monodroid'">
|
||||
<ItemGroup />
|
||||
</When>
|
||||
</Choose>
|
||||
<!--End of per-profile files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../System.XML/System.Xml.csproj" />
|
||||
<ProjectReference Include="../../System.Xml.Linq/System.Xml.Linq.csproj" />
|
||||
<ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization.csproj" />
|
||||
<ProjectReference Include="../../System.Core/System.Core.csproj" />
|
||||
<ProjectReference Include="../../System.Numerics/System.Numerics.csproj" />
|
||||
<ProjectReference Include="../../System.Numerics.Vectors/System.Numerics.Vectors.csproj" />
|
||||
<ProjectReference Include="../../System.Net.Http/System.Net.Http.csproj" />
|
||||
<ProjectReference Include="../../System.Transactions/System.Transactions.csproj" />
|
||||
<ProjectReference Include="../../System.IO.Compression/System.IO.Compression.csproj" />
|
||||
<ProjectReference Include="../../System.Data/System.Data.csproj" />
|
||||
<ProjectReference Include="../../System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj" />
|
||||
<ProjectReference Include="../../System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj" />
|
||||
<ProjectReference Include="../../System.Transactions/System.Transactions.csproj" />
|
||||
<ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization.csproj" />
|
||||
<ProjectReference Include="../../System.Data/System.Data.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
@@ -161,43 +128,33 @@
|
||||
<ProjectReference Include="../../System.Drawing/System.Drawing.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monodroid/Mono.Android.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.iOS.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.iOS.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/OpenTK-1.0.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/OpenTK-1.0.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.WatchOS.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.WatchOS.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.TVOS.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.TVOS.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/OpenTK-1.0.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/OpenTK-1.0.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
@@ -208,21 +165,16 @@
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
<ProjectReference Include="../../System.Drawing/System.Drawing.csproj" />
|
||||
<ProjectReference Include="../System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
<ProjectReference Include="../../System.Drawing/System.Drawing.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.Mac.dll">
|
||||
<Reference Include="$(EXTERNAL_FACADE_DRAWING_REFERENCE)">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/Xamarin.Mac.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="./../../../../external/binary-reference-assemblies/build/monotouch/OpenTK.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../../external/binary-reference-assemblies/build/monotouch/OpenTK.dll</HintPath>
|
||||
<HintPath>$(EXTERNAL_FACADE_DRAWING_REFERENCE)</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<ProjectReference Include="../../System.Web.Services/System.Web.Services.csproj" />
|
||||
|
||||
@@ -12,51 +12,43 @@ LIBRARY = netstandard.dll
|
||||
KEYFILE = ../../Open.snk
|
||||
LIBRARY_SNK = $(KEYFILE)
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699 /nowarn:618
|
||||
LIB_REFS = System System.Xml System.Xml.Linq System.Core System.Numerics System.Net.Http \
|
||||
System.IO.Compression System.ComponentModel.Composition System.IO.Compression.FileSystem
|
||||
LIB_REFS = System System.Xml System.Xml.Linq System.Runtime.Serialization System.Core System.Numerics System.Numerics.Vectors System.Net.Http System.Transactions \
|
||||
System.IO.Compression System.Data System.ComponentModel.Composition System.IO.Compression.FileSystem
|
||||
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) $(EXTRA_LIB_MCS_FLAGS)
|
||||
|
||||
ifneq ($(PROFILE),build)
|
||||
# for the build profile we include stubs for these types directly in netstandard.dll
|
||||
LIB_REFS += System.Transactions System.Runtime.Serialization System.Data
|
||||
|
||||
ifeq ($(PROFILE),xammac_net_4_5)
|
||||
LIB_REFS += System.Web.Services Facades/System.Drawing.Primitives
|
||||
LIB_REFS += System.Web.Services
|
||||
else ifeq (2.1, $(FRAMEWORK_VERSION))
|
||||
LIB_REFS += System.Web.Services
|
||||
else
|
||||
LIB_REFS += System.Web
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),monodroid)
|
||||
# XA implements System.Drawing API inside Mono.Android
|
||||
API_BIN_REFS := Mono.Android
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),monotouch)
|
||||
API_BIN_REFS := Xamarin.iOS OpenTK-1.0
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),monotouch_tv)
|
||||
API_BIN_REFS := Xamarin.TVOS OpenTK-1.0
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),monotouch_watch)
|
||||
API_BIN_REFS := Xamarin.WatchOS
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE),xammac)
|
||||
API_BIN_REFS := Xamarin.Mac OpenTK
|
||||
endif
|
||||
|
||||
# profiles which build a System.Drawing.dll in the repo
|
||||
REPO_DRAWING_DEP := $(filter build net_4_x orbis winaot unreal testing_aot_full wasm, $(PROFILE))
|
||||
REPO_DRAWING_DEP := $(filter net_4_x orbis winaot unreal wasm, $(PROFILE))
|
||||
|
||||
ifdef REPO_DRAWING_DEP
|
||||
LIB_REFS += System.Drawing
|
||||
else
|
||||
|
||||
# xammac_net_4_5 and the testing_* profiles are special, they don't build
|
||||
# System.Drawing.dll or equivalent neither in Mono nor in the XM repo.
|
||||
# For now we typeforward the drawing types to the System.Drawing.Primitives.dll
|
||||
# facade where they are embedded.
|
||||
# TODO: find a better solution.
|
||||
EMBEDDED_DRAWING_DEP := $(filter xammac_net_4_5 testing_aot_full testing_aot_hybrid, $(PROFILE))
|
||||
|
||||
ifdef EMBEDDED_DRAWING_DEP
|
||||
LIB_REFS += Facades/System.Drawing.Primitives
|
||||
else
|
||||
# When System.Drawing.dll is not built in the Mono repo but in
|
||||
# the product repo like in the XI/XA case we need to pass in a reference
|
||||
# to the assembly containing drawing types like Rectangle etc. from there.
|
||||
# This needs to be passed in via EXTERNAL_FACADE_DRAWING_REFERENCE.
|
||||
LIB_MCS_FLAGS += /r:$(EXTERNAL_FACADE_DRAWING_REFERENCE)
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -608,7 +608,6 @@
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ComponentModel.Design.Serialization.SerializationStore))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Configuration.Assemblies.AssemblyHashAlgorithm))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Configuration.Assemblies.AssemblyVersionCompatibility))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.AcceptRejectRule))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.CommandBehavior))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.CommandType))]
|
||||
@@ -763,7 +762,6 @@
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlTypeException))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.SqlXml))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.SqlTypes.StorageState))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.BooleanSwitch))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.ConditionalAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.CorrelationManager))]
|
||||
@@ -1674,7 +1672,6 @@
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.ComTypes.VARDESC))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.ComTypes.VARFLAGS))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.ComTypes.VARKIND))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.CollectionDataContractAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ContractNamespaceAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.DataContractAttribute))]
|
||||
@@ -1688,31 +1685,22 @@
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.EnumMemberAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ExportOptions))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ExtensionDataObject))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Formatter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.FormatterConverter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.FormatterServices))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.IDeserializationCallback))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.IExtensibleDataObject))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.IFormatter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.IFormatterConverter))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.IgnoreDataMemberAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.InvalidDataContractException))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.IObjectReference))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ISafeSerializationData))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ISerializable))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ISerializationSurrogate))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ISerializationSurrogateProvider))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ISurrogateSelector))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.KnownTypeAttribute))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ObjectIDGenerator))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.ObjectManager))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.OnDeserializedAttribute))]
|
||||
@@ -1730,23 +1718,19 @@
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.StreamingContext))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.StreamingContextStates))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.SurrogateSelector))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.XmlObjectSerializer))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.XmlSerializableServices))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.XPathQueryGenerator))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.XsdDataContractExporter))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Formatters.FormatterAssemblyStyle))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Formatters.FormatterTypeStyle))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Formatters.TypeFilterLevel))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Formatters.Binary.BinaryFormatter))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Json.DataContractJsonSerializer))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Json.DataContractJsonSerializerSettings))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Json.IXmlJsonReaderInitializer))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Json.IXmlJsonWriterInitializer))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Json.JsonReaderWriterFactory))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Versioning.ComponentGuaranteesAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Versioning.ComponentGuaranteesOptions))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Versioning.FrameworkName))]
|
||||
@@ -2063,7 +2047,6 @@
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Timers.ElapsedEventHandler))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Timers.Timer))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Timers.TimersDescriptionAttribute))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Transactions.CommittableTransaction))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Transactions.DependentCloneOption))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Transactions.DependentTransaction))]
|
||||
@@ -2099,61 +2082,46 @@
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Transactions.TransactionStartedEventHandler))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Transactions.TransactionStatus))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Web.HttpUtility))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Windows.Input.ICommand))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.ConformanceLevel))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.DtdProcessing))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.EntityHandling))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.Formatting))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IFragmentCapableXmlDictionaryWriter))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IHasXmlNode))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IStreamProvider))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IXmlBinaryReaderInitializer))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IXmlBinaryWriterInitializer))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IXmlDictionary))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IXmlLineInfo))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IXmlNamespaceResolver))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IXmlTextReaderInitializer))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.IXmlTextWriterInitializer))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.NamespaceHandling))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.NameTable))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.NewLineHandling))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.OnXmlDictionaryReaderClose))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.ReadState))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.UniqueId))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.ValidationType))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.WhitespaceHandling))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.WriteState))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlAttributeCollection))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlBinaryReaderSession))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlBinaryWriterSession))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlCDataSection))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlCharacterData))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlComment))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlConvert))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDateTimeSerializationMode))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDeclaration))]
|
||||
#if !BOOTSTRAP_BASIC
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDictionary))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDictionaryReader))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDictionaryReaderQuotas))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDictionaryReaderQuotaTypes))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDictionaryString))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDictionaryWriter))]
|
||||
#endif
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDocument))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDocumentFragment))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.XmlDocumentType))]
|
||||
@@ -2403,126 +2371,3 @@
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.Xsl.XsltMessageEncounteredEventHandler))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.Xsl.XslTransform))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.Xsl.XsltSettings))]
|
||||
|
||||
#if NS21
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.HashCode))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.MathF))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Memory<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.MemoryExtensions))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlyMemory<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlySpan<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Span<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ArrayPool<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.BuffersExtensions))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IBufferWriter<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IMemoryOwner<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IPinnable))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryHandle))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryManager<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.OperationStatus))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySpanAction<,>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.SpanAction<,>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.StandardFormat))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Binary.BinaryPrimitives))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Base64))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Formatter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Parser))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.CollectionExtensions))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Collections.Generic.KeyValuePair))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Data.Common.DbProviderFactories))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Diagnostics.Tracing.EventSourceCreatedEventArgs))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.ColorConverter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.KnownColor))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.PointConverter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.RectangleConverter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.SizeConverter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Drawing.SizeFConverter))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Globalization.ISOWeek))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.EnumerationOptions))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.MatchCasing))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.MatchType))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliDecoder))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliEncoder))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Compression.BrotliStream))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEntry))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEnumerable<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemEnumerator<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IO.Enumeration.FileSystemName))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Http.ReadOnlyMemoryContent))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Security.ServerCertificateSelectionCallback))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Security.SslApplicationProtocol))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Security.SslClientAuthenticationOptions))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Security.SslServerAuthenticationOptions))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.Sockets.UnixDomainSocketEndPoint))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Net.WebSockets.ValueWebSocketReceiveResult))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Matrix3x2))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Matrix4x4))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Plane))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Quaternion))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector2))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector3))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Numerics.Vector4))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.DispatchProxy))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.AssemblyBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.AssemblyBuilderAccess))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.ConstructorBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.CustomAttributeBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.DynamicMethod))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.EnumBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.EventBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.FieldBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.GenericTypeParameterBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.ILGenerator))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.Label))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.LocalBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.MethodBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.ModuleBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.ParameterBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.PropertyBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.SignatureHelper))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Reflection.Emit.TypeBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.IsByRefLikeAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.IsReadOnlyAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.ITuple))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.RuntimeFeature))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.AutomationProxyAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.ImportedFromTypeLibAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.ManagedToNativeComInteropStubAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MemoryMarshal))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SequenceMarshal))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibFuncAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibFuncFlags))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibImportClassAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibTypeAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibTypeFlags))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibVarAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibVarFlags))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.TypeLibVersionAttribute))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.Serialization.Formatters.IFieldInfo))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.CryptographicOperations))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.ECDiffieHellman))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.CertificateRequest))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.DSACertificateExtensions))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Security.Cryptography.X509Certificates.X509SignatureGenerator))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.ValueTask))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.ValueTask<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.IValueTaskSource))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.IValueTaskSource<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Threading.Tasks.Sources.ValueTaskSourceStatus))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Xml.Serialization.SchemaImporter))]
|
||||
#endif
|
||||
@@ -1,9 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Cloned and Build location of https://github.com/dotnet/standard
|
||||
STANDARD=/Users/cloned-location-of/dotnet/standard
|
||||
|
||||
APICOMPAT=$STANDARD/Tools/ApiCompat.exe
|
||||
NSAPI=$STANDARD/bin/ref/netstandard/2.0.0.0/netstandard.dll
|
||||
|
||||
dotnet $APICOMPAT $NSAPI -implDirs:../../lib/net_4_x/Facades/,../../lib/net_4_x/
|
||||
@@ -1,2 +0,0 @@
|
||||
#include netstandard.dll.sources
|
||||
Stubs.build.cs
|
||||
@@ -31,32 +31,46 @@ System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceControll
|
||||
System.Net.Ping System.Resources.Reader System.Resources.Writer System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp \
|
||||
System.Runtime.InteropServices.RuntimeInformation System.Xml.XPath.XDocument System.Threading.Overlapped System.Security.SecureString \
|
||||
System.Diagnostics.StackTrace System.Data.Common System.Globalization.Extensions System.Runtime.Serialization.Xml System.ServiceModel.Primitives \
|
||||
System.Security.Cryptography.X509Certificates System.Runtime.Serialization.Primitives System.Security.Cryptography.Algorithms netstandard System.Drawing.Primitives
|
||||
System.Security.Cryptography.X509Certificates System.Runtime.Serialization.Primitives System.Security.Cryptography.Algorithms
|
||||
|
||||
# common_SUBDIRS dependencies
|
||||
common_DEPS_SUBDIRS :=
|
||||
|
||||
monotouch_SUBDIRS = $(common_DEPS_SUBDIRS)
|
||||
netstandard_drawing_SUBDIRS = System.Drawing.Primitives netstandard
|
||||
|
||||
monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
|
||||
monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
monodroid_SUBDIRS = $(common_DEPS_SUBDIRS)
|
||||
monodroid_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
# We don't build netstandard/System.Drawing.Primitives on monotouch etc. profiles by default,
|
||||
# except when EXTERNAL_FACADE_DRAWING_REFERENCE is defined which allows us to build it in Mono CI
|
||||
# (since the dependent drawing types are normally built in the product repos).
|
||||
ifdef EXTERNAL_FACADE_DRAWING_REFERENCE
|
||||
monotouch_SUBDIRS += $(netstandard_drawing_SUBDIRS)
|
||||
endif
|
||||
|
||||
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS)
|
||||
testing_aot_full_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
testing_aot_full_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS) System.Net.Http.Rtc
|
||||
|
||||
build_PARALLEL_SUBDIRS = System.Runtime System.Reflection System.Collections System.Resources.ResourceManager System.Globalization \
|
||||
basic_PARALLEL_SUBDIRS = System.Runtime System.Reflection System.Collections System.Resources.ResourceManager System.Globalization \
|
||||
System.Threading.Tasks System.Collections.Concurrent System.Text.Encoding System.IO System.Threading System.Diagnostics.Debug \
|
||||
System.Linq.Expressions System.Dynamic.Runtime System.Linq System.Threading.Tasks.Parallel System.Xml.ReaderWriter \
|
||||
System.Diagnostics.Tools System.Reflection.Primitives System.Runtime.Extensions System.Runtime.InteropServices System.Text.Encoding.Extensions \
|
||||
System.Runtime.Numerics System.Xml.XDocument System.Reflection.Extensions System.IO.FileSystem.Primitives System.IO.FileSystem \
|
||||
System.Diagnostics.FileVersionInfo System.Security.Cryptography.Primitives System.Security.Cryptography.Algorithms System.ValueTuple \
|
||||
System.Text.Encoding.CodePages System.Text.RegularExpressions System.Diagnostics.Contracts netstandard
|
||||
System.Text.Encoding.CodePages
|
||||
|
||||
build_PARALLEL_SUBDIRS = $(basic_PARALLEL_SUBDIRS) System.Text.RegularExpressions System.Diagnostics.Contracts
|
||||
|
||||
monodroid_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
monodroid_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
xammac_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
xammac_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
xammac_net_4_5_SUBDIRS = $(net_4_x_SUBDIRS) System.Drawing.Primitives
|
||||
xammac_net_4_5_SUBDIRS = $(net_4_x_SUBDIRS)
|
||||
xammac_net_4_5_PARALLEL_SUBDIRS = $(net_4_x_PARALLEL_SUBDIRS)
|
||||
|
||||
monotouch_watch_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
@@ -65,21 +79,18 @@ monotouch_watch_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
winaot_SUBDIRS = $(common_DEPS_SUBDIRS)
|
||||
winaot_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
orbis_SUBDIRS = $(common_DEPS_SUBDIRS)
|
||||
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
unreal_SUBDIRS = $(common_DEPS_SUBDIRS)
|
||||
unreal_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
wasm_SUBDIRS = $(common_DEPS_SUBDIRS)
|
||||
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
testing_aot_full_SUBDIRS = $(common_DEPS_SUBDIRS)
|
||||
testing_aot_full_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs System.Security.Cryptography.OpenSsl System.Threading.Tasks.Extensions \
|
||||
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Memory \
|
||||
System.Drawing.Common System.Buffers
|
||||
|
||||
@@ -51,15 +51,10 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
|
||||
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full_interp</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
|
||||
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_INTERP;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
|
||||
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC</DefineConstants>
|
||||
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full</OutputPath>
|
||||
@@ -140,12 +135,6 @@
|
||||
<ProjectReference Include="../Common/I18N.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
|
||||
@@ -244,23 +233,6 @@
|
||||
<LogicalName>ks.table</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<EmbeddedResource Include="big5.table">
|
||||
<LogicalName>big5.table</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="gb18030.table">
|
||||
<LogicalName>gb18030.table</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="gb2312.table">
|
||||
<LogicalName>gb2312.table</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="jis.table">
|
||||
<LogicalName>jis.table</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="ks.table">
|
||||
<LogicalName>ks.table</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<EmbeddedResource Include="big5.table">
|
||||
<LogicalName>big5.table</LogicalName>
|
||||
|
||||
@@ -51,15 +51,10 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
|
||||
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full_interp</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
|
||||
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_INTERP;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
|
||||
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC</DefineConstants>
|
||||
<DefineConstants>DISABLE_UNSAFE;NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full</OutputPath>
|
||||
@@ -135,12 +130,6 @@
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
|
||||
|
||||
@@ -51,15 +51,10 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full_interp</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_INTERP;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full</OutputPath>
|
||||
@@ -135,12 +130,6 @@
|
||||
<ProjectReference Include="../Common/I18N.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
|
||||
|
||||
@@ -51,15 +51,10 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full_interp</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_INTERP;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full</OutputPath>
|
||||
@@ -137,12 +132,6 @@
|
||||
<ProjectReference Include="../Common/I18N.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
|
||||
|
||||
@@ -51,15 +51,10 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full_interp</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_INTERP;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full</OutputPath>
|
||||
@@ -167,12 +162,6 @@
|
||||
<ProjectReference Include="../Common/I18N.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
|
||||
|
||||
@@ -51,15 +51,10 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full_interp</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_INTERP;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full</OutputPath>
|
||||
@@ -143,12 +138,6 @@
|
||||
<ProjectReference Include="../Common/I18N.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
|
||||
|
||||
+31
-38
@@ -1,6 +1,6 @@
|
||||
thisdir = class
|
||||
|
||||
NO_FACADES_PROFILE := $(filter monodroid_tools monotouch_tools wasm_tools testing_aot_hybrid binary_reference_assemblies xbuild_12 xbuild_14, $(PROFILE))
|
||||
NO_FACADES_PROFILE := $(filter monodroid_tools binary_reference_assemblies xbuild_12 xbuild_14, $(PROFILE))
|
||||
|
||||
ifndef NO_FACADES_PROFILE
|
||||
FACADES_FOLDER := Facades
|
||||
@@ -12,15 +12,29 @@ ifdef MCS_MODE
|
||||
MCS_MODE_dirs := Mono.Cecil.Mdb
|
||||
endif
|
||||
|
||||
# Tooling dependencies of mscorlib, we build them to /tmp folder for MONO_PATH to work
|
||||
# reliably for clean and update builds. All deps are built against stable API to run with
|
||||
# range of boostrap versions and .NET at the same time
|
||||
# The minimal set of csc dependencies
|
||||
basic_SUBDIRS := \
|
||||
Mono.Cecil \
|
||||
$(MCS_MODE_dirs) \
|
||||
../tools/cil-stringreplacer \
|
||||
corlib \
|
||||
Mono.Security \
|
||||
System \
|
||||
System.XML \
|
||||
System.Security \
|
||||
System.Core \
|
||||
System.ComponentModel.Composition.4.5 \
|
||||
System.Numerics \
|
||||
System.Xml.Linq \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
PEAPI \
|
||||
../ilasm \
|
||||
corlib/il
|
||||
|
||||
build_SUBDIRS = \
|
||||
Mono.Cecil \
|
||||
$(MCS_MODE_dirs) \
|
||||
../tools/cil-stringreplacer \
|
||||
PEAPI \
|
||||
../ilasm \
|
||||
corlib
|
||||
|
||||
build_PARALLEL_SUBDIRS = \
|
||||
@@ -35,12 +49,12 @@ build_PARALLEL_SUBDIRS = \
|
||||
System.Numerics \
|
||||
System.Xml.Linq \
|
||||
System.IO.Compression \
|
||||
System.IO.Compression.FileSystem \
|
||||
System.Net.Http \
|
||||
System.Net.Http.WebRequest \
|
||||
System.Drawing
|
||||
System.Drawing \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
PEAPI
|
||||
|
||||
ifdef MCS_MODE
|
||||
basic_PARALLEL_SUBDIRS := ../mcs
|
||||
|
||||
build_SUBDIRS += \
|
||||
Mono.Security \
|
||||
@@ -48,8 +62,7 @@ build_SUBDIRS += \
|
||||
System.XML \
|
||||
System.Security \
|
||||
Mono.Posix \
|
||||
System.Core \
|
||||
Mono.CompilerServices.SymbolWriter
|
||||
System.Core
|
||||
|
||||
build_PARALLEL_SUBDIRS += ../mcs
|
||||
endif
|
||||
@@ -95,17 +108,13 @@ mobile_common_dirs_parallel := \
|
||||
testing_aot_full_dirs_parallel := \
|
||||
$(mobile_common_dirs_parallel) \
|
||||
Mono.Simd \
|
||||
Mono.CSharp \
|
||||
System.Drawing
|
||||
|
||||
testing_aot_full_interp_dirs_parallel := $(testing_aot_full_dirs_parallel)
|
||||
Mono.CSharp
|
||||
|
||||
testing_aot_hybrid_dirs_parallel := $(testing_aot_full_dirs_parallel)
|
||||
|
||||
xammac_dirs_parallel := \
|
||||
$(mobile_common_dirs_parallel) \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
Mono.CSharp
|
||||
Mono.CompilerServices.SymbolWriter
|
||||
|
||||
monodroid_dirs_parallel := \
|
||||
$(mobile_common_dirs_parallel) \
|
||||
@@ -116,19 +125,13 @@ monodroid_dirs_parallel := \
|
||||
|
||||
monodroid_tools_dirs_parallel := \
|
||||
Mono.Cecil \
|
||||
Mono.CompilerServices.SymbolWriter \
|
||||
ICSharpCode.SharpZipLib \
|
||||
monodoc
|
||||
|
||||
monotouch_tools_dirs_parallel := \
|
||||
Mono.Cecil \
|
||||
Mono.Cecil.Mdb
|
||||
|
||||
monotouch_dirs_parallel := \
|
||||
$(mobile_common_dirs_parallel) \
|
||||
Mono.Simd \
|
||||
Mono.CSharp \
|
||||
Mono.Runtime.Tests
|
||||
Mono.CSharp
|
||||
|
||||
monotouch_watch_dirs_parallel := $(filter-out Mono.Security Mono.Data.Tds,$(monotouch_dirs_parallel))
|
||||
|
||||
@@ -165,9 +168,6 @@ wasm_dirs_parallel := \
|
||||
$(mobile_common_dirs_parallel) \
|
||||
System.Drawing
|
||||
|
||||
wasm_tools_dirs_parallel := \
|
||||
Mono.Cecil
|
||||
|
||||
orbis_dirs_parallel := \
|
||||
$(filter-out Microsoft.CSharp Mono.Data.Sqlite,$(mobile_common_dirs_parallel)) \
|
||||
System.Drawing
|
||||
@@ -387,11 +387,7 @@ monotouch_watch_runtime_SUBDIRS := $(mobile_common_dirs)
|
||||
monotouch_watch_runtime_PARALLEL_SUBDIRS := $(monotouch_watch_runtime_dirs_parallel)
|
||||
monotouch_tv_runtime_SUBDIRS := $(mobile_common_dirs)
|
||||
monotouch_tv_runtime_PARALLEL_SUBDIRS := $(monotouch_tv_runtime_dirs_parallel)
|
||||
monotouch_tools_SUBDIRS :=
|
||||
monotouch_tools_PARALLEL_SUBDIRS := $(monotouch_tools_dirs_parallel)
|
||||
|
||||
testing_aot_full_interp_SUBDIRS := $(mobile_common_dirs)
|
||||
testing_aot_full_interp_PARALLEL_SUBDIRS := $(testing_aot_full_interp_dirs_parallel)
|
||||
testing_aot_full_SUBDIRS := $(mobile_common_dirs)
|
||||
testing_aot_full_PARALLEL_SUBDIRS := $(testing_aot_full_dirs_parallel)
|
||||
testing_aot_hybrid_SUBDIRS := $(mobile_common_dirs)
|
||||
@@ -419,15 +415,13 @@ unreal_PARALLEL_SUBDIRS := $(unreal_dirs_parallel)
|
||||
|
||||
wasm_SUBDIRS := $(mobile_common_dirs)
|
||||
wasm_PARALLEL_SUBDIRS := $(wasm_dirs_parallel)
|
||||
wasm_tools_SUBDIRS :=
|
||||
wasm_tools_PARALLEL_SUBDIRS := $(wasm_tools_dirs_parallel)
|
||||
|
||||
include ../build/rules.make
|
||||
|
||||
DIST_SUBDIRS = $(testing_aot_full_dirs_parallel) $(testing_aot_hybrid_dirs_parallel) $(monotouch_dirs_parallel) $(monotouch_tools_dirs_parallel) \
|
||||
DIST_SUBDIRS = $(testing_aot_full_dirs_parallel) $(testing_aot_hybrid_dirs_parallel) $(monotouch_dirs_parallel) \
|
||||
$(monodroid_dirs_parallel) $(monodroid_tools_dirs_parallel) $(xammac_dirs_parallel) $(net_4_x_dirs) $(net_4_x_parallel_dirs) \
|
||||
$(xammac_4_5_dirs_parallel) $(unreal_dirs_parallel) $(wasm_dirs_parallel) $(wasm_tools_dirs_parallel) $(xbuild_14_SUBDIRS) \
|
||||
$(testing_aot_full_interp_dirs_parallel) dlr aot-compiler reference-assemblies Facades
|
||||
$(xammac_4_5_dirs_parallel) $(unreal_dirs_parallel) $(wasm_dirs_parallel) $(xbuild_14_SUBDIRS) \
|
||||
dlr aot-compiler reference-assemblies Facades
|
||||
|
||||
# No new makefiles for: System.Messaging, System.Web.Mobile,
|
||||
# System.ServiceProcess
|
||||
@@ -457,7 +451,6 @@ DISTFILES = \
|
||||
test-helpers/RemoteExecutorTestBase.Mobile.cs \
|
||||
test-helpers/RemoteExecutorTestBase.Mono.cs \
|
||||
test-helpers/SocketResponder.cs \
|
||||
test-helpers/TestResourceHelper.cs \
|
||||
$(foreach HOST_PLATFORM,macos linux win32 unix,lib/$(monolite_dir)/mcs.exe $(monolite_files))
|
||||
|
||||
.PHONY: all-local $(STD_TARGETS:=-local)
|
||||
|
||||
@@ -12,7 +12,12 @@ KEYFILE = ../msfinal.pub
|
||||
LIB_MCS_FLAGS =
|
||||
|
||||
TEST_RESOURCE_FILES = \
|
||||
$(wildcard Test/resources/*.csproj)
|
||||
$(wildcard Test/resources/*.csproj) \
|
||||
Test/resources/TestTasks.dll
|
||||
|
||||
ifndef MCS_MODE
|
||||
TEST_RESOURCE_FILES += Test/resources/TestTasks.pdb
|
||||
endif
|
||||
|
||||
TEST_MCS_FLAGS = $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
|
||||
TEST_LIB_REFS = $(XBUILD_FRAMEWORK) $(XBUILD_UTILITIES) $(PARENT_PROFILE)System.Xml
|
||||
@@ -27,13 +32,13 @@ CLEAN_FILES = Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks-$
|
||||
Test/resources/TestTasks-$(PROFILE).dll: Test/resources/TestTasks.cs
|
||||
$(CSCOMPILE) /out:$@ Test/resources/TestTasks.cs /r:$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)/mscorlib.dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_FRAMEWORK).dll /r:$(topdir)/class/lib/$(PROFILE)/$(XBUILD_UTILITIES).dll /target:library
|
||||
|
||||
TEST_MCS_FLAGS += -resource:Test/resources/TestTasks-$(PROFILE).dll,Test/resources/TestTasks.dll
|
||||
test-local: compile-resources
|
||||
|
||||
compile-resources: Test/resources/TestTasks-$(PROFILE).dll
|
||||
cp Test/resources/TestTasks-$(PROFILE).dll Test/resources/TestTasks.dll
|
||||
ifndef MCS_MODE
|
||||
TEST_MCS_FLAGS += -resource:Test/resources/TestTasks-$(PROFILE).pdb,Test/resources/TestTasks.pdb
|
||||
cp Test/resources/TestTasks-$(PROFILE).pdb Test/resources/TestTasks.pdb
|
||||
endif
|
||||
|
||||
test-local: Test/resources/TestTasks-$(PROFILE).dll
|
||||
|
||||
include $(XBUILD_DIR)/xbuild_test.make
|
||||
include ../../build/library.make
|
||||
@@ -38,7 +38,7 @@ ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
|
||||
TEST_LIB_REFS += Microsoft.Build
|
||||
endif
|
||||
|
||||
EXTRA_DISTFILES = $(filter-out Test/resources/test.dll, $(TEST_RESOURCE_FILES))
|
||||
EXTRA_DISTFILES = $(TEST_RESOURCE_FILES)
|
||||
|
||||
Test/resources/test.dll: Test/resources/test.cs
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -target:library /out:$@ $<
|
||||
|
||||
@@ -50,15 +50,10 @@
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monotouch_tv</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<OutputPath>./../../class/lib/testing_aot_full_interp</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_INTERP;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../class/lib/testing_aot_full</OutputPath>
|
||||
@@ -273,12 +268,6 @@
|
||||
<ProjectReference Include="../System/System.csproj" />
|
||||
<ProjectReference Include="../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs
|
||||
@@ -1 +0,0 @@
|
||||
#include monotouch_Microsoft.CSharp_xtest.dll.exclude.sources
|
||||
@@ -1 +0,0 @@
|
||||
#include monotouch_Microsoft.CSharp_xtest.dll.exclude.sources
|
||||
@@ -1 +0,0 @@
|
||||
../../../external/corefx/src/Microsoft.CSharp/tests/AccessTests.netcoreapp.cs
|
||||
@@ -50,17 +50,17 @@ namespace Mono.Btls.Interface
|
||||
|
||||
public static X509Certificate CreateCertificate (byte[] data, BtlsX509Format format, bool disallowFallback = false)
|
||||
{
|
||||
return MonoBtlsProvider.CreateCertificate (data, (MonoBtlsX509Format)format);
|
||||
return MonoBtlsProvider.CreateCertificate (data, (MonoBtlsX509Format)format, disallowFallback);
|
||||
}
|
||||
|
||||
public static X509Certificate2 CreateCertificate2 (byte[] data, BtlsX509Format format, bool disallowFallback = false)
|
||||
{
|
||||
return MonoBtlsProvider.CreateCertificate2 (data, (MonoBtlsX509Format)format);
|
||||
return MonoBtlsProvider.CreateCertificate2 (data, (MonoBtlsX509Format)format, disallowFallback);
|
||||
}
|
||||
|
||||
public static X509Certificate2 CreateCertificate2 (byte[] data, string password, bool disallowFallback = false)
|
||||
{
|
||||
return MonoBtlsProvider.CreateCertificate2 (data, password);
|
||||
return MonoBtlsProvider.CreateCertificate2 (data, password, disallowFallback);
|
||||
}
|
||||
|
||||
public static BtlsX509Chain CreateNativeChain ()
|
||||
|
||||
@@ -100,8 +100,7 @@ namespace Mono.Btls.Interface
|
||||
|
||||
public Oid GetSignatureAlgorithm ()
|
||||
{
|
||||
var algorithm = Instance.GetSignatureAlgorithm ();
|
||||
return Oid.FromOidValue (algorithm, OidGroup.SignatureAlgorithm);
|
||||
return Instance.GetSignatureAlgorithm ();
|
||||
}
|
||||
|
||||
public AsnEncodedData GetPublicKeyAsn1 ()
|
||||
|
||||
@@ -65,26 +65,16 @@
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monotouch_tv_runtime</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;MONOTOUCH_TV;IOS_REFLECTION;MONO_FEATURE_PROCESS_START</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<OutputPath>./../../class/lib/testing_aot_full_interp</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_full_interp</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_INTERP;DISABLE_COM;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<OutputPath>./../../class/lib/testing_aot_hybrid</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_hybrid</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../class/lib/testing_aot_full</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-testing_aot_full</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<OutputPath>./../../class/lib/xammac</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../class/lib/xammac_net_4_5</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac_net_4_5</IntermediateOutputPath>
|
||||
@@ -127,18 +117,12 @@
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monotouch_tv_runtime' ">
|
||||
<Compile Include="monotouch_tv_runtime-parser.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Compile Include="testing_aot_full_interp-parser.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Compile Include="testing_aot_hybrid-parser.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Compile Include="testing_aot_full-parser.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<Compile Include="xammac-parser.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<Compile Include="xammac_net_4_5-parser.cs" />
|
||||
</ItemGroup>
|
||||
@@ -227,12 +211,6 @@
|
||||
<ProjectReference Include="../System/System.csproj" />
|
||||
<ProjectReference Include="../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full_interp' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full_interp\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_hybrid' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_hybrid\nunitlite.dll</HintPath>
|
||||
|
||||
@@ -5,14 +5,16 @@ LIBRARY = Mono.Cecil.Mdb.dll
|
||||
KEYFILE = ../mono.snk
|
||||
LIBRARY_PACKAGE = none
|
||||
|
||||
API_BUILD := $(filter build, $(PROFILE))
|
||||
API_BUILD := $(filter basic build, $(PROFILE))
|
||||
|
||||
ifdef API_BUILD
|
||||
TARGET_NET_REFERENCE = $(BOOTSTRAP_BIN_PROFILE)
|
||||
LIBRARY_USE_INTERMEDIATE_FILE = 1
|
||||
DEFAULT_REFERENCES =
|
||||
API_BIN_REFS = System mscorlib
|
||||
else
|
||||
LIB_REFS = System
|
||||
endif
|
||||
|
||||
LIB_REFS = System Mono.Cecil
|
||||
LIB_REFS += Mono.Cecil
|
||||
|
||||
LIB_MCS_FLAGS = -d:CECIL
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@ LIBRARY = Mono.Cecil.dll
|
||||
KEYFILE = ../mono.snk
|
||||
LIBRARY_PACKAGE = none
|
||||
|
||||
LIB_REFS = System.Core System
|
||||
|
||||
API_BUILD := $(filter build, $(PROFILE))
|
||||
API_BUILD := $(filter basic build, $(PROFILE))
|
||||
|
||||
ifdef API_BUILD
|
||||
TARGET_NET_REFERENCE = $(BOOTSTRAP_BIN_PROFILE)
|
||||
LIBRARY_USE_INTERMEDIATE_FILE = 1
|
||||
DEFAULT_REFERENCES =
|
||||
API_BIN_REFS = System.Core System mscorlib
|
||||
else
|
||||
LIB_REFS = System.Core System
|
||||
endif
|
||||
|
||||
LIB_MCS_FLAGS = -d:NET_4_0
|
||||
|
||||
@@ -35,11 +35,6 @@
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monodroid_tools</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_6;MONO;WIN_PLATFORM;NET_4_0</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'wasm_tools' ">
|
||||
<OutputPath>./../../class/lib/wasm_tools</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-wasm_tools</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_6;MONO;NET_4_0</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<!-- @ALL_PROFILE_PROPERTIES@ -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -185,7 +180,6 @@
|
||||
<Compile Include="..\..\..\external\cecil\Mono.Security.Cryptography\CryptoService.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\Mono\Disposable.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\Mono\Empty.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\Mono\MergeSort.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\Mono\Type.cs" />
|
||||
<Compile Include="..\..\..\external\cecil\ProjectInfo.cs" />
|
||||
<Compile Include="Consts.cs" />
|
||||
@@ -215,23 +209,6 @@
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'wasm_tools' ">
|
||||
<Reference Include="./../../../external/binary-reference-assemblies/v4.6/System.Core.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../external/binary-reference-assemblies/v4.6/System.Core.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="./../../../external/binary-reference-assemblies/v4.6/System.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../external/binary-reference-assemblies/v4.6/System.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="./../../../external/binary-reference-assemblies/v4.6/mscorlib.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../external/binary-reference-assemblies/v4.6/mscorlib.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -9,6 +9,12 @@ LIB_MCS_FLAGS =
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
ifneq (basic, $(PROFILE))
|
||||
USE_BOOT_COMPILE = yes
|
||||
endif
|
||||
|
||||
ifdef USE_BOOT_COMPILE
|
||||
LIBRARY_COMPILE = $(BOOT_COMPILE)
|
||||
endif
|
||||
|
||||
include ../../build/library.make
|
||||
-17
@@ -35,11 +35,6 @@
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monodroid</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">
|
||||
<OutputPath>./../../class/lib/monodroid_tools</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-monodroid_tools</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<OutputPath>./../../class/lib/xammac</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-xammac</IntermediateOutputPath>
|
||||
@@ -88,18 +83,6 @@
|
||||
<ProjectReference Include="../System/System.csproj" />
|
||||
<ProjectReference Include="../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'monodroid_tools' ">
|
||||
<Reference Include="./../../../external/binary-reference-assemblies/v4.6/System.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../external/binary-reference-assemblies/v4.6/System.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="./../../../external/binary-reference-assemblies/v4.6/mscorlib.dll">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>./../../../external/binary-reference-assemblies/v4.6/mscorlib.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -15,13 +15,10 @@ KEYFILE = ../mono.pub
|
||||
LIB_MCS_FLAGS = /unsafe \
|
||||
$(RESOURCES:%=-resource:%) -d:SQLITE_STANDARD
|
||||
|
||||
TEST_RESOURCE_FILES = Test/test.db
|
||||
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618 $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) /nowarn:618
|
||||
|
||||
EXTRA_DISTFILES = Test/SqliteTest.cs \
|
||||
Test/test.sql \
|
||||
$(TEST_RESOURCE_FILES) \
|
||||
resources/SR.resx \
|
||||
resources/DataTypes.xml \
|
||||
resources/MetaDataCollections.xml \
|
||||
@@ -32,9 +29,11 @@ CLEAN_FILES += $(RESX_RESOURCES)
|
||||
|
||||
CLEAN_FILES = $(RESX_RESOURCES)
|
||||
|
||||
Test/test.db: Test/test.sql
|
||||
test-local: test.db
|
||||
|
||||
test.db: Test/test.sql
|
||||
rm -f $@
|
||||
sqlite3 $@ < $<
|
||||
sqlite3 $@ < $< || :
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
|
||||
Loaded 100 of 1140 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user