mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 17:10:20 -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 behaviour?
|
||||
-->
|
||||
|
||||
## Expected Behavior
|
||||
|
||||
<!--
|
||||
Please describe the behaviour 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 stacktrace 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
|
||||
-->
|
||||
@@ -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
|
||||
|
||||
+3
-8
@@ -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,18 +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/sdks @luhenry
|
||||
/mono/sdks/android @luhenry @jonpryor
|
||||
/mono/sdks/ios @vargaz @rolfbjarne
|
||||
/mono/sdks/wasm @kumpera @lrz
|
||||
|
||||
/mono/sgen @BrzVlad @kumpera
|
||||
/mono/sgen @brzvlad @kumpera
|
||||
|
||||
/mono/utils @kumpera @vargaz
|
||||
/mono/utils/atomic* @alexrp
|
||||
|
||||
@@ -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 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
|
||||
@@ -174,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
|
||||
@@ -541,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 \
|
||||
|
||||
@@ -40,7 +40,6 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
public int? ExitCode { get; set; }
|
||||
public string StandardOutput { get; set; }
|
||||
public string StandardError { get; set; }
|
||||
public string CombinedOutput { get; set; }
|
||||
}
|
||||
|
||||
static class Program {
|
||||
@@ -58,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 },
|
||||
@@ -92,50 +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 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];
|
||||
|
||||
@@ -144,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,
|
||||
@@ -191,22 +157,17 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
|
||||
var stdout = new StringBuilder ();
|
||||
var stderr = new StringBuilder ();
|
||||
var combined = new StringBuilder ();
|
||||
|
||||
proc.OutputDataReceived += (sender, args) => {
|
||||
if (args.Data != null)
|
||||
lock (result) {
|
||||
lock (result)
|
||||
stdout.AppendLine (args.Data);
|
||||
combined.AppendLine (args.Data);
|
||||
}
|
||||
};
|
||||
|
||||
proc.ErrorDataReceived += (sender, args) => {
|
||||
if (args.Data != null)
|
||||
lock (result) {
|
||||
lock (result)
|
||||
stderr.AppendLine (args.Data);
|
||||
combined.AppendLine (args.Data);
|
||||
}
|
||||
};
|
||||
|
||||
result.Stopwatch.Start ();
|
||||
@@ -216,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);
|
||||
@@ -233,7 +194,6 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
lock (result) {
|
||||
result.StandardOutput = stdout.ToString ();
|
||||
result.StandardError = stderr.ToString ();
|
||||
result.CombinedOutput = combined.ToString ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -245,10 +205,16 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
|
||||
if (result.ExitCode != 0) {
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.WriteLine ("===== stdout + stderr =====");
|
||||
Console.WriteLine ("===== stdout =====");
|
||||
Console.ResetColor ();
|
||||
|
||||
Console.WriteLine (result.CombinedOutput);
|
||||
Console.WriteLine (result.StandardOutput);
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.WriteLine ("===== stderr =====");
|
||||
Console.ResetColor ();
|
||||
|
||||
Console.WriteLine (result.StandardError);
|
||||
}
|
||||
|
||||
results.Add (result);
|
||||
@@ -267,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");
|
||||
|
||||
+27
-194
@@ -1,8 +1,8 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [5.12.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=5
|
||||
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_LARGE_FILES -D_REENTRANT"
|
||||
LDFLAGS="-maix64"
|
||||
libmono_cflags="-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"
|
||||
@@ -884,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
|
||||
@@ -934,75 +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
|
||||
|
||||
|
||||
# Terminology:
|
||||
# Crash privacy - Attempts to not send identifying information in the crash dump / to protect the obscurity of the program control flow
|
||||
# MERP - The MS telemetry profile. Not for general use.
|
||||
# Structured crashes - crashes at runtime that trigger a stack walk by mono that happens cooperatively
|
||||
|
||||
# Structured crashes are not merp crashes. Structured crashes are json dumps made by mono during crashes. Merp upload is going to use the dumping code is a very specific way, and is enabled at runtime with an icall.
|
||||
|
||||
#--with-crash_privacy=yes --with-structured_crashes=no means we don't wanna dump in non-merp-enabled builds, and we want to not send symbol strings. This is going to be the default pair of settings for VS4Mac.
|
||||
#--with-crash_privacy=yes --with-structured_crashes=yes means you want to see crashes on your console, and you want to not see unmanaged symbol names. This is an option for proprietary apps that have manual bugs filed.
|
||||
#--with-crash_privacy=no --with-structured_crashes=no means you want to see no crash dumps on failure and you don't care about privacy. This is how you'd set a "don't want it, don't care" configuration.
|
||||
#--with-crash_privacy=no --with-structured_crashes=yes means you want full crashes and you want to see them in the terminal, not on telemetry. This is going to be how we build for CI.
|
||||
|
||||
AC_ARG_WITH(crash-privacy, [ --with-crash_privacy=yes,no If you want your crashes to not include names of symbols present in the binary. ], [], [with_crash_privacy=no])
|
||||
AC_ARG_WITH(structured-crashes, [ --with-structured_crashes=yes,no If you want your unmanaged crashes to result in a small crash dump file. ], [], [with_structured_crashes=yes])
|
||||
|
||||
if test "x$with_crash_privacy" = "xno"; then
|
||||
AC_DEFINE(MONO_PRIVATE_CRASHES,1,[Do not include names of unmanaged functions in the crash dump])
|
||||
fi
|
||||
|
||||
if test "x$with_structured_crashes" = "xno"; then
|
||||
AC_DEFINE(DISABLE_STRUCTURED_CRASH,1,[Do not create structured crash files during unmanaged crashes])
|
||||
fi
|
||||
|
||||
#
|
||||
# Set the build profiles and options before things which use them
|
||||
#
|
||||
@@ -1023,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
|
||||
@@ -1445,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])
|
||||
@@ -1813,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)
|
||||
@@ -2396,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;
|
||||
|
||||
@@ -2791,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>])
|
||||
@@ -3064,12 +2927,6 @@ case "{$build}" in
|
||||
NAME_DEV_RANDOM="/dev/srandom"
|
||||
;;
|
||||
|
||||
dnl IBM i does not have /dev/random, use unblocking only
|
||||
|
||||
*-*-os400*)
|
||||
NAME_DEV_RANDOM="/dev/urandom"
|
||||
;;
|
||||
|
||||
dnl Win32 does not have /dev/random, they have their own method...
|
||||
|
||||
*-mingw*|*-*-cygwin*)
|
||||
@@ -3391,6 +3248,7 @@ case "$host" in
|
||||
#if _MIPS_SIM != _ABIN32
|
||||
#error Not mips n32
|
||||
#endif
|
||||
return 0;
|
||||
],[
|
||||
AC_MSG_RESULT(yes)
|
||||
sizeof_register=8
|
||||
@@ -3440,9 +3298,6 @@ case "$host" in
|
||||
BTLS_PLATFORM=i386
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
AOT_SUPPORTED="yes"
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=i386
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@@ -3467,9 +3322,6 @@ case "$host" in
|
||||
boehm_supported=false
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
AOT_SUPPORTED="yes"
|
||||
BTLS_SUPPORTED=yes
|
||||
BTLS_PLATFORM=x86_64
|
||||
;;
|
||||
mingw*)
|
||||
;;
|
||||
@@ -3503,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__"
|
||||
@@ -3515,13 +3366,6 @@ case "$host" in
|
||||
fi
|
||||
arch_target=ppc;
|
||||
case $host_os in
|
||||
aix*|os400*)
|
||||
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.9)"
|
||||
;;
|
||||
linux*|darwin*)
|
||||
;;
|
||||
esac
|
||||
@@ -3865,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"
|
||||
@@ -4098,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}"
|
||||
@@ -4132,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)
|
||||
|
||||
@@ -4224,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
|
||||
@@ -4276,6 +4107,7 @@ if test ${TARGET} = ARM; then
|
||||
#ifndef __ARM_PCS_VFP
|
||||
#error "Float ABI is not 'hard'"
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
fpu=VFP_HARD
|
||||
], [
|
||||
@@ -4289,6 +4121,7 @@ if test ${TARGET} = ARM; then
|
||||
#ifdef __SOFTFP__
|
||||
#error "Float ABI is not 'softfp'"
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
fpu=VFP
|
||||
], [
|
||||
@@ -4313,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
|
||||
|
||||
@@ -4323,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
|
||||
@@ -4334,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
|
||||
@@ -4892,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
|
||||
@@ -5115,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
|
||||
@@ -5133,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
|
||||
|
||||
+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: 747f69d6d9...be2efbfa80.
Vendored
+1
-1
Submodule external/bockbuild updated: cee494cc15...1908d43ec6.
Vendored
+1
-1
Submodule external/boringssl updated: 2ba8564f8b...3e0770e188.
Vendored
+1
-1
Submodule external/cecil updated: b6c50e3d34...dfee11e80d.
Vendored
+1
-1
Submodule external/corefx updated: f2c0be7e62...f37e667108.
Vendored
+1
-1
Submodule external/linker updated: dccb0d2378...84d37424cd.
Vendored
+1
-1
Submodule external/nunit-lite updated: 00e259a4bd...70bb70b0ff.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: ab3485efcd...00da53c474.
Vendored
+1
-1
Submodule external/xunit-binaries updated: 9df2dda529...c5a907be25.
+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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
+1
-43
@@ -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
|
||||
@@ -1865,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
|
||||
|
||||
@@ -42,7 +42,7 @@ class X {
|
||||
|
||||
Version min_mono_version;
|
||||
#if __MonoCS__
|
||||
min_mono_version = new Version (5, 11);
|
||||
min_mono_version = new Version (5, 9);
|
||||
#else
|
||||
min_mono_version = new Version (4, 9);
|
||||
#endif
|
||||
|
||||
@@ -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
|
||||
@@ -22,5 +22,3 @@ NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
MONO_FEATURE_APPLETLS=1
|
||||
|
||||
@@ -24,7 +24,6 @@ PROFILE_MCS_FLAGS = \
|
||||
-d:WASM \
|
||||
-d:DISABLE_REMOTING \
|
||||
-d:DISABLE_COM \
|
||||
-d:FEATURE_NO_BSD_SOCKETS \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
|
||||
+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 -) ; \
|
||||
|
||||
+6
-16
@@ -20,15 +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 = $(xunit_test_lib)_RemoteExecuter.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))
|
||||
@@ -60,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)
|
||||
|
||||
@@ -71,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)
|
||||
@@ -115,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
|
||||
@@ -231,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
|
||||
@@ -277,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)" $(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)/../mcs/class/test-helpers/RemoteExecutorConsoleApp.cs
|
||||
$(TEST_COMPILE) $(topdir)/../mcs/class/test-helpers/RemoteExecutorConsoleApp.cs -r:$(xunit_test_lib) $(xtest_flags) /debug-
|
||||
|
||||
$(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)
|
||||
|
||||
|
||||
@@ -20,28 +20,28 @@
|
||||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.MemoryExtensions))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Memory<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlyMemory<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlySpan<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Span<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryHandle))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.OperationStatus))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.StandardFormat))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Binary.BinaryPrimitives))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MemoryMarshal))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Memory<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlyMemory<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlySpan<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Span<>))]
|
||||
[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.OperationStatus))]
|
||||
|
||||
// TODO: we don't have these types yet
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.MemoryExtensions))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.BuffersExtensions))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IBufferWriter<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IMemoryOwner<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IPinnable))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryHandle))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryManager<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.StandardFormat))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Binary.BinaryPrimitives))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Base64))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Formatter))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Parser))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MemoryMarshal))]
|
||||
//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SequenceMarshal))]
|
||||
@@ -1,35 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
[assembly: AssemblyTitle ("System.Net.Http.Rtc")]
|
||||
[assembly: AssemblyDescription ("System.Net.Http.Rtc")]
|
||||
[assembly: AssemblyDefaultAlias ("System.Net.Http.Rtc")]
|
||||
[assembly: AssemblyCompany ("Mono development team")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("(c) Various Mono authors")]
|
||||
[assembly: AssemblyVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -1,21 +0,0 @@
|
||||
MCS_BUILD_DIR = ../../../build
|
||||
|
||||
thisdir = class/Facades/System.Net.Http.Rtc
|
||||
SUBDIRS =
|
||||
include $(MCS_BUILD_DIR)/rules.make
|
||||
|
||||
LIBRARY_SUBDIR = Facades
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = System.Net.Http.Rtc.dll
|
||||
|
||||
KEYFILE = ../../msfinal.pub
|
||||
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
|
||||
@@ -1,2 +0,0 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
@@ -1,35 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
[assembly: AssemblyTitle ("System.Resources.Reader")]
|
||||
[assembly: AssemblyDescription ("System.Resources.Reader")]
|
||||
[assembly: AssemblyDefaultAlias ("System.Resources.Reader")]
|
||||
[assembly: AssemblyCompany ("Mono development team")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("(c) Various Mono authors")]
|
||||
[assembly: AssemblyVersion ("4.0.2.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -1,23 +0,0 @@
|
||||
MCS_BUILD_DIR = ../../../build
|
||||
|
||||
thisdir = class/Facades/System.Resources.Reader
|
||||
SUBDIRS =
|
||||
include $(MCS_BUILD_DIR)/rules.make
|
||||
|
||||
LIBRARY_SUBDIR = Facades
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = System.Resources.Reader.dll
|
||||
|
||||
KEYFILE = ../../msfinal.pub
|
||||
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
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Resources.ResourceReader))]
|
||||
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
[assembly: AssemblyTitle ("System.Resources.Writer")]
|
||||
[assembly: AssemblyDescription ("System.Resources.Writer")]
|
||||
[assembly: AssemblyDefaultAlias ("System.Resources.Writer")]
|
||||
[assembly: AssemblyCompany ("Mono development team")]
|
||||
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
|
||||
[assembly: AssemblyCopyright ("(c) Various Mono authors")]
|
||||
[assembly: AssemblyVersion ("4.0.2.0")]
|
||||
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
|
||||
[assembly: AssemblyFileVersion ("4.0.0.0")]
|
||||
@@ -1,23 +0,0 @@
|
||||
MCS_BUILD_DIR = ../../../build
|
||||
|
||||
thisdir = class/Facades/System.Resources.Writer
|
||||
SUBDIRS =
|
||||
include $(MCS_BUILD_DIR)/rules.make
|
||||
|
||||
LIBRARY_SUBDIR = Facades
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = System.Resources.Writer.dll
|
||||
|
||||
KEYFILE = ../../msfinal.pub
|
||||
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
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
//
|
||||
// Copyright (c) 2015 Xamarin Inc. (http://www.xamarin.com)
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
|
||||
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Resources.ResourceWriter))]
|
||||
|
||||
|
||||
@@ -27,8 +27,7 @@ System.Xml.XPath System.Xml.XmlDocument System.Xml.Xsl.Primitives Microsoft.Win3
|
||||
System.IO.FileSystem.AccessControl System.Reflection.TypeExtensions System.Reflection.Emit.Lightweight System.Reflection.Emit.ILGeneration System.Reflection.Emit \
|
||||
System.Threading.AccessControl System.ValueTuple \
|
||||
System.Security.Cryptography.Primitives System.Text.Encoding.CodePages System.IO.FileSystem.Watcher \
|
||||
System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes \
|
||||
System.Net.Ping System.Resources.Reader System.Resources.Writer System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp
|
||||
System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.IO.Pipes
|
||||
|
||||
# common_SUBDIRS dependencies
|
||||
common_DEPS_SUBDIRS = System.Security.Cryptography.X509Certificates System.ServiceModel.Primitives System.Runtime.Serialization.Primitives \
|
||||
@@ -51,7 +50,7 @@ testing_aot_full_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
testing_aot_full_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
net_4_x_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS) System.Net.Http.Rtc
|
||||
net_4_x_PARALLEL_SUBDIRS = $(common_SUBDIRS)
|
||||
|
||||
basic_PARALLEL_SUBDIRS = System.Runtime System.Reflection System.Collections System.Resources.ResourceManager System.Globalization \
|
||||
System.Threading.Tasks System.Collections.Concurrent System.Text.Encoding System.IO System.Threading System.Diagnostics.Debug \
|
||||
@@ -90,8 +89,8 @@ unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
|
||||
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
|
||||
mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs \
|
||||
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Drawing.Common
|
||||
mobile_only_SUBDIRS = System.Net.Ping System.Runtime.Serialization.Formatters System.Security.Cryptography.Csp System.Security.Cryptography.Pkcs \
|
||||
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Memory System.Drawing.Common
|
||||
|
||||
mobile_only_DEPS_SUBDIRS = System.Security.Cryptography.OpenSsl
|
||||
|
||||
|
||||
@@ -33,9 +33,10 @@
|
||||
|
||||
/*
|
||||
|
||||
jis.table is generated from uni2tab.c, which requires CP932.TXT and
|
||||
Unihan.txt as input files. However, it is non-normative and in Japan it is
|
||||
contains many problem.
|
||||
Well, there looks no jis.table source. Thus, it seems like it is
|
||||
generated from text files from Unicode Home Page such like
|
||||
ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0208.TXT
|
||||
However, it is non-normative and in Japan it is contains many problem.
|
||||
|
||||
FIXME: Some characters such as 0xFF0B (wide "plus") are missing in
|
||||
that table.
|
||||
|
||||
@@ -161,15 +161,6 @@ namespace MonoTests.I18N.CJK
|
||||
AssertDecode ("Test/texts/japanese-utf8.txt", "Test/texts/japanese-932.txt", 932);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Bug28321 ()
|
||||
{
|
||||
var expected = "\u00D7\u00B4\u00B1\u00F7\u00B6\u00B0\u00A8\u00A7";
|
||||
var text = Manager.GetEncoding ("shift_jis").GetString (Convert.FromBase64String ("gX6BTIF9gYCB94GLgU6BmA=="));
|
||||
|
||||
Assert.AreEqual (expected, text);
|
||||
}
|
||||
|
||||
// EUC-JP
|
||||
|
||||
[Test]
|
||||
|
||||
Binary file not shown.
@@ -158,10 +158,6 @@ public sealed class Handlers
|
||||
"I18N.Rare.ENCibm500",
|
||||
"I18N.Rare.CP708",
|
||||
"I18N.Rare.ENCasmo_708",
|
||||
"I18N.Rare.CP737",
|
||||
"I18N.Rare.ENCibm_737",
|
||||
"I18N.Rare.CP775",
|
||||
"I18N.Rare.ENCibm_775",
|
||||
"I18N.Rare.CP852",
|
||||
"I18N.Rare.ENCibm852",
|
||||
"I18N.Rare.CP855",
|
||||
|
||||
@@ -1,462 +0,0 @@
|
||||
/*
|
||||
* CP737.cs - Greek (DOS) code page.
|
||||
*
|
||||
* Copyright (c) 2002 Southern Storm Software, Pty Ltd
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Generated from "ibm-737.ucm".
|
||||
|
||||
// WARNING: Modifying this file directly might be a bad idea.
|
||||
// You should edit the code generator tools/ucm2cp.c instead for your changes
|
||||
// to appear in all relevant classes.
|
||||
namespace I18N.Rare
|
||||
{
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP737 : ByteEncoding
|
||||
{
|
||||
public CP737()
|
||||
: base(737, ToChars, "Greek (DOS)",
|
||||
"ibm737", "ibm737", "ibm737",
|
||||
false, false, false, false, 1253)
|
||||
{}
|
||||
|
||||
private static readonly char[] ToChars = {
|
||||
'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005',
|
||||
'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B',
|
||||
'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011',
|
||||
'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017',
|
||||
'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D',
|
||||
'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023',
|
||||
'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029',
|
||||
'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F',
|
||||
'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035',
|
||||
'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B',
|
||||
'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041',
|
||||
'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047',
|
||||
'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D',
|
||||
'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053',
|
||||
'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059',
|
||||
'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F',
|
||||
'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065',
|
||||
'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B',
|
||||
'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071',
|
||||
'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077',
|
||||
'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D',
|
||||
'\u007E', '\u001A', '\u0391', '\u0392', '\u0393', '\u0394',
|
||||
'\u0395', '\u0396', '\u0397', '\u0398', '\u0399', '\u039A',
|
||||
'\u039B', '\u039C', '\u039D', '\u039E', '\u039F', '\u03A0',
|
||||
'\u03A1', '\u03A3', '\u03A4', '\u03A5', '\u03A6', '\u03A7',
|
||||
'\u03A8', '\u03A9', '\u03B1', '\u03B2', '\u03B3', '\u03B4',
|
||||
'\u03B5', '\u03B6', '\u03B7', '\u03B8', '\u03B9', '\u03BA',
|
||||
'\u03BB', '\u03BC', '\u03BD', '\u03BE', '\u03BF', '\u03C0',
|
||||
'\u03C1', '\u03C3', '\u03C2', '\u03C4', '\u03C5', '\u03C6',
|
||||
'\u03C7', '\u03C8', '\u2591', '\u2592', '\u2593', '\u2502',
|
||||
'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563',
|
||||
'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510',
|
||||
'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C',
|
||||
'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566',
|
||||
'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564',
|
||||
'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B',
|
||||
'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C',
|
||||
'\u2590', '\u2580', '\u03C9', '\u03AC', '\u03AD', '\u03AE',
|
||||
'\u03CA', '\u03AF', '\u03CC', '\u03CD', '\u03CB', '\u03CE',
|
||||
'\u0386', '\u0388', '\u0389', '\u038A', '\u038C', '\u038E',
|
||||
'\u038F', '\u00B1', '\u2265', '\u2264', '\u03AA', '\u03AB',
|
||||
'\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A',
|
||||
'\u207F', '\u00B2', '\u25A0', '\u00A0',
|
||||
};
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public unsafe override int GetByteCountImpl (char* chars, int count)
|
||||
{
|
||||
if (this.EncoderFallback != null) {
|
||||
//Calculate byte count by actually doing encoding and discarding the data.
|
||||
return GetBytesImpl(chars, count, null, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public override int GetByteCount (String s)
|
||||
{
|
||||
if (this.EncoderFallback != null)
|
||||
{
|
||||
//Calculate byte count by actually doing encoding and discarding the data.
|
||||
unsafe
|
||||
{
|
||||
fixed (char *s_ptr = s)
|
||||
{
|
||||
return GetBytesImpl(s_ptr, s.Length, null, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//byte count equals character count because no EncoderFallback set
|
||||
return s.Length;
|
||||
}
|
||||
}
|
||||
|
||||
//ToBytes is just an alias for GetBytesImpl, but doesn't return byte count
|
||||
protected unsafe override void ToBytes(char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
//Calling ToBytes with null destination buffer doesn't make any sense
|
||||
if (bytes == null)
|
||||
throw new ArgumentNullException("bytes");
|
||||
GetBytesImpl(chars, charCount, bytes, byteCount);
|
||||
}
|
||||
|
||||
public unsafe override int GetBytesImpl (char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
int ch;
|
||||
int charIndex = 0;
|
||||
int byteIndex = 0;
|
||||
EncoderFallbackBuffer buffer = null;
|
||||
while (charCount > 0)
|
||||
{
|
||||
ch = (int)(chars[charIndex]);
|
||||
if(ch >= 26) switch(ch)
|
||||
{
|
||||
case 0x001B:
|
||||
case 0x001D:
|
||||
case 0x001E:
|
||||
case 0x001F:
|
||||
case 0x0020:
|
||||
case 0x0021:
|
||||
case 0x0022:
|
||||
case 0x0023:
|
||||
case 0x0024:
|
||||
case 0x0025:
|
||||
case 0x0026:
|
||||
case 0x0027:
|
||||
case 0x0028:
|
||||
case 0x0029:
|
||||
case 0x002A:
|
||||
case 0x002B:
|
||||
case 0x002C:
|
||||
case 0x002D:
|
||||
case 0x002E:
|
||||
case 0x002F:
|
||||
case 0x0030:
|
||||
case 0x0031:
|
||||
case 0x0032:
|
||||
case 0x0033:
|
||||
case 0x0034:
|
||||
case 0x0035:
|
||||
case 0x0036:
|
||||
case 0x0037:
|
||||
case 0x0038:
|
||||
case 0x0039:
|
||||
case 0x003A:
|
||||
case 0x003B:
|
||||
case 0x003C:
|
||||
case 0x003D:
|
||||
case 0x003E:
|
||||
case 0x003F:
|
||||
case 0x0040:
|
||||
case 0x0041:
|
||||
case 0x0042:
|
||||
case 0x0043:
|
||||
case 0x0044:
|
||||
case 0x0045:
|
||||
case 0x0046:
|
||||
case 0x0047:
|
||||
case 0x0048:
|
||||
case 0x0049:
|
||||
case 0x004A:
|
||||
case 0x004B:
|
||||
case 0x004C:
|
||||
case 0x004D:
|
||||
case 0x004E:
|
||||
case 0x004F:
|
||||
case 0x0050:
|
||||
case 0x0051:
|
||||
case 0x0052:
|
||||
case 0x0053:
|
||||
case 0x0054:
|
||||
case 0x0055:
|
||||
case 0x0056:
|
||||
case 0x0057:
|
||||
case 0x0058:
|
||||
case 0x0059:
|
||||
case 0x005A:
|
||||
case 0x005B:
|
||||
case 0x005C:
|
||||
case 0x005D:
|
||||
case 0x005E:
|
||||
case 0x005F:
|
||||
case 0x0060:
|
||||
case 0x0061:
|
||||
case 0x0062:
|
||||
case 0x0063:
|
||||
case 0x0064:
|
||||
case 0x0065:
|
||||
case 0x0066:
|
||||
case 0x0067:
|
||||
case 0x0068:
|
||||
case 0x0069:
|
||||
case 0x006A:
|
||||
case 0x006B:
|
||||
case 0x006C:
|
||||
case 0x006D:
|
||||
case 0x006E:
|
||||
case 0x006F:
|
||||
case 0x0070:
|
||||
case 0x0071:
|
||||
case 0x0072:
|
||||
case 0x0073:
|
||||
case 0x0074:
|
||||
case 0x0075:
|
||||
case 0x0076:
|
||||
case 0x0077:
|
||||
case 0x0078:
|
||||
case 0x0079:
|
||||
case 0x007A:
|
||||
case 0x007B:
|
||||
case 0x007C:
|
||||
case 0x007D:
|
||||
case 0x007E:
|
||||
break;
|
||||
case 0x001A: ch = 0x7F; break;
|
||||
case 0x001C: ch = 0x1A; break;
|
||||
case 0x007F: ch = 0x1C; break;
|
||||
case 0x00A0: ch = 0xFF; break;
|
||||
case 0x00A7: ch = 0x15; break;
|
||||
case 0x00B0: ch = 0xF8; break;
|
||||
case 0x00B1: ch = 0xF1; break;
|
||||
case 0x00B2: ch = 0xFD; break;
|
||||
case 0x00B6: ch = 0x14; break;
|
||||
case 0x00B7: ch = 0xFA; break;
|
||||
case 0x00F7: ch = 0xF6; break;
|
||||
case 0x0386: ch = 0xEA; break;
|
||||
case 0x0388: ch = 0xEB; break;
|
||||
case 0x0389: ch = 0xEC; break;
|
||||
case 0x038A: ch = 0xED; break;
|
||||
case 0x038C: ch = 0xEE; break;
|
||||
case 0x038E: ch = 0xEF; break;
|
||||
case 0x038F: ch = 0xF0; break;
|
||||
case 0x0391:
|
||||
case 0x0392:
|
||||
case 0x0393:
|
||||
case 0x0394:
|
||||
case 0x0395:
|
||||
case 0x0396:
|
||||
case 0x0397:
|
||||
case 0x0398:
|
||||
case 0x0399:
|
||||
case 0x039A:
|
||||
case 0x039B:
|
||||
case 0x039C:
|
||||
case 0x039D:
|
||||
case 0x039E:
|
||||
case 0x039F:
|
||||
case 0x03A0:
|
||||
case 0x03A1:
|
||||
ch -= 0x0311;
|
||||
break;
|
||||
case 0x03A3:
|
||||
case 0x03A4:
|
||||
case 0x03A5:
|
||||
case 0x03A6:
|
||||
case 0x03A7:
|
||||
case 0x03A8:
|
||||
case 0x03A9:
|
||||
ch -= 0x0312;
|
||||
break;
|
||||
case 0x03AA: ch = 0xF4; break;
|
||||
case 0x03AB: ch = 0xF5; break;
|
||||
case 0x03AC: ch = 0xE1; break;
|
||||
case 0x03AD: ch = 0xE2; break;
|
||||
case 0x03AE: ch = 0xE3; break;
|
||||
case 0x03AF: ch = 0xE5; break;
|
||||
case 0x03B1:
|
||||
case 0x03B2:
|
||||
case 0x03B3:
|
||||
case 0x03B4:
|
||||
case 0x03B5:
|
||||
case 0x03B6:
|
||||
case 0x03B7:
|
||||
case 0x03B8:
|
||||
case 0x03B9:
|
||||
case 0x03BA:
|
||||
case 0x03BB:
|
||||
case 0x03BC:
|
||||
case 0x03BD:
|
||||
case 0x03BE:
|
||||
case 0x03BF:
|
||||
case 0x03C0:
|
||||
case 0x03C1:
|
||||
ch -= 0x0319;
|
||||
break;
|
||||
case 0x03C2: ch = 0xAA; break;
|
||||
case 0x03C3: ch = 0xA9; break;
|
||||
case 0x03C4:
|
||||
case 0x03C5:
|
||||
case 0x03C6:
|
||||
case 0x03C7:
|
||||
case 0x03C8:
|
||||
ch -= 0x0319;
|
||||
break;
|
||||
case 0x03C9: ch = 0xE0; break;
|
||||
case 0x03CA: ch = 0xE4; break;
|
||||
case 0x03CB: ch = 0xE8; break;
|
||||
case 0x03CC: ch = 0xE6; break;
|
||||
case 0x03CD: ch = 0xE7; break;
|
||||
case 0x03CE: ch = 0xE9; break;
|
||||
case 0x03D5: ch = 0xAD; break;
|
||||
case 0x2022: ch = 0x07; break;
|
||||
case 0x203C: ch = 0x13; break;
|
||||
case 0x207F: ch = 0xFC; break;
|
||||
case 0x2190: ch = 0x1B; break;
|
||||
case 0x2191: ch = 0x18; break;
|
||||
case 0x2192: ch = 0x1A; break;
|
||||
case 0x2193: ch = 0x19; break;
|
||||
case 0x2194: ch = 0x1D; break;
|
||||
case 0x2195: ch = 0x12; break;
|
||||
case 0x21A8: ch = 0x17; break;
|
||||
case 0x2219: ch = 0xF9; break;
|
||||
case 0x221A: ch = 0xFB; break;
|
||||
case 0x221F: ch = 0x1C; break;
|
||||
case 0x2248: ch = 0xF7; break;
|
||||
case 0x2264: ch = 0xF3; break;
|
||||
case 0x2265: ch = 0xF2; break;
|
||||
case 0x2302: ch = 0x7F; break;
|
||||
case 0x2500: ch = 0xC4; break;
|
||||
case 0x2502: ch = 0xB3; break;
|
||||
case 0x250C: ch = 0xDA; break;
|
||||
case 0x2510: ch = 0xBF; break;
|
||||
case 0x2514: ch = 0xC0; break;
|
||||
case 0x2518: ch = 0xD9; break;
|
||||
case 0x251C: ch = 0xC3; break;
|
||||
case 0x2524: ch = 0xB4; break;
|
||||
case 0x252C: ch = 0xC2; break;
|
||||
case 0x2534: ch = 0xC1; break;
|
||||
case 0x253C: ch = 0xC5; break;
|
||||
case 0x2550: ch = 0xCD; break;
|
||||
case 0x2551: ch = 0xBA; break;
|
||||
case 0x2552: ch = 0xD5; break;
|
||||
case 0x2553: ch = 0xD6; break;
|
||||
case 0x2554: ch = 0xC9; break;
|
||||
case 0x2555: ch = 0xB8; break;
|
||||
case 0x2556: ch = 0xB7; break;
|
||||
case 0x2557: ch = 0xBB; break;
|
||||
case 0x2558: ch = 0xD4; break;
|
||||
case 0x2559: ch = 0xD3; break;
|
||||
case 0x255A: ch = 0xC8; break;
|
||||
case 0x255B: ch = 0xBE; break;
|
||||
case 0x255C: ch = 0xBD; break;
|
||||
case 0x255D: ch = 0xBC; break;
|
||||
case 0x255E: ch = 0xC6; break;
|
||||
case 0x255F: ch = 0xC7; break;
|
||||
case 0x2560: ch = 0xCC; break;
|
||||
case 0x2561: ch = 0xB5; break;
|
||||
case 0x2562: ch = 0xB6; break;
|
||||
case 0x2563: ch = 0xB9; break;
|
||||
case 0x2564: ch = 0xD1; break;
|
||||
case 0x2565: ch = 0xD2; break;
|
||||
case 0x2566: ch = 0xCB; break;
|
||||
case 0x2567: ch = 0xCF; break;
|
||||
case 0x2568: ch = 0xD0; break;
|
||||
case 0x2569: ch = 0xCA; break;
|
||||
case 0x256A: ch = 0xD8; break;
|
||||
case 0x256B: ch = 0xD7; break;
|
||||
case 0x256C: ch = 0xCE; break;
|
||||
case 0x2580: ch = 0xDF; break;
|
||||
case 0x2584: ch = 0xDC; break;
|
||||
case 0x2588: ch = 0xDB; break;
|
||||
case 0x258C: ch = 0xDD; break;
|
||||
case 0x2590: ch = 0xDE; break;
|
||||
case 0x2591: ch = 0xB0; break;
|
||||
case 0x2592: ch = 0xB1; break;
|
||||
case 0x2593: ch = 0xB2; break;
|
||||
case 0x25A0: ch = 0xFE; break;
|
||||
case 0x25AC: ch = 0x16; break;
|
||||
case 0x25B2: ch = 0x1E; break;
|
||||
case 0x25BA: ch = 0x10; break;
|
||||
case 0x25BC: ch = 0x1F; break;
|
||||
case 0x25C4: ch = 0x11; break;
|
||||
case 0x25CB: ch = 0x09; break;
|
||||
case 0x25D8: ch = 0x08; break;
|
||||
case 0x25D9: ch = 0x0A; break;
|
||||
case 0x263A: ch = 0x01; break;
|
||||
case 0x263B: ch = 0x02; break;
|
||||
case 0x263C: ch = 0x0F; break;
|
||||
case 0x2640: ch = 0x0C; break;
|
||||
case 0x2642: ch = 0x0B; break;
|
||||
case 0x2660: ch = 0x06; break;
|
||||
case 0x2663: ch = 0x05; break;
|
||||
case 0x2665: ch = 0x03; break;
|
||||
case 0x2666: ch = 0x04; break;
|
||||
case 0x266A: ch = 0x0D; break;
|
||||
case 0x266C: ch = 0x0E; break;
|
||||
case 0xFFE8: ch = 0xB3; break;
|
||||
case 0xFFE9: ch = 0x1B; break;
|
||||
case 0xFFEA: ch = 0x18; break;
|
||||
case 0xFFEB: ch = 0x1A; break;
|
||||
case 0xFFEC: ch = 0x19; break;
|
||||
case 0xFFED: ch = 0xFE; break;
|
||||
case 0xFFEE: ch = 0x09; break;
|
||||
default:
|
||||
{
|
||||
if(ch >= 0xFF01 && ch <= 0xFF5E)
|
||||
{
|
||||
ch -= 0xFEE0;
|
||||
}
|
||||
else
|
||||
{
|
||||
HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
|
||||
charIndex++;
|
||||
charCount--;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
//Write encoded byte to buffer, if buffer is defined and fallback was not used
|
||||
if (bytes != null)
|
||||
bytes[byteIndex] = (byte)ch;
|
||||
byteIndex++;
|
||||
byteCount--;
|
||||
charIndex++;
|
||||
charCount--;
|
||||
}
|
||||
return byteIndex;
|
||||
}
|
||||
}; // class CP737
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm737 : CP737
|
||||
{
|
||||
public ENCibm737() : base() {}
|
||||
|
||||
}; // class ENCibm737
|
||||
|
||||
}; // namespace I18N.Rare
|
||||
@@ -1,451 +0,0 @@
|
||||
/*
|
||||
* CP775.cs - Baltic (DOS) code page.
|
||||
*
|
||||
* Copyright (c) 2002 Southern Storm Software, Pty Ltd
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// Generated from "ibm-775.ucm".
|
||||
|
||||
// WARNING: Modifying this file directly might be a bad idea.
|
||||
// You should edit the code generator tools/ucm2cp.c instead for your changes
|
||||
// to appear in all relevant classes.
|
||||
namespace I18N.Rare
|
||||
{
|
||||
|
||||
using System;
|
||||
using System.Text;
|
||||
using I18N.Common;
|
||||
|
||||
[Serializable]
|
||||
public class CP775 : ByteEncoding
|
||||
{
|
||||
public CP775()
|
||||
: base(775, ToChars, "Baltic (DOS)",
|
||||
"ibm775", "ibm775", "ibm775",
|
||||
false, false, false, false, 1257)
|
||||
{}
|
||||
|
||||
private static readonly char[] ToChars = {
|
||||
'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005',
|
||||
'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B',
|
||||
'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011',
|
||||
'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017',
|
||||
'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D',
|
||||
'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023',
|
||||
'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029',
|
||||
'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F',
|
||||
'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035',
|
||||
'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B',
|
||||
'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041',
|
||||
'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047',
|
||||
'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D',
|
||||
'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053',
|
||||
'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059',
|
||||
'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F',
|
||||
'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065',
|
||||
'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B',
|
||||
'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071',
|
||||
'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077',
|
||||
'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D',
|
||||
'\u007E', '\u001A', '\u0106', '\u00FC', '\u00E9', '\u0101',
|
||||
'\u00E4', '\u0123', '\u00E5', '\u0107', '\u0142', '\u0113',
|
||||
'\u0156', '\u0157', '\u012B', '\u0179', '\u00C4', '\u00C5',
|
||||
'\u00C9', '\u00E6', '\u00C6', '\u014D', '\u00F6', '\u0122',
|
||||
'\u00A2', '\u015A', '\u015B', '\u00D6', '\u00DC', '\u00F8',
|
||||
'\u00A3', '\u00D8', '\u00D7', '\u00A4', '\u0100', '\u012A',
|
||||
'\u00F3', '\u017B', '\u017C', '\u017A', '\u201D', '\u00A6',
|
||||
'\u00A9', '\u00AE', '\u00AC', '\u00BD', '\u00BC', '\u0141',
|
||||
'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502',
|
||||
'\u2524', '\u0104', '\u010C', '\u0118', '\u0116', '\u2563',
|
||||
'\u2551', '\u2557', '\u255D', '\u012E', '\u0160', '\u2510',
|
||||
'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C',
|
||||
'\u0172', '\u016A', '\u255A', '\u2554', '\u2569', '\u2566',
|
||||
'\u2560', '\u2550', '\u256C', '\u017D', '\u0105', '\u010D',
|
||||
'\u0119', '\u0117', '\u012F', '\u0161', '\u0173', '\u016B',
|
||||
'\u017E', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C',
|
||||
'\u2590', '\u2580', '\u00D3', '\u00DF', '\u014C', '\u0143',
|
||||
'\u00F5', '\u00D5', '\u00B5', '\u0144', '\u0136', '\u0137',
|
||||
'\u013B', '\u013C', '\u0146', '\u0112', '\u0145', '\u2019',
|
||||
'\u00AD', '\u00B1', '\u201C', '\u00BE', '\u00B6', '\u00A7',
|
||||
'\u00F7', '\u201E', '\u00B0', '\u2219', '\u00B7', '\u00B9',
|
||||
'\u00B3', '\u00B2', '\u25A0', '\u00A0',
|
||||
};
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public unsafe override int GetByteCountImpl (char* chars, int count)
|
||||
{
|
||||
if (this.EncoderFallback != null) {
|
||||
//Calculate byte count by actually doing encoding and discarding the data.
|
||||
return GetBytesImpl(chars, count, null, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
// Get the number of bytes needed to encode a character buffer.
|
||||
public override int GetByteCount (String s)
|
||||
{
|
||||
if (this.EncoderFallback != null)
|
||||
{
|
||||
//Calculate byte count by actually doing encoding and discarding the data.
|
||||
unsafe
|
||||
{
|
||||
fixed (char *s_ptr = s)
|
||||
{
|
||||
return GetBytesImpl(s_ptr, s.Length, null, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//byte count equals character count because no EncoderFallback set
|
||||
return s.Length;
|
||||
}
|
||||
}
|
||||
|
||||
//ToBytes is just an alias for GetBytesImpl, but doesn't return byte count
|
||||
protected unsafe override void ToBytes(char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
//Calling ToBytes with null destination buffer doesn't make any sense
|
||||
if (bytes == null)
|
||||
throw new ArgumentNullException("bytes");
|
||||
GetBytesImpl(chars, charCount, bytes, byteCount);
|
||||
}
|
||||
|
||||
public unsafe override int GetBytesImpl (char* chars, int charCount,
|
||||
byte* bytes, int byteCount)
|
||||
{
|
||||
int ch;
|
||||
int charIndex = 0;
|
||||
int byteIndex = 0;
|
||||
EncoderFallbackBuffer buffer = null;
|
||||
while (charCount > 0)
|
||||
{
|
||||
ch = (int)(chars[charIndex]);
|
||||
if(ch >= 26) switch(ch)
|
||||
{
|
||||
case 0x001B:
|
||||
case 0x001D:
|
||||
case 0x001E:
|
||||
case 0x001F:
|
||||
case 0x0020:
|
||||
case 0x0021:
|
||||
case 0x0022:
|
||||
case 0x0023:
|
||||
case 0x0024:
|
||||
case 0x0025:
|
||||
case 0x0026:
|
||||
case 0x0027:
|
||||
case 0x0028:
|
||||
case 0x0029:
|
||||
case 0x002A:
|
||||
case 0x002B:
|
||||
case 0x002C:
|
||||
case 0x002D:
|
||||
case 0x002E:
|
||||
case 0x002F:
|
||||
case 0x0030:
|
||||
case 0x0031:
|
||||
case 0x0032:
|
||||
case 0x0033:
|
||||
case 0x0034:
|
||||
case 0x0035:
|
||||
case 0x0036:
|
||||
case 0x0037:
|
||||
case 0x0038:
|
||||
case 0x0039:
|
||||
case 0x003A:
|
||||
case 0x003B:
|
||||
case 0x003C:
|
||||
case 0x003D:
|
||||
case 0x003E:
|
||||
case 0x003F:
|
||||
case 0x0040:
|
||||
case 0x0041:
|
||||
case 0x0042:
|
||||
case 0x0043:
|
||||
case 0x0044:
|
||||
case 0x0045:
|
||||
case 0x0046:
|
||||
case 0x0047:
|
||||
case 0x0048:
|
||||
case 0x0049:
|
||||
case 0x004A:
|
||||
case 0x004B:
|
||||
case 0x004C:
|
||||
case 0x004D:
|
||||
case 0x004E:
|
||||
case 0x004F:
|
||||
case 0x0050:
|
||||
case 0x0051:
|
||||
case 0x0052:
|
||||
case 0x0053:
|
||||
case 0x0054:
|
||||
case 0x0055:
|
||||
case 0x0056:
|
||||
case 0x0057:
|
||||
case 0x0058:
|
||||
case 0x0059:
|
||||
case 0x005A:
|
||||
case 0x005B:
|
||||
case 0x005C:
|
||||
case 0x005D:
|
||||
case 0x005E:
|
||||
case 0x005F:
|
||||
case 0x0060:
|
||||
case 0x0061:
|
||||
case 0x0062:
|
||||
case 0x0063:
|
||||
case 0x0064:
|
||||
case 0x0065:
|
||||
case 0x0066:
|
||||
case 0x0067:
|
||||
case 0x0068:
|
||||
case 0x0069:
|
||||
case 0x006A:
|
||||
case 0x006B:
|
||||
case 0x006C:
|
||||
case 0x006D:
|
||||
case 0x006E:
|
||||
case 0x006F:
|
||||
case 0x0070:
|
||||
case 0x0071:
|
||||
case 0x0072:
|
||||
case 0x0073:
|
||||
case 0x0074:
|
||||
case 0x0075:
|
||||
case 0x0076:
|
||||
case 0x0077:
|
||||
case 0x0078:
|
||||
case 0x0079:
|
||||
case 0x007A:
|
||||
case 0x007B:
|
||||
case 0x007C:
|
||||
case 0x007D:
|
||||
case 0x007E:
|
||||
break;
|
||||
case 0x001A: ch = 0x7F; break;
|
||||
case 0x001C: ch = 0x1A; break;
|
||||
case 0x007F: ch = 0x1C; break;
|
||||
case 0x00A0: ch = 0xFF; break;
|
||||
case 0x00A2: ch = 0x96; break;
|
||||
case 0x00A3: ch = 0x9C; break;
|
||||
case 0x00A4: ch = 0x9F; break;
|
||||
case 0x00A6: ch = 0xA7; break;
|
||||
case 0x00A7: ch = 0xF5; break;
|
||||
case 0x00A9: ch = 0xA8; break;
|
||||
case 0x00AB: ch = 0xAE; break;
|
||||
case 0x00AC: ch = 0xAA; break;
|
||||
case 0x00AD: ch = 0xF0; break;
|
||||
case 0x00AE: ch = 0xA9; break;
|
||||
case 0x00B0: ch = 0xF8; break;
|
||||
case 0x00B1: ch = 0xF1; break;
|
||||
case 0x00B2: ch = 0xFD; break;
|
||||
case 0x00B3: ch = 0xFC; break;
|
||||
case 0x00B5: ch = 0xE6; break;
|
||||
case 0x00B6: ch = 0xF4; break;
|
||||
case 0x00B7: ch = 0xFA; break;
|
||||
case 0x00B9: ch = 0xFB; break;
|
||||
case 0x00BB: ch = 0xAF; break;
|
||||
case 0x00BC: ch = 0xAC; break;
|
||||
case 0x00BD: ch = 0xAB; break;
|
||||
case 0x00BE: ch = 0xF3; break;
|
||||
case 0x00C4: ch = 0x8E; break;
|
||||
case 0x00C5: ch = 0x8F; break;
|
||||
case 0x00C6: ch = 0x92; break;
|
||||
case 0x00C9: ch = 0x90; break;
|
||||
case 0x00D3: ch = 0xE0; break;
|
||||
case 0x00D5: ch = 0xE5; break;
|
||||
case 0x00D6: ch = 0x99; break;
|
||||
case 0x00D7: ch = 0x9E; break;
|
||||
case 0x00D8: ch = 0x9D; break;
|
||||
case 0x00DC: ch = 0x9A; break;
|
||||
case 0x00DF: ch = 0xE1; break;
|
||||
case 0x00E4: ch = 0x84; break;
|
||||
case 0x00E5: ch = 0x86; break;
|
||||
case 0x00E6: ch = 0x91; break;
|
||||
case 0x00E9: ch = 0x82; break;
|
||||
case 0x00F3: ch = 0xA2; break;
|
||||
case 0x00F5: ch = 0xE4; break;
|
||||
case 0x00F6: ch = 0x94; break;
|
||||
case 0x00F7: ch = 0xF6; break;
|
||||
case 0x00F8: ch = 0x9B; break;
|
||||
case 0x00FC: ch = 0x81; break;
|
||||
case 0x0100: ch = 0xA0; break;
|
||||
case 0x0101: ch = 0x83; break;
|
||||
case 0x0104: ch = 0xB5; break;
|
||||
case 0x0105: ch = 0xD0; break;
|
||||
case 0x0106: ch = 0x80; break;
|
||||
case 0x0107: ch = 0x87; break;
|
||||
case 0x010C: ch = 0xB6; break;
|
||||
case 0x010D: ch = 0xD1; break;
|
||||
case 0x0112: ch = 0xED; break;
|
||||
case 0x0113: ch = 0x89; break;
|
||||
case 0x0116: ch = 0xB8; break;
|
||||
case 0x0117: ch = 0xD3; break;
|
||||
case 0x0118: ch = 0xB7; break;
|
||||
case 0x0119: ch = 0xD2; break;
|
||||
case 0x0122: ch = 0x95; break;
|
||||
case 0x0123: ch = 0x85; break;
|
||||
case 0x012A: ch = 0xA1; break;
|
||||
case 0x012B: ch = 0x8C; break;
|
||||
case 0x012E: ch = 0xBD; break;
|
||||
case 0x012F: ch = 0xD4; break;
|
||||
case 0x0136: ch = 0xE8; break;
|
||||
case 0x0137: ch = 0xE9; break;
|
||||
case 0x013B: ch = 0xEA; break;
|
||||
case 0x013C: ch = 0xEB; break;
|
||||
case 0x0141: ch = 0xAD; break;
|
||||
case 0x0142: ch = 0x88; break;
|
||||
case 0x0143: ch = 0xE3; break;
|
||||
case 0x0144: ch = 0xE7; break;
|
||||
case 0x0145: ch = 0xEE; break;
|
||||
case 0x0146: ch = 0xEC; break;
|
||||
case 0x014C: ch = 0xE2; break;
|
||||
case 0x014D: ch = 0x93; break;
|
||||
case 0x0156: ch = 0x8A; break;
|
||||
case 0x0157: ch = 0x8B; break;
|
||||
case 0x015A: ch = 0x97; break;
|
||||
case 0x015B: ch = 0x98; break;
|
||||
case 0x0160: ch = 0xBE; break;
|
||||
case 0x0161: ch = 0xD5; break;
|
||||
case 0x016A: ch = 0xC7; break;
|
||||
case 0x016B: ch = 0xD7; break;
|
||||
case 0x0172: ch = 0xC6; break;
|
||||
case 0x0173: ch = 0xD6; break;
|
||||
case 0x0179: ch = 0x8D; break;
|
||||
case 0x017A: ch = 0xA5; break;
|
||||
case 0x017B: ch = 0xA3; break;
|
||||
case 0x017C: ch = 0xA4; break;
|
||||
case 0x017D: ch = 0xCF; break;
|
||||
case 0x017E: ch = 0xD8; break;
|
||||
case 0x2019: ch = 0xEF; break;
|
||||
case 0x201C: ch = 0xF2; break;
|
||||
case 0x201D: ch = 0xA6; break;
|
||||
case 0x201E: ch = 0xF7; break;
|
||||
case 0x2022: ch = 0x07; break;
|
||||
case 0x203C: ch = 0x13; break;
|
||||
case 0x2190: ch = 0x1B; break;
|
||||
case 0x2191: ch = 0x18; break;
|
||||
case 0x2192: ch = 0x1A; break;
|
||||
case 0x2193: ch = 0x19; break;
|
||||
case 0x2194: ch = 0x1D; break;
|
||||
case 0x2195: ch = 0x12; break;
|
||||
case 0x21A8: ch = 0x17; break;
|
||||
case 0x2219: ch = 0xF9; break;
|
||||
case 0x221F: ch = 0x1C; break;
|
||||
case 0x2302: ch = 0x7F; break;
|
||||
case 0x2500: ch = 0xC4; break;
|
||||
case 0x2502: ch = 0xB3; break;
|
||||
case 0x250C: ch = 0xDA; break;
|
||||
case 0x2510: ch = 0xBF; break;
|
||||
case 0x2514: ch = 0xC0; break;
|
||||
case 0x2518: ch = 0xD9; break;
|
||||
case 0x251C: ch = 0xC3; break;
|
||||
case 0x2524: ch = 0xB4; break;
|
||||
case 0x252C: ch = 0xC2; break;
|
||||
case 0x2534: ch = 0xC1; break;
|
||||
case 0x253C: ch = 0xC5; break;
|
||||
case 0x2550: ch = 0xCD; break;
|
||||
case 0x2551: ch = 0xBA; break;
|
||||
case 0x2554: ch = 0xC9; break;
|
||||
case 0x2557: ch = 0xBB; break;
|
||||
case 0x255A: ch = 0xC8; break;
|
||||
case 0x255D: ch = 0xBC; break;
|
||||
case 0x2560: ch = 0xCC; break;
|
||||
case 0x2563: ch = 0xB9; break;
|
||||
case 0x2566: ch = 0xCB; break;
|
||||
case 0x2569: ch = 0xCA; break;
|
||||
case 0x256C: ch = 0xCE; break;
|
||||
case 0x2580: ch = 0xDF; break;
|
||||
case 0x2584: ch = 0xDC; break;
|
||||
case 0x2588: ch = 0xDB; break;
|
||||
case 0x258C: ch = 0xDD; break;
|
||||
case 0x2590: ch = 0xDE; break;
|
||||
case 0x2591: ch = 0xB0; break;
|
||||
case 0x2592: ch = 0xB1; break;
|
||||
case 0x2593: ch = 0xB2; break;
|
||||
case 0x25A0: ch = 0xFE; break;
|
||||
case 0x25AC: ch = 0x16; break;
|
||||
case 0x25B2: ch = 0x1E; break;
|
||||
case 0x25BA: ch = 0x10; break;
|
||||
case 0x25BC: ch = 0x1F; break;
|
||||
case 0x25C4: ch = 0x11; break;
|
||||
case 0x25CB: ch = 0x09; break;
|
||||
case 0x25D8: ch = 0x08; break;
|
||||
case 0x25D9: ch = 0x0A; break;
|
||||
case 0x263A: ch = 0x01; break;
|
||||
case 0x263B: ch = 0x02; break;
|
||||
case 0x263C: ch = 0x0F; break;
|
||||
case 0x2640: ch = 0x0C; break;
|
||||
case 0x2642: ch = 0x0B; break;
|
||||
case 0x2660: ch = 0x06; break;
|
||||
case 0x2663: ch = 0x05; break;
|
||||
case 0x2665: ch = 0x03; break;
|
||||
case 0x2666: ch = 0x04; break;
|
||||
case 0x266A: ch = 0x0D; break;
|
||||
case 0x266B: ch = 0x0E; break;
|
||||
case 0xFFE8: ch = 0xB3; break;
|
||||
case 0xFFE9: ch = 0x1B; break;
|
||||
case 0xFFEA: ch = 0x18; break;
|
||||
case 0xFFEB: ch = 0x1A; break;
|
||||
case 0xFFEC: ch = 0x19; break;
|
||||
case 0xFFED: ch = 0xFE; break;
|
||||
case 0xFFEE: ch = 0x09; break;
|
||||
default:
|
||||
{
|
||||
if(ch >= 0xFF01 && ch <= 0xFF5E)
|
||||
{
|
||||
ch -= 0xFEE0;
|
||||
}
|
||||
else
|
||||
{
|
||||
HandleFallback (ref buffer, chars, ref charIndex, ref charCount, bytes, ref byteIndex, ref byteCount);
|
||||
charIndex++;
|
||||
charCount--;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
//Write encoded byte to buffer, if buffer is defined and fallback was not used
|
||||
if (bytes != null)
|
||||
bytes[byteIndex] = (byte)ch;
|
||||
byteIndex++;
|
||||
byteCount--;
|
||||
charIndex++;
|
||||
charCount--;
|
||||
}
|
||||
return byteIndex;
|
||||
}
|
||||
}; // class CP775
|
||||
|
||||
[Serializable]
|
||||
public class ENCibm775 : CP775
|
||||
{
|
||||
public ENCibm775() : base() {}
|
||||
|
||||
}; // class ENCibm775
|
||||
|
||||
}; // namespace I18N.Rare
|
||||
@@ -83,8 +83,6 @@
|
||||
<Compile Include="CP37.cs" />
|
||||
<Compile Include="CP500.cs" />
|
||||
<Compile Include="CP708.cs" />
|
||||
<Compile Include="CP737.cs" />
|
||||
<Compile Include="CP775.cs" />
|
||||
<Compile Include="CP852.cs" />
|
||||
<Compile Include="CP855.cs" />
|
||||
<Compile Include="CP857.cs" />
|
||||
|
||||
@@ -31,8 +31,6 @@ CP21025.cs
|
||||
CP37.cs
|
||||
CP500.cs
|
||||
CP708.cs
|
||||
CP737.cs
|
||||
CP775.cs
|
||||
CP852.cs
|
||||
CP855.cs
|
||||
CP857.cs
|
||||
|
||||
@@ -1,411 +0,0 @@
|
||||
# ***************************************************************************
|
||||
# *
|
||||
# * Copyright (C) 1995-2002, International Business Machines
|
||||
# * Corporation and others. All Rights Reserved.
|
||||
# *
|
||||
# ***************************************************************************
|
||||
#
|
||||
# File created by rptp2ucm (compiled on Dec 3 2002)
|
||||
# from source files 34B002E1.RPMAP100 and 02E134B0.TPMAP100
|
||||
#
|
||||
<code_set_name> "ibm-737_P100-1997"
|
||||
<char_name_mask> "AXXXX"
|
||||
<mb_cur_max> 1
|
||||
<mb_cur_min> 1
|
||||
<uconv_class> "SBCS"
|
||||
<subchar> \x7F
|
||||
<icu:charsetFamily> "ASCII"
|
||||
<icu:alias> "ibm-737_VSUB"
|
||||
|
||||
CHARMAP
|
||||
<U0000> \x00 |0
|
||||
<U0001> \x01 |0
|
||||
<U0002> \x02 |0
|
||||
<U0003> \x03 |0
|
||||
<U0004> \x04 |0
|
||||
<U0005> \x05 |0
|
||||
<U0006> \x06 |0
|
||||
<U0007> \x07 |0
|
||||
<U0008> \x08 |0
|
||||
<U0009> \x09 |0
|
||||
<U000A> \x0A |0
|
||||
<U000B> \x0B |0
|
||||
<U000C> \x0C |0
|
||||
<U000D> \x0D |0
|
||||
<U000E> \x0E |0
|
||||
<U000F> \x0F |0
|
||||
<U0010> \x10 |0
|
||||
<U0011> \x11 |0
|
||||
<U0012> \x12 |0
|
||||
<U0013> \x13 |0
|
||||
<U0014> \x14 |0
|
||||
<U0015> \x15 |0
|
||||
<U0016> \x16 |0
|
||||
<U0017> \x17 |0
|
||||
<U0018> \x18 |0
|
||||
<U0019> \x19 |0
|
||||
<U001A> \x7F |0
|
||||
<U001B> \x1B |0
|
||||
<U001C> \x1A |0
|
||||
<U001D> \x1D |0
|
||||
<U001E> \x1E |0
|
||||
<U001F> \x1F |0
|
||||
<U0020> \x20 |0
|
||||
<U0021> \x21 |0
|
||||
<U0022> \x22 |0
|
||||
<U0023> \x23 |0
|
||||
<U0024> \x24 |0
|
||||
<U0025> \x25 |0
|
||||
<U0026> \x26 |0
|
||||
<U0027> \x27 |0
|
||||
<U0028> \x28 |0
|
||||
<U0029> \x29 |0
|
||||
<U002A> \x2A |0
|
||||
<U002B> \x2B |0
|
||||
<U002C> \x2C |0
|
||||
<U002D> \x2D |0
|
||||
<U002E> \x2E |0
|
||||
<U002F> \x2F |0
|
||||
<U0030> \x30 |0
|
||||
<U0031> \x31 |0
|
||||
<U0032> \x32 |0
|
||||
<U0033> \x33 |0
|
||||
<U0034> \x34 |0
|
||||
<U0035> \x35 |0
|
||||
<U0036> \x36 |0
|
||||
<U0037> \x37 |0
|
||||
<U0038> \x38 |0
|
||||
<U0039> \x39 |0
|
||||
<U003A> \x3A |0
|
||||
<U003B> \x3B |0
|
||||
<U003C> \x3C |0
|
||||
<U003D> \x3D |0
|
||||
<U003E> \x3E |0
|
||||
<U003F> \x3F |0
|
||||
<U0040> \x40 |0
|
||||
<U0041> \x41 |0
|
||||
<U0042> \x42 |0
|
||||
<U0043> \x43 |0
|
||||
<U0044> \x44 |0
|
||||
<U0045> \x45 |0
|
||||
<U0046> \x46 |0
|
||||
<U0047> \x47 |0
|
||||
<U0048> \x48 |0
|
||||
<U0049> \x49 |0
|
||||
<U004A> \x4A |0
|
||||
<U004B> \x4B |0
|
||||
<U004C> \x4C |0
|
||||
<U004D> \x4D |0
|
||||
<U004E> \x4E |0
|
||||
<U004F> \x4F |0
|
||||
<U0050> \x50 |0
|
||||
<U0051> \x51 |0
|
||||
<U0052> \x52 |0
|
||||
<U0053> \x53 |0
|
||||
<U0054> \x54 |0
|
||||
<U0055> \x55 |0
|
||||
<U0056> \x56 |0
|
||||
<U0057> \x57 |0
|
||||
<U0058> \x58 |0
|
||||
<U0059> \x59 |0
|
||||
<U005A> \x5A |0
|
||||
<U005B> \x5B |0
|
||||
<U005C> \x5C |0
|
||||
<U005D> \x5D |0
|
||||
<U005E> \x5E |0
|
||||
<U005F> \x5F |0
|
||||
<U0060> \x60 |0
|
||||
<U0061> \x61 |0
|
||||
<U0062> \x62 |0
|
||||
<U0063> \x63 |0
|
||||
<U0064> \x64 |0
|
||||
<U0065> \x65 |0
|
||||
<U0066> \x66 |0
|
||||
<U0067> \x67 |0
|
||||
<U0068> \x68 |0
|
||||
<U0069> \x69 |0
|
||||
<U006A> \x6A |0
|
||||
<U006B> \x6B |0
|
||||
<U006C> \x6C |0
|
||||
<U006D> \x6D |0
|
||||
<U006E> \x6E |0
|
||||
<U006F> \x6F |0
|
||||
<U0070> \x70 |0
|
||||
<U0071> \x71 |0
|
||||
<U0072> \x72 |0
|
||||
<U0073> \x73 |0
|
||||
<U0074> \x74 |0
|
||||
<U0075> \x75 |0
|
||||
<U0076> \x76 |0
|
||||
<U0077> \x77 |0
|
||||
<U0078> \x78 |0
|
||||
<U0079> \x79 |0
|
||||
<U007A> \x7A |0
|
||||
<U007B> \x7B |0
|
||||
<U007C> \x7C |0
|
||||
<U007D> \x7D |0
|
||||
<U007E> \x7E |0
|
||||
<U007F> \x1C |0
|
||||
<U00A0> \xFF |0
|
||||
<U00A7> \x15 |1
|
||||
<U00B0> \xF8 |0
|
||||
<U00B1> \xF1 |0
|
||||
<U00B2> \xFD |0
|
||||
<U00B6> \x14 |1
|
||||
<U00B7> \xFA |0
|
||||
<U00F7> \xF6 |0
|
||||
<U0386> \xEA |0
|
||||
<U0388> \xEB |0
|
||||
<U0389> \xEC |0
|
||||
<U038A> \xED |0
|
||||
<U038C> \xEE |0
|
||||
<U038E> \xEF |0
|
||||
<U038F> \xF0 |0
|
||||
<U0391> \x80 |0
|
||||
<U0392> \x81 |0
|
||||
<U0393> \x82 |0
|
||||
<U0394> \x83 |0
|
||||
<U0395> \x84 |0
|
||||
<U0396> \x85 |0
|
||||
<U0397> \x86 |0
|
||||
<U0398> \x87 |0
|
||||
<U0399> \x88 |0
|
||||
<U039A> \x89 |0
|
||||
<U039B> \x8A |0
|
||||
<U039C> \x8B |0
|
||||
<U039D> \x8C |0
|
||||
<U039E> \x8D |0
|
||||
<U039F> \x8E |0
|
||||
<U03A0> \x8F |0
|
||||
<U03A1> \x90 |0
|
||||
<U03A3> \x91 |0
|
||||
<U03A4> \x92 |0
|
||||
<U03A5> \x93 |0
|
||||
<U03A6> \x94 |0
|
||||
<U03A7> \x95 |0
|
||||
<U03A8> \x96 |0
|
||||
<U03A9> \x97 |0
|
||||
<U03AA> \xF4 |0
|
||||
<U03AB> \xF5 |0
|
||||
<U03AC> \xE1 |0
|
||||
<U03AD> \xE2 |0
|
||||
<U03AE> \xE3 |0
|
||||
<U03AF> \xE5 |0
|
||||
<U03B1> \x98 |0
|
||||
<U03B2> \x99 |0
|
||||
<U03B3> \x9A |0
|
||||
<U03B4> \x9B |0
|
||||
<U03B5> \x9C |0
|
||||
<U03B6> \x9D |0
|
||||
<U03B7> \x9E |0
|
||||
<U03B8> \x9F |0
|
||||
<U03B9> \xA0 |0
|
||||
<U03BA> \xA1 |0
|
||||
<U03BB> \xA2 |0
|
||||
<U03BC> \xA3 |0
|
||||
<U03BD> \xA4 |0
|
||||
<U03BE> \xA5 |0
|
||||
<U03BF> \xA6 |0
|
||||
<U03C0> \xA7 |0
|
||||
<U03C1> \xA8 |0
|
||||
<U03C2> \xAA |0
|
||||
<U03C3> \xA9 |0
|
||||
<U03C4> \xAB |0
|
||||
<U03C5> \xAC |0
|
||||
<U03C6> \xAD |0
|
||||
<U03C7> \xAE |0
|
||||
<U03C8> \xAF |0
|
||||
<U03C9> \xE0 |0
|
||||
<U03CA> \xE4 |0
|
||||
<U03CB> \xE8 |0
|
||||
<U03CC> \xE6 |0
|
||||
<U03CD> \xE7 |0
|
||||
<U03CE> \xE9 |0
|
||||
<U03D5> \xAD |1
|
||||
<U2022> \x07 |1
|
||||
<U203C> \x13 |1
|
||||
<U207F> \xFC |0
|
||||
<U2190> \x1B |1
|
||||
<U2191> \x18 |1
|
||||
<U2192> \x1A |1
|
||||
<U2193> \x19 |1
|
||||
<U2194> \x1D |1
|
||||
<U2195> \x12 |1
|
||||
<U21A8> \x17 |1
|
||||
<U2219> \xF9 |0
|
||||
<U221A> \xFB |0
|
||||
<U221F> \x1C |1
|
||||
<U2248> \xF7 |0
|
||||
<U2264> \xF3 |0
|
||||
<U2265> \xF2 |0
|
||||
<U2302> \x7F |2
|
||||
<U2500> \xC4 |0
|
||||
<U2502> \xB3 |0
|
||||
<U250C> \xDA |0
|
||||
<U2510> \xBF |0
|
||||
<U2514> \xC0 |0
|
||||
<U2518> \xD9 |0
|
||||
<U251C> \xC3 |0
|
||||
<U2524> \xB4 |0
|
||||
<U252C> \xC2 |0
|
||||
<U2534> \xC1 |0
|
||||
<U253C> \xC5 |0
|
||||
<U2550> \xCD |0
|
||||
<U2551> \xBA |0
|
||||
<U2552> \xD5 |0
|
||||
<U2553> \xD6 |0
|
||||
<U2554> \xC9 |0
|
||||
<U2555> \xB8 |0
|
||||
<U2556> \xB7 |0
|
||||
<U2557> \xBB |0
|
||||
<U2558> \xD4 |0
|
||||
<U2559> \xD3 |0
|
||||
<U255A> \xC8 |0
|
||||
<U255B> \xBE |0
|
||||
<U255C> \xBD |0
|
||||
<U255D> \xBC |0
|
||||
<U255E> \xC6 |0
|
||||
<U255F> \xC7 |0
|
||||
<U2560> \xCC |0
|
||||
<U2561> \xB5 |0
|
||||
<U2562> \xB6 |0
|
||||
<U2563> \xB9 |0
|
||||
<U2564> \xD1 |0
|
||||
<U2565> \xD2 |0
|
||||
<U2566> \xCB |0
|
||||
<U2567> \xCF |0
|
||||
<U2568> \xD0 |0
|
||||
<U2569> \xCA |0
|
||||
<U256A> \xD8 |0
|
||||
<U256B> \xD7 |0
|
||||
<U256C> \xCE |0
|
||||
<U2580> \xDF |0
|
||||
<U2584> \xDC |0
|
||||
<U2588> \xDB |0
|
||||
<U258C> \xDD |0
|
||||
<U2590> \xDE |0
|
||||
<U2591> \xB0 |0
|
||||
<U2592> \xB1 |0
|
||||
<U2593> \xB2 |0
|
||||
<U25A0> \xFE |0
|
||||
<U25AC> \x16 |1
|
||||
<U25B2> \x1E |1
|
||||
<U25BA> \x10 |1
|
||||
<U25BC> \x1F |1
|
||||
<U25C4> \x11 |1
|
||||
<U25CB> \x09 |1
|
||||
<U25D8> \x08 |1
|
||||
<U25D9> \x0A |1
|
||||
<U263A> \x01 |1
|
||||
<U263B> \x02 |1
|
||||
<U263C> \x0F |1
|
||||
<U2640> \x0C |1
|
||||
<U2642> \x0B |1
|
||||
<U2660> \x06 |1
|
||||
<U2663> \x05 |1
|
||||
<U2665> \x03 |1
|
||||
<U2666> \x04 |1
|
||||
<U266A> \x0D |1
|
||||
<U266C> \x0E |1
|
||||
<UFF01> \x21 |1
|
||||
<UFF02> \x22 |1
|
||||
<UFF03> \x23 |1
|
||||
<UFF04> \x24 |1
|
||||
<UFF05> \x25 |1
|
||||
<UFF06> \x26 |1
|
||||
<UFF07> \x27 |1
|
||||
<UFF08> \x28 |1
|
||||
<UFF09> \x29 |1
|
||||
<UFF0A> \x2A |1
|
||||
<UFF0B> \x2B |1
|
||||
<UFF0C> \x2C |1
|
||||
<UFF0D> \x2D |1
|
||||
<UFF0E> \x2E |1
|
||||
<UFF0F> \x2F |1
|
||||
<UFF10> \x30 |1
|
||||
<UFF11> \x31 |1
|
||||
<UFF12> \x32 |1
|
||||
<UFF13> \x33 |1
|
||||
<UFF14> \x34 |1
|
||||
<UFF15> \x35 |1
|
||||
<UFF16> \x36 |1
|
||||
<UFF17> \x37 |1
|
||||
<UFF18> \x38 |1
|
||||
<UFF19> \x39 |1
|
||||
<UFF1A> \x3A |1
|
||||
<UFF1B> \x3B |1
|
||||
<UFF1C> \x3C |1
|
||||
<UFF1D> \x3D |1
|
||||
<UFF1E> \x3E |1
|
||||
<UFF1F> \x3F |1
|
||||
<UFF20> \x40 |1
|
||||
<UFF21> \x41 |1
|
||||
<UFF22> \x42 |1
|
||||
<UFF23> \x43 |1
|
||||
<UFF24> \x44 |1
|
||||
<UFF25> \x45 |1
|
||||
<UFF26> \x46 |1
|
||||
<UFF27> \x47 |1
|
||||
<UFF28> \x48 |1
|
||||
<UFF29> \x49 |1
|
||||
<UFF2A> \x4A |1
|
||||
<UFF2B> \x4B |1
|
||||
<UFF2C> \x4C |1
|
||||
<UFF2D> \x4D |1
|
||||
<UFF2E> \x4E |1
|
||||
<UFF2F> \x4F |1
|
||||
<UFF30> \x50 |1
|
||||
<UFF31> \x51 |1
|
||||
<UFF32> \x52 |1
|
||||
<UFF33> \x53 |1
|
||||
<UFF34> \x54 |1
|
||||
<UFF35> \x55 |1
|
||||
<UFF36> \x56 |1
|
||||
<UFF37> \x57 |1
|
||||
<UFF38> \x58 |1
|
||||
<UFF39> \x59 |1
|
||||
<UFF3A> \x5A |1
|
||||
<UFF3B> \x5B |1
|
||||
<UFF3C> \x5C |1
|
||||
<UFF3D> \x5D |1
|
||||
<UFF3E> \x5E |1
|
||||
<UFF3F> \x5F |1
|
||||
<UFF40> \x60 |1
|
||||
<UFF41> \x61 |1
|
||||
<UFF42> \x62 |1
|
||||
<UFF43> \x63 |1
|
||||
<UFF44> \x64 |1
|
||||
<UFF45> \x65 |1
|
||||
<UFF46> \x66 |1
|
||||
<UFF47> \x67 |1
|
||||
<UFF48> \x68 |1
|
||||
<UFF49> \x69 |1
|
||||
<UFF4A> \x6A |1
|
||||
<UFF4B> \x6B |1
|
||||
<UFF4C> \x6C |1
|
||||
<UFF4D> \x6D |1
|
||||
<UFF4E> \x6E |1
|
||||
<UFF4F> \x6F |1
|
||||
<UFF50> \x70 |1
|
||||
<UFF51> \x71 |1
|
||||
<UFF52> \x72 |1
|
||||
<UFF53> \x73 |1
|
||||
<UFF54> \x74 |1
|
||||
<UFF55> \x75 |1
|
||||
<UFF56> \x76 |1
|
||||
<UFF57> \x77 |1
|
||||
<UFF58> \x78 |1
|
||||
<UFF59> \x79 |1
|
||||
<UFF5A> \x7A |1
|
||||
<UFF5B> \x7B |1
|
||||
<UFF5C> \x7C |1
|
||||
<UFF5D> \x7D |1
|
||||
<UFF5E> \x7E |1
|
||||
<UFFE8> \xB3 |1
|
||||
<UFFE9> \x1B |1
|
||||
<UFFEA> \x18 |1
|
||||
<UFFEB> \x1A |1
|
||||
<UFFEC> \x19 |1
|
||||
<UFFED> \xFE |1
|
||||
<UFFEE> \x09 |1
|
||||
END CHARMAP
|
||||
@@ -1,408 +0,0 @@
|
||||
# ***************************************************************************
|
||||
# *
|
||||
# * Copyright (C) 1995-2004, International Business Machines
|
||||
# * Corporation and others. All Rights Reserved.
|
||||
# *
|
||||
# ***************************************************************************
|
||||
#
|
||||
# File created by rptp2ucm (compiled on Jan 14 2004)
|
||||
# from source files 34B00307.RPMAP100 and 030734B0.TPMAP100
|
||||
#
|
||||
<code_set_name> "ibm-775_P100-1996"
|
||||
<char_name_mask> "AXXXX"
|
||||
<mb_cur_max> 1
|
||||
<mb_cur_min> 1
|
||||
<uconv_class> "SBCS"
|
||||
<subchar> \x7F
|
||||
<icu:charsetFamily> "ASCII"
|
||||
<icu:alias> "ibm-775_VSUB"
|
||||
|
||||
CHARMAP
|
||||
<U0000> \x00 |0
|
||||
<U0001> \x01 |0
|
||||
<U0002> \x02 |0
|
||||
<U0003> \x03 |0
|
||||
<U0004> \x04 |0
|
||||
<U0005> \x05 |0
|
||||
<U0006> \x06 |0
|
||||
<U0007> \x07 |0
|
||||
<U0008> \x08 |0
|
||||
<U0009> \x09 |0
|
||||
<U000A> \x0A |0
|
||||
<U000B> \x0B |0
|
||||
<U000C> \x0C |0
|
||||
<U000D> \x0D |0
|
||||
<U000E> \x0E |0
|
||||
<U000F> \x0F |0
|
||||
<U0010> \x10 |0
|
||||
<U0011> \x11 |0
|
||||
<U0012> \x12 |0
|
||||
<U0013> \x13 |0
|
||||
<U0014> \x14 |0
|
||||
<U0015> \x15 |0
|
||||
<U0016> \x16 |0
|
||||
<U0017> \x17 |0
|
||||
<U0018> \x18 |0
|
||||
<U0019> \x19 |0
|
||||
<U001A> \x7F |0
|
||||
<U001B> \x1B |0
|
||||
<U001C> \x1A |0
|
||||
<U001D> \x1D |0
|
||||
<U001E> \x1E |0
|
||||
<U001F> \x1F |0
|
||||
<U0020> \x20 |0
|
||||
<U0021> \x21 |0
|
||||
<U0022> \x22 |0
|
||||
<U0023> \x23 |0
|
||||
<U0024> \x24 |0
|
||||
<U0025> \x25 |0
|
||||
<U0026> \x26 |0
|
||||
<U0027> \x27 |0
|
||||
<U0028> \x28 |0
|
||||
<U0029> \x29 |0
|
||||
<U002A> \x2A |0
|
||||
<U002B> \x2B |0
|
||||
<U002C> \x2C |0
|
||||
<U002D> \x2D |0
|
||||
<U002E> \x2E |0
|
||||
<U002F> \x2F |0
|
||||
<U0030> \x30 |0
|
||||
<U0031> \x31 |0
|
||||
<U0032> \x32 |0
|
||||
<U0033> \x33 |0
|
||||
<U0034> \x34 |0
|
||||
<U0035> \x35 |0
|
||||
<U0036> \x36 |0
|
||||
<U0037> \x37 |0
|
||||
<U0038> \x38 |0
|
||||
<U0039> \x39 |0
|
||||
<U003A> \x3A |0
|
||||
<U003B> \x3B |0
|
||||
<U003C> \x3C |0
|
||||
<U003D> \x3D |0
|
||||
<U003E> \x3E |0
|
||||
<U003F> \x3F |0
|
||||
<U0040> \x40 |0
|
||||
<U0041> \x41 |0
|
||||
<U0042> \x42 |0
|
||||
<U0043> \x43 |0
|
||||
<U0044> \x44 |0
|
||||
<U0045> \x45 |0
|
||||
<U0046> \x46 |0
|
||||
<U0047> \x47 |0
|
||||
<U0048> \x48 |0
|
||||
<U0049> \x49 |0
|
||||
<U004A> \x4A |0
|
||||
<U004B> \x4B |0
|
||||
<U004C> \x4C |0
|
||||
<U004D> \x4D |0
|
||||
<U004E> \x4E |0
|
||||
<U004F> \x4F |0
|
||||
<U0050> \x50 |0
|
||||
<U0051> \x51 |0
|
||||
<U0052> \x52 |0
|
||||
<U0053> \x53 |0
|
||||
<U0054> \x54 |0
|
||||
<U0055> \x55 |0
|
||||
<U0056> \x56 |0
|
||||
<U0057> \x57 |0
|
||||
<U0058> \x58 |0
|
||||
<U0059> \x59 |0
|
||||
<U005A> \x5A |0
|
||||
<U005B> \x5B |0
|
||||
<U005C> \x5C |0
|
||||
<U005D> \x5D |0
|
||||
<U005E> \x5E |0
|
||||
<U005F> \x5F |0
|
||||
<U0060> \x60 |0
|
||||
<U0061> \x61 |0
|
||||
<U0062> \x62 |0
|
||||
<U0063> \x63 |0
|
||||
<U0064> \x64 |0
|
||||
<U0065> \x65 |0
|
||||
<U0066> \x66 |0
|
||||
<U0067> \x67 |0
|
||||
<U0068> \x68 |0
|
||||
<U0069> \x69 |0
|
||||
<U006A> \x6A |0
|
||||
<U006B> \x6B |0
|
||||
<U006C> \x6C |0
|
||||
<U006D> \x6D |0
|
||||
<U006E> \x6E |0
|
||||
<U006F> \x6F |0
|
||||
<U0070> \x70 |0
|
||||
<U0071> \x71 |0
|
||||
<U0072> \x72 |0
|
||||
<U0073> \x73 |0
|
||||
<U0074> \x74 |0
|
||||
<U0075> \x75 |0
|
||||
<U0076> \x76 |0
|
||||
<U0077> \x77 |0
|
||||
<U0078> \x78 |0
|
||||
<U0079> \x79 |0
|
||||
<U007A> \x7A |0
|
||||
<U007B> \x7B |0
|
||||
<U007C> \x7C |0
|
||||
<U007D> \x7D |0
|
||||
<U007E> \x7E |0
|
||||
<U007F> \x1C |0
|
||||
<U00A0> \xFF |0
|
||||
<U00A2> \x96 |0
|
||||
<U00A3> \x9C |0
|
||||
<U00A4> \x9F |0
|
||||
<U00A6> \xA7 |0
|
||||
<U00A7> \xF5 |0
|
||||
<U00A9> \xA8 |0
|
||||
<U00AB> \xAE |0
|
||||
<U00AC> \xAA |0
|
||||
<U00AD> \xF0 |0
|
||||
<U00AE> \xA9 |0
|
||||
<U00B0> \xF8 |0
|
||||
<U00B1> \xF1 |0
|
||||
<U00B2> \xFD |0
|
||||
<U00B3> \xFC |0
|
||||
<U00B5> \xE6 |0
|
||||
<U00B6> \xF4 |0
|
||||
<U00B7> \xFA |0
|
||||
<U00B9> \xFB |0
|
||||
<U00BB> \xAF |0
|
||||
<U00BC> \xAC |0
|
||||
<U00BD> \xAB |0
|
||||
<U00BE> \xF3 |0
|
||||
<U00C4> \x8E |0
|
||||
<U00C5> \x8F |0
|
||||
<U00C6> \x92 |0
|
||||
<U00C9> \x90 |0
|
||||
<U00D3> \xE0 |0
|
||||
<U00D5> \xE5 |0
|
||||
<U00D6> \x99 |0
|
||||
<U00D7> \x9E |0
|
||||
<U00D8> \x9D |0
|
||||
<U00DC> \x9A |0
|
||||
<U00DF> \xE1 |0
|
||||
<U00E4> \x84 |0
|
||||
<U00E5> \x86 |0
|
||||
<U00E6> \x91 |0
|
||||
<U00E9> \x82 |0
|
||||
<U00F3> \xA2 |0
|
||||
<U00F5> \xE4 |0
|
||||
<U00F6> \x94 |0
|
||||
<U00F7> \xF6 |0
|
||||
<U00F8> \x9B |0
|
||||
<U00FC> \x81 |0
|
||||
<U0100> \xA0 |0
|
||||
<U0101> \x83 |0
|
||||
<U0104> \xB5 |0
|
||||
<U0105> \xD0 |0
|
||||
<U0106> \x80 |0
|
||||
<U0107> \x87 |0
|
||||
<U010C> \xB6 |0
|
||||
<U010D> \xD1 |0
|
||||
<U0112> \xED |0
|
||||
<U0113> \x89 |0
|
||||
<U0116> \xB8 |0
|
||||
<U0117> \xD3 |0
|
||||
<U0118> \xB7 |0
|
||||
<U0119> \xD2 |0
|
||||
<U0122> \x95 |0
|
||||
<U0123> \x85 |0
|
||||
<U012A> \xA1 |0
|
||||
<U012B> \x8C |0
|
||||
<U012E> \xBD |0
|
||||
<U012F> \xD4 |0
|
||||
<U0136> \xE8 |0
|
||||
<U0137> \xE9 |0
|
||||
<U013B> \xEA |0
|
||||
<U013C> \xEB |0
|
||||
<U0141> \xAD |0
|
||||
<U0142> \x88 |0
|
||||
<U0143> \xE3 |0
|
||||
<U0144> \xE7 |0
|
||||
<U0145> \xEE |0
|
||||
<U0146> \xEC |0
|
||||
<U014C> \xE2 |0
|
||||
<U014D> \x93 |0
|
||||
<U0156> \x8A |0
|
||||
<U0157> \x8B |0
|
||||
<U015A> \x97 |0
|
||||
<U015B> \x98 |0
|
||||
<U0160> \xBE |0
|
||||
<U0161> \xD5 |0
|
||||
<U016A> \xC7 |0
|
||||
<U016B> \xD7 |0
|
||||
<U0172> \xC6 |0
|
||||
<U0173> \xD6 |0
|
||||
<U0179> \x8D |0
|
||||
<U017A> \xA5 |0
|
||||
<U017B> \xA3 |0
|
||||
<U017C> \xA4 |0
|
||||
<U017D> \xCF |0
|
||||
<U017E> \xD8 |0
|
||||
<U2019> \xEF |0
|
||||
<U201C> \xF2 |0
|
||||
<U201D> \xA6 |0
|
||||
<U201E> \xF7 |0
|
||||
<U2022> \x07 |1
|
||||
<U203C> \x13 |1
|
||||
<U2190> \x1B |1
|
||||
<U2191> \x18 |1
|
||||
<U2192> \x1A |1
|
||||
<U2193> \x19 |1
|
||||
<U2194> \x1D |1
|
||||
<U2195> \x12 |1
|
||||
<U21A8> \x17 |1
|
||||
<U2219> \xF9 |0
|
||||
<U221F> \x1C |1
|
||||
<U2302> \x7F |2
|
||||
<U2500> \xC4 |0
|
||||
<U2502> \xB3 |0
|
||||
<U250C> \xDA |0
|
||||
<U2510> \xBF |0
|
||||
<U2514> \xC0 |0
|
||||
<U2518> \xD9 |0
|
||||
<U251C> \xC3 |0
|
||||
<U2524> \xB4 |0
|
||||
<U252C> \xC2 |0
|
||||
<U2534> \xC1 |0
|
||||
<U253C> \xC5 |0
|
||||
<U2550> \xCD |0
|
||||
<U2551> \xBA |0
|
||||
<U2554> \xC9 |0
|
||||
<U2557> \xBB |0
|
||||
<U255A> \xC8 |0
|
||||
<U255D> \xBC |0
|
||||
<U2560> \xCC |0
|
||||
<U2563> \xB9 |0
|
||||
<U2566> \xCB |0
|
||||
<U2569> \xCA |0
|
||||
<U256C> \xCE |0
|
||||
<U2580> \xDF |0
|
||||
<U2584> \xDC |0
|
||||
<U2588> \xDB |0
|
||||
<U258C> \xDD |0
|
||||
<U2590> \xDE |0
|
||||
<U2591> \xB0 |0
|
||||
<U2592> \xB1 |0
|
||||
<U2593> \xB2 |0
|
||||
<U25A0> \xFE |0
|
||||
<U25AC> \x16 |1
|
||||
<U25B2> \x1E |1
|
||||
<U25BA> \x10 |1
|
||||
<U25BC> \x1F |1
|
||||
<U25C4> \x11 |1
|
||||
<U25CB> \x09 |1
|
||||
<U25D8> \x08 |1
|
||||
<U25D9> \x0A |1
|
||||
<U263A> \x01 |1
|
||||
<U263B> \x02 |1
|
||||
<U263C> \x0F |1
|
||||
<U2640> \x0C |1
|
||||
<U2642> \x0B |1
|
||||
<U2660> \x06 |1
|
||||
<U2663> \x05 |1
|
||||
<U2665> \x03 |1
|
||||
<U2666> \x04 |1
|
||||
<U266A> \x0D |1
|
||||
<U266B> \x0E |1
|
||||
<UFF01> \x21 |1
|
||||
<UFF02> \x22 |1
|
||||
<UFF03> \x23 |1
|
||||
<UFF04> \x24 |1
|
||||
<UFF05> \x25 |1
|
||||
<UFF06> \x26 |1
|
||||
<UFF07> \x27 |1
|
||||
<UFF08> \x28 |1
|
||||
<UFF09> \x29 |1
|
||||
<UFF0A> \x2A |1
|
||||
<UFF0B> \x2B |1
|
||||
<UFF0C> \x2C |1
|
||||
<UFF0D> \x2D |1
|
||||
<UFF0E> \x2E |1
|
||||
<UFF0F> \x2F |1
|
||||
<UFF10> \x30 |1
|
||||
<UFF11> \x31 |1
|
||||
<UFF12> \x32 |1
|
||||
<UFF13> \x33 |1
|
||||
<UFF14> \x34 |1
|
||||
<UFF15> \x35 |1
|
||||
<UFF16> \x36 |1
|
||||
<UFF17> \x37 |1
|
||||
<UFF18> \x38 |1
|
||||
<UFF19> \x39 |1
|
||||
<UFF1A> \x3A |1
|
||||
<UFF1B> \x3B |1
|
||||
<UFF1C> \x3C |1
|
||||
<UFF1D> \x3D |1
|
||||
<UFF1E> \x3E |1
|
||||
<UFF1F> \x3F |1
|
||||
<UFF20> \x40 |1
|
||||
<UFF21> \x41 |1
|
||||
<UFF22> \x42 |1
|
||||
<UFF23> \x43 |1
|
||||
<UFF24> \x44 |1
|
||||
<UFF25> \x45 |1
|
||||
<UFF26> \x46 |1
|
||||
<UFF27> \x47 |1
|
||||
<UFF28> \x48 |1
|
||||
<UFF29> \x49 |1
|
||||
<UFF2A> \x4A |1
|
||||
<UFF2B> \x4B |1
|
||||
<UFF2C> \x4C |1
|
||||
<UFF2D> \x4D |1
|
||||
<UFF2E> \x4E |1
|
||||
<UFF2F> \x4F |1
|
||||
<UFF30> \x50 |1
|
||||
<UFF31> \x51 |1
|
||||
<UFF32> \x52 |1
|
||||
<UFF33> \x53 |1
|
||||
<UFF34> \x54 |1
|
||||
<UFF35> \x55 |1
|
||||
<UFF36> \x56 |1
|
||||
<UFF37> \x57 |1
|
||||
<UFF38> \x58 |1
|
||||
<UFF39> \x59 |1
|
||||
<UFF3A> \x5A |1
|
||||
<UFF3B> \x5B |1
|
||||
<UFF3C> \x5C |1
|
||||
<UFF3D> \x5D |1
|
||||
<UFF3E> \x5E |1
|
||||
<UFF3F> \x5F |1
|
||||
<UFF40> \x60 |1
|
||||
<UFF41> \x61 |1
|
||||
<UFF42> \x62 |1
|
||||
<UFF43> \x63 |1
|
||||
<UFF44> \x64 |1
|
||||
<UFF45> \x65 |1
|
||||
<UFF46> \x66 |1
|
||||
<UFF47> \x67 |1
|
||||
<UFF48> \x68 |1
|
||||
<UFF49> \x69 |1
|
||||
<UFF4A> \x6A |1
|
||||
<UFF4B> \x6B |1
|
||||
<UFF4C> \x6C |1
|
||||
<UFF4D> \x6D |1
|
||||
<UFF4E> \x6E |1
|
||||
<UFF4F> \x6F |1
|
||||
<UFF50> \x70 |1
|
||||
<UFF51> \x71 |1
|
||||
<UFF52> \x72 |1
|
||||
<UFF53> \x73 |1
|
||||
<UFF54> \x74 |1
|
||||
<UFF55> \x75 |1
|
||||
<UFF56> \x76 |1
|
||||
<UFF57> \x77 |1
|
||||
<UFF58> \x78 |1
|
||||
<UFF59> \x79 |1
|
||||
<UFF5A> \x7A |1
|
||||
<UFF5B> \x7B |1
|
||||
<UFF5C> \x7C |1
|
||||
<UFF5D> \x7D |1
|
||||
<UFF5E> \x7E |1
|
||||
<UFFE8> \xB3 |1
|
||||
<UFFE9> \x1B |1
|
||||
<UFFEA> \x18 |1
|
||||
<UFFEB> \x1A |1
|
||||
<UFFEC> \x19 |1
|
||||
<UFFED> \xFE |1
|
||||
<UFFEE> \x09 |1
|
||||
END CHARMAP
|
||||
@@ -67,20 +67,6 @@ ${UCM2CP} --region Rare --page 708 --wpage 1256 \
|
||||
--no-browser-save --no-mailnews-display \
|
||||
--no-mailnews-save Rare/ibm-1089.ucm >Rare/CP708.cs
|
||||
|
||||
${UCM2CP} --region Rare --page 737 --wpage 1253 \
|
||||
--name 'Greek (DOS)' \
|
||||
--webname ibm737 --bodyname ibm737 \
|
||||
--headername ibm737 --no-browser-display \
|
||||
--no-browser-save --no-mailnews-display \
|
||||
--no-mailnews-save Rare/ibm-737.ucm >Rare/CP737.cs
|
||||
|
||||
${UCM2CP} --region Rare --page 775 --wpage 1257 \
|
||||
--name 'Baltic (DOS)' \
|
||||
--webname ibm775 --bodyname ibm775 \
|
||||
--headername ibm775 --no-browser-display \
|
||||
--no-browser-save --no-mailnews-display \
|
||||
--no-mailnews-save Rare/ibm-775.ucm >Rare/CP775.cs
|
||||
|
||||
${UCM2CP} --region West --page 850 --wpage 1252 \
|
||||
--name 'Western European (DOS)' \
|
||||
--webname ibm850 --bodyname ibm850 \
|
||||
@@ -495,6 +481,8 @@ exit 0
|
||||
# 709 Arabic - ASMO 449+, BCON V4
|
||||
# 710 Arabic - Transparent Arabic
|
||||
# 720 Arabic - Transparent ASMO
|
||||
# 737 OEM - Greek (formerly 437G)
|
||||
# 775 OEM - Baltic
|
||||
# 936 Chinese Simplified (GB2312)
|
||||
# 949 Korean
|
||||
# 950 Chinese Traditional (Big5)
|
||||
|
||||
@@ -23,15 +23,12 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
*
|
||||
* Usage: uni2tab
|
||||
*
|
||||
* Required files from ftp.unicode.org: Unihan.txt, CP932.TXT
|
||||
*
|
||||
* Unihan.txt and CP932.TXT can be found at:
|
||||
* ftp://www.unicode.org/Public/5.0.0/ucd/Unihan.txt
|
||||
* ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
|
||||
*/
|
||||
|
||||
Usage: uni2tab
|
||||
|
||||
Required files from ftp.unicode.org: Unihan.txt, CP932.TXT
|
||||
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@@ -324,13 +321,6 @@ static void convertSJISLine(char *buf)
|
||||
/* Non-CJK characters within JIS */
|
||||
processJis0208(code, (offset / 94) + 1, (offset % 94) + 1);
|
||||
}
|
||||
else if(code >= 0x00A7 && code <= 0x00F7)
|
||||
{
|
||||
/* Non-CJK characters within JIS for which unicodeToJis should not be
|
||||
* edited. In addition to this, do not track lowJis and highJis. */
|
||||
jisx0208ToUnicode[offset] = (unsigned short)(code & 0xFF);
|
||||
jisx0208ToUnicode[offset + 1] = (((unsigned short)(code & 0x00FF)) >> 8);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -102,8 +102,8 @@ namespace MonoTests.Microsoft.Build.Execution
|
||||
AssertHelper.GreaterOrEqual (endBuildDone, TimeSpan.FromSeconds (1), "#2");
|
||||
AssertHelper.GreaterOrEqual (waitDone, TimeSpan.FromSeconds (1), "#3");
|
||||
AssertHelper.GreaterOrEqual (endBuildDone, waitDone, "#4");
|
||||
AssertHelper.LessOrEqual (endBuildDone, TimeSpan.FromSeconds (2.5), "#5");
|
||||
AssertHelper.LessOrEqual (waitDone, TimeSpan.FromSeconds (2.5), "#6");
|
||||
AssertHelper.LessOrEqual (endBuildDone, TimeSpan.FromSeconds (2), "#5");
|
||||
AssertHelper.LessOrEqual (waitDone, TimeSpan.FromSeconds (2), "#6");
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
||||
@@ -84,6 +84,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\ExpressionTreeCallRewriter.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\ICSharpBinder.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\ICSharpInvokeOrInvokeMemberBinder.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\ResetBindException.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinder.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderException.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\RuntimeBinderExtensions.cs" />
|
||||
@@ -124,6 +125,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\SemanticChecker.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\SubstitutionContext.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\AggregateSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\AssemblyQualifiedNamespaceSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\EventSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\FieldSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Symbols\IndexerSymbol.cs" />
|
||||
@@ -148,6 +150,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ArrayInitialization.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Assignment.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\BinaryOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Block.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\BoundAnonymousFunction.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Call.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Cast.cs" />
|
||||
@@ -158,10 +161,11 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\EXPR.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExpressionIterator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprOperator.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprWithArgs.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\ExprWithType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Field.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\FieldInfo.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\HoistedLocal.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\IExprWithArgs.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\IExprWithObject.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\List.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\LocalVariable.cs" />
|
||||
@@ -170,6 +174,8 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\NamedArgumentSpecification.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Property.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\PropertyInfo.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Return.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Statement.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\Temporary.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\TypeOf.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Tree\UnaryOperator.cs" />
|
||||
@@ -182,6 +188,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\AggregateType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ArgumentListType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ArrayType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\ErrorType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\MethodGroupType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\NullableType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\NullType.cs" />
|
||||
@@ -193,7 +200,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeFactory.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeKind.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeManager.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeParameterType_.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeParameterType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\TypeTable.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\Types\VoidType.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Microsoft.CSharp\src\Microsoft\CSharp\RuntimeBinder\Semantics\UnaOpSig.cs" />
|
||||
|
||||
@@ -19,12 +19,6 @@ endif
|
||||
TEST_MCS_FLAGS =
|
||||
TEST_LIB_REFS = System.Core
|
||||
|
||||
ifndef NO_PROCESS_START
|
||||
REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START
|
||||
TEST_MCS_FLAGS += -d:MONO_FEATURE_PROCESS_START
|
||||
endif
|
||||
|
||||
|
||||
LIB_MCS_FLAGS += $(REFERENCE_SOURCES_FLAGS)
|
||||
|
||||
BUILT_SOURCES = $(PROFILE)-parser.cs
|
||||
|
||||
@@ -19,8 +19,7 @@ namespace Mono.Debugger.Soft
|
||||
if (!type.IsEnum)
|
||||
throw new ArgumentException ("type must be an enum type", "type");
|
||||
TypeMirror t = type.EnumUnderlyingType;
|
||||
// Can't access t's domain, so compare type names
|
||||
if (value.Value == null || !value.Value.GetType ().IsPrimitive || t.Name != vm.RootDomain.GetCorrespondingType (value.Value.GetType ()).Name)
|
||||
if (value.Value == null || !value.Value.GetType ().IsPrimitive || t != vm.RootDomain.GetCorrespondingType (value.Value.GetType ()))
|
||||
throw new ArgumentException ("Value '" + value.Value + "' does not match the type of the enum.");
|
||||
}
|
||||
|
||||
|
||||
@@ -434,7 +434,6 @@ public class Tests : TestsBase, ITest2
|
||||
}
|
||||
ss7 ();
|
||||
ss_nested ();
|
||||
ss_nested_with_two_args_wrapper ();
|
||||
ss_regress_654694 ();
|
||||
ss_step_through ();
|
||||
ss_non_user_code ();
|
||||
@@ -551,21 +550,6 @@ public class Tests : TestsBase, ITest2
|
||||
ss_nested_3 ();
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void ss_nested_with_two_args_wrapper () {
|
||||
ss_nested_with_two_args(ss_nested_arg (), ss_nested_arg ());
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_with_two_args (int a1, int a2) {
|
||||
return a1 + a2;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int ss_nested_arg () {
|
||||
return 0;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static void ss_nested_1 (int i) {
|
||||
}
|
||||
|
||||
@@ -3509,10 +3509,6 @@ public class DebuggerTests
|
||||
Assert.AreEqual ("domains", frames [2].Method.Name);
|
||||
Assert.AreEqual (vm.RootDomain, frames [2].Domain);
|
||||
|
||||
// Check enum creation in other domains
|
||||
var anenum = vm.CreateEnumMirror (d_method.DeclaringType.Assembly.GetType ("AnEnum"), vm.CreateValue (1));
|
||||
Assert.AreEqual (1, anenum.Value);
|
||||
|
||||
// Test breakpoints on already JITted methods in other domains
|
||||
m = entry_point.DeclaringType.GetMethod ("invoke_in_domain_2");
|
||||
Assert.IsNotNull (m);
|
||||
@@ -4311,33 +4307,6 @@ public class DebuggerTests
|
||||
vm = null;
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category("NotWorking")]
|
||||
public void ShouldCorrectlyStepOverOnExitFromArgsAfterStepInMethodParameter() {
|
||||
Event e = run_until ("ss_nested_with_two_args_wrapper");
|
||||
|
||||
var req = create_step(e);
|
||||
req.Enable();
|
||||
|
||||
e = step_once();
|
||||
assert_location(e, "ss_nested_with_two_args_wrapper");
|
||||
|
||||
e = step_into();
|
||||
assert_location(e, "ss_nested_arg");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_arg");
|
||||
|
||||
e = step_over();
|
||||
assert_location(e, "ss_nested_with_two_args_wrapper");
|
||||
|
||||
e = step_into();
|
||||
assert_location(e, "ss_nested_arg");
|
||||
}
|
||||
|
||||
[Test]
|
||||
// Uses a fixed port
|
||||
[Category("NotWorking")]
|
||||
|
||||
@@ -1390,27 +1390,28 @@ namespace Mono.Options
|
||||
o.Write (s);
|
||||
}
|
||||
|
||||
static string GetArgumentName (int index, int maxIndex, string description)
|
||||
private static string GetArgumentName (int index, int maxIndex, string description)
|
||||
{
|
||||
var matches = Regex.Matches (description ?? "", @"(?<=(?<!\{)\{)[^{}]*(?=\}(?!\}))"); // ignore double braces
|
||||
string argName = "";
|
||||
foreach (Match match in matches) {
|
||||
var parts = match.Value.Split (':');
|
||||
// for maxIndex=1 it can be {foo} or {0:foo}
|
||||
if (maxIndex == 1) {
|
||||
argName = parts[parts.Length - 1];
|
||||
}
|
||||
// look for {i:foo} if maxIndex > 1
|
||||
if (maxIndex > 1 && parts.Length == 2 &&
|
||||
parts[0] == index.ToString (CultureInfo.InvariantCulture)) {
|
||||
argName = parts[1];
|
||||
}
|
||||
if (description == null)
|
||||
return maxIndex == 1 ? "VALUE" : "VALUE" + (index + 1);
|
||||
string[] nameStart;
|
||||
if (maxIndex == 1)
|
||||
nameStart = new string[]{"{0:", "{"};
|
||||
else
|
||||
nameStart = new string[]{"{" + index + ":"};
|
||||
for (int i = 0; i < nameStart.Length; ++i) {
|
||||
int start, j = 0;
|
||||
do {
|
||||
start = description.IndexOf (nameStart [i], j);
|
||||
} while (start >= 0 && j != 0 ? description [j++ - 1] == '{' : false);
|
||||
if (start == -1)
|
||||
continue;
|
||||
int end = description.IndexOf ("}", start);
|
||||
if (end == -1)
|
||||
continue;
|
||||
return description.Substring (start + nameStart [i].Length, end - start - nameStart [i].Length);
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty (argName)) {
|
||||
argName = maxIndex == 1 ? "VALUE" : "VALUE" + (index + 1);
|
||||
}
|
||||
return argName;
|
||||
return maxIndex == 1 ? "VALUE" : "VALUE" + (index + 1);
|
||||
}
|
||||
|
||||
private static string GetDescription (string description)
|
||||
|
||||
@@ -413,8 +413,6 @@ namespace MonoTests.Mono.Options
|
||||
{ "color2:", "set {color}", v => {} },
|
||||
{ "rk=", "required key/value option", (k, v) => {} },
|
||||
{ "rk2=", "required {{foo}} {0:key}/{1:value} option", (k, v) => {} },
|
||||
{ "rk3=", "required {{foo}} {}", k => {} },
|
||||
{ "rk4=", "required {{foo}} {0:val}", k => {} },
|
||||
{ "ok:", "optional key/value option", (k, v) => {} },
|
||||
{ "long-desc",
|
||||
"This has a really\nlong, multi-line description that also\ntests\n" +
|
||||
@@ -458,8 +456,6 @@ namespace MonoTests.Mono.Options
|
||||
expected.WriteLine (" --color2[=color] set color");
|
||||
expected.WriteLine (" --rk=VALUE1:VALUE2 required key/value option");
|
||||
expected.WriteLine (" --rk2=key:value required {foo} key/value option");
|
||||
expected.WriteLine (" --rk3=VALUE required {foo}");
|
||||
expected.WriteLine (" --rk4=val required {foo} val");
|
||||
expected.WriteLine (" --ok[=VALUE1:VALUE2] optional key/value option");
|
||||
expected.WriteLine (" --long-desc This has a really");
|
||||
expected.WriteLine (" long, multi-line description that also");
|
||||
|
||||
@@ -6,7 +6,7 @@ LIBRARY_SNK = ../mono.snk
|
||||
|
||||
LIB_REFS = System System.Core
|
||||
KEYFILE = $(LIBRARY_SNK)
|
||||
LIB_MCS_FLAGS = /unsafe /publicsign /nowarn:0618
|
||||
LIB_MCS_FLAGS = /unsafe /publicsign
|
||||
|
||||
LIBRARY_WARN_AS_ERROR = yes
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{58A188CE-DED8-48B0-98B7-065A260D21DF}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,618</NoWarn>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|
||||
@@ -32,7 +32,7 @@
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699,618</NoWarn>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
@@ -40,7 +40,7 @@
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699,618</NoWarn>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
|
||||
@@ -54,8 +54,6 @@ namespace Mono.Profiler.Log {
|
||||
HeapEnd = 1 << 4,
|
||||
HeapObject = 2 << 4,
|
||||
HeapRoots = 3 << 4,
|
||||
HeapRootRegister = 4 << 4,
|
||||
HeapRootUnregister = 5 << 4,
|
||||
|
||||
SampleHit = 0 << 4,
|
||||
SampleUnmanagedSymbol = 1 << 4,
|
||||
@@ -76,7 +74,6 @@ namespace Mono.Profiler.Log {
|
||||
AppDomain = 4,
|
||||
Thread = 5,
|
||||
Context = 6,
|
||||
VTable = 7,
|
||||
}
|
||||
|
||||
// mono/utils/mono-counters.h : MONO_COUNTER_*
|
||||
@@ -136,7 +133,6 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
// mono/metadata/profiler.h : MonoProfilerGCRootType
|
||||
[Flags]
|
||||
[Obsolete ("The event field using this enum is no longer produced.")]
|
||||
public enum LogHeapRootAttributes {
|
||||
Pinning = 1 << 8,
|
||||
WeakReference = 2 << 8,
|
||||
@@ -151,26 +147,6 @@ namespace Mono.Profiler.Log {
|
||||
TypeMask = 0xff,
|
||||
}
|
||||
|
||||
// mono/metadata/mono-gc.h : MonoGCRootSource
|
||||
public enum LogHeapRootSource {
|
||||
External = 0,
|
||||
Stack = 1,
|
||||
FinalizerQueue = 2,
|
||||
Static = 3,
|
||||
ThreadStatic = 4,
|
||||
ContextStatic = 5,
|
||||
GCHandle = 6,
|
||||
Jit = 7,
|
||||
Threading = 8,
|
||||
AppDomain = 9,
|
||||
Reflection = 10,
|
||||
Marshal = 11,
|
||||
ThreadPool = 12,
|
||||
Debugger = 13,
|
||||
Handle = 14,
|
||||
Ephemeron = 15,
|
||||
}
|
||||
|
||||
// mono/profiler/log.h : MonoProfilerMonitorEvent
|
||||
public enum LogMonitorEvent {
|
||||
Contention = 1,
|
||||
|
||||
@@ -66,10 +66,6 @@ namespace Mono.Profiler.Log {
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (VTableLoadEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (JitEvent ev)
|
||||
{
|
||||
}
|
||||
@@ -98,14 +94,6 @@ namespace Mono.Profiler.Log {
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (HeapRootRegisterEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (HeapRootUnregisterEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void Visit (GCEvent ev)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -161,20 +161,6 @@ namespace Mono.Profiler.Log {
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class VTableLoadEvent : LogEvent {
|
||||
|
||||
public long VTablePointer { get; internal set; }
|
||||
|
||||
public long AppDomainId { get; internal set; }
|
||||
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class JitEvent : LogEvent {
|
||||
|
||||
public long MethodPointer { get; internal set; }
|
||||
@@ -209,11 +195,8 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
public sealed class AllocationEvent : LogEvent {
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
public long VTablePointer { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
public long ObjectSize { get; internal set; }
|
||||
@@ -253,11 +236,8 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public long ClassPointer { get; internal set; }
|
||||
|
||||
public long VTablePointer { get; internal set; }
|
||||
|
||||
public long ObjectSize { get; internal set; }
|
||||
|
||||
public IReadOnlyList<HeapObjectReference> References { get; internal set; }
|
||||
@@ -272,18 +252,13 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
public struct HeapRoot {
|
||||
|
||||
public long AddressPointer { get; internal set; }
|
||||
|
||||
public long ObjectPointer { get; internal set; }
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public LogHeapRootAttributes Attributes { get; internal set; }
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public long ExtraInfo { get; internal set; }
|
||||
}
|
||||
|
||||
[Obsolete ("This field is no longer produced.")]
|
||||
public long MaxGenerationCollectionCount { get; internal set; }
|
||||
|
||||
public IReadOnlyList<HeapRoot> Roots { get; internal set; }
|
||||
@@ -294,34 +269,6 @@ namespace Mono.Profiler.Log {
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class HeapRootRegisterEvent : LogEvent {
|
||||
|
||||
public long RootPointer { get; internal set; }
|
||||
|
||||
public long RootSize { get; internal set; }
|
||||
|
||||
public LogHeapRootSource Source { get; internal set; }
|
||||
|
||||
public long Key { get; internal set; }
|
||||
|
||||
public string Name { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class HeapRootUnregisterEvent : LogEvent {
|
||||
|
||||
public long RootPointer { get; internal set; }
|
||||
|
||||
internal override void Accept (LogEventVisitor visitor)
|
||||
{
|
||||
visitor.Visit (this);
|
||||
}
|
||||
}
|
||||
|
||||
public sealed class GCEvent : LogEvent {
|
||||
|
||||
public LogGCEvent Type { get; internal set; }
|
||||
|
||||
@@ -127,8 +127,7 @@ namespace Mono.Profiler.Log {
|
||||
case LogEventType.AllocationBacktrace:
|
||||
case LogEventType.AllocationNoBacktrace:
|
||||
ev = new AllocationEvent {
|
||||
ClassPointer = StreamHeader.FormatVersion < 15 ? ReadPointer () : 0,
|
||||
VTablePointer = StreamHeader.FormatVersion >= 15 ? ReadPointer () : 0,
|
||||
ClassPointer = ReadPointer (),
|
||||
ObjectPointer = ReadObject (),
|
||||
ObjectSize = (long) _reader.ReadULeb128 (),
|
||||
Backtrace = ReadBacktrace (extType == LogEventType.AllocationBacktrace),
|
||||
@@ -306,16 +305,6 @@ namespace Mono.Profiler.Log {
|
||||
} else
|
||||
throw new LogException ("Invalid context metadata event.");
|
||||
break;
|
||||
case LogMetadataType.VTable:
|
||||
if (load) {
|
||||
ev = new VTableLoadEvent {
|
||||
VTablePointer = ReadPointer (),
|
||||
AppDomainId = ReadPointer (),
|
||||
ClassPointer = ReadPointer (),
|
||||
};
|
||||
} else
|
||||
throw new LogException ("Invalid VTable metadata event.");
|
||||
break;
|
||||
default:
|
||||
throw new LogException ($"Invalid metadata type ({metadataType}).");
|
||||
}
|
||||
@@ -384,8 +373,8 @@ namespace Mono.Profiler.Log {
|
||||
case LogEventType.MonitorBacktrace:
|
||||
ev = new MonitorEvent {
|
||||
Event = StreamHeader.FormatVersion >= 14 ?
|
||||
(LogMonitorEvent) _reader.ReadByte () :
|
||||
(LogMonitorEvent) ((((byte) type & 0xf0) >> 4) & 0x3),
|
||||
(LogMonitorEvent) _reader.ReadByte () :
|
||||
(LogMonitorEvent) ((((byte) type & 0xf0) >> 4) & 0x3),
|
||||
ObjectPointer = ReadObject (),
|
||||
Backtrace = ReadBacktrace (extType == LogEventType.MonitorBacktrace),
|
||||
};
|
||||
@@ -405,8 +394,7 @@ namespace Mono.Profiler.Log {
|
||||
case LogEventType.HeapObject: {
|
||||
HeapObjectEvent hoe = new HeapObjectEvent {
|
||||
ObjectPointer = ReadObject (),
|
||||
ClassPointer = StreamHeader.FormatVersion < 15 ? ReadPointer () : 0,
|
||||
VTablePointer = StreamHeader.FormatVersion >= 15 ? ReadPointer () : 0,
|
||||
ClassPointer = ReadPointer (),
|
||||
ObjectSize = (long) _reader.ReadULeb128 (),
|
||||
};
|
||||
|
||||
@@ -426,22 +414,17 @@ namespace Mono.Profiler.Log {
|
||||
}
|
||||
|
||||
case LogEventType.HeapRoots: {
|
||||
// TODO: This entire event makes no sense.
|
||||
var hre = new HeapRootsEvent ();
|
||||
var list = new HeapRootsEvent.HeapRoot [(int) _reader.ReadULeb128 ()];
|
||||
|
||||
if (StreamHeader.FormatVersion < 15)
|
||||
hre.MaxGenerationCollectionCount = (long) _reader.ReadULeb128 ();
|
||||
hre.MaxGenerationCollectionCount = (long) _reader.ReadULeb128 ();
|
||||
|
||||
for (var i = 0; i < list.Length; i++) {
|
||||
list [i] = new HeapRootsEvent.HeapRoot {
|
||||
AddressPointer = StreamHeader.FormatVersion >= 15 ? ReadPointer () : 0,
|
||||
ObjectPointer = ReadObject (),
|
||||
Attributes = StreamHeader.FormatVersion < 15 ?
|
||||
(StreamHeader.FormatVersion == 13 ?
|
||||
(LogHeapRootAttributes) _reader.ReadByte () :
|
||||
(LogHeapRootAttributes) _reader.ReadULeb128 ()) :
|
||||
0,
|
||||
ExtraInfo = StreamHeader.FormatVersion < 15 ? (long) _reader.ReadULeb128 () : 0,
|
||||
Attributes = StreamHeader.FormatVersion == 13 ? (LogHeapRootAttributes) _reader.ReadByte () : (LogHeapRootAttributes) _reader.ReadULeb128 (),
|
||||
ExtraInfo = (long) _reader.ReadULeb128 (),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -450,20 +433,6 @@ namespace Mono.Profiler.Log {
|
||||
|
||||
break;
|
||||
}
|
||||
case LogEventType.HeapRootRegister:
|
||||
ev = new HeapRootRegisterEvent {
|
||||
RootPointer = ReadPointer (),
|
||||
RootSize = (long) _reader.ReadULeb128 (),
|
||||
Source = (LogHeapRootSource) _reader.ReadByte (),
|
||||
Key = ReadPointer (),
|
||||
Name = _reader.ReadCString (),
|
||||
};
|
||||
break;
|
||||
case LogEventType.HeapRootUnregister:
|
||||
ev = new HeapRootUnregisterEvent {
|
||||
RootPointer = ReadPointer (),
|
||||
};
|
||||
break;
|
||||
default:
|
||||
throw new LogException ($"Invalid extended event type ({extType}).");
|
||||
}
|
||||
@@ -507,9 +476,9 @@ namespace Mono.Profiler.Log {
|
||||
Section = section,
|
||||
SectionName = section == LogCounterSection.User ? _reader.ReadCString () : null,
|
||||
CounterName = _reader.ReadCString (),
|
||||
Type = StreamHeader.FormatVersion < 15 ? (LogCounterType) _reader.ReadByte () : (LogCounterType) _reader.ReadULeb128 (),
|
||||
Unit = StreamHeader.FormatVersion < 15 ? (LogCounterUnit) _reader.ReadByte () : (LogCounterUnit) _reader.ReadULeb128 (),
|
||||
Variance = StreamHeader.FormatVersion < 15 ? (LogCounterVariance) _reader.ReadByte () : (LogCounterVariance) _reader.ReadULeb128 (),
|
||||
Type = (LogCounterType) _reader.ReadByte (),
|
||||
Unit = (LogCounterUnit) _reader.ReadByte (),
|
||||
Variance = (LogCounterVariance) _reader.ReadByte (),
|
||||
Index = (long) _reader.ReadULeb128 (),
|
||||
};
|
||||
}
|
||||
@@ -529,7 +498,7 @@ namespace Mono.Profiler.Log {
|
||||
if (index == 0)
|
||||
break;
|
||||
|
||||
var counterType = StreamHeader.FormatVersion < 15 ? (LogCounterType) _reader.ReadByte () : (LogCounterType) _reader.ReadULeb128 ();
|
||||
var counterType = (LogCounterType) _reader.ReadByte ();
|
||||
|
||||
object value = null;
|
||||
|
||||
@@ -575,9 +544,6 @@ namespace Mono.Profiler.Log {
|
||||
case LogEventType.RuntimeJitHelper: {
|
||||
var helperType = (LogJitHelper) _reader.ReadByte ();
|
||||
|
||||
if (StreamHeader.FormatVersion < 14)
|
||||
helperType--;
|
||||
|
||||
ev = new JitHelperEvent {
|
||||
Type = helperType,
|
||||
BufferPointer = ReadPointer (),
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace Mono.Profiler.Log {
|
||||
public sealed class LogStreamHeader {
|
||||
|
||||
const int MinVersion = 13;
|
||||
const int MaxVersion = 15;
|
||||
const int MaxVersion = 14;
|
||||
|
||||
const int Id = 0x4d505a01;
|
||||
|
||||
|
||||
@@ -31,64 +31,6 @@ using System;
|
||||
using System.IO;
|
||||
using System.Security.Cryptography;
|
||||
|
||||
/*
|
||||
FIXME There are a number of problems and deficiencies in this code.
|
||||
|
||||
- It requires the PE header to fit in 4K. This is not guaranteed
|
||||
by the file format and it is easy to construct valid files that violate it.
|
||||
i.e. with a large MS-DOS header. The code should just read the entire
|
||||
file into memory.
|
||||
|
||||
- It has a number of missing or incorrect range checks.
|
||||
Incorrect, as in, checking that record or field starts within
|
||||
range, but does not end within range.
|
||||
|
||||
- It removes/ignores COFF symbols. These rarely/never occur, but removing
|
||||
them is not likely correct. It is not mentioned in either of the two specifications.
|
||||
This seems to be extra unnecessary incorrect code.
|
||||
|
||||
- There are two specifications, Authenticode and PE:
|
||||
https://download.microsoft.com/download/9/c/5/9c5b2167-8017-4bae-9fde-d599bac8184a/Authenticode_PE.docx
|
||||
https://www.microsoft.com/whdc/system/platform/firmware/PECOFF.mspx
|
||||
https://msdn.microsoft.com/library/windows/desktop/ms680547(v=vs.85).aspx
|
||||
|
||||
These are in contradiction regarding hashing of data after the sections.
|
||||
Such data is usually absent. More comparison is need between
|
||||
Mono runtime and desktop runtime/tools.
|
||||
The most common such data is an older signature, which is supposed to be ignored.
|
||||
The next most common is appended setup data, which isn't likely with managed code.
|
||||
However this code has nothing to do with signing managed code specifically, just PEs.
|
||||
There is a slight inconsistency in the Authenticode_PE.doc around the location
|
||||
of the signature vs. other data past sections.
|
||||
The picture has the signature first, the text puts last.
|
||||
|
||||
- A buffer size of 4K is small and probably not performant.
|
||||
Buffering makes the code harder to update and correct, vs.
|
||||
reading the entire file into memory.
|
||||
|
||||
- It does not validate NumberOfRvasAndSizes field.
|
||||
Usually it is valid.
|
||||
|
||||
- It is missing a number of other validations.
|
||||
For example, the optional header magic was ignored, so in the
|
||||
interest of small change, we treat all non-0x20B values the same.
|
||||
|
||||
Mail with Microsoft confirms the documents do not agree, and that the PE document
|
||||
is outdated and/or incorrect and/or referring to no longer supported v1 Authenticode,
|
||||
and that the intent is for the signature to be at the end, per the text and not the picture.
|
||||
And that data past the sections is to be hashed -- there rarely is any.
|
||||
|
||||
The plan is therefore:
|
||||
read the entire file into memory
|
||||
add missing validation
|
||||
hash, excluding checksum, security directory, and security content
|
||||
place security content at the end, replacing what is there if anything
|
||||
remove the symbol code (here and in formatter)
|
||||
expose more offsets from here to cleanup the formatter code
|
||||
|
||||
There is also no unit tests for this code it seems.
|
||||
*/
|
||||
|
||||
namespace Mono.Security.Authenticode {
|
||||
|
||||
// References:
|
||||
@@ -122,20 +64,9 @@ namespace Mono.Security.Authenticode {
|
||||
private int dirSecurityOffset;
|
||||
private int dirSecuritySize;
|
||||
private int coffSymbolTableOffset;
|
||||
private bool pe64;
|
||||
|
||||
internal bool PE64 {
|
||||
get {
|
||||
if (blockNo < 1)
|
||||
ReadFirstBlock ();
|
||||
return pe64;
|
||||
}
|
||||
}
|
||||
|
||||
public AuthenticodeBase ()
|
||||
{
|
||||
// FIXME Read the entire file into memory.
|
||||
// See earlier comments.
|
||||
fileblock = new byte [4096];
|
||||
}
|
||||
|
||||
@@ -211,17 +142,11 @@ namespace Mono.Security.Authenticode {
|
||||
peOffset = BitConverterLE.ToInt32 (fileblock, 60);
|
||||
if (peOffset > fileblock.Length) {
|
||||
// just in case (0.1%) this can actually happen
|
||||
// FIXME This does not mean the file is invalid,
|
||||
// just that this code cannot handle it.
|
||||
// FIXME Read the entire file into memory.
|
||||
// See earlier comments.
|
||||
string msg = String.Format (Locale.GetText (
|
||||
"Header size too big (> {0} bytes)."),
|
||||
fileblock.Length);
|
||||
throw new NotSupportedException (msg);
|
||||
}
|
||||
// FIXME This verifies that PE starts within the file,
|
||||
// but not that it fits.
|
||||
if (peOffset > fs.Length)
|
||||
return 4;
|
||||
|
||||
@@ -231,33 +156,12 @@ namespace Mono.Security.Authenticode {
|
||||
if (BitConverterLE.ToUInt32 (fileblock, peOffset) != 0x4550)
|
||||
return 5;
|
||||
|
||||
// PE signature is followed by 20 byte file header, and
|
||||
// then 2 byte magic 0x10B for PE32 or 0x20B for PE32+,
|
||||
// or 0x107 for the obscure ROM case.
|
||||
// FIXME The code historically ignored this magic value
|
||||
// entirely, so we only treat 0x20B differently to maintain
|
||||
// this dubious behavior.
|
||||
// FIXME The code also lacks range checks in a number of places,
|
||||
// and will access arrays out of bounds for valid files.
|
||||
|
||||
ushort magic = BitConverterLE.ToUInt16 (fileblock, peOffset + 24);
|
||||
const int IMAGE_NT_OPTIONAL_HDR64_MAGIC = 0x20B;
|
||||
pe64 = magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC;
|
||||
|
||||
// FIXME This fails to validate NumberOfRvasAndSizes.
|
||||
// 2.2. Locate IMAGE_DIRECTORY_ENTRY_SECURITY (offset and size)
|
||||
// These offsets are from the documentation, but add 24 for
|
||||
// PE signature and file header.
|
||||
if (pe64) {
|
||||
dirSecurityOffset = BitConverterLE.ToInt32 (fileblock, peOffset + 168);
|
||||
dirSecuritySize = BitConverterLE.ToInt32 (fileblock, peOffset + 168 + 4);
|
||||
}
|
||||
else {
|
||||
dirSecurityOffset = BitConverterLE.ToInt32 (fileblock, peOffset + 152);
|
||||
dirSecuritySize = BitConverterLE.ToInt32 (fileblock, peOffset + 156);
|
||||
}
|
||||
dirSecurityOffset = BitConverterLE.ToInt32 (fileblock, peOffset + 152);
|
||||
dirSecuritySize = BitConverterLE.ToInt32 (fileblock, peOffset + 156);
|
||||
|
||||
// FIXME Remove this code and the dependency on it.
|
||||
// COFF symbol tables are deprecated - we'll strip them if we see them!
|
||||
// (otherwise the signature won't work on MS and we don't want to support COFF for that)
|
||||
coffSymbolTableOffset = BitConverterLE.ToInt32 (fileblock, peOffset + 12);
|
||||
|
||||
return 0;
|
||||
@@ -325,38 +229,14 @@ namespace Mono.Security.Authenticode {
|
||||
|
||||
// Authenticode(r) gymnastics
|
||||
// Hash from (generally) 0 to 215 (216 bytes)
|
||||
// 88 = 64 + 24
|
||||
// 64 is the offset of Checksum within OptionalHeader.
|
||||
// 24 is offset of OptionalHeader within PEHeader.
|
||||
int pe = peOffset + 88;
|
||||
hash.TransformBlock (fileblock, 0, pe, fileblock, 0);
|
||||
// then skip 4 for checksum
|
||||
pe += 4;
|
||||
|
||||
if (pe64) {
|
||||
// security_directory, if present, is at offset 144 within OptionalHeader64
|
||||
// FIXME This code fails to check if the security_directory is present.
|
||||
// If it is absent, it may or may not be difficult to add, and reject
|
||||
// the file as valid but unsignable.
|
||||
// Checksum is at [64, 68].
|
||||
// 144 - 68 = 76
|
||||
// Hash from checksum to security_directory.
|
||||
hash.TransformBlock (fileblock, pe, 76, fileblock, pe);
|
||||
// then skip 8 bytes for IMAGE_DIRECTORY_ENTRY_SECURITY
|
||||
pe += 76 + 8;
|
||||
}
|
||||
else {
|
||||
// security_directory, if present, is at offset 128 within OptionalHeader32
|
||||
// FIXME This code fails to check if the security_directory is present.
|
||||
// If it is absent, it may or may not be difficult to add, and reject
|
||||
// the file as valid but unsignable.
|
||||
// Checksum is at [64, 68].
|
||||
// 128 - 68 = 60
|
||||
// Continue hashing from (generally) 220 to 279 (60 bytes)
|
||||
hash.TransformBlock (fileblock, pe, 60, fileblock, pe);
|
||||
// then skip 8 bytes for IMAGE_DIRECTORY_ENTRY_SECURITY
|
||||
pe += 68;
|
||||
}
|
||||
// Continue hashing from (generally) 220 to 279 (60 bytes)
|
||||
hash.TransformBlock (fileblock, pe, 60, fileblock, pe);
|
||||
// then skip 8 bytes for IMAGE_DIRECTORY_ENTRY_SECURITY
|
||||
pe += 68;
|
||||
|
||||
// everything is present so start the hashing
|
||||
if (n == 0) {
|
||||
|
||||
@@ -148,19 +148,19 @@ namespace Mono.Security.Authenticode {
|
||||
}
|
||||
|
||||
// pkcs 1
|
||||
// private const string rsaEncryption = "1.2.840.113549.1.1.1";
|
||||
// private const string rsaEncryption = "1.2.840.113549.1.1.1";
|
||||
// pkcs 7
|
||||
// private const string data = "1.2.840.113549.1.7.1";
|
||||
// private const string data = "1.2.840.113549.1.7.1";
|
||||
private const string signedData = "1.2.840.113549.1.7.2";
|
||||
// pkcs 9
|
||||
// private const string contentType = "1.2.840.113549.1.9.3";
|
||||
// private const string messageDigest = "1.2.840.113549.1.9.4";
|
||||
// private const string contentType = "1.2.840.113549.1.9.3";
|
||||
// private const string messageDigest = "1.2.840.113549.1.9.4";
|
||||
private const string countersignature = "1.2.840.113549.1.9.6";
|
||||
// microsoft spc (software publisher certificate)
|
||||
private const string spcStatementType = "1.3.6.1.4.1.311.2.1.11";
|
||||
private const string spcSpOpusInfo = "1.3.6.1.4.1.311.2.1.12";
|
||||
private const string spcPelmageData = "1.3.6.1.4.1.311.2.1.15";
|
||||
// private const string individualCodeSigning = "1.3.6.1.4.1.311.2.1.21";
|
||||
// private const string individualCodeSigning = "1.3.6.1.4.1.311.2.1.21";
|
||||
private const string commercialCodeSigning = "1.3.6.1.4.1.311.2.1.22";
|
||||
private const string timestampCountersignature = "1.3.6.1.4.1.311.3.2.1";
|
||||
|
||||
@@ -192,8 +192,8 @@ namespace Mono.Security.Authenticode {
|
||||
else
|
||||
opus = Attribute (spcSpOpusInfo, Opus (description, url.ToString ()));
|
||||
pkcs7.SignerInfo.AuthenticatedAttributes.Add (opus);
|
||||
// When using the MS Root Agency (test) we can't include this attribute in the signature or it won't validate!
|
||||
// pkcs7.SignerInfo.AuthenticatedAttributes.Add (Attribute (spcStatementType, new ASN1 (0x30, ASN1Convert.FromOid (commercialCodeSigning).GetBytes ())));
|
||||
// When using the MS Root Agency (test) we can't include this attribute in the signature or it won't validate!
|
||||
// pkcs7.SignerInfo.AuthenticatedAttributes.Add (Attribute (spcStatementType, new ASN1 (0x30, ASN1Convert.FromOid (commercialCodeSigning).GetBytes ())));
|
||||
pkcs7.GetASN1 (); // sign
|
||||
return pkcs7.SignerInfo.Signature;
|
||||
}
|
||||
@@ -243,14 +243,9 @@ namespace Mono.Security.Authenticode {
|
||||
using (FileStream fs = File.Open (fileName, FileMode.Open, FileAccess.ReadWrite)) {
|
||||
int filesize;
|
||||
if (SecurityOffset > 0) {
|
||||
// FIXME Does it fit? Is it always the same size?
|
||||
// file was already signed, we'll reuse the position for the updated signature
|
||||
filesize = SecurityOffset;
|
||||
} else if (CoffSymbolTableOffset > 0) {
|
||||
// FIXME This is not documented as something to remove.
|
||||
// However some documentation says to remove after the last
|
||||
// section, and some does not, and this might be there,
|
||||
// or it might not.
|
||||
// strip (deprecated) COFF symbol table
|
||||
fs.Seek (PEOffset + 12, SeekOrigin.Begin);
|
||||
for (int i = 0; i < 8; i++)
|
||||
@@ -268,22 +263,14 @@ namespace Mono.Security.Authenticode {
|
||||
|
||||
// IMAGE_DIRECTORY_ENTRY_SECURITY (offset, size)
|
||||
byte[] data = BitConverterLE.GetBytes (filesize + addsize);
|
||||
if (PE64)
|
||||
fs.Seek (PEOffset + 168, SeekOrigin.Begin);
|
||||
else
|
||||
fs.Seek (PEOffset + 152, SeekOrigin.Begin);
|
||||
|
||||
fs.Seek (PEOffset + 152, SeekOrigin.Begin);
|
||||
fs.Write (data, 0, 4);
|
||||
int size = asn.Length + 8;
|
||||
int addsize_signature = (size & 7);
|
||||
if (addsize_signature > 0)
|
||||
addsize_signature = 8 - addsize_signature;
|
||||
data = BitConverterLE.GetBytes (size + addsize_signature);
|
||||
if (PE64)
|
||||
fs.Seek (PEOffset + 168 + 4, SeekOrigin.Begin);
|
||||
else
|
||||
fs.Seek (PEOffset + 156, SeekOrigin.Begin);
|
||||
|
||||
fs.Seek (PEOffset + 156, SeekOrigin.Begin);
|
||||
fs.Write (data, 0, 4);
|
||||
fs.Seek (filesize, SeekOrigin.Begin);
|
||||
// align certificate entry to a multiple of 8 bytes
|
||||
@@ -291,40 +278,8 @@ namespace Mono.Security.Authenticode {
|
||||
byte[] fillup = new byte[addsize];
|
||||
fs.Write (fillup, 0, fillup.Length);
|
||||
}
|
||||
|
||||
/*
|
||||
https://download.microsoft.com/download/9/c/5/9c5b2167-8017-4bae-9fde-d599bac8184a/Authenticode_PE.docx
|
||||
The Authenticode signature is in a WIN_CERTIFICATE structure, which is declared in Wintrust.h as follows:
|
||||
typedef struct _WIN_CERTIFICATE
|
||||
{
|
||||
DWORD dwLength;
|
||||
WORD wRevision;
|
||||
WORD wCertificateType;
|
||||
BYTE bCertificate[ANYSIZE_ARRAY];
|
||||
} WIN_CERTIFICATE, *LPWIN_CERTIFICATE;
|
||||
|
||||
The fields in WIN_CERTIFICATE are set to the following values:
|
||||
dwLength is set to the length of bCertificate.
|
||||
wRevision is set to the WIN_CERTIFICATE version number.
|
||||
|
||||
wCertificateType is set to 0x0002 for Authenticode signatures.
|
||||
This value is defined in Wintrust.h as WIN_CERT_TYPE_PKCS_SIGNED_DATA.
|
||||
bCertificate is set to a variable-length binary array that contains the Authenticode PKCS #7 signedData.
|
||||
The PKCS #7 integrity is verified as described in ”PKCS #7: Cryptographic Message Syntax Standard.”
|
||||
*/
|
||||
// write WIN_CERTIFICATE.dwLength
|
||||
fs.Write (data, 0, data.Length); // length (again)
|
||||
// write WIN_CERTIFICATE.wRevision = 0x0200 and wCertificateType = 2.
|
||||
// /usr/local/Cellar/mingw-w64/5.0.3/toolchain-x86_64/x86_64-w64-mingw32/include/wintrust.h
|
||||
// const short WIN_CERT_REVISION_1_0 = 0x0100;
|
||||
const short WIN_CERT_REVISION_2_0 = 0x0200;
|
||||
// const short WIN_CERT_TYPE_X509 = 0x0001;
|
||||
const short WIN_CERT_TYPE_PKCS_SIGNED_DATA = 0x0002;
|
||||
// const short WIN_CERT_TYPE_RESERVED_1 = 0x0003;
|
||||
// const short WIN_CERT_TYPE_TS_STACK_SIGNED = 0x0004;
|
||||
data = BitConverterLE.GetBytes (WIN_CERT_REVISION_2_0);
|
||||
fs.Write (data, 0, data.Length);
|
||||
data = BitConverterLE.GetBytes (WIN_CERT_TYPE_PKCS_SIGNED_DATA);
|
||||
data = BitConverterLE.GetBytes (0x00020200); // magic
|
||||
fs.Write (data, 0, data.Length);
|
||||
fs.Write (asn, 0, asn.Length);
|
||||
if (addsize_signature > 0) {
|
||||
|
||||
+1
-1
@@ -700,7 +700,7 @@ namespace MonoTests.Mono.Security.Authenticode {
|
||||
AuthenticodeDeformatter ad = new AuthenticodeDeformatter (filename);
|
||||
// note: it's a valid signed PE file - but it doesn't
|
||||
// mean it's root is trusted on the current system
|
||||
Assert.IsTrue (((ad.Reason == 0) || (ad.Reason == 6)), "Reason");
|
||||
Assert.IsTrue (((ad.Reason == 0) || (ad.Reason == 6)), $"Reason = {ad.Reason}");
|
||||
Assert.AreEqual ("35-A5-21-3B-FC-FE-FA-40-97-AA-BB-DE-3B-52-15-6F", BitConverter.ToString (ad.Hash), "Hash");
|
||||
Assert.AreEqual (632011370700000000, ad.Timestamp.ToUniversalTime ().Ticks, "Timestamp");
|
||||
Assert.AreEqual (4, ad.Certificates.Count, "#Certificates");
|
||||
|
||||
@@ -25,7 +25,7 @@ LIB_MCS_FLAGS += -d:NET_3_5
|
||||
endif
|
||||
|
||||
ifdef AOT_FRIENDLY_PROFILE
|
||||
extra_test_flags := -exclude:NotWorkingLinqInterpreter
|
||||
extra_test_flags := -exclude:NotWorkingInterpreter
|
||||
LIB_MCS_FLAGS += -d:NO_FEATURE_STATIC_DELEGATE,FEATURE_MAKE_RUN_METHODS
|
||||
else
|
||||
LIB_MCS_FLAGS += -d:FEATURE_COMPILE,FEATURE_COMPILE_TO_METHODBUILDER,FEATURE_PDB_GENERATOR
|
||||
@@ -52,10 +52,6 @@ BUILT_SOURCES = \
|
||||
endif
|
||||
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
|
||||
XTEST_LIB_REFS = System Facades/System.Threading.Tasks Microsoft.CSharp Facades/System.Text.RegularExpressions Facades/System.Reflection Facades/System.Reflection.Extensions Facades/System.Runtime.InteropServices.RuntimeInformation Facades/System.Reflection.Emit
|
||||
# FEATURE_INTERPRET, FEATURE_COMPILE, NO_FEATURE_STATIC_DELEGATE
|
||||
XTEST_LIB_FLAGS = -unsafe -d:FEATURE_COMPILE
|
||||
XTEST_RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Collections.Immutable/src/Resources/Strings.resx
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
|
||||
@@ -1,69 +0,0 @@
|
||||
../../build/common/SR.cs
|
||||
|
||||
../../../external/corefx/src/CoreFx.Private.TestUtilities/src/System/AssertExtensions.cs
|
||||
|
||||
# System.Linq.Queryable
|
||||
../../../external/corefx/src/System.Linq.Queryable/tests/*.cs
|
||||
../../../external/corefx/src/Common/tests/System/Linq/SkipTakeData.cs
|
||||
|
||||
# System.Linq.Expressions
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Array/*.cs:NewArrayBoundsTests.cs,ArrayAccessTests.cs,ArrayIndexTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Block/*.cs:NoParameterBlockTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Call/*.cs:CallTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Cast/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Conditional/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Constant/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Convert/*.cs:ConvertCheckedTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/DebuggerTypeProxy/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/DebugInfo/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Default/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/DelegateType/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Dynamic/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/DynamicExpression/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/ExceptionHandling/*.cs:ExceptionHandlingExpressions.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Goto/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/ILReader/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/IndexExpression/*.cs:IndexExpressionTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Invoke/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Label/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Lambda/*.cs:LambdaTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Lifted/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/ListInit/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Loop/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Member/*.cs:MemberAccessTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/MemberInit/*.cs:BindTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/New/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/SequenceTests/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Switch/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Ternary/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/TestExtensions/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/TypeBinary/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Unary/*.cs:UnaryConvertTests.cs,UnaryQuoteTests.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Variables/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Visitor/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Arithmetic/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Assignment/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Bitwise/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Coalesce/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Comparison/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/Logical/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/BinaryOperators/ReferenceComparison/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/Unary/IncDecAssign/*.cs
|
||||
../../../external/corefx/src/System.Linq.Expressions/tests/*.cs:StackSpillerTests.cs,ReadOnlyCollectionBuilderTests.cs
|
||||
|
||||
# System.Linq.Expressions
|
||||
../../../external/corefx/src/System.Linq.Parallel/tests/Combinatorial/*.cs
|
||||
../../../external/corefx/src/System.Linq.Parallel/tests/Helpers/*.cs
|
||||
#../../../external/corefx/src/System.Linq.Parallel/tests/QueryOperators/*.cs
|
||||
../../../external/corefx/src/System.Linq.Parallel/tests/*.cs:WithCancellationTests.cs,PlinqModesTests.cs,ExchangeTests.cs,EtwTests.cs
|
||||
../../../external/corefx/src/Common/tests/System/Threading/ThreadPoolHelpers.cs
|
||||
../../../external/corefx/src/Common/tests/System/Diagnostics/Tracing/TestEventListener.cs
|
||||
../../../external/corefx/src/Common/tests/System/ShouldNotBeInvokedException.cs
|
||||
|
||||
# tests need System.Collections.Immutable.dll
|
||||
../../../external/corefx/src/Common/src/System/Runtime/Versioning/NonVersionableAttribute.cs
|
||||
../../../external/corefx/src/System.Collections.Immutable/src/System/Collections/Generic/*.cs
|
||||
../../../external/corefx/src/System.Collections.Immutable/src/System/Collections/Immutable/*.cs
|
||||
../../../external/corefx/src/System.Collections.Immutable/src/Validation/*.cs
|
||||
corefx/SR.tests.cs
|
||||
@@ -137,7 +137,7 @@ namespace System.IO.Pipes
|
||||
#pragma warning disable 618
|
||||
stream = new FileStream (handle.DangerousGetHandle (),
|
||||
CanRead ? (CanWrite ? FileAccess.ReadWrite : FileAccess.Read)
|
||||
: FileAccess.Write, false, buffer_size, IsAsync);
|
||||
: FileAccess.Write, true, buffer_size, IsAsync);
|
||||
#pragma warning restore 618
|
||||
}
|
||||
return stream;
|
||||
|
||||
@@ -37,7 +37,6 @@ using NUnit.Framework;
|
||||
namespace MonoTests.System.IO.MemoryMappedFiles {
|
||||
|
||||
[TestFixture]
|
||||
[Category("NotWasm")]
|
||||
public class MemoryMappedFileTest {
|
||||
|
||||
void AssertThrows<ExType> (Action del) where ExType : Exception {
|
||||
|
||||
@@ -403,8 +403,7 @@ namespace MonoTests.System.Linq.Expressions {
|
||||
|
||||
[Test]
|
||||
[Category ("NotDotNet")] // https://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=319190
|
||||
[Category ("NotWorkingLinqInterpreter")]
|
||||
[Category ("NotWasm")]
|
||||
[Category ("NotWorkingInterpreter")]
|
||||
public void Connect319190 ()
|
||||
{
|
||||
var lambda = Expression.Lambda<Func<bool>> (
|
||||
|
||||
@@ -472,7 +472,7 @@ namespace MonoTests.System.Linq.Expressions
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("NotWorkingLinqInterpreter")]
|
||||
[Category ("NotWorkingInterpreter")]
|
||||
public void NullableNullEqual ()
|
||||
{
|
||||
var param = Expression.Parameter (typeof (DateTime?), "x");
|
||||
|
||||
@@ -324,7 +324,7 @@ namespace MonoTests.System.Linq {
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("NotWorkingLinqInterpreter")]
|
||||
[Category ("NotWorkingInterpreter")]
|
||||
public void UserExtensionMethod ()
|
||||
{
|
||||
BindingFlags extensionFlags = BindingFlags.Static | BindingFlags.Public;
|
||||
|
||||
@@ -37,7 +37,6 @@ namespace MonoTests.System.Threading.Tasks
|
||||
public class TaskExtensionsTests
|
||||
{
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void TaskUnwrapingBehavioralTest ()
|
||||
{
|
||||
Task<int> t2 = Increment(4)
|
||||
|
||||
@@ -343,7 +343,6 @@ namespace MonoTests.System.Threading
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void EnterReadLock_MultiRead ()
|
||||
{
|
||||
var v = new ReaderWriterLockSlim ();
|
||||
@@ -372,7 +371,6 @@ namespace MonoTests.System.Threading
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void TryEnterWriteLock_WhileReading ()
|
||||
{
|
||||
var v = new ReaderWriterLockSlim ();
|
||||
@@ -397,7 +395,6 @@ namespace MonoTests.System.Threading
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void EnterWriteLock_MultiRead ()
|
||||
{
|
||||
var v = new ReaderWriterLockSlim ();
|
||||
@@ -452,9 +449,7 @@ namespace MonoTests.System.Threading
|
||||
Assert.IsTrue (v.TryEnterWriteLock (100));
|
||||
v.ExitWriteLock ();
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void EnterWriteLockWhileInUpgradeAndOtherWaiting ()
|
||||
{
|
||||
var v = new ReaderWriterLockSlim ();
|
||||
@@ -564,7 +559,6 @@ namespace MonoTests.System.Threading
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void RecursiveReadPropertiesTest ()
|
||||
{
|
||||
var v = new ReaderWriterLockSlim (LockRecursionPolicy.SupportsRecursion);
|
||||
@@ -594,7 +588,6 @@ namespace MonoTests.System.Threading
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void RecursiveUpgradePropertiesTest ()
|
||||
{
|
||||
var v = new ReaderWriterLockSlim (LockRecursionPolicy.SupportsRecursion);
|
||||
@@ -627,7 +620,6 @@ namespace MonoTests.System.Threading
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void RecursiveWritePropertiesTest ()
|
||||
{
|
||||
var v = new ReaderWriterLockSlim (LockRecursionPolicy.SupportsRecursion);
|
||||
@@ -747,7 +739,6 @@ namespace MonoTests.System.Threading
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MultiThreaded")]
|
||||
public void RecursiveWriteReadAcquisitionInterleaving ()
|
||||
{
|
||||
var v = new ReaderWriterLockSlim (LockRecursionPolicy.SupportsRecursion);
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
//
|
||||
// This file was generated by resx2sr tool
|
||||
//
|
||||
|
||||
partial class SR
|
||||
{
|
||||
public const string Arg_KeyNotFoundWithKey = "The given key '{0}' was not present in the dictionary.";
|
||||
public const string ArrayInitializedStateNotEqual = "Object is not an array with the same initialization state as the array to compare it to.";
|
||||
public const string ArrayLengthsNotEqual = "Object is not an array with the same number of elements as the array to compare it to.";
|
||||
public const string CannotFindOldValue = "Cannot find the old value";
|
||||
public const string CapacityMustBeGreaterThanOrEqualToCount = "Capacity was less than the current Count of elements.";
|
||||
public const string CapacityMustEqualCountOnMove = "MoveToImmutable can only be performed when Count equals Capacity.";
|
||||
public const string CollectionModifiedDuringEnumeration = "Collection was modified; enumeration operation may not execute.";
|
||||
public const string DuplicateKey = "An element with the same key but a different value already exists. Key: {0}";
|
||||
public const string InvalidEmptyOperation = "This operation does not apply to an empty instance.";
|
||||
public const string InvalidOperationOnDefaultArray = "This operation cannot be performed on a default instance of ImmutableArray<T>. Consider initializing the array, or checking the ImmutableArray<T>.IsDefault property.";
|
||||
}
|
||||
@@ -34,7 +34,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699,219,414,649,619</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT;MONO_FEATURE_APPLETLS;MONO_FEATURE_BTLS</DefineConstants>
|
||||
<DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -42,7 +42,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699,219,414,649,619</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT;MONO_FEATURE_APPLETLS;MONO_FEATURE_BTLS</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -54,8 +54,6 @@
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Interop.Odbc.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Linux\Interop.Libraries.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\Interop.Libraries.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssApiException.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Net.Security.Native\Interop.GssBuffer.cs" />
|
||||
@@ -329,10 +327,13 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XmlDataImplementation.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Common\src\System\Xml\XPathNodePointer.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\DBConnectionString.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\ExternDll.Linux.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\NameValuePermission.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\SafeNativeMethods.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\Common\UnsafeNativeMethods.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\Data\ProviderBase\DbBuffer.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Common\System\HResults.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\Properties\SecurityTransparent.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\DbDataRecord.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\Odbc32.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.Odbc\src\System\Data\Odbc\OdbcCommand.cs" />
|
||||
@@ -408,9 +409,7 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\DbReferenceCollection.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\ProviderBase\TimeoutTimer.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlMetaData.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNorm.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlNotificationRequest.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\Sql\SqlSer.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\ApplicationIntent.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\LocalDBAPI.Unix.cs" />
|
||||
@@ -470,8 +469,8 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlInfoMessageEventHandler.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlInternalConnection.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlInternalConnectionTds.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlInternalTransaction.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlMetadataFactory_.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\sqlinternaltransaction.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\sqlmetadatafactory.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlNotificationEventArgs.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlNotificationInfo.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlNotificationSource.cs" />
|
||||
@@ -490,7 +489,6 @@
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlStatistics.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlStream.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlTransaction.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlUdtInfo.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\SqlUtil.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsEnums.cs" />
|
||||
<Compile Include="..\..\..\external\corefx\src\System.Data.SqlClient\src\System\Data\SqlClient\TdsParameterSetter.cs" />
|
||||
@@ -541,6 +539,7 @@
|
||||
<Compile Include="..\referencesource\System.Data\System\Data\SqlClient\SqlClientPermission.cs" />
|
||||
<Compile Include="..\referencesource\System.Data\System\Data\SQLTypes\SqlTypesSchemaImporter.cs" />
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
<Compile Include="corefx\DbConnection.cs" />
|
||||
<Compile Include="corefx\DbConnectionOptions.cs" />
|
||||
<Compile Include="corefx\DiagnosticListener.cs" />
|
||||
<Compile Include="corefx\Odbc\AdapterUtil.cs" />
|
||||
@@ -554,6 +553,8 @@
|
||||
<Compile Include="corefx\SqlConnectionStringBuilder.cs" />
|
||||
<Compile Include="corefx\SqlDependencyUtils.cs" />
|
||||
<Compile Include="corefx\SqlException.cs" />
|
||||
<Compile Include="corefx\SqlMetaData.cs" />
|
||||
<Compile Include="corefx\SqlParameter.cs" />
|
||||
<Compile Include="corefx\SqlParameterCollection.cs" />
|
||||
<Compile Include="corefx\SR.cs" />
|
||||
<Compile Include="corefx\TdsEnums.cs" />
|
||||
|
||||
@@ -196,6 +196,9 @@ namespace System.Data.SqlClient
|
||||
internal void OnReturnStatus(int status)
|
||||
=> throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
|
||||
|
||||
internal void OnReturnValue(SqlReturnValue rec)
|
||||
=> throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
|
||||
|
||||
internal void OnReturnValue(SqlReturnValue rec, TdsParserStateObject stateObj)
|
||||
=> throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
../../../external/corefx/src/System.Data.Common/tests/System/Data/DataTableLoadRowTest.cs
|
||||
../../../external/corefx/src/System.Data.Common/tests/System/Data/DataTableReaderTest.cs
|
||||
../../../external/corefx/src/System.Data.Common/tests/System/Data/DataTableReadWriteXmlTest.cs
|
||||
../../../external/corefx/src/System.Data.Common/tests/System/Data/DataTableReadXmlSchemaTest.cs
|
||||
#../../../external/corefx/src/System.Data.Common/tests/System/Data/DataTableReadXmlSchemaTest.cs
|
||||
#../../../external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest.cs
|
||||
../../../external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest2.cs
|
||||
../../../external/corefx/src/System.Data.Common/tests/System/Data/DataTableTest3.cs
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace System.Data.SqlClient
|
||||
"keyword and always reset the connection")]
|
||||
public bool ConnectionReset { get; set; }
|
||||
|
||||
[MonoTODO("Not implemented in corefx: https://github.com/dotnet/corefx/issues/22474")]
|
||||
[MonoTODO("Not implemented in corefx: dotnet/corefx/issues/22474")]
|
||||
public SqlAuthenticationMethod Authentication {
|
||||
get => throw new NotImplementedException();
|
||||
set => throw new NotImplementedException();
|
||||
|
||||
Loaded 100 of 738 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user