mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 11:21:08 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db33692ca0 | ||
|
|
10feb7c1d8 | ||
|
|
4d38f69507 | ||
|
|
7344e17620 | ||
|
|
ea8a24b1bb | ||
|
|
a5b924fa68 | ||
|
|
34396522f3 | ||
|
|
dd6e11936b | ||
|
|
e81726eb29 | ||
|
|
c7a91c01fa | ||
|
|
c6b39a0614 | ||
|
|
99af4a9eda | ||
|
|
75be2e6537 | ||
|
|
9273efd973 | ||
|
|
8eb8f7d5e7 | ||
|
|
c6a8c0e38a | ||
|
|
c2e1021ed0 | ||
|
|
29bbcfb022 | ||
|
|
2cc6bede97 | ||
|
|
16cad3ccd4 | ||
|
|
8605da46f5 | ||
|
|
d194b8fd4d | ||
|
|
a749680783 | ||
|
|
b4e428d7c4 | ||
|
|
1cb70ef771 | ||
|
|
00f930c13d | ||
|
|
911b32aef0 | ||
|
|
82306753f9 | ||
|
|
edabe88417 | ||
|
|
12304ec458 | ||
|
|
9340ebefcd | ||
|
|
32031273ec | ||
|
|
083c130d4a | ||
|
|
b149c23832 | ||
|
|
8aa3f6182f | ||
|
|
db135e42db | ||
|
|
de7bff2994 | ||
|
|
28f285b972 | ||
|
|
9b8ba28bac | ||
|
|
3c76d261e1 | ||
|
|
b932a792d8 | ||
|
|
34c3d019ed | ||
|
|
6c4c039c9b | ||
|
|
4de0fb710b | ||
|
|
c45f358856 | ||
|
|
bf27e25446 | ||
|
|
4e276971c0 | ||
|
|
1075824929 | ||
|
|
2dbce94d6f | ||
|
|
1f09e9af88 | ||
|
|
847a2de1d0 | ||
|
|
beb137dd79 | ||
|
|
d95eaa61b1 | ||
|
|
f3a6da6d94 | ||
|
|
264e0d4bb2 | ||
|
|
2eba668040 | ||
|
|
607e20ee6c | ||
|
|
47631c34a7 | ||
|
|
942eb2b779 | ||
|
|
225ba3efa4 | ||
|
|
7bdd7b1738 | ||
|
|
42672fbcb2 | ||
|
|
129dc324e7 | ||
|
|
dac6077561 | ||
|
|
3141c9490d | ||
|
|
e3466bc325 | ||
|
|
a7adb18ce2 | ||
|
|
131c3dd675 | ||
|
|
c836aa14af | ||
|
|
5dae72b19b | ||
|
|
4050681098 | ||
|
|
ef8ab4986a | ||
|
|
266326d7c2 | ||
|
|
89cc3619d5 | ||
|
|
05453b1c80 | ||
|
|
0938bbc98c | ||
|
|
c06eb62b14 | ||
|
|
0fb02c88cd | ||
|
|
d4aa545f56 | ||
|
|
ff7f5576d2 | ||
|
|
d5d67eab6a | ||
|
|
15d76bf5e2 | ||
|
|
f3ac8fdeb3 | ||
|
|
1f48672a90 | ||
|
|
becded2606 | ||
|
|
d21cb0853b | ||
|
|
f7f359a2dd | ||
|
|
607cbde47a | ||
|
|
85fb6bce10 | ||
|
|
78136c4a90 | ||
|
|
b4c45099fb | ||
|
|
70837feda9 | ||
|
|
c2728d29f7 | ||
|
|
54b2e194f3 | ||
|
|
10f1f84138 | ||
|
|
e1ff841329 | ||
|
|
46912f8f80 | ||
|
|
3f4f070d3d | ||
|
|
331f927bfe | ||
|
|
da6a45a158 | ||
|
|
21d6b331fc | ||
|
|
e87d1235da | ||
|
|
b9fb4d8857 | ||
|
|
b7031bccfc | ||
|
|
3538148a18 | ||
|
|
947e457f0e | ||
|
|
7f0c97aa03 | ||
|
|
85cfb9ccab | ||
|
|
22a6ec10b1 | ||
|
|
454bd206aa | ||
|
|
4adf8229e8 | ||
|
|
de4729fae2 | ||
|
|
721462c4a1 | ||
|
|
177997b063 | ||
|
|
c8845164ad | ||
|
|
ac87945049 | ||
|
|
5ef368bb1e | ||
|
|
c67ec40879 | ||
|
|
fd1fd05f18 | ||
|
|
936f7841d7 | ||
|
|
9a2f778a91 | ||
|
|
96eee2f901 | ||
|
|
28e047fd35 | ||
|
|
0d51a8063b | ||
|
|
b232a3929b | ||
|
|
fbc4f0546d | ||
|
|
d0c1e9d32b | ||
|
|
778a70ba01 | ||
|
|
f83b8da83e | ||
|
|
f12e936ca3 | ||
|
|
3977339940 | ||
|
|
cb15effa2f | ||
|
|
2ad3f0bf9e | ||
|
|
899599b951 | ||
|
|
3da56339ec | ||
|
|
a0af42ab18 | ||
|
|
aab818fbf3 | ||
|
|
4b1745401d | ||
|
|
1746c18f79 | ||
|
|
38c4fa936f | ||
|
|
c1fcbe0ae8 | ||
|
|
b66bc5390f | ||
|
|
0501da7b55 | ||
|
|
587fed1498 | ||
|
|
e62d2ff40f | ||
|
|
f5e8783eee | ||
|
|
231983017c | ||
|
|
b6bff2a286 | ||
|
|
142047819b | ||
|
|
e146c01ec9 | ||
|
|
7d20732432 | ||
|
|
fa7740e0a1 | ||
|
|
8a3c54a555 | ||
|
|
a5ccbc4f92 | ||
|
|
71fdb336b8 | ||
|
|
6ea480ea70 | ||
|
|
9407a08c98 | ||
|
|
a024fe40af | ||
|
|
6094376b9d | ||
|
|
bfc7397859 | ||
|
|
4cefdc21f5 | ||
|
|
79b419483f | ||
|
|
0dbef43aa8 | ||
|
|
6be8ed4490 | ||
|
|
e87f9d77e7 | ||
|
|
2c07caaa89 | ||
|
|
f59d94b8ef | ||
|
|
8690335a1b | ||
|
|
98a566225a | ||
|
|
4837409ab5 | ||
|
|
b05dad9f31 | ||
|
|
94fa6e513e | ||
|
|
84c3251449 | ||
|
|
f9011ff53a | ||
|
|
664424113b | ||
|
|
008fadc689 | ||
|
|
8ab23120b1 | ||
|
|
d7e3297640 | ||
|
|
2ab1f71dc7 | ||
|
|
c0264304e7 | ||
|
|
c7837d7526 | ||
|
|
df24f1e8da | ||
|
|
d54e8b4e13 | ||
|
|
4eae0ba533 | ||
|
|
f4ac568f87 | ||
|
|
62f7ec0ae8 | ||
|
|
bb98788ef5 | ||
|
|
e292c7b245 | ||
|
|
b0a755079e | ||
|
|
e131c9ce2a | ||
|
|
4da306a2ca | ||
|
|
ba2ad8a64e | ||
|
|
5a725c544d | ||
|
|
aa440dbfba | ||
|
|
c085d00019 | ||
|
|
57500fce5d | ||
|
|
11bea3ec41 | ||
|
|
570226dc13 | ||
|
|
123d623cf8 | ||
|
|
9ccd1450ab | ||
|
|
d303a9096c | ||
|
|
12fa379c6a | ||
|
|
4796de33e9 | ||
|
|
1d5a4b8440 | ||
|
|
a9e184e780 | ||
|
|
041e1dd073 | ||
|
|
a4c1776ccb | ||
|
|
30737519b8 | ||
|
|
0a30e46bb2 | ||
|
|
a76978f83a | ||
|
|
becaba2655 | ||
|
|
88f7b739ee | ||
|
|
40432cd2ca | ||
|
|
52e225e4b1 | ||
|
|
70a71e69fe | ||
|
|
a59563176a | ||
|
|
a496a9a5ff | ||
|
|
26f12f2f9c | ||
|
|
bdf199da26 | ||
|
|
00413c20a2 | ||
|
|
70fe915df2 | ||
|
|
4dee5cabd9 | ||
|
|
a250365791 | ||
|
|
b6677cc2ba | ||
|
|
dcaf47f518 | ||
|
|
30d69ae55e | ||
|
|
519e15744c | ||
|
|
907075a5f0 | ||
|
|
3a0de9703b | ||
|
|
d4ffec6385 | ||
|
|
4116105b8b | ||
|
|
34634352e1 | ||
|
|
4b62c55e7d | ||
|
|
9a2543e8c0 | ||
|
|
a68cfd2ffa | ||
|
|
84f05e8817 | ||
|
|
ea6f8ab201 | ||
|
|
17f4b4286f | ||
|
|
4f130913c6 | ||
|
|
dd1faf6f54 | ||
|
|
febbfd1e3e | ||
|
|
0c5a524e50 | ||
|
|
ec4a957151 |
No files matched your search
@@ -1,45 +0,0 @@
|
||||
## Steps to Reproduce
|
||||
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
|
||||
<!--
|
||||
You may drag & drop the attachment (repro code/solution, screenshot, etc.) onto the issue.
|
||||
-->
|
||||
|
||||
## Current Behavior
|
||||
|
||||
<!--
|
||||
What is the current behavior?
|
||||
-->
|
||||
|
||||
## Expected Behavior
|
||||
|
||||
<!--
|
||||
Please describe the behavior you are expecting
|
||||
-->
|
||||
|
||||
### On which platforms did you notice this
|
||||
|
||||
[ ] macOS
|
||||
[ ] Linux
|
||||
[ ] Windows
|
||||
|
||||
**Version Used**:
|
||||
|
||||
<!--
|
||||
You can use `mono --version` or About dialog to obtain this information.
|
||||
-->
|
||||
|
||||
### Stacktrace
|
||||
|
||||
```
|
||||
Please paste the stack trace here if available.
|
||||
```
|
||||
|
||||
<!--
|
||||
|
||||
You can join us at https://gitter.im/mono/mono to discuss your reported issue
|
||||
|
||||
-->
|
||||
@@ -1,9 +0,0 @@
|
||||
|
||||
|
||||
<!--
|
||||
Thank you for your Pull Request!
|
||||
|
||||
If you are new to contributing to Mono, please try to do your best at conforming to our coding guidelines http://www.mono-project.com/community/contributing/coding-guidelines/ but don't worry if you get something wrong. One of the project members will help you to get things landed.
|
||||
|
||||
Does your pull request fix any of the existing issues? Please use the following format: Fixes #issue-number
|
||||
-->
|
||||
@@ -40,7 +40,6 @@ Ankh.NoLoad
|
||||
*.gpState
|
||||
.vscode/
|
||||
*.exp
|
||||
.vs/
|
||||
|
||||
# Tooling
|
||||
_ReSharper*/
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
[submodule "external/cecil"]
|
||||
path = external/cecil
|
||||
url = git://github.com/mono/cecil.git
|
||||
branch = mono-2017-12
|
||||
[submodule "external/rx"]
|
||||
path = external/rx
|
||||
url = git://github.com/mono/rx.git
|
||||
@@ -43,6 +44,7 @@
|
||||
[submodule "external/linker"]
|
||||
path = external/linker
|
||||
url = git://github.com/mono/linker.git
|
||||
branch = mono-2017-12
|
||||
[submodule "external/roslyn-binaries"]
|
||||
path = external/roslyn-binaries
|
||||
url = git://github.com/mono/roslyn-binaries.git
|
||||
|
||||
Vendored
-91
@@ -1,91 +0,0 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Mac",
|
||||
"includePath": [
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
|
||||
"/usr/local/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
|
||||
"/usr/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [],
|
||||
"intelliSenseMode": "clang-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
|
||||
"/usr/local/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
|
||||
"/usr/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
},
|
||||
"macFrameworkPath": [
|
||||
"/System/Library/Frameworks",
|
||||
"/Library/Frameworks"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Linux",
|
||||
"includePath": [
|
||||
"/usr/include",
|
||||
"/usr/local/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [],
|
||||
"intelliSenseMode": "clang-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"/usr/include",
|
||||
"/usr/local/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Win32",
|
||||
"includePath": [
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [
|
||||
"_DEBUG",
|
||||
"UNICODE"
|
||||
],
|
||||
"intelliSenseMode": "msvc-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
}
|
||||
}
|
||||
],
|
||||
"version": 3
|
||||
}
|
||||
+15
-20
@@ -17,7 +17,7 @@
|
||||
/acceptance-tests @akoeplinger
|
||||
/acceptance-tests/profiler-stress* @alexrp
|
||||
|
||||
/data @marek-safar @akoeplinger @luhenry
|
||||
/data @marek-safar @akoeplinger
|
||||
/data/gdb @vargaz
|
||||
/data/lldb @lewurm @vargaz
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
/external/boringssl @baulig
|
||||
/external/nuget-buildtasks @radical @akoeplinger
|
||||
|
||||
/libgc @BrzVlad @vargaz @luhenry
|
||||
/libgc @BrzVlad @vargaz
|
||||
|
||||
/llvm @vargaz @luhenry
|
||||
/llvm @vargaz
|
||||
|
||||
/man @marek-safar @miguel @luhenry
|
||||
/man @marek-safar @miguel
|
||||
/man/*prof* @alexrp
|
||||
|
||||
/mcs @marek-safar @luhenry
|
||||
/mcs @marek-safar
|
||||
|
||||
/mcs/build @marek-safar @akoeplinger
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
/mcs/errors @marek-safar
|
||||
/mcs/ilasm @marek-safar
|
||||
/mcs/jay @marek-safar
|
||||
/mcs/mcs @marek-safar @lewurm
|
||||
/mcs/mcs @marek-safar
|
||||
/mcs/tests @marek-safar
|
||||
/mcs/tools @marek-safar @akoeplinger
|
||||
|
||||
@@ -83,13 +83,13 @@
|
||||
/mono/mini/*exceptions* @lewurm
|
||||
/mono/mini/*ppc* @lewurm
|
||||
/mono/mini/*type-check* @lewurm
|
||||
/mono/mini/interp/* @lewurm @BrzVlad
|
||||
/mono/mini/interp/* @lewurm
|
||||
/mono/mini/*profiler* @alexrp
|
||||
/mono/mini/debugger-agent.c @DavidKarlas
|
||||
|
||||
/mono/profiler @alexrp @kumpera
|
||||
|
||||
/mono/sgen @BrzVlad @kumpera
|
||||
/mono/sgen @brzvlad @kumpera
|
||||
|
||||
/mono/utils @kumpera @vargaz
|
||||
/mono/utils/atomic* @alexrp
|
||||
@@ -98,31 +98,26 @@
|
||||
/mono/utils/mono-threads* @luhenry @kumpera
|
||||
/mono/utils/*-win* @lateralusX @kumpera
|
||||
|
||||
/msvc @lateralusX @luhenry
|
||||
/msvc @lateralusX
|
||||
/msvc/*profiler* @alexrp
|
||||
/msvc/scripts @akoeplinger @kg
|
||||
/msvc/scripts @akoeplinger
|
||||
|
||||
/packaging/ @alexischr @akoeplinger @luhenry
|
||||
/packaging/ @alexischr @akoeplinger
|
||||
/packaging/MacSDK/msbuild.py @radical @akoeplinger
|
||||
|
||||
/runtime @akoeplinger @marek-safar @luhenry
|
||||
/runtime @akoeplinger @marek-safar
|
||||
|
||||
/samples @luhenry
|
||||
/samples/profiler @alexrp
|
||||
/samples/size @alexrp
|
||||
|
||||
/scripts @akoeplinger @luhenry
|
||||
/scripts/ci @akoeplinger @alexischr
|
||||
/scripts @akoeplinger
|
||||
/scripts/ci @akoeplinger
|
||||
/scripts/ci/run-test-profiler-stress-tests.sh @alexrp
|
||||
|
||||
/sdks @marek-safar @luhenry
|
||||
/sdks/wasm @kumpera @lrz
|
||||
/sdks/ios @vargaz @rolfbjarne
|
||||
/sdks/android @luhenry @jonpryor
|
||||
|
||||
/support @luhenry @vargaz
|
||||
|
||||
/tools @kumpera @luhenry
|
||||
/tools @kumpera
|
||||
/tools/checker @tritao
|
||||
/tools/crash-bisector @kumpera
|
||||
/tools/locale-builder @marek-safar
|
||||
|
||||
@@ -32,7 +32,7 @@ file in this directory.
|
||||
CLA
|
||||
=======
|
||||
|
||||
Contributions are now taken under the [.NET Foundation CLA](https://cla.dotnetfoundation.org/).
|
||||
Contributions are now taken under the [.NET Foundation CLA](https://cla2.dotnetfoundation.org/).
|
||||
|
||||
Code Review
|
||||
=======
|
||||
+5
-6
@@ -44,7 +44,6 @@ dist-hook:
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
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/*'`
|
||||
rm -rf "$(top_distdir)/external/linker/linker/Tests"
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
noinst_DATA = mono-uninstalled.pc
|
||||
@@ -115,7 +114,7 @@ update-csproj:
|
||||
-rm msvc/scripts/order.xml
|
||||
-rm -rf msvc/scripts/inputs
|
||||
-mkdir msvc/scripts/inputs
|
||||
(cd runtime; $(MAKE) V=1 extra_targets=csproj-local)
|
||||
(cd runtime; make V=1 extra_targets=csproj-local)
|
||||
|
||||
package-inputs:
|
||||
echo '<?xml version="1.0" encoding="utf-8"?>' > msvc/scripts/order.xml
|
||||
@@ -144,9 +143,9 @@ update-llvm-version:
|
||||
|
||||
|
||||
update-solution-files:
|
||||
$(MAKE) update-csproj
|
||||
$(MAKE) package-inputs
|
||||
(cd msvc/scripts; $(MAKE) genproj.exe; mono genproj.exe $(GENPROJ_ARGS))
|
||||
make update-csproj
|
||||
make package-inputs
|
||||
(cd msvc/scripts; make genproj.exe; mono genproj.exe $(GENPROJ_ARGS))
|
||||
|
||||
update-solution-files-with-tests:
|
||||
$(MAKE) "GENPROJ_ARGS=2012 true true" update-solution-files
|
||||
make "GENPROJ_ARGS=2012 true true" update-solution-files
|
||||
@@ -19,30 +19,30 @@ The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.or
|
||||
|
||||
| OS | Architecture | Status |
|
||||
|--------------|--------------------|------------------------------|
|
||||
| Debian 9 | amd64 | [![debian-9-amd64][1]][2] |
|
||||
| Debian 9 | i386 | [![debian-9-i386][3]][4] |
|
||||
| Debian 9 | armel | [![debian-9-armel][5]][6] |
|
||||
| Debian 9 | armhf | [![debian-9-armhf][7]][8] |
|
||||
| Debian 9 | arm64 | [![debian-9-arm64][9]][10] |
|
||||
| Ubuntu 14.04 | amd64 | [![ubuntu-1404-amd64][1]][2] |
|
||||
| Ubuntu 14.04 | i386 | [![ubuntu-1404-i386][3]][4] |
|
||||
| Debian 8 | armel | [![debian-8-armel][5]][6] |
|
||||
| Debian 8 | armhf | [![debian-8-armhf][7]][8] |
|
||||
| Debian 8 | arm64 | [![debian-8-arm64][9]][10] |
|
||||
| OS X | amd64 | [![osx-amd64][11]][12] |
|
||||
| OS X | i386 | [![osx-i386][13]][14] |
|
||||
| Windows | amd64 | [![windows-amd64][15]][16] |
|
||||
| Windows | i386 | [![windows-i386][17]][18] |
|
||||
| Windows | i386 | [![windows-amd64][17]][18] |
|
||||
| CentOS | s390x (cs) | [![centos-s390x][19]][20] |
|
||||
| Debian 9 | ppc64el (cs) | [![debian-9-ppc64el][21]][22]|
|
||||
| Debian 8 | ppc64el (cs) | [![debian-8-ppc64el][21]][22]|
|
||||
|
||||
_(cs) = community supported architecture_
|
||||
|
||||
[1]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-amd64/badge/icon
|
||||
[2]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-amd64
|
||||
[3]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-i386/badge/icon
|
||||
[4]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-i386/
|
||||
[5]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armel/badge/icon
|
||||
[6]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armel/
|
||||
[7]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armhf/badge/icon
|
||||
[8]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armhf/
|
||||
[9]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-arm64/badge/icon
|
||||
[10]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-arm64/
|
||||
[1]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-amd64/badge/icon
|
||||
[2]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-amd64
|
||||
[3]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-i386/badge/icon
|
||||
[4]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-i386/
|
||||
[5]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armel/badge/icon
|
||||
[6]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armel/
|
||||
[7]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armhf/badge/icon
|
||||
[8]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armhf/
|
||||
[9]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/badge/icon
|
||||
[10]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/
|
||||
[11]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-amd64/badge/icon
|
||||
[12]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-amd64/
|
||||
[13]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-i386/badge/icon
|
||||
@@ -53,8 +53,8 @@ _(cs) = community supported architecture_
|
||||
[18]: https://jenkins.mono-project.com/job/z/label=w32/
|
||||
[19]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x/badge/icon
|
||||
[20]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x
|
||||
[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el/badge/icon
|
||||
[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el
|
||||
[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el/badge/icon
|
||||
[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
@@ -111,7 +111,7 @@ Once you have installed the software, you can run a few programs:
|
||||
|
||||
* `mono program.exe` runtime engine
|
||||
|
||||
* `mcs program.cs` C# compiler
|
||||
* `mcs program.cs` C# compiler
|
||||
|
||||
* `monodis program.exe` CIL Disassembler
|
||||
|
||||
@@ -128,14 +128,6 @@ Directory Roadmap
|
||||
|
||||
* `external/` - Git submodules for external libraries (Newtonsoft.Json, ikvm, etc).
|
||||
|
||||
* `ikvm-native/` - Glue code for ikvm.
|
||||
|
||||
* `libgc/` - The (deprecated) Boehm GC implementation.
|
||||
|
||||
* `llvm/` - Utility Makefiles for integrating the Mono LLVM fork.
|
||||
|
||||
* `m4/` - General utility Makefiles.
|
||||
|
||||
* `man/` - Manual pages for the various Mono commands and programs.
|
||||
|
||||
* `mcs/` - The class libraries, compiler and tools
|
||||
@@ -150,52 +142,26 @@ Directory Roadmap
|
||||
|
||||
* `arch/` - Architecture specific portions.
|
||||
|
||||
* `benchmark/` - A collection of benchmarks.
|
||||
|
||||
* `btls/` - Build files for the BTLS library which incorporates BoringSSL.
|
||||
|
||||
* `cil/` - Common Intermediate Representation, XML
|
||||
definition of the CIL bytecodes.
|
||||
|
||||
* `dis/` - CIL executable Disassembler.
|
||||
* `dis/` - CIL executable Disassembler
|
||||
|
||||
* `eglib/` - Independent implementation of the glib API.
|
||||
* `io-layer/` - The I/O layer and system abstraction for
|
||||
emulating the .NET IO model.
|
||||
|
||||
* `metadata/` - The object system and metadata reader.
|
||||
|
||||
* `mini/` - The Just in Time Compiler.
|
||||
|
||||
* `profiler/` - The profiler implementation.
|
||||
|
||||
* `sgen/` - The SGen Garbage Collector implementation.
|
||||
|
||||
* `tests/` - The main runtime tests.
|
||||
|
||||
* `unit-tests/` - Additional runtime unit tests.
|
||||
|
||||
* `utils/` - Utility functions used across the runtime codebase.
|
||||
|
||||
* `msvc/` - Logic for the MSVC / Visual Studio based runtime and BCL build system.
|
||||
The latter is experimental at the moment.
|
||||
|
||||
* `packaging/` - Packaging logic for the OS X and Windows Mono packages.
|
||||
|
||||
* `po/` - Translation files.
|
||||
|
||||
* `runtime/` - A directory that contains the Makefiles that link the
|
||||
mono/ and mcs/ build systems.
|
||||
|
||||
* `samples/` - Some simple sample programs on uses of the Mono
|
||||
runtime as an embedded library.
|
||||
* `samples/` -Some simple sample programs on uses of the Mono
|
||||
runtime as an embedded library.
|
||||
|
||||
* `scripts/` - Scripts used to invoke Mono and the corresponding program.
|
||||
|
||||
* `sdks/` - A new way of embedding Mono into Xamarin.iOS, Xamarin.Android and other products.
|
||||
|
||||
* `support/` - Various support libraries.
|
||||
|
||||
* `tools/` - A collection of tools, mostly used during Mono development.
|
||||
|
||||
Contributing to Mono
|
||||
====================
|
||||
|
||||
@@ -208,7 +174,8 @@ section.
|
||||
Reporting bugs
|
||||
==============
|
||||
|
||||
To submit bug reports, please [open an issue on the mono GitHub repo](https://github.com/mono/mono/issues/new).
|
||||
To submit bug reports, please use [Xamarin's
|
||||
Bugzilla](https://bugzilla.xamarin.com/)
|
||||
|
||||
Please use the search facility to ensure the same bug hasn't already
|
||||
been submitted and follow our
|
||||
@@ -575,7 +542,7 @@ file for information about Microsoft's patent grant.
|
||||
Mono Trademark Use Policy
|
||||
=========================
|
||||
|
||||
The use of trademarks and logos for Mono can be found [here](http://www.dotnetfoundation.org/legal/mono-tm).
|
||||
The use of trademarks and logos for Mono can be found [here] (http://www.dotnetfoundation.org/legal/mono-tm).
|
||||
|
||||
Maintaining the Class Library Solution Files
|
||||
============================================
|
||||
|
||||
@@ -2217,6 +2217,7 @@ CORECLR_COREMANGLIB_TEST_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcgettotalmemory.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gckeepalive.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcmaxgeneration.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcsuppressfinalize.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcwaitforpendingfinalizers.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/globalization/calendarweekrule/calendarweekrulefirstday.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/globalization/calendarweekrule/calendarweekrulefirstfourdayweek.cs \
|
||||
@@ -3981,10 +3982,6 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/newarr/newarr.cs \
|
||||
$(CORECLR_PATH)/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/oomexception01.cs
|
||||
|
||||
# https://github.com/mono/mono/issues/7432
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcsuppressfinalize.cs
|
||||
|
||||
CORECLR_TEST_IL_SRC = \
|
||||
$(CORECLR_PATH)/tests/src/JIT/BBT/Scenario4/Not-Int32.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/Convert/implicitConv.il \
|
||||
|
||||
@@ -57,9 +57,7 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
"jit",
|
||||
};
|
||||
|
||||
static readonly TimeSpan _timeout = TimeSpan.FromHours (6);
|
||||
|
||||
const RegexOptions _regexOptions = RegexOptions.Compiled | RegexOptions.Singleline;
|
||||
static readonly TimeSpan _timeout = TimeSpan.FromHours (9);
|
||||
|
||||
static readonly Dictionary<string, Predicate<Benchmark>> _filters = new Dictionary<string, Predicate<Benchmark>> {
|
||||
{ "ironjs-v8", FilterNotOnArm },
|
||||
@@ -91,55 +89,26 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
|
||||
static int Main ()
|
||||
{
|
||||
var regex = new Regex (".*", _regexOptions);
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_REGEX") is string envRegex)
|
||||
regex = new Regex (envRegex, _regexOptions);
|
||||
|
||||
var depDir = Path.Combine ("..", "external", "benchmarker");
|
||||
var benchDir = Path.Combine (depDir, "benchmarks");
|
||||
var testDir = Path.Combine (depDir, "tests");
|
||||
|
||||
var benchmarks = Directory.EnumerateFiles (benchDir, "*.benchmark")
|
||||
.Select (Benchmark.Load)
|
||||
.Where (b => !b.OnlyExplicit && b.ClientCommandLine == null && IsSupported (b) && regex.IsMatch (b.Name))
|
||||
.Where (b => !b.OnlyExplicit && b.ClientCommandLine == null && IsSupported (b))
|
||||
.OrderBy (b => b.Name)
|
||||
.ToArray ();
|
||||
|
||||
var monoPath = Path.GetFullPath (Path.Combine ("..", "..", "runtime", "mono-wrapper"));
|
||||
var classDir = Path.GetFullPath (Path.Combine ("..", "..", "mcs", "class", "lib", "net_4_x"));
|
||||
|
||||
var seed = Environment.TickCount;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_SEED") is string envSeed)
|
||||
seed = int.Parse (envSeed);
|
||||
|
||||
var timeout = (int) _timeout.TotalMilliseconds;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_TIMEOUT") is string envTimeout)
|
||||
timeout = (int) TimeSpan.Parse (envTimeout).TotalMilliseconds;
|
||||
|
||||
string options = null;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_OPTIONS") is string envOptions)
|
||||
options = envOptions;
|
||||
|
||||
var suspend = false;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_SUSPEND") is string envSuspend)
|
||||
suspend = bool.Parse (envSuspend);
|
||||
|
||||
var rand = new Random (seed);
|
||||
var rand = new Random ();
|
||||
var cpus = Environment.ProcessorCount;
|
||||
|
||||
var sw = Stopwatch.StartNew ();
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Magenta;
|
||||
Console.WriteLine ($"[{sw.Elapsed.ToString ("G")}] Starting test session with seed: {seed}");
|
||||
Console.ResetColor ();
|
||||
|
||||
var results = new List<TestResult> (benchmarks.Length);
|
||||
|
||||
var sw = Stopwatch.StartNew ();
|
||||
|
||||
for (var i = 0; i < benchmarks.Length; i++) {
|
||||
var bench = benchmarks [i];
|
||||
|
||||
@@ -148,24 +117,17 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
var maxSamples = rand.Next (0, cpus * 2000 + 1);
|
||||
var heapShotFreq = rand.Next (-10, 11);
|
||||
var maxFrames = rand.Next (0, 33);
|
||||
var flags = _options.ToDictionary (x => x, _ => rand.Next (0, 2) == 1)
|
||||
.Select (x => (x.Value ? string.Empty : "no") + x.Key)
|
||||
.ToArray ();
|
||||
var options = _options.ToDictionary (x => x, _ => rand.Next (0, 2) == 1)
|
||||
.Select (x => (x.Value ? string.Empty : "no") + x.Key)
|
||||
.ToArray ();
|
||||
|
||||
var profOptions = "nodefaults,output=/dev/null,";
|
||||
var profOptions = $"maxframes={maxFrames},{string.Join (",", options)},output=/dev/null";
|
||||
|
||||
if (options == null) {
|
||||
profOptions += $"maxframes={maxFrames},";
|
||||
if (sampleFreq > 0)
|
||||
profOptions += $",sample{sampleMode}={sampleFreq},maxsamples={maxSamples}";
|
||||
|
||||
if (sampleFreq > 0)
|
||||
profOptions += $"sample{sampleMode}={sampleFreq},maxsamples={maxSamples},";
|
||||
|
||||
if (heapShotFreq > 0)
|
||||
profOptions += $"heapshot={heapShotFreq}gc,";
|
||||
|
||||
profOptions += string.Join (",", flags);
|
||||
} else
|
||||
profOptions += options;
|
||||
if (heapShotFreq > 0)
|
||||
profOptions += $",heapshot={heapShotFreq}gc";
|
||||
|
||||
var info = new ProcessStartInfo {
|
||||
UseShellExecute = false,
|
||||
@@ -179,9 +141,6 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
info.EnvironmentVariables.Clear ();
|
||||
info.EnvironmentVariables.Add ("MONO_PATH", classDir);
|
||||
|
||||
if (suspend)
|
||||
info.EnvironmentVariables.Add ("MONO_DEBUG", "suspend-on-native-crash,suspend-on-unhandled");
|
||||
|
||||
var progress = $"({i + 1}/{benchmarks.Length})";
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Blue;
|
||||
@@ -218,7 +177,7 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
proc.BeginOutputReadLine ();
|
||||
proc.BeginErrorReadLine ();
|
||||
|
||||
if (!proc.WaitForExit (timeout)) {
|
||||
if (!proc.WaitForExit ((int) _timeout.TotalMilliseconds)) {
|
||||
// Force a thread dump.
|
||||
Syscall.kill (proc.Id, Signum.SIGQUIT);
|
||||
Thread.Sleep (1000);
|
||||
@@ -274,7 +233,7 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
|
||||
using (var writer = XmlWriter.Create ("TestResult-profiler-stress.xml", settings)) {
|
||||
writer.WriteStartDocument ();
|
||||
writer.WriteComment ($"This file represents the results of running a test suite (seed: {seed})");
|
||||
writer.WriteComment ("This file represents the results of running a test suite");
|
||||
|
||||
writer.WriteStartElement ("test-results");
|
||||
writer.WriteAttributeString ("name", "profiler-stress-tests.dummy");
|
||||
|
||||
+63
-239
@@ -1,8 +1,8 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [5.13.0],
|
||||
[https://github.com/mono/mono/issues/new])
|
||||
AC_INIT(mono, [5.10.1],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
@@ -40,7 +40,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3`
|
||||
# This can be reset to 0 when Mono's version number is bumped
|
||||
# since it's part of the corlib version (the prefix '1' in the full
|
||||
# version number is to ensure the number isn't treated as octal in C)
|
||||
MONO_CORLIB_COUNTER=3
|
||||
MONO_CORLIB_COUNTER=4
|
||||
MONO_CORLIB_VERSION=`printf "1%02d%02d%02d%03d" $MONO_VERSION_MAJOR $MONO_VERSION_MINOR 0 $MONO_CORLIB_COUNTER`
|
||||
|
||||
AC_DEFINE_UNQUOTED(MONO_CORLIB_VERSION,$MONO_CORLIB_VERSION,[Version of the corlib-runtime interface])
|
||||
@@ -100,7 +100,7 @@ extra_runtime_ldflags=""
|
||||
# Hack for WASM
|
||||
# Current autotools (v1.15) doesn't have a triplet we can use for wasm so the kludge we do is to
|
||||
# work around it by using a feature flag instead
|
||||
AC_ARG_ENABLE(wasm,[ --enable-wasm Hack to set the current runtime to target wasm], enable_wasm=$enableval)
|
||||
AC_ARG_ENABLE(wasm,[ --enable-wasm Hack to set the current runtime to target wasm], enable_wasm=$enableval)
|
||||
|
||||
# Thread configuration inspired by sleepycat's db
|
||||
AC_MSG_CHECKING([host platform characteristics])
|
||||
@@ -123,7 +123,6 @@ CFLAGS="$CFLAGS -D_REENTRANT -D_GNU_SOURCE -DNO_UNALIGNED_ACCESS -s WASM=1"
|
||||
CPPFLAGS="$CPPFLAGS -D_REENTRANT -DUSE_MMAP -D_GNU_SOURCE -DNO_UNALIGNED_ACCESS -s WASM=1"
|
||||
libdl="-ldl"
|
||||
libgc_threads=pthreads
|
||||
platform_wasm=yes
|
||||
|
||||
else
|
||||
|
||||
@@ -207,7 +206,6 @@ case "$host" in
|
||||
;;
|
||||
*-*-*openbsd*)
|
||||
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DHOST_BSD -D_REENTRANT -DUSE_MMAP"
|
||||
LDFLAGS="${LDFLAGS} -Wl,-zwxneeded"
|
||||
if test "x$disable_munmap" != "xyes"; then
|
||||
CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
|
||||
fi
|
||||
@@ -217,7 +215,6 @@ case "$host" in
|
||||
AC_DEFINE(PTHREAD_POINTER_ID)
|
||||
libdl=
|
||||
libgc_threads=pthreads
|
||||
with_tls=pthread
|
||||
with_sigaltstack=no
|
||||
use_sigposix=yes
|
||||
with_sgen_default_concurrent=yes
|
||||
@@ -371,32 +368,11 @@ case "$host" in
|
||||
AC_DEFINE(PTHREAD_POINTER_ID)
|
||||
dnl Haiku does not support static TLS with __thread
|
||||
with_tls=pthread
|
||||
dnl Boehm is too much work to backport Haiku support for
|
||||
support_boehm=no
|
||||
libgc_threads=pthreads
|
||||
use_sigposix=yes
|
||||
;;
|
||||
*-*-aix*|*-*-os400*)
|
||||
dnl Set up a 64-bit build
|
||||
CPPFLAGS="$CPPFLAGS -maix64 -DGC_AIX_THREADS -D_ALL_SOURCE -D_THREAD_SAFE -D_LARGE_FILES -D_REENTRANT"
|
||||
LDFLAGS="-maix64"
|
||||
libmono_cflags="-D_THREAD_SAFE -D_REENTRANT"
|
||||
dnl Would you believe GNU nm doesn't know how to process AIX libraries?
|
||||
dnl Hardcode IBM binutils in case GNU ones end up on our path. Also
|
||||
dnl specifiy 64-bit mode for tools.
|
||||
AR="/usr/bin/ar -X64"
|
||||
NM="/usr/bin/nm -X64"
|
||||
dnl SGen is the future (changes to Boehm support code would be
|
||||
dnl required if you wish to re-enable Boehm)
|
||||
support_boehm=no
|
||||
with_gc=sgen
|
||||
need_link_unlink=yes
|
||||
use_sigposix=yes
|
||||
dnl the valloc call to alloc the guard page bombs out, even with extending the data area
|
||||
with_sigaltstack=no
|
||||
dnl use pthread TLS, __thread has issues with the compiler flags we use
|
||||
with_tls=pthread
|
||||
dnl ppc Linux is the same? test further
|
||||
disable_munmap=yes
|
||||
;;
|
||||
*)
|
||||
AC_MSG_WARN([*** Please add $host to configure.ac checks!])
|
||||
libdl="-ldl"
|
||||
@@ -437,7 +413,6 @@ AM_CONDITIONAL(HOST_SIGPOSIX, test x$use_sigposix = xyes)
|
||||
AM_CONDITIONAL(HOST_ANDROID, test x$platform_android = xyes)
|
||||
AM_CONDITIONAL(HOST_TIZEN, test x$platform_tizen = xyes)
|
||||
AM_CONDITIONAL(HOST_IOS, test x$platform_ios = xyes)
|
||||
AM_CONDITIONAL(HOST_WASM, test x$platform_wasm = xyes)
|
||||
|
||||
if test -z "$HOST_DARWIN_TRUE"; then :
|
||||
PLATFORM_AOT_SUFFIX=.dylib
|
||||
@@ -541,6 +516,7 @@ AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
|
||||
if test x$have_zlib = xyes; then
|
||||
AC_TRY_COMPILE([#include <zlib.h>], [
|
||||
#if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)
|
||||
return 0;
|
||||
#else
|
||||
#error No good zlib found
|
||||
#endif
|
||||
@@ -567,7 +543,6 @@ AC_CHECK_HEADERS(sys/poll.h)
|
||||
AC_CHECK_HEADERS(sys/wait.h)
|
||||
AC_CHECK_HEADERS(grp.h)
|
||||
AC_CHECK_HEADERS(syslog.h)
|
||||
AC_CHECK_FUNCS(vsyslog)
|
||||
|
||||
# for mono/dis
|
||||
AC_CHECK_HEADERS(wchar.h)
|
||||
@@ -639,6 +614,7 @@ if test x$platform_android = xyes; then
|
||||
#include <android/versioning.h>
|
||||
],[
|
||||
#if __ANDROID_API_O__ == 26 && defined(__INTRODUCED_IN)
|
||||
return 0
|
||||
#else
|
||||
#error __ANDROID_API_O__ != 26 or the __INTRODUCED_IN macro not defined
|
||||
#endif
|
||||
@@ -679,6 +655,7 @@ AC_CACHE_CHECK([for clang],
|
||||
#else
|
||||
#error "FAILED"
|
||||
#endif
|
||||
return 0;
|
||||
],
|
||||
[mono_cv_clang=yes],
|
||||
[mono_cv_clang=no],
|
||||
@@ -714,6 +691,7 @@ if test x"$GCC" = xyes; then
|
||||
CFLAGS="$CFLAGS -Wunused-but-set-variable -Werror"
|
||||
AC_MSG_CHECKING(for -Wno-unused-but-set-variable option to gcc)
|
||||
AC_TRY_COMPILE([],[
|
||||
return 0;
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
CFLAGS="$ORIG_CFLAGS -Wno-unused-but-set-variable"
|
||||
@@ -824,9 +802,8 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan
|
||||
fi
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE(ninja,[ --enable-ninja Enable using ninja where available], enable_ninja=$enableval)
|
||||
AC_CHECK_PROG(HAVE_NINJA, ninja, yes, no)
|
||||
AM_CONDITIONAL(NINJA, test x$enable_ninja = xyes -a x$HAVE_NINJA != xno)
|
||||
AC_CHECK_PROG(ninja, ninja, yes, no)
|
||||
AM_CONDITIONAL(NINJA, test x$ninja != xno)
|
||||
|
||||
AC_ARG_ENABLE(werror, [ --enable-werror Pass -Werror to the C compiler], werror_flag=$enableval, werror_flag=no)
|
||||
if test x$werror_flag = xyes; then
|
||||
@@ -885,6 +862,7 @@ if test "x$with_xen_opt" = "xyes" -a "x$mono_cv_clang" = "xno"; then
|
||||
CFLAGS="$CFLAGS -mno-tls-direct-seg-refs"
|
||||
AC_MSG_CHECKING(for -mno-tls-direct-seg-refs option to gcc)
|
||||
AC_TRY_COMPILE([], [
|
||||
return 0;
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
# Pass it to libgc as well
|
||||
@@ -935,51 +913,6 @@ if test $csc_compiler = default; then
|
||||
fi
|
||||
AC_MSG_RESULT($csc_compiler)
|
||||
|
||||
AC_ARG_WITH(jemalloc, [ --with-jemalloc=yes,no If jemalloc is enabled (defaults to no)], [], [with_jemalloc=no])
|
||||
AC_ARG_WITH(jemalloc-always, [ --with-jemalloc_always=yes,no If jemalloc is enabled and always used (defaults to yes)], [], [with_jemalloc_always=no])
|
||||
AC_ARG_WITH(jemalloc-assert, [ --with-jemalloc_assert=yes,no If jemalloc performs runtime checks for memory correctness (defaults to no)], [], [with_jemalloc_assert=no])
|
||||
|
||||
|
||||
if test x$target_win32 = xyes; then
|
||||
with_jemalloc=no
|
||||
with_jemalloc_assert=no
|
||||
with_jemalloc_always=no
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(MONO_JEMALLOC_ASSERT, [test "x$with_jemalloc_assert" = "xyes"])
|
||||
if test "x$with_jemalloc_assert" = "xyes"; then
|
||||
JEMALLOC_CFLAGS+=" -DMONO_JEMALLOC_ASSERT"
|
||||
AC_DEFINE(MONO_JEMALLOC_ASSERT, 1, [Make jemalloc assert for mono])
|
||||
AC_SUBST(MONO_JEMALLOC_ASSERT, 1)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(MONO_JEMALLOC_DEFAULT, [test "x$with_jemalloc_always" = "xyes"])
|
||||
if test "x$with_jemalloc_always" = "xyes"; then
|
||||
with_jemalloc=yes
|
||||
JEMALLOC_CFLAGS+=" -DMONO_JEMALLOC_DEFAULT"
|
||||
AC_DEFINE(MONO_JEMALLOC_DEFAULT, 1, [Make jemalloc default for mono])
|
||||
AC_SUBST(MONO_JEMALLOC_DEFAULT, 1)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(MONO_JEMALLOC_ENABLED, [test "x$with_jemalloc" = "xyes"])
|
||||
if test "x$with_jemalloc" = "xyes"; then
|
||||
JEMALLOC_LDFLAGS="-L`pwd`/mono/utils/jemalloc/jemalloc/lib -ljemalloc_pic"
|
||||
JEMALLOC_CFLAGS+=" -DMONO_JEMALLOC_ENABLED -I `pwd`/mono/utils/jemalloc/jemalloc/include"
|
||||
JEMALLOC_AUTOCONF_FLAGS=" --build=$target --host=$host"
|
||||
|
||||
if test "x$target_mach" = "xyes"; then
|
||||
JEMALLOC_CPPFLAGS=" -stdlib=libc++ "
|
||||
fi
|
||||
|
||||
AC_DEFINE(MONO_JEMALLOC_ENABLED, 1, [Enable jemalloc usage for mono])
|
||||
AC_SUBST(MONO_JEMALLOC_ENABLED, 1)
|
||||
|
||||
AC_SUBST(JEMALLOC_CFLAGS)
|
||||
AC_SUBST(JEMALLOC_CPPFLAGS)
|
||||
AC_SUBST(JEMALLOC_LDFLAGS)
|
||||
AC_SUBST(JEMALLOC_AUTOCONF_FLAGS)
|
||||
fi
|
||||
|
||||
#
|
||||
# Set the build profiles and options before things which use them
|
||||
#
|
||||
@@ -1000,52 +933,6 @@ AC_ARG_WITH(wasm, [ --with-wasm=yes,no If you w
|
||||
|
||||
|
||||
AC_ARG_WITH(runtime_preset, [ --with-runtime_preset=net_4_x,all,aot,hybridaot,fullaot,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])
|
||||
|
||||
dnl
|
||||
dnl Spectre compiler mitigation flag checks
|
||||
dnl
|
||||
if test "x$with_spectre_mitigation" = "xyes"; then
|
||||
AC_MSG_NOTICE([Compiler Spectre mitigation support checks])
|
||||
SPECTRE_CFLAGS=
|
||||
SPECTRE_INDIRECT_BRANCH_KIND=
|
||||
case "x$with_spectre_indirect_branch_choice" in
|
||||
xkeep) SPECTRE_INDIRECT_BRANCH_KIND=keep ;;
|
||||
xthunk) SPECTRE_INDIRECT_BRANCH_KIND=thunk ;;
|
||||
xinline) SPECTRE_INDIRECT_BRANCH_KIND=thunk-inline ;;
|
||||
xextern) SPECTRE_INDIRECT_BRANCH_KIND=thunk-extern ;;
|
||||
*) AC_MSG_ERROR([Invalid indirect jump thunk kind ($with_spectre_indirect_branch_choice)]) ;;
|
||||
esac
|
||||
|
||||
SPECTRE_FUNCTION_RETURN_KIND=""
|
||||
case "x$with_spectre_function_return_choice" in
|
||||
xkeep) SPECTRE_FUNCTION_RETURN_KIND=keep ;;
|
||||
xthunk) SPECTRE_FUNCTION_RETURN_KIND=thunk ;;
|
||||
xinline) SPECTRE_FUNCTION_RETURN_KIND=thunk-inline ;;
|
||||
xextern) SPECTRE_FUNCTION_RETURN_KIND=thunk-extern ;;
|
||||
*) AC_MSG_ERROR([Invalid function return thunk kind ($with_spectre_function_return_choice)]) ;;
|
||||
esac
|
||||
|
||||
AX_CHECK_COMPILE_FLAG(
|
||||
[ -mindirect-branch=$SPECTRE_INDIRECT_BRANCH_KIND ],
|
||||
[ SPECTRE_CFLAGS="$SPECTRE_CFLAGS -mindirect-branch=$SPECTRE_INDIRECT_BRANCH_KIND" ]
|
||||
)
|
||||
|
||||
AX_CHECK_COMPILE_FLAG(
|
||||
[ -mfunction-return=$SPECTRE_FUNCTION_RETURN_KIND ],
|
||||
[ SPECTRE_CFLAGS="$SPECTRE_CFLAGS -mfunction-return=$SPECTRE_FUNCTION_RETURN_KIND" ]
|
||||
)
|
||||
|
||||
if test "x$SPECTRE_CFLAGS" != "x" ; then
|
||||
CFLAGS="$CFLAGS $SPECTRE_CFLAGS"
|
||||
CXXFLAGS="$CXXFLAGS $SPECTRE_CFLAGS"
|
||||
spectre_mitigation_status="mitigation enabled"
|
||||
fi
|
||||
else
|
||||
spectre_mitigation_status="no mitigation"
|
||||
fi
|
||||
|
||||
dnl
|
||||
dnl Profile defaults
|
||||
@@ -1069,7 +956,7 @@ with_wasm_default=no
|
||||
with_bitcode_default=no
|
||||
with_cooperative_gc_default=no
|
||||
|
||||
INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=10000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4000
|
||||
INVARIANT_AOT_OPTIONS=nimt-trampolines=2000,ntrampolines=9000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=4000
|
||||
|
||||
AOT_BUILD_ATTRS=$INVARIANT_AOT_OPTIONS
|
||||
|
||||
@@ -1314,7 +1201,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, sgen_marksweep_conc, sgen_split_nursery, sgen_gc_bridge, sgen_debug_helpers.],
|
||||
security, lldb, mdb, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
|
||||
[
|
||||
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
|
||||
eval "mono_feature_disable_$feature='yes'"
|
||||
@@ -1422,12 +1309,6 @@ fi
|
||||
|
||||
AM_CONDITIONAL(DISABLE_INTERPRETER, test x$mono_feature_disable_interpreter = xyes)
|
||||
|
||||
if test "x$mono_feature_disable_interpreter" != "xyes" -o "x$mono_feature_disable_jit" != "xyes"; then
|
||||
AC_DEFINE(ENABLE_ILGEN, 1, [Some VES is available at runtime])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(ENABLE_ILGEN, test x$mono_feature_disable_interpreter != xyes -o x$mono_feature_disable_jit != xyes)
|
||||
|
||||
if test "x$mono_feature_disable_simd" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SIMD, 1, [Disable SIMD intrinsics related optimizations.])
|
||||
AC_MSG_NOTICE([Disabled SIMD support])
|
||||
@@ -1483,25 +1364,29 @@ 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_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.])
|
||||
if test "x$mono_feature_disable_sgen_remset" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_REMSET, 1, [Disable wbarrier=remset support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled wbarrier=remset support in SGEN.])
|
||||
fi
|
||||
|
||||
|
||||
if test "x$mono_feature_disable_sgen_split_nursery" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_SPLIT_NURSERY, 1, [Disable minor=split support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled minor=split support in SGEN.])
|
||||
if test "x$mono_feature_disable_sgen_marksweep_par" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_PAR, 1, [Disable major=marksweep-par support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled major=marksweep-par support in SGEN.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_sgen_gc_bridge" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_GC_BRIDGE, 1, [Disable gc bridge support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled gc bridge support in SGEN.])
|
||||
if test "x$mono_feature_disable_sgen_marksweep_fixed" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_FIXED, 1, [Disable major=marksweep-fixed support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled major=marksweep-fixed support in SGEN.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_sgen_debug_helpers" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_DEBUG_HELPERS, 1, [Disable debug helpers in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled debug helpers in SGEN.])
|
||||
if test "x$mono_feature_disable_sgen_marksweep_fixed_par" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_FIXED_PAR, 1, [Disable major=marksweep-fixed-par support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled major=marksweep-fixed-par support in SGEN.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_sgen_copying" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SGEN_MAJOR_COPYING, 1, [Disable major=copying support in SGEN.])
|
||||
AC_MSG_NOTICE([Disabled major=copying support in SGEN.])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(executables, [ --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
|
||||
@@ -1786,6 +1671,7 @@ if test x$host_win32 = xno; then
|
||||
AC_TRY_COMPILE([#include <sched.h>], [
|
||||
int mask = 1;
|
||||
sched_setaffinity(0, &mask);
|
||||
return 0;
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
@@ -2369,7 +2255,11 @@ if test x$host_win32 = xno; then
|
||||
child ()
|
||||
{
|
||||
struct sigaction sa;
|
||||
#ifdef __APPLE__
|
||||
stack_t sas;
|
||||
#else
|
||||
struct sigaltstack sas;
|
||||
#endif
|
||||
pthread_t id;
|
||||
pthread_attr_t attr;
|
||||
|
||||
@@ -2638,21 +2528,6 @@ if test x$host_win32 = xno; then
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
dnl **********************************
|
||||
dnl *** Check for access ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for access)
|
||||
AC_TRY_LINK([
|
||||
#include <unistd.h>
|
||||
], [
|
||||
access(NULL,0);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_ACCESS, 1, [Have access])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Checks for proclib ***
|
||||
@@ -2779,7 +2654,7 @@ if test x$host_win32 = xno; then
|
||||
[#include <sys/types.h>
|
||||
#include <sys/vfs.h>])
|
||||
AC_CHECK_MEMBERS(
|
||||
[struct stat.st_atim, struct stat.st_mtim, struct stat.st_atimespec, struct stat.st_ctim],,,
|
||||
[struct stat.st_atim, struct stat.st_mtim, struct stat.st_ctim],,,
|
||||
[#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>])
|
||||
@@ -3048,11 +2923,8 @@ try_dev_random=$enableval, try_dev_random=yes)
|
||||
AC_MSG_RESULT($try_dev_random)
|
||||
|
||||
case "{$build}" in
|
||||
|
||||
dnl IBM i does not have /dev/random, use unblocking only
|
||||
|
||||
*-*-os400*)
|
||||
NAME_DEV_RANDOM="/dev/urandom"
|
||||
*-openbsd*)
|
||||
NAME_DEV_RANDOM="/dev/srandom"
|
||||
;;
|
||||
|
||||
dnl Win32 does not have /dev/random, they have their own method...
|
||||
@@ -3098,7 +2970,7 @@ if test "x$ac_cv_have_dev_random" = "xno" \
|
||||
*** will throw a NotImplemented exception.
|
||||
***
|
||||
*** If you are seeing this message, and you know your system DOES have an
|
||||
*** entropy collection in place, please report an issue on GitHub and
|
||||
*** entropy collection in place, please contact <[email protected]> and
|
||||
*** provide information about the system and how to access the random device.
|
||||
***
|
||||
*** Otherwise you can install either egd or prngd and set the environment
|
||||
@@ -3376,6 +3248,7 @@ case "$host" in
|
||||
#if _MIPS_SIM != _ABIN32
|
||||
#error Not mips n32
|
||||
#endif
|
||||
return 0;
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
sizeof_register=8
|
||||
@@ -3425,9 +3298,6 @@ case "$host" in
|
||||
BTLS_PLATFORM=i386
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
AOT_SUPPORTED="yes"
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=i386
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -3452,9 +3322,6 @@ case "$host" in
|
||||
boehm_supported=false
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
AOT_SUPPORTED="yes"
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=x86_64
|
||||
;;
|
||||
mingw*)
|
||||
;;
|
||||
@@ -3488,8 +3355,7 @@ case "$host" in
|
||||
INTL="intl"
|
||||
;;
|
||||
macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
|
||||
powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | \
|
||||
powerpc-*-freebsd* | powerpc-*-aix* | powerpc-*-os400* )
|
||||
powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* )
|
||||
if test "x$ac_cv_sizeof_void_p" = "x8"; then
|
||||
TARGET=POWERPC64;
|
||||
CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__"
|
||||
@@ -3500,18 +3366,7 @@ case "$host" in
|
||||
fi
|
||||
arch_target=ppc;
|
||||
case $host_os in
|
||||
aix*|os400*)
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=powerpc
|
||||
dnl on AIX/PASE, shared libraries can be inside archives
|
||||
dnl if they are, we specify them by lib.a(lib.so)
|
||||
dnl we may hardcode 64-bit names at times, but we don't do 32-bit AIX, so
|
||||
LIBC="libc.a(shr_64.o)"
|
||||
INTL="libintl.a(libintl.so.8)"
|
||||
;;
|
||||
linux*)
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=powerpc
|
||||
linux*|darwin*)
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -3854,6 +3709,7 @@ if test "x$target_mach" = "xyes"; then
|
||||
#if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
|
||||
#error fail this for ios
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
AC_DEFINE(TARGET_OSX,1,[The JIT/AOT targets OSX])
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_OSX"
|
||||
@@ -4087,19 +3943,7 @@ AC_SEARCH_LIBS(nanosleep, rt)
|
||||
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
old_ldflags="${LDFLAGS}"
|
||||
# GNU specific option, this confuses IBM ld, but do offer alternatives when possible
|
||||
if test $lt_cv_prog_gnu_ld = yes; then
|
||||
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
|
||||
else
|
||||
case $host in
|
||||
*-*-aix*|*-*-os400*)
|
||||
;;
|
||||
*)
|
||||
dnl Try to use export-dynamic anyways
|
||||
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
|
||||
AC_TRY_LINK(, [int i;], found_export_dynamic=yes, found_export_dynamic=no)
|
||||
if test $found_export_dynamic = no; then
|
||||
LDFLAGS="${old_ldflags}"
|
||||
@@ -4121,7 +3965,7 @@ fi
|
||||
AC_SUBST(G_HAVE_ISO_VARARGS)
|
||||
|
||||
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h iconv.h localcharset.h sys/types.h sys/resource.h)
|
||||
AC_CHECK_LIB([iconv], [locale_charset],[],[AC_CHECK_LIB([charset], [locale_charset],[LIBS+=" -liconv -lcharset"])])
|
||||
AC_CHECK_LIB([iconv], [locale_charset],[],[AC_CHECK_LIB([charset], [locale_charset],[LIBS+="-liconv -lcharset"])])
|
||||
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
|
||||
AC_SUBST(HAVE_ALLOCA_H)
|
||||
|
||||
@@ -4178,23 +4022,10 @@ case "$host" in
|
||||
esac
|
||||
|
||||
case $with_libgdiplus in
|
||||
no)
|
||||
no|installed)
|
||||
libgdiplus_loc=
|
||||
;;
|
||||
|
||||
installed)
|
||||
libgdiplus_loc=
|
||||
if test x$cross_compiling = xno; then
|
||||
if test x$host_darwin = xyes; then
|
||||
a=/Library/Frameworks/Mono.framework/Versions/Current/lib/$libgdiplus_install_loc
|
||||
if test -x $a; then
|
||||
libgdiplus_install_loc=$a
|
||||
libgdiplus_loc=$a
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
yes|sibling)
|
||||
libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la
|
||||
;;
|
||||
@@ -4208,8 +4039,8 @@ case $with_libgdiplus in
|
||||
libgdiplus_loc=`pwd`/$with_libgdiplus
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(libgdiplus_loc)
|
||||
AC_SUBST(libgdiplus_install_loc)
|
||||
AC_SUBST([libgdiplus_loc])
|
||||
AC_SUBST([libgdiplus_install_loc])
|
||||
|
||||
AC_ARG_ENABLE(icall-symbol-map,[ --enable-icall-symbol-map Generate tables which map icall functions to their C symbols], icall_symbol_map=$enableval, icall_symbol_map=no)
|
||||
if test "x$icall_symbol_map" = "xyes"; then
|
||||
@@ -4226,8 +4057,6 @@ if test "x$icall_tables" = "xno"; then
|
||||
AC_DEFINE(DISABLE_ICALL_TABLES, 1, [Icall tables disabled])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(DISABLE_ICALL_TABLES, test x$icall_tables = xno)
|
||||
|
||||
if test "x$with_tls" = "x__thread"; then
|
||||
AC_DEFINE(HAVE_KW_THREAD, 1, [Have __thread keyword])
|
||||
# Pass the information to libgc
|
||||
@@ -4278,6 +4107,7 @@ if test ${TARGET} = ARM; then
|
||||
#ifndef __ARM_PCS_VFP
|
||||
#error "Float ABI is not 'hard'"
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
fpu=VFP_HARD
|
||||
], [
|
||||
@@ -4291,6 +4121,7 @@ if test ${TARGET} = ARM; then
|
||||
#ifdef __SOFTFP__
|
||||
#error "Float ABI is not 'softfp'"
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
fpu=VFP
|
||||
], [
|
||||
@@ -4315,6 +4146,7 @@ if test ${TARGET} = ARM; then
|
||||
#if !defined(__ARM_ARCH_5T__) && !defined(__ARM_ARCH_5TE__) && !defined(__ARM_ARCH_5TEJ__)
|
||||
#error Not on ARM v5.
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
arm_v5=yes
|
||||
|
||||
@@ -4325,6 +4157,7 @@ if test ${TARGET} = ARM; then
|
||||
#if !defined(__ARM_ARCH_6J__) && !defined(__ARM_ARCH_6ZK__) && !defined(__ARM_ARCH_6K__) && !defined(__ARM_ARCH_6T2__) && !defined(__ARM_ARCH_6M__)
|
||||
#error Not on ARM v6.
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
arm_v5=yes
|
||||
arm_v6=yes
|
||||
@@ -4336,6 +4169,7 @@ if test ${TARGET} = ARM; then
|
||||
#if !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_7R__) && !defined(__ARM_ARCH_7EM__) && !defined(__ARM_ARCH_7M__) && !defined(__ARM_ARCH_7S__)
|
||||
#error Not on ARM v7.
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
arm_v5=yes
|
||||
arm_v6=yes
|
||||
@@ -4488,7 +4322,7 @@ fi
|
||||
|
||||
AM_CONDITIONAL([ENABLE_COOP], [test x$with_cooperative_gc != xno])
|
||||
|
||||
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],[
|
||||
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],[
|
||||
|
||||
if test x$enable_checked_build != x ; then
|
||||
AC_DEFINE(ENABLE_CHECKED_BUILD,1,[Enable checked build])
|
||||
@@ -4501,7 +4335,6 @@ AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable check
|
||||
eval "mono_checked_build_test_enable_gc='yes'"
|
||||
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'"
|
||||
fi
|
||||
|
||||
if test "x$mono_checked_build_test_enable_gc" = "xyes"; then
|
||||
@@ -4516,9 +4349,6 @@ AC_ARG_ENABLE(checked_build, [ --enable-checked-build=LIST To enable check
|
||||
AC_DEFINE(ENABLE_CHECKED_BUILD_THREAD, 1, [Enable thread checked build])
|
||||
fi
|
||||
|
||||
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
|
||||
], [])
|
||||
|
||||
AC_CHECK_HEADER([malloc.h],
|
||||
@@ -4551,9 +4381,14 @@ dnl *** Btls ***
|
||||
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])
|
||||
|
||||
AM_CONDITIONAL(BTLS, test x$enable_btls = xyes)
|
||||
if test "x$enable_btls" = "xno"; then
|
||||
enable_btls_lib=no
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(BTLS, test x$enable_btls_lib = xyes)
|
||||
|
||||
btls_android=no
|
||||
if test "x$enable_btls" = "xyes"; then
|
||||
@@ -4591,14 +4426,6 @@ if test "x$enable_btls" = "xyes"; then
|
||||
aarch64)
|
||||
btls_arch=aarch64
|
||||
;;
|
||||
powerpc)
|
||||
btls_arch=powerpc
|
||||
case $host_os in
|
||||
aix*|os400*)
|
||||
btls_cflags="$btls_cflags -maix64 -mminimal-toc -pthread -D_ALL_SOURCE -D_THREAD_SAFE -D_REENTRANT"
|
||||
BTLS_CMAKE_ARGS="-DCMAKE_AR=/usr/bin/ar -DCMAKE_C_ARCHIVE_CREATE=\"<CMAKE_AR> -X64 cr <TARGET> <LINK_FLAGS> <OBJECTS>\""
|
||||
esac
|
||||
;;
|
||||
android-armv5)
|
||||
BTLS_CMAKE_ARGS="-DANDROID_ABI=\"armeabi\" -DANDROID_NATIVE_API_LEVEL=14"
|
||||
;;
|
||||
@@ -4705,7 +4532,7 @@ AC_SUBST(mono_build_root)
|
||||
mono_runtime=mono/mini/mono
|
||||
AC_SUBST(mono_runtime)
|
||||
|
||||
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.7.0/tools/csc.exe
|
||||
CSC_LOCATION=`cd $srcdir && pwd`/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/csc.exe
|
||||
|
||||
if test $csc_compiler = mcs; then
|
||||
CSC=$mcs_topdir/class/lib/build/mcs.exe
|
||||
@@ -4901,7 +4728,6 @@ scripts/mono-find-requires
|
||||
mono/Makefile
|
||||
mono/btls/Makefile
|
||||
mono/utils/Makefile
|
||||
mono/utils/jemalloc/Makefile
|
||||
mono/metadata/Makefile
|
||||
mono/dis/Makefile
|
||||
mono/cil/Makefile
|
||||
@@ -5124,7 +4950,6 @@ echo "
|
||||
BigArrays: $enable_big_arrays
|
||||
DTrace: $enable_dtrace
|
||||
LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
|
||||
Spectre: $spectre_mitigation_status
|
||||
|
||||
Libraries:
|
||||
.NET 4.x: $with_profile4_x
|
||||
@@ -5142,7 +4967,6 @@ echo "
|
||||
libgdiplus: $libgdiplus_msg
|
||||
zlib: $zlib_msg
|
||||
BTLS: $enable_btls$btls_platform_string
|
||||
jemalloc: $with_jemalloc (always use: $with_jemalloc_always)
|
||||
$disabled
|
||||
"
|
||||
if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then
|
||||
|
||||
@@ -40,5 +40,4 @@
|
||||
<dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="System.Native" target="__Internal"/>
|
||||
</configuration>
|
||||
+2
-2
@@ -13,10 +13,10 @@ ASSEMBLED_DOCS = \
|
||||
monoapi.tree monoapi.zip
|
||||
|
||||
convert.exe: $(srcdir)/convert.cs AgilityPack.dll
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -out:$@ $< -r:AgilityPack.dll
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -out:$@ $< -r:AgilityPack.dll
|
||||
|
||||
AgilityPack.dll:
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
|
||||
|
||||
monoapi.zip: monoapi.tree
|
||||
@test -f $@ || { rm -f $< && $(MAKE) $<; }
|
||||
|
||||
+1
-1
@@ -69,5 +69,5 @@ object for filters is passed in a local variable (cfg->exvar).
|
||||
throw: we first save all regs into a sigcontext struct and then call the stack
|
||||
unwinding code.
|
||||
|
||||
catch handler: catch handlers are always called from the stack unwinding
|
||||
catch handler: catch hanlders are always called from the stack unwinding
|
||||
code. The exception object is passed in a local variable (cfg->exvar).
|
||||
Vendored
+1
-1
Submodule external/api-snapshot updated: cc9c087cdf...be2efbfa80.
Vendored
+1
-1
Submodule external/binary-reference-assemblies updated: c7ca004a74...e048fe4a88.
Vendored
+1
-1
Submodule external/bockbuild updated: 463bf5f401...1908d43ec6.
Vendored
+1
-1
Submodule external/boringssl updated: 345755cb49...3e0770e188.
Vendored
+1
-1
Submodule external/corefx updated: 0a41bc4733...f37e667108.
Vendored
+1
-1
Submodule external/corert updated: 9e38c16f94...aa64b376c1.
Vendored
+1
-1
Submodule external/linker updated: dccb0d2378...84d37424cd.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: 0542d0d56f...00da53c474.
+1
-1
@@ -49,7 +49,7 @@ obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
|
||||
solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
|
||||
backgraph.c win32_threads.c \
|
||||
pthread_support.c pthread_stop_world.c darwin_stop_world.c \
|
||||
mach_dep.c $(asm_libgc_sources)
|
||||
openbsd_stop_world.c mach_dep.c $(asm_libgc_sources)
|
||||
|
||||
# Include THREADDLLIBS here to ensure that the correct versions of
|
||||
# linuxthread semaphore functions get linked:
|
||||
|
||||
@@ -104,10 +104,6 @@ case "$THREADS" in
|
||||
AC_DEFINE(GC_AIX_THREADS)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
*-*-haiku*)
|
||||
AC_DEFINE(GC_HAIKU_THREADS)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
;;
|
||||
*-*-hpux*)
|
||||
AC_MSG_WARN("Only HP/UX 11 threads are supported.")
|
||||
AC_DEFINE(GC_HPUX_THREADS)
|
||||
|
||||
+1
-18
@@ -59,7 +59,7 @@
|
||||
!(defined(FREEBSD) && defined(__ELF__)) && \
|
||||
!(defined(OPENBSD) && (defined(__ELF__) || defined(M68K))) && \
|
||||
!(defined(NETBSD) && defined(__ELF__)) && !defined(HURD) && \
|
||||
!defined(DARWIN) && !defined(HAIKU)
|
||||
!defined(DARWIN)
|
||||
--> We only know how to find data segments of dynamic libraries for the
|
||||
--> above. Additional SVR4 variants might not be too
|
||||
--> hard to add.
|
||||
@@ -1258,23 +1258,6 @@ GC_bool GC_register_main_static_data()
|
||||
|
||||
#endif /* DARWIN */
|
||||
|
||||
#if defined(HAIKU)
|
||||
|
||||
#include <kernel/image.h>
|
||||
|
||||
void GC_register_dynamic_libraries()
|
||||
{
|
||||
image_info info;
|
||||
int32 cookie = 0;
|
||||
while (get_next_image_info(0, &cookie, &info) == B_OK)
|
||||
{
|
||||
void *data = info.data;
|
||||
GC_add_roots_inner(data, data + info.data_size, TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* HAIKU */
|
||||
|
||||
#else /* !DYNAMIC_LOADING */
|
||||
|
||||
#ifdef PCR
|
||||
|
||||
@@ -835,18 +835,6 @@ typedef GC_PTR (*GC_fn_type) GC_PROTO((GC_PTR client_data));
|
||||
GC_API GC_PTR GC_call_with_alloc_lock
|
||||
GC_PROTO((GC_fn_type fn, GC_PTR client_data));
|
||||
|
||||
/*
|
||||
* These are similar to GC_do_blocking () in upstream bdwgc. The design is
|
||||
* simpler in that there is no distinction between active and inactive stack
|
||||
* frames; instead, while a thread is in blocking state, it promises to not
|
||||
* interact with the GC at all, and to not keep any pointers to GC memory
|
||||
* around from before entering blocking state. Additionally, these can be
|
||||
* called unbalanced (they simply set a flag internally).
|
||||
*/
|
||||
GC_API void GC_start_blocking GC_PROTO((void));
|
||||
|
||||
GC_API void GC_end_blocking GC_PROTO((void));
|
||||
|
||||
/* The following routines are primarily intended for use with a */
|
||||
/* preprocessor which inserts calls to check C pointer arithmetic. */
|
||||
/* They indicate failure by invoking the corresponding _print_proc. */
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
|
||||
defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
|
||||
defined(GC_AIX_THREADS) || defined(GC_NETBSD_THREADS) || \
|
||||
defined(GC_OPENBSD_THREADS) || defined(GC_HAIKU_THREADS) ||\
|
||||
defined(GC_OPENBSD_THREADS) || \
|
||||
(defined(GC_WIN32_THREADS) && defined(__CYGWIN32__))
|
||||
# define GC_PTHREADS
|
||||
# endif
|
||||
|
||||
@@ -1979,8 +1979,6 @@ void GC_err_puts GC_PROTO((GC_CONST char *s));
|
||||
/* Linuxthreads itself uses SIGUSR1 and SIGUSR2. */
|
||||
# define SIG_SUSPEND SIGPWR
|
||||
# endif
|
||||
# elif defined(GC_OPENBSD_THREADS)
|
||||
# define SIG_SUSPEND SIGXFSZ
|
||||
# else /* !GC_LINUX_THREADS */
|
||||
# if defined(_SIGRTMIN)
|
||||
# define SIG_SUSPEND _SIGRTMIN + 6
|
||||
|
||||
@@ -238,16 +238,6 @@
|
||||
# define BEOS
|
||||
# define mach_type_known
|
||||
# endif
|
||||
# if defined(__HAIKU__) && defined(_X86_)
|
||||
# define I386
|
||||
# define HAIKU
|
||||
# define mach_type_known
|
||||
# endif
|
||||
# if defined(__HAIKU__) && defined(__amd64__)
|
||||
# define X86_64
|
||||
# define HAIKU
|
||||
# define mach_type_known
|
||||
# endif
|
||||
# if defined(LINUX) && (defined(i386) || defined(__i386__))
|
||||
# define I386
|
||||
# define mach_type_known
|
||||
@@ -1174,15 +1164,6 @@
|
||||
extern int etext[];
|
||||
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
# endif
|
||||
# ifdef HAIKU
|
||||
# define OS_TYPE "HAIKU"
|
||||
# include <OS.h>
|
||||
# define GETPAGESIZE() B_PAGE_SIZE
|
||||
extern int etext[];
|
||||
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
# define DYNAMIC_LOADING
|
||||
# define MPROTECT_VDB
|
||||
# endif
|
||||
# ifdef SUNOS5
|
||||
# define OS_TYPE "SUNOS5"
|
||||
extern int _etext[], _end[];
|
||||
@@ -2153,15 +2134,6 @@
|
||||
/* There seems to be some issues with trylock hanging on darwin. This
|
||||
should be looked into some more */
|
||||
# endif
|
||||
# ifdef HAIKU
|
||||
# define OS_TYPE "HAIKU"
|
||||
# include <OS.h>
|
||||
# define GETPAGESIZE() B_PAGE_SIZE
|
||||
extern int etext[];
|
||||
# define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
|
||||
# define DYNAMIC_LOADING
|
||||
# define MPROTECT_VDB
|
||||
# endif
|
||||
# ifdef FREEBSD
|
||||
# define OS_TYPE "FREEBSD"
|
||||
# ifndef GC_FREEBSD_THREADS
|
||||
@@ -2279,7 +2251,7 @@
|
||||
# if defined(SVR4) || defined(LINUX) || defined(IRIX5) || defined(HPUX) \
|
||||
|| defined(OPENBSD) || defined(NETBSD) || defined(FREEBSD) \
|
||||
|| defined(DGUX) || defined(BSD) || defined(SUNOS4) \
|
||||
|| defined(_AIX) || defined(DARWIN) || defined(OSF1) || defined(HAIKU)
|
||||
|| defined(_AIX) || defined(DARWIN) || defined(OSF1)
|
||||
# define UNIX_LIKE /* Basic Unix-like system calls work. */
|
||||
# endif
|
||||
|
||||
@@ -2535,9 +2507,6 @@
|
||||
# if defined(SN_TARGET_PS3)
|
||||
extern void *ps3_get_mem (size_t size);
|
||||
# define GET_MEM(bytes) (struct hblk*) ps3_get_mem (bytes)
|
||||
# elif defined(HAIKU)
|
||||
ptr_t GC_haiku_get_mem(GC_word bytes);
|
||||
# define GET_MEM(bytes) (struct hblk*)GC_haiku_get_mem(bytes)
|
||||
# else
|
||||
extern ptr_t GC_unix_get_mem(word size);
|
||||
# define GET_MEM(bytes) (struct hblk *)GC_unix_get_mem(bytes)
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
#ifndef GC_OPENBSD_STOP_WORLD_H
|
||||
#define GC_OPENBSD_STOP_WORLD_H
|
||||
|
||||
#if !defined(GC_OPENBSD_THREADS)
|
||||
#error openbsd_stop_world.h included without GC_OPENBSD_THREADS defined
|
||||
#endif
|
||||
|
||||
struct thread_stop_info {
|
||||
ptr_t stack_ptr; /* Valid only when stopped. */
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
#if defined(GC_DARWIN_THREADS)
|
||||
# include "private/darwin_stop_world.h"
|
||||
#elif defined(GC_OPENBSD_THREADS)
|
||||
# include "private/openbsd_stop_world.h"
|
||||
#else
|
||||
# include "private/pthread_stop_world.h"
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,161 @@
|
||||
#include "private/pthread_support.h"
|
||||
|
||||
/* derived from pthread_stop_world.c */
|
||||
|
||||
# if defined(GC_OPENBSD_THREADS)
|
||||
|
||||
#define THREAD_EQUAL(id1, id2) pthread_equal(id1, id2)
|
||||
|
||||
/* We hold allocation lock. Should do exactly the right thing if the */
|
||||
/* world is stopped. Should not fail if it isn't. */
|
||||
void GC_push_all_stacks()
|
||||
{
|
||||
GC_bool found_me = FALSE;
|
||||
size_t nthreads = 0;
|
||||
int i;
|
||||
GC_thread p;
|
||||
ptr_t lo, hi;
|
||||
pthread_t me = pthread_self();
|
||||
|
||||
if (!GC_thr_initialized) GC_thr_init();
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("Pushing stacks from thread 0x%x\n", (unsigned) me);
|
||||
# endif
|
||||
for (i = 0; i < THREAD_TABLE_SZ; i++) {
|
||||
for (p = GC_threads[i]; p != 0; p = p -> next) {
|
||||
if (p -> flags & FINISHED) continue;
|
||||
++nthreads;
|
||||
if (THREAD_EQUAL(p -> id, me)) {
|
||||
# ifdef SPARC
|
||||
lo = (ptr_t)GC_save_regs_in_stack();
|
||||
# else
|
||||
lo = GC_approx_sp();
|
||||
# endif
|
||||
found_me = TRUE;
|
||||
} else {
|
||||
lo = p -> stop_info.stack_ptr;
|
||||
}
|
||||
if ((p -> flags & MAIN_THREAD) == 0) {
|
||||
hi = p -> stack_end;
|
||||
} else {
|
||||
/* The original stack. */
|
||||
hi = GC_stackbottom;
|
||||
}
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("Stack for thread 0x%x = [%p,%p)\n",
|
||||
(unsigned)(p -> id), lo, hi);
|
||||
# endif
|
||||
if (0 == lo) ABORT("GC_push_all_stacks: sp not set!\n");
|
||||
# ifdef STACK_GROWS_UP
|
||||
/* We got them backwards! */
|
||||
GC_push_all_stack(hi, lo);
|
||||
# else
|
||||
GC_push_all_stack(lo, hi);
|
||||
# endif
|
||||
}
|
||||
}
|
||||
if (!found_me && !GC_in_thread_creation)
|
||||
ABORT("Collecting from unknown thread.");
|
||||
}
|
||||
|
||||
/* We hold the allocation lock. Suspend all threads that might */
|
||||
/* still be running. */
|
||||
void GC_suspend_all()
|
||||
{
|
||||
int i;
|
||||
GC_thread p;
|
||||
int result;
|
||||
pthread_t my_thread = pthread_self();
|
||||
|
||||
for (i = 0; i < THREAD_TABLE_SZ; i++) {
|
||||
for (p = GC_threads[i]; p != 0; p = p -> next) {
|
||||
if (!THREAD_EQUAL(p -> id, my_thread)) {
|
||||
if (p -> flags & FINISHED) continue;
|
||||
if (p -> thread_blocked) /* Will wait */ continue;
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("Suspending thread 0x%x\n",
|
||||
(unsigned)(p -> id));
|
||||
# endif
|
||||
|
||||
if (pthread_suspend_np(p -> id) != 0)
|
||||
ABORT("pthread_suspend_np failed");
|
||||
|
||||
/*
|
||||
* This will only work for userland pthreads. It will
|
||||
* fail badly on rthreads. Perhaps we should consider
|
||||
* a pthread_sp_np() function that returns the stack
|
||||
* pointer for a suspended thread and implement in
|
||||
* both pthreads and rthreads.
|
||||
*/
|
||||
p -> stop_info.stack_ptr = *(ptr_t*)((char *)p -> id + UTHREAD_SP_OFFSET);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void GC_stop_world()
|
||||
{
|
||||
int i;
|
||||
|
||||
GC_ASSERT(I_HOLD_LOCK());
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("Stopping the world from 0x%x\n", (unsigned)pthread_self());
|
||||
# endif
|
||||
|
||||
/* Make sure all free list construction has stopped before we start. */
|
||||
/* No new construction can start, since free list construction is */
|
||||
/* required to acquire and release the GC lock before it starts, */
|
||||
/* and we have the lock. */
|
||||
# ifdef PARALLEL_MARK
|
||||
GC_acquire_mark_lock();
|
||||
GC_ASSERT(GC_fl_builder_count == 0);
|
||||
/* We should have previously waited for it to become zero. */
|
||||
# endif /* PARALLEL_MARK */
|
||||
|
||||
GC_suspend_all();
|
||||
|
||||
# ifdef PARALLEL_MARK
|
||||
GC_release_mark_lock();
|
||||
# endif
|
||||
#if DEBUG_THREADS
|
||||
GC_printf("World stopped from 0x%x\n", (unsigned)pthread_self());
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Caller holds allocation lock, and has held it continuously since */
|
||||
/* the world stopped. */
|
||||
void GC_start_world()
|
||||
{
|
||||
pthread_t my_thread = pthread_self();
|
||||
register int i;
|
||||
register GC_thread p;
|
||||
register int result;
|
||||
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("World starting\n");
|
||||
# endif
|
||||
|
||||
for (i = 0; i < THREAD_TABLE_SZ; i++) {
|
||||
for (p = GC_threads[i]; p != 0; p = p -> next) {
|
||||
if (!THREAD_EQUAL(p -> id, my_thread)) {
|
||||
if (p -> flags & FINISHED) continue;
|
||||
if (p -> thread_blocked) continue;
|
||||
#if DEBUG_THREADS
|
||||
GC_printf("Resuming thread 0x%x\n",
|
||||
(unsigned)(p -> id));
|
||||
#endif
|
||||
|
||||
if (pthread_resume_np(p -> id) != 0)
|
||||
ABORT("pthread_kill failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
# if DEBUG_THREADS
|
||||
GC_printf("World started\n");
|
||||
# endif
|
||||
}
|
||||
|
||||
void GC_stop_init() {
|
||||
}
|
||||
|
||||
#endif
|
||||
+9
-31
@@ -609,7 +609,7 @@ void GC_enable_signals(void)
|
||||
&& !defined(MACOS) && !defined(DJGPP) && !defined(DOS4GW) \
|
||||
&& !defined(NOSYS) && !defined(ECOS) && !defined(SN_TARGET_PS3)
|
||||
|
||||
# if defined(sigmask) && !defined(UTS4) && !defined(HURD) && !defined(HAIKU)
|
||||
# if defined(sigmask) && !defined(UTS4) && !defined(HURD)
|
||||
/* Use the traditional BSD interface */
|
||||
# define SIGSET_T int
|
||||
# define SIG_DEL(set, signal) (set) &= ~(sigmask(signal))
|
||||
@@ -764,14 +764,14 @@ ptr_t GC_get_stack_base()
|
||||
|
||||
# endif /* MS Windows */
|
||||
|
||||
# ifdef HAIKU
|
||||
# ifdef BEOS
|
||||
# include <kernel/OS.h>
|
||||
ptr_t GC_get_stack_base(){
|
||||
thread_info th;
|
||||
get_thread_info(find_thread(NULL),&th);
|
||||
return th.stack_end;
|
||||
}
|
||||
# endif /* HAIKU */
|
||||
# endif /* BEOS */
|
||||
|
||||
|
||||
# ifdef OS2
|
||||
@@ -1122,7 +1122,7 @@ void *GC_set_stackbottom = NULL;
|
||||
|
||||
#endif /* FREEBSD_STACKBOTTOM */
|
||||
|
||||
#if !defined(HAIKU) && !defined(AMIGA) && !defined(MSWIN32) \
|
||||
#if !defined(BEOS) && !defined(AMIGA) && !defined(MSWIN32) \
|
||||
&& !defined(MSWINCE) && !defined(OS2) && !defined(NOSYS) && !defined(ECOS) \
|
||||
&& !defined(GC_OPENBSD_THREADS)
|
||||
|
||||
@@ -1182,7 +1182,7 @@ ptr_t GC_get_stack_base()
|
||||
# endif /* STACKBOTTOM */
|
||||
}
|
||||
|
||||
# endif /* ! AMIGA, !OS 2, ! MS Windows, !HAIKU, !NOSYS, !ECOS */
|
||||
# endif /* ! AMIGA, !OS 2, ! MS Windows, !BEOS, !NOSYS, !ECOS */
|
||||
|
||||
#if defined(GC_OPENBSD_THREADS)
|
||||
|
||||
@@ -1957,19 +1957,6 @@ word bytes;
|
||||
}
|
||||
# endif
|
||||
|
||||
#if defined(HAIKU)
|
||||
#include <stdlib.h>
|
||||
|
||||
ptr_t GC_haiku_get_mem(word bytes)
|
||||
{
|
||||
void* mem;
|
||||
if (posix_memalign(&mem, GC_page_size, bytes) == 0)
|
||||
return mem;
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef USE_MUNMAP
|
||||
|
||||
/* For now, this only works on Win32/WinCE and some Unix-like */
|
||||
@@ -2406,9 +2393,7 @@ GC_bool is_ptrfree;
|
||||
|
||||
# include <sys/mman.h>
|
||||
# include <signal.h>
|
||||
# if !defined(HAIKU)
|
||||
# include <sys/syscall.h>
|
||||
# endif
|
||||
# include <sys/syscall.h>
|
||||
|
||||
# define PROTECT(addr, len) \
|
||||
if (mprotect((caddr_t)(addr), (size_t)(len), \
|
||||
@@ -2465,13 +2450,13 @@ GC_bool is_ptrfree;
|
||||
#endif /* SUNOS4 || (FREEBSD && !SUNOS5SIGS) */
|
||||
|
||||
#if defined(SUNOS5SIGS) || defined(OSF1) || defined(LINUX) \
|
||||
|| defined(HURD) || defined(HAIKU)
|
||||
|| defined(HURD)
|
||||
# ifdef __STDC__
|
||||
typedef void (* SIG_PF)(int);
|
||||
# else
|
||||
typedef void (* SIG_PF)();
|
||||
# endif
|
||||
#endif /* SUNOS5SIGS || OSF1 || LINUX || HURD || HAIKU */
|
||||
#endif /* SUNOS5SIGS || OSF1 || LINUX || HURD */
|
||||
|
||||
#if defined(MSWIN32)
|
||||
typedef LPTOP_LEVEL_EXCEPTION_FILTER SIG_PF;
|
||||
@@ -2649,13 +2634,6 @@ SIG_PF GC_old_segv_handler; /* Also old MSWIN32 ACCESS_VIOLATION filter */
|
||||
/* architectures. */
|
||||
# endif /* LINUX */
|
||||
|
||||
# if defined(HAIKU)
|
||||
# include <errno.h>
|
||||
# define CODE_OK TRUE
|
||||
# define SIG_OK (sig == SIGSEGV)
|
||||
void GC_write_failt_handler(int sig, siginfo_t *scp, void * context)
|
||||
#endif /* HAIKU */
|
||||
|
||||
# if defined(SUNOS5SIGS)
|
||||
# ifdef __STDC__
|
||||
void GC_write_fault_handler(int sig, SIGINFO_T *scp, void * context)
|
||||
@@ -2701,7 +2679,7 @@ SIG_PF GC_old_segv_handler; /* Also old MSWIN32 ACCESS_VIOLATION filter */
|
||||
# if defined(OSF1) && defined(ALPHA)
|
||||
char * addr = (char *) (scp -> sc_traparg_a0);
|
||||
# endif
|
||||
# if defined(SUNOS5SIGS) || defined(HAIKU)
|
||||
# ifdef SUNOS5SIGS
|
||||
char * addr = (char *) (scp -> si_addr);
|
||||
# endif
|
||||
# ifdef LINUX
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
|
||||
#if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
|
||||
&& !defined(GC_IRIX_THREADS) && !defined(GC_WIN32_THREADS) \
|
||||
&& !defined(GC_DARWIN_THREADS) && !defined(GC_AIX_THREADS)
|
||||
&& !defined(GC_DARWIN_THREADS) && !defined(GC_AIX_THREADS) \
|
||||
&& !defined(GC_OPENBSD_THREADS)
|
||||
|
||||
#include <signal.h>
|
||||
#include <semaphore.h>
|
||||
|
||||
@@ -1135,7 +1135,7 @@ void GC_thr_init()
|
||||
# if defined(GC_HPUX_THREADS)
|
||||
GC_nprocs = pthread_num_processors_np();
|
||||
# endif
|
||||
# if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS) || defined(GC_HAIKU_THREADS)
|
||||
# if defined(GC_OSF1_THREADS) || defined(GC_AIX_THREADS)
|
||||
GC_nprocs = sysconf(_SC_NPROCESSORS_ONLN);
|
||||
if (GC_nprocs <= 0) GC_nprocs = 1;
|
||||
# endif
|
||||
@@ -1245,6 +1245,7 @@ void GC_start_blocking(void) {
|
||||
GC_thread me;
|
||||
LOCK();
|
||||
me = GC_lookup_thread(pthread_self());
|
||||
GC_ASSERT(!(me -> thread_blocked));
|
||||
# ifdef SPARC
|
||||
me -> stop_info.stack_ptr = (ptr_t)GC_save_regs_in_stack();
|
||||
# else
|
||||
@@ -1272,6 +1273,7 @@ void GC_end_blocking(void) {
|
||||
GC_thread me;
|
||||
LOCK(); /* This will block if the world is stopped. */
|
||||
me = GC_lookup_thread(pthread_self());
|
||||
GC_ASSERT(me -> thread_blocked);
|
||||
me -> thread_blocked = FALSE;
|
||||
UNLOCK();
|
||||
}
|
||||
|
||||
+1
-47
@@ -48,7 +48,6 @@ struct GC_thread_Rep {
|
||||
/* 0 ==> entry not valid. */
|
||||
/* !in_use ==> stack_base == 0 */
|
||||
GC_bool suspended;
|
||||
GC_bool thread_blocked;
|
||||
|
||||
# ifdef CYGWIN32
|
||||
void *status; /* hold exit value until join in case it's a pointer */
|
||||
@@ -175,7 +174,6 @@ static GC_thread GC_new_thread(void) {
|
||||
/* the world, wait here. Hopefully this can't happen on any */
|
||||
/* systems that don't allow us to block here. */
|
||||
while (GC_please_stop) Sleep(20);
|
||||
GC_ASSERT(!thread_table[i]->thread_blocked);
|
||||
return thread_table + i;
|
||||
}
|
||||
|
||||
@@ -225,6 +223,7 @@ static void GC_delete_thread(DWORD thread_id) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#ifdef CYGWIN32
|
||||
|
||||
/* Return a GC_thread corresponding to a given pthread_t. */
|
||||
@@ -246,20 +245,6 @@ static GC_thread GC_lookup_thread(pthread_t id)
|
||||
return thread_table + i;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
static GC_thread GC_lookup_thread(DWORD id)
|
||||
{
|
||||
int i;
|
||||
LONG max = GC_get_max_thread_index();
|
||||
|
||||
for (i = 0; i <= max; i++)
|
||||
if (thread_table[i].in_use && thread_table[i].id == id)
|
||||
return &thread_table[i];
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif /* CYGWIN32 */
|
||||
|
||||
void GC_push_thread_structures GC_PROTO((void))
|
||||
@@ -279,35 +264,6 @@ void GC_push_thread_structures GC_PROTO((void))
|
||||
# endif
|
||||
}
|
||||
|
||||
/* Wrappers for functions that are likely to block for an appreciable */
|
||||
/* length of time. Must be called in pairs, if at all. */
|
||||
/* Nothing much beyond the system call itself should be executed */
|
||||
/* between these. */
|
||||
|
||||
void GC_start_blocking(void) {
|
||||
GC_thread me;
|
||||
LOCK();
|
||||
#ifdef CYGWIN32
|
||||
me = GC_lookup_thread(pthread_self());
|
||||
#else
|
||||
me = GC_lookup_thread(GetCurrentThreadId());
|
||||
#endif
|
||||
me->thread_blocked = TRUE;
|
||||
UNLOCK();
|
||||
}
|
||||
|
||||
void GC_end_blocking(void) {
|
||||
GC_thread me;
|
||||
LOCK(); /* This will block if the world is stopped. */
|
||||
#ifdef CYGWIN32
|
||||
me = GC_lookup_thread(pthread_self());
|
||||
#else
|
||||
me = GC_lookup_thread(GetCurrentThreadId());
|
||||
#endif
|
||||
me->thread_blocked = FALSE;
|
||||
UNLOCK();
|
||||
}
|
||||
|
||||
/* Defined in misc.c */
|
||||
extern CRITICAL_SECTION GC_write_cs;
|
||||
|
||||
@@ -325,8 +281,6 @@ void GC_stop_world()
|
||||
for (i = 0; i <= GC_get_max_thread_index(); i++)
|
||||
if (thread_table[i].stack_base != 0
|
||||
&& thread_table[i].id != thread_id) {
|
||||
if (thread_table [i].thread_blocked)
|
||||
continue;
|
||||
# ifdef MSWINCE
|
||||
/* SuspendThread will fail if thread is running kernel code */
|
||||
while (SuspendThread(thread_table[i].handle) == (DWORD)-1)
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
# ===========================================================================
|
||||
# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
|
||||
# ===========================================================================
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
|
||||
#
|
||||
# DESCRIPTION
|
||||
#
|
||||
# Check whether the given FLAG works with the current language's compiler
|
||||
# or gives an error. (Warnings, however, are ignored)
|
||||
#
|
||||
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
|
||||
# success/failure.
|
||||
#
|
||||
# If EXTRA-FLAGS is defined, it is added to the current language's default
|
||||
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
|
||||
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
|
||||
# force the compiler to issue an error when a bad flag is given.
|
||||
#
|
||||
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
|
||||
#
|
||||
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
|
||||
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
|
||||
#
|
||||
# LICENSE
|
||||
#
|
||||
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
|
||||
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by the
|
||||
# Free Software Foundation, either version 3 of the License, or (at your
|
||||
# option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
# Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License along
|
||||
# with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
#
|
||||
# As a special exception, the respective Autoconf Macro's copyright owner
|
||||
# gives unlimited permission to copy, distribute and modify the configure
|
||||
# scripts that are the output of Autoconf when processing the Macro. You
|
||||
# need not follow the terms of the GNU General Public License when using
|
||||
# or distributing such scripts, even though portions of the text of the
|
||||
# Macro appear in them. The GNU General Public License (GPL) does govern
|
||||
# all other use of the material that constitutes the Autoconf Macro.
|
||||
#
|
||||
# This special exception to the GPL applies to versions of the Autoconf
|
||||
# Macro released by the Autoconf Archive. When you make and distribute a
|
||||
# modified version of the Autoconf Macro, you may extend this special
|
||||
# exception to the GPL to apply to your modified version as well.
|
||||
|
||||
#serial 5
|
||||
|
||||
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
|
||||
[AC_PREREQ(2.63)dnl for _AC_LANG_PREFIX and AS_VAR_IF
|
||||
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
|
||||
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
|
||||
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
|
||||
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
|
||||
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
|
||||
[AS_VAR_SET(CACHEVAR,[yes])],
|
||||
[AS_VAR_SET(CACHEVAR,[no])])
|
||||
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
|
||||
AS_VAR_IF(CACHEVAR,yes,
|
||||
[m4_default([$2], :)],
|
||||
[m4_default([$3], :)])
|
||||
AS_VAR_POPDEF([CACHEVAR])dnl
|
||||
])dnl AX_CHECK_COMPILE_FLAGS
|
||||
@@ -13,7 +13,6 @@ man_MANS = \
|
||||
genxs.1 \
|
||||
httpcfg.1 \
|
||||
ilasm.1 \
|
||||
illinkanalyzer.1 \
|
||||
lc.1 \
|
||||
macpack.1 \
|
||||
makecert.1 \
|
||||
|
||||
+17
-83
@@ -111,11 +111,10 @@ directory.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.I "--config FILE"
|
||||
Specifies that a DLLMAP Mono config file must be bundled as well. In
|
||||
the simple and cross compiler modes, if no config file is specified
|
||||
the one for the current target is picked (either the system one in the
|
||||
case of the simple mode, or the one that came from the cross
|
||||
compilation target for the cross compiling mode).
|
||||
Specifies that a machine.config file must be bundled as well.
|
||||
Typically this is $prefix/etc/mono/1.0/machine.config or
|
||||
$prefix/etc/mono/2.0/machine.config depending on the profile that you
|
||||
are using (1.0 or 2.0)
|
||||
.TP
|
||||
.I "--config-dir DIR"
|
||||
When passed, DIR will be set for the MONO_CFG_DIR environment variable
|
||||
@@ -203,31 +202,13 @@ Provides mkbundle access to a managed linker to preprocess the assemblies.
|
||||
.TP
|
||||
.I "--machine-config FILE"
|
||||
Uses the given FILE as the machine.config file for the generated
|
||||
application. The machine config contains an XML file that is used by
|
||||
System.Configuration APIs to configure the .NET stack. Typically this
|
||||
is
|
||||
.I $prefix/etc/mono/4.5/machine.config.
|
||||
.Sp
|
||||
If you want to disable this automatic bundling, you can use the
|
||||
.I "--no-machine-config"
|
||||
flag. In the simple and cross compiler modes, if no machine.config file is specified
|
||||
the one for the current target is picked (either the system one in the
|
||||
case of the simple mode, or the one that came from the cross
|
||||
compilation target for the cross compiling mode).
|
||||
.TP
|
||||
.I "--no-config"
|
||||
In simple or cross compiling mode, this prevents mkbundle from
|
||||
automatically bundling a config file.
|
||||
application.
|
||||
.TP
|
||||
.I "--nodeps"
|
||||
This is the default: \fImkbundle\fP will only include the assemblies that
|
||||
were specified on the command line to reduce the size of the resulting
|
||||
image created.
|
||||
.TP
|
||||
.I "--no-machine-config"
|
||||
In simple or cross compiling mode, this prevents mkbundle from
|
||||
automatically bundling a machine.config file.
|
||||
.TP
|
||||
.I "-o filename"
|
||||
Places the output on `out'. If the flag -c is specified, this is the
|
||||
C host program. If not, this contains the resulting executable.
|
||||
@@ -359,80 +340,33 @@ not require runtime code generation. The "llvmonly" setting does the same, but f
|
||||
to go through the llvm backend.
|
||||
|
||||
.SH WINDOWS
|
||||
If you are using the old embedding on Windows systems, it possible to use
|
||||
a Unix-like toolchain like cygwin's and install gcc, gcc-mingw packages or
|
||||
use Visual Studio 2015/2017 VC toolchain together with Clang for Visual Studio as assembler.
|
||||
Clang can be installed as an individual component, "Clang/C2", using Visual Studio installer.
|
||||
.PP
|
||||
Using Visual Studio toolchain, mkbundle will, by default, use latest installed Visual Studio compiler
|
||||
and linker as well as Windows SDK. If executed from one of the Visual Studio developer command prompts,
|
||||
mkbundle will retrieve information directly from that build environment.
|
||||
If you are using the old embedding on Windows systems, it it necessary
|
||||
to have Unix-like toolchain to be installed for \fImkbundle\fP to
|
||||
work. You can use cygwin's and install gcc, gcc-mingw and as
|
||||
packages.
|
||||
.SH ENVIRONMENT VARIABLES
|
||||
.TP
|
||||
.I "AS"
|
||||
Assembler command. The default is "as". For Visual Studio, default is "clang.exe".
|
||||
If "clang.exe" for Visual Studio is not installed, mkbundle will fall back using "as".
|
||||
Assembler command. The default is "as".
|
||||
.TP
|
||||
.I "CC"
|
||||
C compiler command. The default is "cc" for Linux, "gcc"
|
||||
for cygwin and "cl.exe" for Visual Studio.
|
||||
C compiler command. The default is "cc" under Linux and "gcc"
|
||||
under Windows.
|
||||
.TP
|
||||
.I "MONO_BUNDLED_OPTIONS"
|
||||
Options to be passed to the bundled
|
||||
Mono runtime, separated by spaces. See the mono(1) manual page or run mono --help.
|
||||
.SH WINDOWS VISUAL STUDIO ENVIRONMENT VARIABLES
|
||||
.TP
|
||||
.I "VisualStudioVersion"
|
||||
Visual Studio version used in mkbundle build.
|
||||
Default, latest installed Visual Studio version.
|
||||
Values, "14.0" for Visual Studio 2015 or "15.0" for Visual Studio 2017.
|
||||
.TP
|
||||
.I "WindowsSdkVersion"
|
||||
Windows SDK version used in mkbundle build.
|
||||
Default/unknown, latest installed Windows SDK.
|
||||
Values, "8.1", "10.0.10240.0", "10.0.15063.0" etc.
|
||||
.TP
|
||||
.I "VSCMD_ARG_TGT_ARCH"
|
||||
Output target architecture used in mkbundle build.
|
||||
Default/unknown, use architecture of .NET runtime executing mkbundle.
|
||||
Values, "x86" or "x64".
|
||||
NOTE, when running from a Visual Studio command prompt, this variable should already be set
|
||||
by the command prompt and match the rest of that build environment.
|
||||
.TP
|
||||
.I "INCLUDE"
|
||||
Override all custom include paths passed to "cl.exe".
|
||||
Predefined by Visual Studio developer command prompt or auto detected by mkbundle when undefined.
|
||||
.TP
|
||||
.I "LIB"
|
||||
Override all custom library paths passed to "link.exe".
|
||||
Predefined by Visual Studio developer command prompt or auto detected by mkbundle when undefined.
|
||||
.TP
|
||||
.I "MONOPREFIX"
|
||||
Use a custom Mono SDK install root matching the output target architecture (x86/x64).
|
||||
Default, mkbundle will look for installed Mono SDK’s matching targeted architecture.
|
||||
.TP
|
||||
.I "MONOLIB"
|
||||
Use a different mono library name or an absolute path to the mono library passed to linker.
|
||||
Default, mkbundle will use default mono library name depending on mkbundle dynamic/static use case.
|
||||
NOTE, supplied mono library needs to match mkbundle dynamic/static use case and target architecture.
|
||||
.TP
|
||||
.I "VCCRT"
|
||||
Override C-runtime library linker settings.
|
||||
Default "MD", mkbundle will use dynamic C-runtime linking on Windows compatible with Mono SDK distribution.
|
||||
If a custom built Mono runtime using static C-Runtime linkage is used, setting this variable to "MT"
|
||||
will link using static C-runtime libraries.
|
||||
.TP
|
||||
.I "VCSUBSYSTEM"
|
||||
Override Windows subsystem.
|
||||
Default, "windows". If console subsystem is preferred, use "console".
|
||||
NOTE, if console output is expected from output target process then
|
||||
set this variable to "console".
|
||||
.SH FILES
|
||||
This program will load referenced assemblies from the Mono assembly
|
||||
cache.
|
||||
.PP
|
||||
Targets are loaded from ~/.mono/targets/TARGETNAME/mono
|
||||
.SH BUGS
|
||||
The option "--static" is not supported under Windows when using the
|
||||
old embedding.
|
||||
Moreover, a full cygwin environment containing at least "gcc" and "as"
|
||||
is required for the build process. The generated executable does not
|
||||
depend on cygwin.
|
||||
.SH MAILING LISTS
|
||||
Visit http://lists.ximian.com/mailman/listinfo/mono-devel-list for details.
|
||||
.SH WEB SITE
|
||||
|
||||
+13
-52
@@ -65,45 +65,6 @@ and
|
||||
See the description for
|
||||
.B MONO_IOMAP
|
||||
in the environment variables section for more details.
|
||||
.SH METHOD DESCRIPTIONS
|
||||
A number of diagnostic command line options take as argument a method
|
||||
description. A method description is a textual representation that
|
||||
can be used to uniquely identify a method. The syntax is as follows:
|
||||
.nf
|
||||
[namespace]classname:methodname[(arguments)]
|
||||
.fi
|
||||
.PP
|
||||
The values in brackets are optional, like the namespace and the
|
||||
arguments. The arguments themselves are either empty, or a
|
||||
comma-separated list of arguments. Both the
|
||||
\fBclassname\fR
|
||||
and
|
||||
\fBmethodname\fR
|
||||
can be set to the special value '*' to match any values (Unix shell
|
||||
users should escape the argument to avoid the shell interpreting
|
||||
this).
|
||||
.PP
|
||||
The arguments, if present should be a comma separated list of types
|
||||
either a full typename, or for built-in types it should use the
|
||||
low-level ILAsm type names for the built-in types,
|
||||
like 'void', 'char', 'bool', 'byte', 'sbyte', 'uint16', 'int16', 'uint',
|
||||
'int', 'ulong', 'long', 'uintptr', 'intptr', 'single', 'double', 'string', 'object'.
|
||||
.PP
|
||||
Pointer types should be the name of the type, followed by a '*',
|
||||
arrays should be the typename followed by '[' one or more commas (to
|
||||
indicate the rank of the array), and ']'.
|
||||
.PP
|
||||
Generic values should use '<', one or more type names, separated by
|
||||
both a comma and a space and '>'.
|
||||
.PP
|
||||
By-reference arguments should include a "&" after the typename.
|
||||
.PP
|
||||
Examples:
|
||||
.nf
|
||||
*:ctor(int) // All constructors that take an int as an argument
|
||||
*:Main // Methods named Main in any class
|
||||
*:Main(string[]) // Methods named Main that take a string array in any class
|
||||
.fi
|
||||
.SH RUNTIME OPTIONS
|
||||
The following options are available:
|
||||
.TP
|
||||
@@ -1126,13 +1087,15 @@ When Mono is built with a soft float fallback on ARM and this variable is set to
|
||||
"1", Mono will always emit soft float code, even if a VFP unit is
|
||||
detected.
|
||||
.TP
|
||||
\fBMONO_DARWIN_USE_KQUEUE_FSW\fR
|
||||
Fall back on the kqueue FileSystemWatcher implementation in Darwin. The default is the FSEvent implementation.
|
||||
.TP
|
||||
\fBMONO_DARWIN_WATCHER_MAXFDS\fR
|
||||
This is a debugging aid used to force limits on the kqueue FileSystemWatcher
|
||||
This is a debugging aid used to force limits on the FileSystemWatcher
|
||||
implementation in Darwin. There is no limit by default.
|
||||
.TP
|
||||
\fBMONO_DISABLE_AIO\fR
|
||||
If set, tells mono NOT to attempt using native asynchronous I/O services. In
|
||||
that case, a default select/poll implementation is used. Currently only epoll()
|
||||
is supported.
|
||||
.TP
|
||||
\fBMONO_DISABLE_MANAGED_COLLATION\fR
|
||||
If this environment variable is `yes', the runtime uses unmanaged
|
||||
collation (which actually means no culture-sensitive collation). It
|
||||
@@ -1158,11 +1121,6 @@ For platforms that do not otherwise have a way of obtaining random bytes
|
||||
this can be set to the name of a file system socket on which an egd or
|
||||
prngd daemon is listening.
|
||||
.TP
|
||||
\fBMONO_ENABLE_AIO\fR
|
||||
If set, tells mono to attempt using native asynchronous I/O services. If not
|
||||
set, a default select/poll implementation is used. Currently epoll and kqueue
|
||||
are supported.
|
||||
.TP
|
||||
\fBMONO_ENABLE_COOP\fR
|
||||
This makes the Mono runtime and the SGen garbage collector run in cooperative
|
||||
mode as opposed to run on preemptive mode. Preemptive mode is the mode
|
||||
@@ -1599,6 +1557,12 @@ home directories that might be shared over the network.
|
||||
If set, extra checks are made during IO operations. Currently, this
|
||||
includes only advisory locks around file writes.
|
||||
.TP
|
||||
\fBMONO_THEME\fR
|
||||
The name of the theme to be used by Windows.Forms. Available themes today
|
||||
include "clearlooks", "nice" and "win32".
|
||||
.Sp
|
||||
The default is "win32".
|
||||
.TP
|
||||
\fBMONO_TLS_SESSION_CACHE_TIMEOUT\fR
|
||||
The time, in seconds, that the SSL/TLS session cache will keep it's entry to
|
||||
avoid a new negotiation between the client and a server. Negotiation are very
|
||||
@@ -1862,10 +1826,7 @@ for example, to see managed frame names on gdb backtraces.
|
||||
\fBMONO_VERBOSE_METHOD\fR
|
||||
Enables the maximum JIT verbosity for the specified method. This is
|
||||
very helpfull to diagnose a miscompilation problems of a specific
|
||||
method. This can be a comma-separated list of method names to
|
||||
match. If the name is simple, this applies to any method with that
|
||||
name, otherwise you can use a mono method description (see the section
|
||||
METHOD DESCRIPTIONS).
|
||||
method.
|
||||
.TP
|
||||
\fBMONO_JIT_DUMP_METHOD\fR
|
||||
Enables sending of the JITs intermediate representation for a specified
|
||||
|
||||
+1
-1
@@ -202,7 +202,7 @@ Specify a parameter for a custom step.
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2007 Novell, Inc (http://www.novell.com)
|
||||
.SH BUGS
|
||||
Bugs report are welcome at https://github.com/mono/linker/issues
|
||||
Bugs report are welcome at http://bugzilla.xamarin.com
|
||||
.PP
|
||||
Product Mono Tools, Component linker.
|
||||
.SH MAILING LISTS
|
||||
|
||||
+2
-2
@@ -515,10 +515,10 @@ The Mono SQL Query Tool is released under the terms of the GNU GPL.
|
||||
Please read the accompanying `COPYING' file for details. Alternative
|
||||
licenses are available from Novell or Daniel Morgan.
|
||||
.SH BUGS
|
||||
To report bugs in the compiler, you can
|
||||
To report bugs in the compiler, you can use `bug-buddy', or you can
|
||||
file bug reports in our bug tracking system:
|
||||
.nf
|
||||
https://github.com/mono/mono/issues
|
||||
http://bugzilla.xamarin.com.
|
||||
.fi
|
||||
.PP
|
||||
.SH MAILING LISTS
|
||||
|
||||
@@ -45,8 +45,6 @@ static partial class SR
|
||||
{
|
||||
return string.Format (CultureInfo.InvariantCulture, resourceFormat, p1, p2, p3);
|
||||
}
|
||||
|
||||
internal static string GetResourceString (string str) => str;
|
||||
}
|
||||
|
||||
#if !INSIDE_CORLIB
|
||||
|
||||
@@ -42,9 +42,9 @@ class X {
|
||||
|
||||
Version min_mono_version;
|
||||
#if __MonoCS__
|
||||
min_mono_version = new Version (5, 13);
|
||||
min_mono_version = new Version (5, 9);
|
||||
#else
|
||||
min_mono_version = new Version (5, 10);
|
||||
min_mono_version = new Version (4, 9);
|
||||
#endif
|
||||
|
||||
if (version < min_mono_version)
|
||||
|
||||
@@ -34,8 +34,7 @@ sysconfdir = $(prefix)/etc
|
||||
RUNTIME = false
|
||||
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)
|
||||
TEST_RUNTIME = MONO_PATH="$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR).$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
|
||||
TEST_RUNTIME = MONO_PATH="$(MONO_PATH_TOP)$(PLATFORM_PATH_SEPARATOR)$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$(MONO_PATH_TESTS)$(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
|
||||
|
||||
@@ -42,17 +42,15 @@ executable_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_
|
||||
|
||||
makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag
|
||||
|
||||
LIB_REFS_ALL = $(DEFAULT_REFERENCES) $(LIB_REFS)
|
||||
|
||||
ifdef TARGET_NET_REFERENCE
|
||||
# System*, mscorlib references come from the TARGET_NET_REFERENCE dir, others from the profile dir
|
||||
LIB_REFS_MONO = $(call _FILTER_OUT,System,$(call _FILTER_OUT,mscorlib,$(LIB_REFS_ALL)))
|
||||
LIB_REFS_SYSTEM = $(filter-out $(LIB_REFS_MONO),$(LIB_REFS_ALL))
|
||||
# System.*.dll references come from the TARGET_NET_REFERENCE dir, others from the profile dir
|
||||
LIB_REFS_MONO = $(call _FILTER_OUT,System,$(LIB_REFS))
|
||||
LIB_REFS_SYSTEM = $(filter-out $(LIB_REFS_MONO),$(LIB_REFS))
|
||||
|
||||
MCS_REFERENCES = $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_SYSTEM))
|
||||
MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_MONO))
|
||||
else
|
||||
MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_ALL))
|
||||
MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS))
|
||||
endif
|
||||
|
||||
ifdef KEYFILE
|
||||
|
||||
+9
-15
@@ -18,19 +18,19 @@
|
||||
# Have to rename to handle differences between assembly/directory names
|
||||
DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS))
|
||||
|
||||
LIB_REFS_FULL = $(call _FILTER_OUT,=, $(LIB_REFS)) $(DEFAULT_REFERENCES)
|
||||
LIB_REFS_FULL = $(call _FILTER_OUT,=, $(LIB_REFS))
|
||||
LIB_REFS_ALIAS = $(filter-out $(LIB_REFS_FULL),$(LIB_REFS))
|
||||
|
||||
ifdef TARGET_NET_REFERENCE
|
||||
# System*, mscorlib references come from the TARGET_NET_REFERENCE dir, others from the profile dir
|
||||
LIB_REFS_MONO_FULL = $(call _FILTER_OUT,System,$(call _FILTER_OUT,mscorlib,$(LIB_REFS_FULL)))
|
||||
# System.*.dll references come from the TARGET_NET_REFERENCE dir, others from the profile dir
|
||||
LIB_REFS_MONO_FULL = $(call _FILTER_OUT,System,$(LIB_REFS_FULL))
|
||||
LIB_REFS_MONO_ALIAS = $(call _FILTER_OUT,System,$(LIB_REFS_ALIAS))
|
||||
|
||||
LIB_REFS_NET_FULL = $(filter-out $(LIB_REFS_MONO_FULL),$(LIB_REFS_FULL))
|
||||
LIB_REFS_NET_ALIAS = $(filter-out $(LIB_REFS_MONO_ALIAS),$(LIB_REFS_ALIAS))
|
||||
LIB_REFS_SYSTEM_FULL = $(filter-out $(LIB_REFS_MONO_FULL),$(LIB_REFS_FULL))
|
||||
LIB_REFS_SYSTEM_ALIAS = $(filter-out $(LIB_REFS_MONO_ALIAS),$(LIB_REFS_ALIAS))
|
||||
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_NET_FULL))
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/,$(LIB_REFS_NET_ALIAS)))
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_SYSTEM_FULL))
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/,$(LIB_REFS_SYSTEM_ALIAS)))
|
||||
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_MONO_FULL))
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE_DIRECTORY)/,$(LIB_REFS_MONO_ALIAS)))
|
||||
@@ -388,11 +388,5 @@ $(the_libdir)/.doc-stamp: $(the_lib)
|
||||
gen-deps:
|
||||
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
|
||||
|
||||
update-corefx-sr-generic:
|
||||
ifneq ($(RESX_STRINGS),)
|
||||
MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_STRINGS) >$(SR_OUTPUT)
|
||||
endif
|
||||
|
||||
update-corefx-sr: $(RESX_RESOURCE_STRING) $(XTEST_RESX_RESOURCE_STRING)
|
||||
make SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" update-corefx-sr-generic \
|
||||
&& make SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic
|
||||
update-corefx-sr: $(RESX_RESOURCE_STRING)
|
||||
MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_RESOURCE_STRING) >corefx/SR.cs
|
||||
@@ -26,13 +26,11 @@ else
|
||||
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)/cil-stringreplacer.exe
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES)
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
|
||||
@@ -13,8 +13,8 @@ PLATFORMS = darwin linux win32
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES)
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
|
||||
@@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
@@ -24,6 +24,7 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:ANDROID \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monodroid
|
||||
|
||||
@@ -9,9 +9,9 @@ profile-check:
|
||||
@:
|
||||
|
||||
TARGET_NET_REFERENCE = v4.6
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
@@ -24,6 +24,7 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS) \
|
||||
$(MONOTOUCH_MCS_FLAGS)
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@ PLATFORMS = darwin linux win32
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
|
||||
@@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
@@ -26,6 +26,7 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:DISABLE_COM \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
|
||||
@@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
@@ -25,6 +25,7 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:DISABLE_COM \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
|
||||
@@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
@@ -22,6 +22,7 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:MONO \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
|
||||
@@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
@@ -22,6 +22,7 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:MONO \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
|
||||
@@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
@@ -24,9 +24,9 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:WASM \
|
||||
-d:DISABLE_REMOTING \
|
||||
-d:DISABLE_COM \
|
||||
-d:FEATURE_NO_BSD_SOCKETS \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
|
||||
@@ -8,7 +8,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
@@ -26,6 +26,7 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:WIN_PLATFORM \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
API_BIN_PROFILE = build/monotouch
|
||||
|
||||
@@ -6,7 +6,7 @@ MCS = $(BOOTSTRAP_MCS)
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
@@ -23,6 +23,7 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:XAMARIN_MODERN \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS) \
|
||||
$(XAMMAC_MCS_FLAGS)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
include $(topdir)/build/profiles/net_4_x.make
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS) \
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS) \
|
||||
-d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
|
||||
-d:NO_SYSTEM_DRAWING_DEPENDENCY \
|
||||
-d:NO_WINFORMS_DEPENDENCY \
|
||||
|
||||
@@ -5,7 +5,7 @@ include $(topdir)/build/profiles/net_4_x.make
|
||||
PLATFORMS:=
|
||||
|
||||
PARENT_PROFILE = ../net_4_x$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))/
|
||||
DEFAULT_REFERENCES = ../net_4_x/mscorlib
|
||||
DEFAULT_REFERENCES = -r:$(topdir)/class/lib/net_4_x$(if $(PROFILE_PLATFORM),-$(PROFILE_PLATFORM))/mscorlib.dll
|
||||
PROFILE_MCS_FLAGS += -d:XBUILD_12
|
||||
|
||||
XBUILD_VERSION = 12.0
|
||||
+9
-12
@@ -161,7 +161,7 @@ gacutil = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/gacutil.exe
|
||||
GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
|
||||
endif
|
||||
|
||||
STD_TARGETS = test run-test run-xunit-test run-test-ondotnet clean install uninstall doc-update
|
||||
STD_TARGETS = test run-test run-test-ondotnet clean install uninstall doc-update
|
||||
|
||||
$(STD_TARGETS): %: do-%
|
||||
|
||||
@@ -288,15 +288,6 @@ dist-recursive: dist-local
|
||||
(cd $$d && $(MAKE) distdir=$$reldir/$$d $@) || exit 1 ; \
|
||||
done
|
||||
|
||||
# function to dist files in groups of 100 entries to make sure we don't exceed shell char limits
|
||||
define distfilesingroups
|
||||
for f in $(wordlist 1, 100, $(1)) ; do \
|
||||
dest=`dirname "$(distdir)/$$f"` ; \
|
||||
$(MKINSTALLDIRS) $$dest && cp -p "$$f" $$dest || exit 1 ; \
|
||||
done
|
||||
$(if $(word 101, $(1)), $(call distfilesingroups, $(wordlist 101, $(words $(1)), $(1))))
|
||||
endef
|
||||
|
||||
# The following target can be used like
|
||||
#
|
||||
# dist-local: dist-default
|
||||
@@ -305,11 +296,17 @@ endef
|
||||
# Notes:
|
||||
# 1. we invert the test here to not end in an error if ChangeLog doesn't exist.
|
||||
# 2. we error out if we try to dist a nonexistant file.
|
||||
# 3. we pick up Makefile
|
||||
# 3. we pick up Makefile, makefile, or GNUmakefile.
|
||||
dist-default:
|
||||
-mkdir -p $(distdir)
|
||||
test '!' -f ChangeLog || cp ChangeLog $(distdir)
|
||||
$(call distfilesingroups, Makefile $(DISTFILES))
|
||||
if test -f Makefile; then m=M; fi; \
|
||||
if test -f makefile; then m=m; fi; \
|
||||
if test -f GNUmakefile; then m=GNUm; fi; \
|
||||
for f in $${m}akefile $(DISTFILES) ; do \
|
||||
dest=`dirname "$(distdir)/$$f"` ; \
|
||||
$(MKINSTALLDIRS) $$dest && cp -p "$$f" $$dest || exit 1 ; \
|
||||
done
|
||||
if test -d Documentation ; then \
|
||||
find . -name '*.xml' > .files ; \
|
||||
tar cTf .files - | (cd $(distdir); tar xf -) ; \
|
||||
|
||||
+11
-27
@@ -20,20 +20,9 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
|
||||
ifndef NO_TEST
|
||||
|
||||
test_nunit_lib = nunitlite.dll
|
||||
xunit_core := xunit.core xunit.execution.desktop xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_core := xunit.core xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_deps := 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 = $(topdir)/class/lib/$(PROFILE)/RemoteExecutorConsoleApp.exe
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/AdminHelper.cs \
|
||||
$(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/IO/FileCleanupTestBase.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs \
|
||||
$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs
|
||||
endif
|
||||
|
||||
xunit_class_deps :=
|
||||
|
||||
xunit_libs_ref = $(patsubst %,-r:$(topdir)/../external/xunit-binaries/%.dll,$(xunit_core))
|
||||
@@ -42,8 +31,8 @@ xunit_libs_ref += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/Facades/%.dll,$
|
||||
xunit_libs_dep = $(xunit_class_deps:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%.dll)
|
||||
xunit_libs_ref += $(xunit_libs_dep:%=-r:%)
|
||||
|
||||
TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(TEST_LIB_REFS) $(DEFAULT_REFERENCES))
|
||||
XTEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(XTEST_LIB_REFS) $(DEFAULT_REFERENCES))
|
||||
TEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(TEST_LIB_REFS))
|
||||
XTEST_LIB_MCS_FLAGS = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(XTEST_LIB_REFS))
|
||||
|
||||
test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)%)
|
||||
test_nunit_ref = $(test_nunit_dep:%=-r:%)
|
||||
@@ -65,7 +54,6 @@ test_makefrag = $(depsdir)/$(test_lib).makefrag
|
||||
test_flags = $(test_nunit_ref) $(TEST_MCS_FLAGS) $(TEST_LIB_MCS_FLAGS)
|
||||
ifndef NO_BUILD
|
||||
test_flags += -r:$(the_assembly)
|
||||
test_assembly_dep = $(the_assembly)
|
||||
endif
|
||||
tests_CLEAN_FILES += $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.dll) $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.pdb) $(test_response) $(test_makefrag)
|
||||
|
||||
@@ -76,7 +64,7 @@ xunit_test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xunit-test.dll)
|
||||
|
||||
xtest_response = $(depsdir)/$(xunit_test_lib).response
|
||||
xtest_makefrag = $(depsdir)/$(xunit_test_lib).makefrag
|
||||
xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LIB_MCS_FLAGS) /unsafe
|
||||
xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LIB_MCS_FLAGS)
|
||||
|
||||
ifeq ($(wildcard $(xtest_sourcefile)),)
|
||||
xtest_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
@@ -120,7 +108,7 @@ run-test-local: run-test-lib
|
||||
run-test-ondotnet-local: run-test-ondotnet-lib
|
||||
|
||||
ifdef TEST_WITH_INTERPRETER
|
||||
TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,NotWorkingRuntimeInterpreter,CAS
|
||||
TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,InterpreterNotWorking,CAS
|
||||
else
|
||||
TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,CAS
|
||||
endif
|
||||
@@ -205,7 +193,7 @@ ifneq ($(wildcard $(MKBUNDLE_TEST_BIN)),)
|
||||
TEST_HARNESS_EXEC=$(MKBUNDLE_TEST_BIN)
|
||||
TEST_HARNESS_EXCLUDES:=$(TEST_HARNESS_EXCLUDES),StaticLinkedAotNotWorking
|
||||
else
|
||||
TEST_HARNESS_EXEC=$(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(TEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(TEST_HARNESS)
|
||||
TEST_HARNESS_EXEC=$(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(TEST_HARNESS)
|
||||
endif
|
||||
|
||||
## FIXME: i18n problem in the 'sed' command below
|
||||
@@ -236,7 +224,7 @@ ifdef HAVE_CS_TESTS
|
||||
$(test_lib_dir):
|
||||
mkdir -p $@
|
||||
|
||||
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_dir)
|
||||
$(test_lib_output): $(the_assembly) $(test_response) $(test_nunit_dep) $(test_lib_dir)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
|
||||
|
||||
test_response_preprocessed = $(test_response)_preprocessed
|
||||
@@ -264,11 +252,10 @@ endif
|
||||
|
||||
ifdef HAVE_CS_XTESTS
|
||||
|
||||
XTEST_HARNESS_PATH := $(topdir)/../external/xunit-binaries
|
||||
XTEST_HARNESS_PATH = $(topdir)/../external/xunit-binaries
|
||||
XTEST_HARNESS = $(XTEST_HARNESS_PATH)/xunit.console.exe
|
||||
XTEST_HARNESS_FLAGS := -noappdomain -noshadow -parallel none -nunit TestResult-$(PROFILE)-xunit.xml
|
||||
XTEST_TRAIT := -notrait category=failing -notrait category=nonmonotests -notrait Benchmark=true -notrait category=outerloop
|
||||
TEST_MONO_PATH := $(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$(XTEST_HARNESS_PATH)
|
||||
|
||||
ifdef FIXTURE
|
||||
XTEST_HARNESS_FLAGS += -class $(FIXTURE)
|
||||
@@ -283,21 +270,18 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
|
||||
endif
|
||||
|
||||
check: run-xunit-test-local
|
||||
run-xunit-test: run-xunit-test-local
|
||||
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.desktop.dll file in local folder on .net only
|
||||
run-xunit-test-lib: xunit-test-local $(XTEST_REMOTE_EXECUTOR)
|
||||
run-xunit-test-lib: xunit-test-local
|
||||
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll
|
||||
ok=:; \
|
||||
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) || ok=false; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \
|
||||
$$ok
|
||||
@rm -f xunit.execution.desktop.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_COMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll $< -out:$@
|
||||
|
||||
$(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)
|
||||
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>Accessibility</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>../mono.pub</AssemblyOriginatorKeyFile>
|
||||
@@ -104,11 +103,11 @@
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
$(ProjectDir)\..\..\jay\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
|
||||
$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
|
||||
$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
@@ -119,6 +118,10 @@ $(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(P
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
@@ -127,10 +130,6 @@ $(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(P
|
||||
<Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
|
||||
<Name>System.Xml-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -22,7 +22,7 @@ EXTRA_DISTFILES = \
|
||||
$(RESOURCE_FILES)
|
||||
|
||||
Commons.Xml.Relaxng.Rnc/RncParser.cs: Commons.Xml.Relaxng.Rnc/RncParser.jay $(topdir)/jay/skeleton.cs
|
||||
$(topdir)/jay/jay -ctv -o Commons.Xml.Relaxng.Rnc/RncParser.cs $< < $(topdir)/jay/skeleton.cs
|
||||
$(topdir)/jay/jay -ctv < $(topdir)/jay/skeleton.cs $(CURDIR)/Commons.Xml.Relaxng.Rnc/RncParser.jay > Commons.Xml.Relaxng.Rnc/RncParser.cs
|
||||
|
||||
BUILT_SOURCES = Commons.Xml.Relaxng.Rnc/RncParser.cs
|
||||
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>cscompmgd</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
@@ -84,14 +83,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>CustomMarshalers</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
@@ -85,14 +84,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>Microsoft.Win32.Primitives</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+6
-7
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>Microsoft.Win32.Registry.AccessControl</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -56,8 +55,8 @@
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\..\..\external\corefx\src\Microsoft.Win32.Registry.AccessControl\src\Microsoft\Win32\RegistryAclExtensions.cs" />
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="RegistryAclExtensions.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />␍ </ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
@@ -81,14 +80,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
|
||||
../../../../external/corefx/src/Microsoft.Win32.Registry.AccessControl/src/Microsoft/Win32/RegistryAclExtensions.cs
|
||||
RegistryAclExtensions.cs
|
||||
@@ -0,0 +1,63 @@
|
||||
//
|
||||
// RegistryAclExtensions.cs
|
||||
//
|
||||
// Author:
|
||||
// Alexander Köplinger ([email protected])
|
||||
//
|
||||
// (C) 2016 Xamarin, Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
using System.Security;
|
||||
using System.Security.AccessControl;
|
||||
|
||||
namespace Microsoft.Win32
|
||||
{
|
||||
public static class RegistryAclExtensions
|
||||
{
|
||||
public static RegistrySecurity GetAccessControl (this RegistryKey key)
|
||||
{
|
||||
if (key == null)
|
||||
throw new ArgumentNullException (nameof (key));
|
||||
|
||||
return key.GetAccessControl ();
|
||||
}
|
||||
|
||||
public static RegistrySecurity GetAccessControl (this RegistryKey key, AccessControlSections includeSections)
|
||||
{
|
||||
if (key == null)
|
||||
throw new ArgumentNullException (nameof (key));
|
||||
|
||||
return key.GetAccessControl (includeSections);
|
||||
}
|
||||
|
||||
public static void SetAccessControl (this RegistryKey key, RegistrySecurity registrySecurity)
|
||||
{
|
||||
if (key == null)
|
||||
throw new ArgumentNullException (nameof (key));
|
||||
|
||||
key.SetAccessControl (registrySecurity);
|
||||
}
|
||||
}
|
||||
}
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>Microsoft.Win32.Registry</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.AppContext</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Collections.Concurrent</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Collections.NonGeneric</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Collections.Specialized</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Collections</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,6 +79,10 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
@@ -88,10 +91,6 @@
|
||||
<Project>{359142A1-D80F-401E-AA64-7167C9317649}</Project>
|
||||
<Name>System.Core-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.ComponentModel.Annotations</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_x.csproj">
|
||||
<Project>{8F86C287-38A5-49F8-BE6D-1E0E3D74AF39}</Project>
|
||||
<Name>System.ComponentModel.DataAnnotations-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_x.csproj">
|
||||
<Project>{8F86C287-38A5-49F8-BE6D-1E0E3D74AF39}</Project>
|
||||
<Name>System.ComponentModel.DataAnnotations-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.ComponentModel.Primitives</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.ComponentModel.TypeConverter</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.ComponentModel</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Console</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Data.Common</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,6 +79,10 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
@@ -92,10 +95,6 @@
|
||||
<Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
|
||||
<Name>System.Xml-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Data.SqlClient</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,6 +79,10 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
@@ -92,10 +95,6 @@
|
||||
<Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>
|
||||
<Name>System.Xml-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+1
-2
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Diagnostics.Contracts</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Diagnostics.Debug</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Diagnostics.FileVersionInfo</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Diagnostics.Process</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+7
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Diagnostics.StackTrace</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -56,7 +55,9 @@
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\..\build\common\MonoTODOAttribute.cs" />
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="StackFrameExtensions.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />␍ </ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
@@ -80,14 +81,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS)
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
include $(MCS_BUILD_DIR)/library.make
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
//
|
||||
// StackFrameExtensions.cs
|
||||
//
|
||||
// Author:
|
||||
// Alexander Köplinger ([email protected])
|
||||
//
|
||||
// (C) 2016 Xamarin, Inc.
|
||||
//
|
||||
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
using System;
|
||||
|
||||
namespace System.Diagnostics
|
||||
{
|
||||
public static class StackFrameExtensions
|
||||
{
|
||||
[MonoTODO]
|
||||
public static IntPtr GetNativeImageBase (this StackFrame stackFrame)
|
||||
{
|
||||
if (stackFrame == null)
|
||||
throw new ArgumentNullException (nameof (stackFrame));
|
||||
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public static IntPtr GetNativeIP (this StackFrame stackFrame)
|
||||
{
|
||||
if (stackFrame == null)
|
||||
throw new ArgumentNullException (nameof (stackFrame));
|
||||
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public static bool HasNativeImage (this StackFrame stackFrame)
|
||||
{
|
||||
if (stackFrame == null)
|
||||
throw new ArgumentNullException (nameof (stackFrame));
|
||||
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public static bool HasMethod (this StackFrame stackFrame)
|
||||
{
|
||||
if (stackFrame == null)
|
||||
throw new ArgumentNullException (nameof (stackFrame));
|
||||
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public static bool HasILOffset (this StackFrame stackFrame)
|
||||
{
|
||||
if (stackFrame == null)
|
||||
throw new ArgumentNullException (nameof (stackFrame));
|
||||
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
[MonoTODO]
|
||||
public static bool HasSource (this StackFrame stackFrame)
|
||||
{
|
||||
if (stackFrame == null)
|
||||
throw new ArgumentNullException (nameof (stackFrame));
|
||||
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
@@ -1,2 +1,5 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
|
||||
../../../build/common/MonoTODOAttribute.cs
|
||||
StackFrameExtensions.cs
|
||||
@@ -21,7 +21,6 @@
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackFrame))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackFrameExtensions))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.StackTrace))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolBinder))]
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.SymbolStore.ISymbolBinder1))]
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Diagnostics.TextWriterTraceListener</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Diagnostics.Tools</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
+5
-6
@@ -18,14 +18,13 @@
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
|
||||
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>System.Diagnostics.TraceEvent</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
@@ -80,14 +79,14 @@
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../corlib/corlib-net_4_x.csproj">
|
||||
<Project>{2CA6026B-2DC8-4C4C-A12C-1E8234049DB7}</Project>
|
||||
<Name>corlib-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../../System/System-net_4_x.csproj">
|
||||
<Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>
|
||||
<Name>System-net_4_x</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
|
||||
Loaded 100 of 1531 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user