Compare commits

...
Author SHA1 Message Date
Atsushi Eno f5f2b96b13 more System.IdentityModel imports. 2015-03-06 03:49:16 +08:00
Atsushi Eno 7dcf6e4ccf Fix System.IdentityModel build. 2015-03-05 17:19:24 +08:00
Atsushi Eno 4ab90c98d3 Merge branch 'master' into wip-serialization-halfway 2015-03-05 01:55:06 +08:00
Atsushi Eno 6fdc2ecf07 Remove old System.Xml.Linq code. 2015-03-04 23:47:57 +08:00
Marek Safar 50db473790 [system.xml] Clean up build output 2015-03-04 13:45:25 +01:00
Atsushi Eno 9dc2beb577 bump referencesource, bring in the fix for bug #27258. 2015-03-04 20:28:13 +08:00
Atsushi Eno 7964743ae0 Merge pull request #1613 from atsushieno/import-system-xml-linq
Import System.Xml.Linq from referencesource.
2015-03-04 16:05:42 +08:00
Atsushi Eno 60bc3cd67f Merge branch 'master' into import-system-xml-linq 2015-03-04 12:59:51 +08:00
Atsushi Eno 51c8433b18 bump referencesource. 2015-03-04 12:58:42 +08:00
Atsushi Eno 854a2fba5f XLinq in referencesource depends on S.R.Serialization. 2015-03-04 11:44:16 +08:00
Atsushi Eno c90c434b8d Merge branch 'master' into import-system-xml-linq 2015-03-04 11:44:07 +08:00
Miguel de Icaza 23625eff75 [Registry] Revert 826060172f until I fix the regression 2015-03-03 21:59:07 -05:00
Miguel de Icaza 79d44c11f9 Add referencesource changes 2015-03-03 21:23:56 -05:00
Miguel de Icaza a4c517c504 Partial progress on System.ServiceModel, currently stuck on System.IdentityModel, checking in to share with Atsushi 2015-03-03 21:18:34 -05:00
Zoltan Varga d651e3d670 Fix Microsoft.Build tests which got broken by some newline changes in ef380e3712. 2015-03-03 19:11:36 -05:00
Zoltan Varga eb2bd2c1a8 Fix make dist. 2015-03-03 17:48:08 -05:00
Miguel de Icaza 1b7f975ba1 Style consistency with the rest of Mono's code 2015-03-03 17:26:23 -05:00
Zoltan Varga 34cdab89ff [build] Delete class/lib/$(PROFILE) on clean. 2015-03-03 16:55:31 -05:00
Zoltan Varga f88248ee17 [jit] Really enable partial generic sharing. 2015-03-03 16:46:37 -05:00
Alexander Köplinger 588046144a appveyor.yml: switch away from unstable image and simplify script
The unstable image seemed to cause problems recently.
We should just use the default image and fetch Cygwin ourselves.

Also added caching of the Cygwin files and simplified the script a bit.
2015-03-03 22:35:36 +01:00
Miguel de Icaza 826060172f [UnixRegistry] Fix leak (#25559), remove races.
There was a memory leak caused by not having a lookup mechanism for
the RegistryKey.  In addition, the entire code to dispose code was
never used (due to the leak), and it was wrong.

In addition, added locking to the "values" field, which currently was
racy.

No test cases, the repro is to run the above code for about 5 minutes.
2015-03-03 16:19:37 -05:00
Zoltan Varga ef380e3712 Rename Managed.Windows.Forms to System.Windows.Forms for consistency. 2015-03-03 15:59:16 -05:00
Zoltan Varga 837b034d76 [jit] Enable partial generic sharing when not using AOT as an experiment. 2015-03-03 15:27:11 -05:00
Atsushi Eno a314eac67e Remove old System.Xml sources. bye bye. 2015-03-04 03:31:00 +08:00
Atsushi Eno cfa8bc07f6 import System.Xml.Linq from referencesource. 2015-03-04 02:40:49 +08:00
Marek Safar ce10d3b2be [corlib] Peek to attribute import from reference souces 2015-03-03 17:50:58 +01:00
Marek Safar 74793c47ab [corlib] Apply activation attributes for IsContextful types only 2015-03-03 17:50:58 +01:00
João Matos b91712816c Support multiple options when processing the AOT flag "ld-flags". 2015-03-03 16:29:08 +00:00
Atsushi Eno 8e3da5fe7c Update expected error message to match System.Xml referencesource. 2015-03-03 22:43:22 +08:00
João Matos ef2db766e2 Merge pull request #1611 from mono/akoeplinger-patch-1
Readme: add badges for armel/armhf and split off community supported archs
2015-03-03 14:40:32 +00:00
Alexander Köplinger 8ac85a3121 Readme: add badges for armel/armhf and split off community supported archs 2015-03-03 15:06:18 +01:00
Marek Safar a1487060c0 [corlib] Activator from reference sources 2015-03-03 14:28:34 +01:00
Atsushi Eno e9ef998703 Merge pull request #1608 from atsushieno/import-system-xml-4
Import large chunk of System.Xml sources from referencesource.
2015-03-03 20:04:43 +08:00
Zoltan Varga 1a679a64fc [aot] Fix thumb support with separate llvm modules. 2015-03-02 22:37:43 -05:00
Zoltan Varga bc849e04bc [arm] Fix support for backward branches in mono_arm_get_thumb_plt_entry (). 2015-03-02 22:37:20 -05:00
Zoltan Varga ec67acc7ae Disable bug-Xamarin-5278.exe for now to make the build green again, it was broken by 5d26590e79. 2015-03-02 20:39:01 -05:00
Zoltan Varga 65c4728162 Revert some accidental changes in c00a4c8003. 2015-03-02 20:20:53 -05:00
Zoltan Varga c00a4c8003 [runtime] Fix the non-loaded llvm build. 2015-03-02 20:16:15 -05:00
Rodrigo Kumpera 49d81f6c73 Merge pull request #1610 from madewokherd/decimalbuild
Rename decimal functions to not conflict with win32 versions.
2015-03-02 14:26:09 -06:00
Vincent Povirk 8ea6384117 Rename decimal functions to not conflict with win32 versions. 2015-03-02 14:19:09 -06:00
Atsushi Eno e7da0c1319 Merge branch 'master' into import-system-xml-4 2015-03-03 03:46:39 +08:00
Zoltan Varga 13685c2326 [build] Add the assemblies in LIB_REFS to LIB_MCS_FLAGS automatically to reduce duplication. 2015-03-02 14:03:56 -05:00
João Matos fa5e78a8d7 Merge pull request #1609 from iainx/build-cov-for-osx
[COV] Set the correct link flags for OS X
2015-03-02 16:08:40 +00:00
Iain 07654fb2ea [COV] Set the correct link flags for OS X
Cov needs to be linked using the flat namespace on OS X, the same way that proflog is linked or else it won't do anything.
2015-03-02 15:51:10 +00:00
Atsushi Eno 510710e423 take out ThisAssembly from SR.cs, conflicts with the one in Sys.Data. 2015-03-02 21:32:07 +08:00
Marek Safar 31afb2659c [mcs] Handle string constants inside interpolated string expression. Fixes #27533 2015-03-02 14:19:37 +01:00
Jo Shields 2175d73ac6 Add net_4_5_parallel_dirs to SUBDIRS, so it's included in "make dist" 2015-03-02 12:58:52 +00:00
Atsushi Eno 2fc5471e11 fix build; I only updated Consts.cs, not Consts.cs.in... 2015-03-02 19:35:32 +08:00
Atsushi Eno 751ecd3e5b [xml] take out some types in Dummy.cs to better source files. 2015-03-02 19:12:39 +08:00
Atsushi Eno 20cfe2e4c1 XML error messages has changed again now that they are from referencesource. 2015-03-02 19:11:54 +08:00
Marek Safar e17e4f170e [mcs] Add cloning to string interpolation expressions. Fixes #27525 2015-03-02 10:16:48 +01:00
Atsushi Eno 4bdf5defdd Add referencesource's [InternalsVisiblTo] attributes in System.Xml.dll. 2015-03-02 11:36:45 +08:00
Atsushi Eno 331e521fdc [xml] Fix dropped lines in Makefile during merge. 2015-03-02 11:36:45 +08:00
Atsushi Eno 55d49237d0 Fix mobile build wrt. Res classes. 2015-03-02 11:36:44 +08:00
Atsushi Eno c646ba01a3 Add referencesource-based message strings to the build.
It should be using RESOURCE_STRINGS, but mcs doesn't support its special
option for string resources for multiple files.

The resource .cs files are generated by genresstringcs.sh, but System.Xml.txt
contains some bogus characters that prevents source generation, so after
the tool has generated the sources, I manually fixed them.
It won't matter once mcs supports the option for multiple files anyways.
2015-03-02 11:36:44 +08:00
Atsushi Eno 0763126f4b [xml] update message resources for referencesource. 2015-03-02 11:36:43 +08:00
Atsushi Eno 4e2bd09616 Update all mcs errors expected messages for referencesource changes. 2015-03-02 11:36:43 +08:00
Atsushi Eno b91781b08f Fix regression in mcs/tools/mdoc by giving referencesource-based message.
(The error message is actually created by ourselves.)
2015-03-02 11:36:43 +08:00
Atsushi Eno 91657324d6 [mdoc/Test] add missing DTD.
With referencesource, the XmlReader now requires the DTD in SYSTEM
declaration to exist. So just add the DTD.
2015-03-02 11:36:43 +08:00
Atsushi Eno 47e8337395 [msbuild] fixing referencesource import "regression".
It is about insignificant whitespace handling difference.
2015-03-02 11:36:42 +08:00
Atsushi Eno cae1f99ef8 [Xml] another human readable exception message. 2015-03-02 11:36:42 +08:00
Atsushi Eno 82b6e115cc [Xml] fix regression in winforms tests.
ResXResourceReaderTest checks that the argument file is in the error
message. We only have stub messages so far, hence it "regressed".
2015-03-02 11:36:42 +08:00
Atsushi Eno b40dd06602 [WCF] fix mobile builds. Mono.Xml.XPath is gone. 2015-03-02 11:36:42 +08:00
Atsushi Eno 94f667b1f3 [Xml] add mobile XslCompiledTransform implementation.
XslCompiledTransform doesn't work without CodeDom and dynamic code
generation. This "implementation" just dispatches everything to XslTransform.
2015-03-02 11:36:42 +08:00
Atsushi Eno 281e3c0a11 [Xml] Removed XslCompiledTransform and co. Now monodroid builds.
It will be added as mere alias of XslTransform as mono used to do.
2015-03-02 11:36:41 +08:00
Atsushi Eno e7b1d9d96e [Sys.Xml] first onging mobile build work. It does NOT build for mobiles now.
Removed Configuration dependencies and codegenerator parts in XmlSerializer
as well as switching CodeIdentifier implementation to old mono stuff
as referencesource totally depends on CodeDom (mono doesn't).
2015-03-02 11:36:41 +08:00
Atsushi Eno 8d2cf588c9 [Xaml] fix EOL handling in tests. referencesource emits LF. 2015-03-02 11:36:41 +08:00
Atsushi Eno 6d3edb6643 [Sys.Xml] give understandable message and arguments for Xml_WrongToken. 2015-03-02 11:36:41 +08:00
Atsushi Eno 77c316c520 [XLinq] fix some "regressions" caused by referencesource switch.
EOLs are platform dependent on referencesource.

Turn NotDotNet into Ignore (as we're also importing buggy implementation).
2015-03-02 11:36:40 +08:00
Atsushi Eno 848916fb2b [S.R.Serialization] explicitly add MS serialization schema if it's not in the set. 2015-03-02 11:36:40 +08:00
Atsushi Eno 3c4c9e5759 [Sys.Xml] swap xmlns:xsd and xmlns:xsi in serialized xml to remove "regression".
The order of those namespaces are insignificant, and the latest
combination of mono corlib (partly referencesource-d) and sys.xml
(referencesource except for XmlSerializer) caused this implementation
glitch.
2015-03-02 11:36:40 +08:00
Atsushi Eno 27d469af0d [Sys.Data] fix wrong test in XmlDataDocument.
This doesn't match .NET behavior.
(Found by referencesource import, verified w/ .NET 4.5.)
2015-03-02 11:36:40 +08:00
Atsushi Eno 81e07b6e1a [Sys.Data] Fix tests regarding XmlTextWriter EOL handling.
MS referencesource changed XmlTextWriter behavior regarding EOL so that
now it preserves CRLF as is, instead of replacing them with
XmlWriterSettings.NewLineChars (mono implementation behavior).

There are some tests that depend on old behavior. The entire points of
those XmlDataDocument tests are not about checking EOLs, so just replace
the test XML file to not contain CRLF.
2015-03-02 11:36:39 +08:00
Atsushi Eno ff9d202ceb [Sys.Data] fix DOM event order related issue caused by referencesource.
There is implementation mismatch in XmlDocument event order regarding
Load(). Take this code:

	string xml = "<root><child>1</child></root>";

	var doc = new XmlDocument ();
	doc.NodeInserted += (o, e) =>
		Console.WriteLine (e.Node.NodeType + e.Node.LocalName);
	doc.LoadXml (xml);

This is mono output before referencesource:

	Text#text
	Elementchild
	Elementroot

This is with referencesource:

	Elementchild
	Text#text
	Elementroot

So, there are event order differences in our two implementations.

Now, XmlDataDocument depends on those XmlDocument events to fill DataRow
values. It worked fine with pre-referencesource System.Xml model, but
with referencesource it skipped to fill data row values.

This change makes sure to fill data row values from text node which are
added _after_ the parent node is added to the document.
2015-03-02 11:36:39 +08:00
Atsushi Eno fd25cd14ca [System.Data] fix another NRE that was exposed by referencesource. 2015-03-02 11:36:39 +08:00
Atsushi Eno e8fa9b5229 [System.Data] MS implementation doesn't expect CRLF on *nix. Use Env.NewLine. 2015-03-02 11:36:39 +08:00
Atsushi Eno a5ea493bdd [System.Data] MS implementation does NOT expect CRLF in the output on *nix. 2015-03-02 11:36:39 +08:00
Atsushi Eno eb71b01513 [System.Data] fix NRE that was exposed by referencesource. 2015-03-02 11:36:38 +08:00
Atsushi Eno e7d2a05791 update dummy messages to somewhat understandable values. 2015-03-02 11:36:38 +08:00
Atsushi Eno 4990b4c47b First step to import referencesource System.Xml.
It is not simply replacement because we have to workaround dynamic codegen
for Xamarin.iOS.

Also there were several tests failing with MS implementation (e.g. for
W3C DOM conformance), so we had to disable them.

There is one regression that rather needs to be fixed in Reflection.Emit.

Also, some WCF tests fail with this implementation. They need to be
investigated, reviewed and appropriately fixed.
2015-03-02 11:36:38 +08:00
Zoltan Varga b862ff8acc [jit] Rename mini-llvm.h to mini-llvm-loaded.c and make it a non-header file. 2015-03-01 22:15:09 -05:00
Zoltan Varga e71fdeef4c [runtime] Fix the loadable llvm build. 2015-03-01 18:36:26 -05:00
João Matos b8467ef0dd Merge pull request #1514 from directhex/master
Workaround for X509Certificate.RSA throwing an unhandled exception
2015-03-01 20:36:42 +00:00
Zoltan Varga 2d8af16663 [jit] Move aot method loading to mono_jit_compile_method_with_opt (). 2015-03-01 00:47:02 -05:00
Zoltan Varga 880fb9c3eb [jit] Remove some dead code/includes. 2015-03-01 00:17:38 -05:00
Zoltan Varga 83e2223403 [runtime] Split mini.c into two files: mini.c contains the JIT code, while mini-runtime.c contains the runtime code, i.e. startup/shutdown, threading, tls, etc. 2015-03-01 00:03:07 -05:00
Zoltan Varga f6ea703e09 Fix a warning. 2015-02-28 22:56:31 -05:00
Zoltan Varga ac637b0fa1 [build] Avoid changing System.Xml.Linq references to System.XML.Linq during parallel build dependency calculation. 2015-02-28 20:56:52 -05:00
Zoltan Varga 0b4533dd59 [jit] Remove some dead code. 2015-02-28 17:01:28 -05:00
Zoltan Varga 4cd6718bf6 Merge pull request #1607 from davidmoore1/bug-27529
Bug 27529 Tool Tip appears behind menu
2015-02-28 16:19:26 -05:00
David Moore f3ff59749f Bug 27529 Tool Tip appears behind menu
In certain cases, hovering over a ToolStripMenuItem
that has a tool tip defined will result in the tool
tip appearing behind, and hidden by, the context
menu containing the item.  The change is to cause
the tool tip to be pushed to the front when it is
displayed.
2015-02-28 11:00:05 -05:00
Jo Shields d53ed1c8f8 Workaround for X509Certificate.RSA throwing an unhandled exception in ASN1 parsing of certificates with ECC public keys only. 2015-02-28 12:48:49 +00:00
Zoltan Varga 3ceb869495 [bcl] Enable parallel build for parts of the 4.5 class libs/tools. 2015-02-27 19:46:29 -05:00
Zoltan Varga d5fcd29868 [llvm] Increase the size of a parameter array which was too small for some arm64 calling conventions. 2015-02-27 13:33:30 -05:00
Marek Safar c47a456d29 [Microsoft.Build.Engine] Update missing method exception type 2015-02-27 19:08:33 +01:00
Marek Safar 001c0d17eb [corlib] Throw correct exception for missing properties called via InvokeMember 2015-02-27 18:59:43 +01:00
João Matos 5927ede215 Added "ld-flags" to pass extra linker flags to the AOT linker pipeline. 2015-02-27 17:26:23 +00:00
Rodrigo Kumpera ec8a06433f Remove explicit support for 2.0, it will now use 4.5 2015-02-27 11:07:27 -05:00
Marek Safar 4f23050db1 [mcs] Better error reporting for wrong unexpected escaped characters. Fixes #27441 2015-02-27 16:57:35 +01:00
Zoltan Varga c947640d2a Merge pull request #1605 from iainx/cov-install-coverage-filter
Check the coverage hash exists before accessing it
2015-02-27 10:41:07 -05:00
iain holmes 7ce0c7c9bb Check the coverage hash exists before accessing it
If a profiler has not installed a coverage filter, or the coverage filter has returned FALSE, then calls to mono_profiler_coverage_get trigger a assertion failed warning in g_hash_table_lookup.
2015-02-27 15:28:31 +00:00
Zoltan Varga f4e7da7e0c Merge pull request #1604 from iainx/cov-install-coverage-filter
[cov] Install a coverage filter
2015-02-27 10:25:02 -05:00
Marek Safar 9b4e5bb49b [corlib] Implement Activator invocation on params constructor with conversion from object 2015-02-27 14:43:25 +01:00
Zoltan Varga 8b43cc0761 Merge pull request #1603 from iainx/coverage-null-protect
Check for valid coverage info before dereferencing it.
2015-02-27 08:07:48 -05:00
iain holmes 5e9bbbc27e Check for valid coverage info before dereferencing it.
If a profiler had requested MONO_PROFILE_COVERAGE events and not installed a
coverage filter, then the coverage info is NULL and a crash quickly followed
2015-02-27 12:35:40 +00:00
Marek Safar 2ec7528ec5 Bump reference sources to fix #27492 2015-02-27 13:13:01 +01:00
Marek Safar 23603fe1bd [corlib] Add DefaultDllImportSearchPathsAttribute 2015-02-27 13:02:35 +01:00
Marek Safar 5d26590e79 [corlib] Binder from reference sources 2015-02-27 12:06:17 +01:00
Marek Safar 739afc39be [build] Use resource strings for library builds only 2015-02-27 11:35:05 +01:00
iain holmes e91693fbb8 [cov] Install a coverage filter 2015-02-27 10:13:54 +00:00
Zoltan Varga 2656bf0cc7 [build] Fix a bug in 37983f7fc3. 2015-02-26 23:30:35 -05:00
Zoltan Varga 37983f7fc3 [build] Add dependency information for class libraries using a LIB_REFS variable which lists the assemblies a given assembly depends on to build. 2015-02-26 22:27:27 -05:00
Zoltan Varga 5cf4cbde3a [bcl] Remove some net 1.0 stuff from Makefiles. 2015-02-26 18:06:29 -05:00
Zoltan Varga c38f5406a7 Merge pull request #1602 from cdettmering/master
Fixing ToolStripManager.RevertMerge
2015-02-26 17:54:40 -05:00
Chad Dettmering 9fe0952221 Fixed up formatting to comply with Mono coding guidelines 2015-02-26 17:47:03 -05:00
Chad Dettmering 2550e73081 Changed System.Windows.Forms.ToolStripManager.RevertMerge to return
false when given a null argument instead of throwing an exception.
According to the msdn here:
https://msdn.microsoft.com/en-us/library/b4e35dwy%28v=vs.110%29.aspx
this method should never throw an exception. This was also confirmed
with the official Microsoft runtime.

This change is released under the MIT license.
2015-02-26 17:31:49 -05:00
Zoltan Varga 4c9cd80099 [jit] Disable direct calls to icalls when using llvm, llvm can't handle direct calls to 64 bit addresses (tests/jit-float.exe fails). 2015-02-26 15:18:56 -05:00
Rolf Bjarne Kvinge 6fe661159c Ignore a few decimal tests on mobile, according to #27269
https://bugzilla.xamarin.com/show_bug.cgi?id=27269
2015-02-26 20:01:06 +01:00
Zoltan Varga d32a4bd512 [runtime] Use mono_set_pending_exception () in some places in icalls. Avoid using it for throwing exceptions returned by mono_thread_execute_interruption (), since that seems to cause problems. 2015-02-26 13:08:34 -05:00
Zoltan Varga 690183aa08 [runtime] Disable the "bridge-implementation=tarjan,major=marksweep-conc|ms-conc-tarjan-bridge" sgen tests which currently fail. 2015-02-26 12:57:14 -05:00
Rolf Bjarne Kvinge d79c519b39 Don't use _NSGetEnviron on arm64. 2015-02-26 13:55:30 +01:00
Rolf Bjarne Kvinge 1dbe593001 Restrict IOKit usage to desktop OSX.
IOKit is a private framework in iOS, so it can't be used (and
no headers are provided, so it doesn't even compile).
2015-02-26 13:49:59 +01:00
João Matos 4b6173d11f Fixed compilation on Linux targets without linux/serial.h.
/Users/builder/data/lanes/monodroid-mavericks-master/7de6731a/source/mono/support/serial.c:25:26: fatal error: linux/serial.h: No such file or directory
 #include <linux/serial.h>

The header is only available on Android NDK API level >= 21.
2015-02-26 12:09:17 +00:00
Zoltan Varga c9b2e3e4c2 Merge pull request #1599 from StephenMcConnel/bug-26887-A
Prevent right click from triggering ToolStrip.OnItemClicked
2015-02-25 19:49:27 -05:00
Rodrigo Kumpera abd5c65999 [sgen-bridge] Fix all the bridges after the change to have descriptor loading happen outside of scanning.
This changes all bridges to use the _safe variant of sgen_obj_get_descriptor. Bridge processing happens in
the post-scan world, before objects get untagged.
2015-02-25 18:16:23 -05:00
Stephen McConnel 0c95513a0e Prevent right click from triggering ToolStrip.OnItemClicked
This addresses https://bugzilla.xamarin.com/show_bug.cgi?id=26887
(along with a previous fix).
2015-02-25 17:00:30 -06:00
Rodrigo Kumpera e02337995e Fix my last commit to properly include the tarjan test suite. 2015-02-25 17:54:51 -05:00
Rodrigo Kumpera 1d57482131 Add the tarjan bridge to the test matrix. 2015-02-25 17:50:46 -05:00
Rodrigo Kumpera 68dcdcaac6 [sgen] Fix the sgen bridge test suite. Oh my. 2015-02-25 17:43:42 -05:00
Rodrigo Kumpera 132d9511ff Merge pull request #1598 from mono/revert-1593-new_suspend
Revert "This introduces the new suspend machinery. Right now the unified...
2015-02-25 16:39:59 -06:00
Rodrigo Kumpera 43a734f579 Revert "This introduces the new suspend machinery. Right now the unified STW is disabled for sgen." 2015-02-25 17:39:26 -05:00
Atsushi Eno 03ff64f6e1 bump referencesource. 2015-02-26 05:16:13 +08:00
Rodrigo Kumpera 5786bd0ce9 Merge pull request #1597 from akoeplinger/remove-ef
Remove EntityFramework from class libs
2015-02-25 15:01:28 -06:00
Zoltan Varga 0bab8ed6a0 [runtime] Remove definitions of MONO_SHARED_DIR from scripts, its not needed anymore. 2015-02-25 15:45:22 -05:00
Alexander Köplinger c1bbee0b95 Remove EntityFramework from class libs
We currently ship a horribly outdated version of EF. This is unnecessary since EF is on NuGet and has an active set of users using it on Unix.

Miguel gave his +1 on the mailing list already.
2015-02-25 21:24:52 +01:00
Rodrigo Kumpera 9e79098001 Merge pull request #1593 from kumpera/new_suspend
This introduces the new suspend machinery. Right now the unified STW is disabled for sgen.
2015-02-25 13:53:36 -06:00
Zoltan Varga f30e78bcab [jit] Make the opcode emulation jit icalls callable without a wrapper in some cases. 2015-02-25 14:48:50 -05:00
Miguel de Icaza ccaf0cc44c [SslClientStream] Prevent crashes when a connection is closed
When a socket has been closed as part of the negotiation, the
SendAlert method would crash when trying to reuse the socket.

Add try/catch around this to prevent this.

Fixes #19334
2015-02-25 12:01:15 -05:00
Miguel de Icaza 2f953191fc Merge pull request #1584 from zevane/patch-2
Limit the lock to the writing operation
2015-02-25 10:32:00 -05:00
Miguel de Icaza 5b2d5b4bf4 [Serial] Add support for high baud rates to MacOS 2015-02-25 10:27:43 -05:00
Miguel de Icaza 87357b51e9 [serial,signal] Add support for Linux arbitrary baud rates + drop Apple legacy poll support
This patch brings support for arbitrary baud rates in Linux, from patch:

https://bugzilla.xamarin.com/show_bug.cgi?id=8207

Which has been MIT licensed (see mono-devel-list).

In addition, while testing the patch, discovered that we are using
fakepoll.h on MacOS which was there to support Tiger-era broken poll
implementations.

The details about the lack of poll support come from this document
that is now only available on web.archive.org:

http://web.archive.org/web/20030604064847/http://developer.apple.com/technotes/tn2002/tn2071.html

And the original Mono bug that reported the problem in 2008, followed
by the fixes is reported and discussed here:

https://bugzilla.novell.com/show_bug.cgi?id=384227

The source of the problem, confirmed by an Apple employee at the time
(form the bug) is that poll sometimes results in returning POLLHUP
when a POLLIN was expected:

http://curl.haxx.se/mail/lib-2005-05/0122.html

This web site tracks the behavior of poll (POLLHUP and POLLIN) across
Posix implementations when you reach an end of file:

http://www.greenend.org.uk/rjk/tech/poll.html
2015-02-25 10:20:44 -05:00
Marek Safar 0b7afa989d [system.net.http] Add another workaround for incompatible mono Uri handling. Fixes #27386 2015-02-25 12:28:47 +01:00
Marek Safar 6ee0adb342 [System.Net.Http] Change relative uri test to not require internet access 2015-02-25 08:45:03 +01:00
Atsushi Eno 06334e4f24 remove replaced and unused Encoding code. 2015-02-25 15:20:23 +08:00
Atsushi Eno 8d24d4dc74 Merge pull request #1590 from atsushieno/import-diagnostics-trace
Import System.Diagnostics.Trace from referencesource
2015-02-25 15:14:53 +08:00
Atsushi Eno c4929cbf9c remove replaced System.Diagnostics.Trace family code. 2015-02-25 15:13:27 +08:00
Zoltan Varga 93a5401ee0 Revert "[runtime] Use mono_set_pending_exception () in some places in icalls."
This reverts commit d0d0d29320.

Revert this as it caused too many test failures.
2015-02-24 18:20:41 -05:00
Atsushi Eno 4add6e6c44 [xml] add missing CONFIGURATION_DEP 2015-02-25 07:18:34 +08:00
Zoltan Varga 281c3842d3 [runtime] Declare ICALL_EXPORT as MONO_API so it works with -fvisibility=hidden. 2015-02-24 18:07:26 -05:00
Zoltan Varga 47ef0fd121 Fix a warning. 2015-02-24 18:07:26 -05:00
Zoltan Varga 623f54afed [runtime] Remove some dead definitions. 2015-02-24 18:07:26 -05:00
Marek Safar 48daad9728 [Mono.XBuild.Tasks] Fixes versioning with newer than 4.0 special msbuild profiles 2015-02-25 00:04:51 +01:00
Rodrigo Kumpera b0d6f33857 bump master version of mono. 2015-02-24 17:28:10 -05:00
Rodrigo Kumpera 59c82ade25 [threading] Rework suspend code to be based on a state machine and eliminate known races in the process.
The new suspend machinery is based around a single word state machine that is manipulated using CAS.

This solves the first set of problems with the current approach, the lack of atomicity and the impossibility of
doing race free manipulation of protected state. This is specially acute when doing a self suspend.
Suspend data must be atomically protected while we prepare to self suspend so a resume request won't race with the current
thread putting itself to sleep. This is a classical problem that calls for a mutex/conditional variable pair. Except that all
locks in the suspend path must be suspend safe. Wait, WHAT?

A Suspend Safe Lock is a primitive that is obstruction free in the face of the kernel suspending a thread either performing a
lock operation or waiting on a lock to become available. This, unfortunately, is not possible with pthread_mutex on OSX. The
only safe primitive are kernel semaphores, for which doesn't exist conditional variables for.

So back to locking and self-suspend. We need a lock because the existing thread state is not atomic but we can't use a
mutex/condvar pair so we're left with racy code. Yay! The fix is using CAS over a single variable.

Another change was the hardening of the suspend/resume code on posix targets. First we replace a semaphore wait with
sigsuspend for async suspend. This is needed since sem_wait is not async-signal safe (yet sem_post is). Second, we now
respect interruption requests by having a pair of suspend signals, one with SA_RESTART and one without.

Onto the design of the suspension system, a few concepts that are useful looking around.

* Self suspend: This is when the thread decides to suspend itself.

* Async suspend: This is when a thread decides to suspend another thread.

* Suspend Initiator: This the name of a thread that decided to suspend one or more other threads. This is important
since all suspending threads will notify it when they are suspended. There can be only one initiator in the system
at a given time.

* Suspension count: Number of resume calls before a thread is back to running state.

There are 7 states that can happen while a thread is runnable:

* Running: just running...

* (Async|Self) Suspended: Suspended, the difference comes into play when resuming.

* (Async|Self) Suspend Requested: Suspend requested, but not completed. See more below for the discussion on why the request state is needed.

* Suspend In Progress: Self suspend started saving its state thus async suspend should not modify it.
* Suspend Promoted to Async: Async tried to suspend a thread in the middle of a self suspend, it wants to be notified.

Now to the suspension protocol and how it happens on a high level view.

Suspension starts with a suspend request, which bumps the suspend count by one. This suspend request can be fulfilled either
by an async or self suspend action. This is confusing as there's only one initiator but any number of threads can be self suspending.

Async suspend then performs a platform specific action such as posix signals that forces a transition on the target. In the case
of self suspend, it depends on the thread polling its state and trigger the transition.

This works fine except that the suspend state is one huge struct with tons of fields. To control concurrent access to it we use a
single initiator in the case of async suspend and we put the thread in a transitional "saving my state" in the case of self suspend.

In the case of async suspend, the initiator must wait for all 1+ threads to notify back that they have suspended. Only after that
it's possible to know if the async suspend request actually worked or not (we might have hit a dying thread).

Together with this, there's an optional implementation of STW in sgen that can use this new machinery. To enable it set the
MONO_ENABLE_UNIFIED_SUSPEND env var for now while it gets more testing.
2015-02-24 17:14:28 -05:00
Zoltan Varga d0d0d29320 [runtime] Use mono_set_pending_exception () in some places in icalls. 2015-02-24 16:42:13 -05:00
Rodrigo Kumpera 0b3822a9e1 Merge pull request #1591 from akoeplinger/remove-npgsql
Remove Npgsql from class libs
2015-02-24 14:41:16 -06:00
Alexis Christoforides 2df1c787bf [Decimal] Fix C89 compliance in decimal-ms.c 2015-02-24 12:21:24 -08:00
Marek Safar 665a55d4f8 [facades] Add missing System.ServiceModel.Primitives forwarders to MT profile. Fixes #27338 2015-02-24 20:29:34 +01:00
Marek Safar 2984695832 [corlib] Use HGlobalUnmanagedMemoryStream directly from MonoTouch timezoneinfo 2015-02-24 20:15:56 +01:00
Alexander Köplinger 762bc0bbe6 Remove Npgsql from class libs
This has been requested by the maintainers of Npgsql a few times already (https://bugzilla.xamarin.com/show_bug.cgi?id=23119) and we should do it for Mono 4.0.
Miguel gave his +1 on the mailing list already.
2015-02-24 20:12:40 +01:00
João Matos b528a79db5 [runtime] Upgraded Jay MSVC project to VS 2013. 2015-02-24 18:46:11 +00:00
João Matos 220afd9d49 [runtime] Fixed the MSVC build.
Even though this seems like it's just moving the files around in the project, for some reason it makes a difference to VS.
2015-02-24 18:46:04 +00:00
Rodrigo Kumpera 46c30d31f8 [sgen] Introduce SgenThreadInfo::suspend_done.
This variable must be set to all threads that have been properly suspended. This is
an initial step to simplify suspend state and use explicitly named variables instead
of hiding state in stopped_ip / stopped_domain.
2015-02-24 13:33:49 -05:00
Rodrigo Kumpera 6bd7be2081 Add suspend done everywhere else. 2015-02-24 13:33:49 -05:00
Atsushi Eno 525c47a7f3 Bring back DefaultTraceListener because it already works better for mono. 2015-02-25 01:23:35 +08:00
Atsushi Eno d6bd25591b import System.Diagnostics.Trace etc. from referencesource. 2015-02-25 00:54:38 +08:00
Atsushi Eno c34def6299 bump referencesource to include System.Diagnostics changes. 2015-02-25 00:04:49 +08:00
Marek Safar 6f14f86357 [system.net.http] Accept header with multiple values. Fixes #27352 2015-02-24 16:55:01 +01:00
Rodrigo Kumpera e9836b3511 Merge pull request #1587 from kumpera/cleanup_threading
This is a small cleanup of the threading API.
2015-02-24 09:02:24 -06:00
Marek Safar f35b4f0996 [corlib] BinaryWriter/BinaryReader from reference sources 2015-02-24 10:33:45 +01:00
Marek Safar 6a415e894c [corlib] UnmanagedMemoryStream from reference sources 2015-02-24 10:28:35 +01:00
Atsushi Eno 9f5a54b33e bump referencesource (more BIGENDIAN fixes for UnicodeEncoding). 2015-02-24 12:56:17 +08:00
Zoltan Varga cd4cb57572 [runtime] Fix the non-msvc build. 2015-02-23 20:41:30 -05:00
Zoltan Varga 3d984f7feb [runtime] Mark mono_set_pending_exception () as a cold function, so calling code is generated out-of-line. 2015-02-23 20:05:40 -05:00
Zoltan Varga 40e8a35f27 [jit] Use mono_set_pending_exception () instead of throwing exceptions in JIT icalls. 2015-02-23 20:05:05 -05:00
Rodrigo Kumpera 7b6bb72285 [threading] Don't suspend a thread running out of its thread bounds. 2015-02-23 17:41:28 -05:00
Rodrigo Kumpera b093d2384f [threading] compute thread boulds on thread registration. 2015-02-23 17:41:27 -05:00
Zoltan Varga aa4768dafb [runtime] Disable some dyncall/gsharedvt fullaot tests on amd64. 2015-02-23 16:52:36 -05:00
Zoltan Varga 3eeb285c9a [bcl] Fix Console support on ios, the TextWriter class from the reference sources called TextWriter:Write(char), so stdout was never flushed. 2015-02-23 16:08:39 -05:00
Rodrigo Kumpera 4e1dca9d5e [threading] When checking if a thread is in a critical region, ask the GC too.
MonoThreads was previously ignoring sgen's in_critical_region, which could lead
to a thread suspended inside a gc critical region leading to the GC not been able
to STW.
2015-02-23 15:54:04 -05:00
Rodrigo Kumpera 8a133f2d7e [threading] Introduce mono_thread_info_is_live and move all thread state testing to inside MonoThread. 2015-02-23 15:47:17 -05:00
Zoltan Varga d20fb1aa2e [jit] Make mono_thread_interruption_checkpoint () return the exception which needs to be thrown and throw it from the managed method/wrapper which called it. 2015-02-23 14:19:20 -05:00
Marek Safar e3e6f308fd [system] Bymp reference sources to get correct category names 2015-02-23 19:24:17 +01:00
Marek Safar 602287a0da Bump reference sources for stream api update 2015-02-23 18:14:45 +01:00
Ludovic Henry a81a3ce4a1 [mdoc] Update few failing tests 2015-02-23 11:27:22 -05:00
Marek Safar a5f6ff93ed [mdoc] Update few failing tests 2015-02-23 17:15:44 +01:00
Marek Safar 04c5ac7f7e [system.core] Switch to dynamic visitor from reference sources and remove unused files 2015-02-23 17:03:43 +01:00
Marek Safar 31b143fdc1 [build] 3.10 bump for bootstrap was too much 2015-02-23 13:40:31 +01:00
Atsushi Eno 45d731a8bc bump referencesource (fix encoding endianness). 2015-02-23 20:24:59 +08:00
João Matos 82dbc244da Merge pull request #1586 from vkargov/master
[runtime] Prioritize loading a profiler library from the installation dir.
2015-02-23 11:11:52 +00:00
Marek Safar e220c8f7cb [build] Bump bootstrap mono requirement to 3.10 which does not have problems with flow-analysis in external/referencesource/mscorlib/system/text/asciiencoding.cs 2015-02-23 11:29:42 +01:00
Marek Safar d2978f3833 Merge pull request #1580 from akoeplinger/msbuild-3B-escape
[Microsoft.Build.Engine] Fix bug with escaped semicolon and spaces
2015-02-23 10:42:27 +01:00
Marek Safar 8408ce4b5d Merge pull request #1585 from akoeplinger/msbuild-makerelative
[Microsoft.Build.Engine] Implement MakeRelative() predefined property function
2015-02-23 07:36:11 +01:00
Vladimir Kargov e3cfac464b [runtime] Prioritize loading a profiler library from the installation dir over standard libarary paths. 2015-02-23 07:02:20 +03:00
Ludovic Henry 6e9c5ab5b3 [Linq] Replace implementation by Microsoft reference sources 2015-02-22 23:00:42 -05:00
Zoltan Varga 674a2849b4 [aot] Fix thumb support when using separate llvm modules. 2015-02-22 00:31:41 -05:00
Zoltan Varga d8b896bb7c [runtime] Add a --disable-visibility-hidden flag to disable the usage of -fvisibility=hidden for now. 2015-02-21 18:41:00 -05:00
Zoltan Varga 4249eba7f2 [runtime] Export a few more symbols. 2015-02-21 18:32:10 -05:00
zevane 4751c10f9c Limit the lock to the writing operation
I initially discarded this change, because locking BaseSet (name, sec), didn't prevent the threads from trying to add the same key. That said, following the code, the point at which it actually fails is in NameObjectCollectionBase.BaseAdd, lines 331 and 332. The threads were arriving the second line at the same time:

   if (_entriesTable[name] == null)
          _entriesTable.Add(name, entry);

In brief, it's safe to call BaseSet twice with the same key, so it's safe to lock only the call to BaseSet
2015-02-20 20:04:01 +01:00
Alexander Köplinger 51297ed7ab [Microsoft.Build.Engine] Fix bug with escaped semicolon and spaces 2015-02-19 00:19:31 +01:00
Alexander Köplinger 2850b1274c [Microsoft.Build.Tasks] Added tests for escaped semicolon and space 2015-02-18 22:41:48 +01:00
Alexander Köplinger e70880d895 [Microsoft.Build.Tasks] Fix bug in test method
The if check was inverted, so the actual test code didn't run.
2015-02-18 09:44:32 +01:00
Miguel de Icaza 757c146741 [System.ServiceModel] Couple of extra classes 2015-02-17 23:21:59 -05:00
Miguel de Icaza d060165941 [System.ServiceModel] Bring UriTemplate from ReferenceSource 2015-02-17 22:59:15 -05:00
Miguel de Icaza 0a77ba4b2e Merge branch 'master' into wip-serialization 2015-02-17 22:46:23 -05:00
Miguel de Icaza 53c20ba829 Merge pull request #1544 from alexanderkyte/wip-serialization
Removed unused dependency to break dependency loop
2015-02-05 21:02:30 -05:00
Alexander Kyte 20f782d80e Added system.runtime.serialization config 2015-02-03 14:00:43 -05:00
Alexander Kyte 6de77f9019 Removed unused dependency to break dependency loop 2015-02-03 10:31:34 -05:00
Miguel de Icaza 649d82d04d Automatically build these 2015-02-02 16:04:04 -05:00
Miguel de Icaza 2c9c0aad5a Add missing files 2015-02-02 16:03:07 -05:00
Miguel de Icaza ff322b5809 [mscorlib] SerializationInfo, add constructor 2015-01-08 17:20:17 -05:00
Miguel de Icaza 6fc5955051 Work in progress to bring Microsoft System.Runtime.Serialization to Mono
The current code compiles by replacing existing Mono code with
Microsoft code (without actually deleting the unreferenced files -
purely to use them as a roadmap for things that we should do to make
the code MOBILE and AOT friendly).

Currently this does not compile the mobile profile assembly, nor has
the code been tested yet.

The code also brings an extensive tracing/logging system that wont
work on Unix as it is based on Window's Event Tracing facility.

We should consider a few options:

   * Allow for the code to be disabled (for release builds on Mobile,
     or for an initial delivery that does not support any tracing
     capabilities).

   * Allow for the tracing framework to be replaced with some other
     logging framework.
2015-01-05 12:00:29 -02:00
3508 changed files with 17028 additions and 185248 deletions

No files matched your search

-3
View File
@@ -10,9 +10,6 @@
[submodule "external/debian-snapshot"]
path = external/debian-snapshot
url = git://github.com/directhex/mono-snapshot.git
[submodule "external/entityframework"]
path = external/entityframework
url = git://github.com/mono/entityframework.git
[submodule "external/rx"]
path = external/rx
url = git://github.com/mono/rx.git
+19 -7
View File
@@ -10,20 +10,32 @@ It is an open source implementation of Microsoft's .NET Framework based on the E
**Build Status**
| debian-amd64 | debian-i386 | debian-ppc64el | centos-s390x | windows-amd64 |
|:-----------------------:|:----------------------:|:-------------------------:|:-----------------------:|:-------------------------:|
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-ppc64el][5]][6] | [![centos-s390x][7]][8] | [![windows-amd64][9]][10] |
Officially supported architectures:
| debian-amd64 | debian-i386 | debian-armel | debian-armhf | windows-amd64 |
|-------------------------|------------------------|-------------------------|-------------------------|---------------------------|
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-armel][5]][6] | [![debian-armhf][7]][8] | [![windows-amd64][9]][10] |
Community supported architectures:
| debian-ppc64el | centos-s390x |
|-----------------------------|---------------------------|
| [![debian-ppc64el][11]][12] | [![centos-s390x][13]][14] |
[1]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon
[2]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/
[3]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/badge/icon
[4]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/
[5]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/badge/icon
[6]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/
[7]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/badge/icon
[8]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/
[5]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/badge/icon
[6]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/
[7]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/badge/icon
[8]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/
[9]: https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true
[10]: https://ci.appveyor.com/project/ajlennon/mono-817/branch/master
[11]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/badge/icon
[12]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=debian-ppc64el/
[13]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/badge/icon
[14]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=centos-s390x/
Compilation and Installation
============================
+28 -54
View File
@@ -4,54 +4,41 @@
# For further details see http://www.appveyor.com
#
# Use 'unstable' Appveyor build worker image as Appveyor have added Cygwin to this for us
os: Unstable
#
# Custom environment variables
#
environment:
global:
CYG_ROOT: C:/cygwin
CYG_ROOT: C:\cygwin
CYG_MIRROR: http://cygwin.mirror.constant.com
CYG_CACHE: C:/cygwin/var/cache/setup
NSIS_ROOT: C:\nsis
CYG_CACHE: C:\cygwin\var\cache\setup
CYG_BASH: C:\cygwin\bin\bash
#
# Cache Cygwin files to speed up build
#
cache:
- '%CYG_CACHE%'
#
# Do a shallow clone of the repo to speed up build
#
clone_depth: 1
#
# Initialisation prior to pulling the Mono repository
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
#
init:
- 'echo Building Mono for Windows'
- 'echo System architecture: %PLATFORM%'
- 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
- 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
- 'git config --global core.autocrlf input'
- git config --global core.autocrlf input
#
# Install needed build dependencies
#
install:
# NOTE: Already installed on current Appveyor unstable image
# - 'echo Retrieving Cygwin'
# - 'appveyor DownloadFile http://cygwin.com/setup-x86.exe -FileName %CYGROOT%/setup-x86.exe'
- 'echo Setting up Cygwin dependencies'
- '%CYG_ROOT%\setup-x86.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P autoconf -P automake -P bison -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P pkg-config -P git -P wget -P curl > NUL'
- 'echo Check Cygwin setup'
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
- 'echo Done setting up Cygwin'
- 'echo Retrieving NSIS'
- 'appveyor DownloadFile "http://sunet.dl.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe'
- 'echo Setting up NSIS'
- 'nsissetup.exe /S /D=%NSIS_ROOT%'
- 'echo Done setting up NSIS'
#
# NOTE: msbuild doesn't work at present so use Cygwin to build
#
#build:
# project: C:\projects\mono\msvc\mono.sln
# verbosity: detailed
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
- 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages autoconf,automake,bison,gcc-core,gcc-g++,mingw-runtime,mingw-binutils,mingw-gcc-core,mingw-gcc-g++,mingw-pthreads,mingw-w32api,libtool,make,python,gettext-devel,gettext,intltool,libiconv,pkg-config,git,curl,libxslt > NUL 2>&1'
- '%CYG_BASH% -lc "cygcheck -dc cygwin"'
# Cygwin build script
#
@@ -59,29 +46,16 @@ install:
#
# The stdin/stdout file descriptor appears not to be valid for the Appveyor
# build which causes failures as certain functions attempt to redirect
# default file handles. Ensure a dummy file descriptor is opened with exec.
# default file handles. Ensure a dummy file descriptor is opened with 'exec'.
#
build_script:
- cmd: 'echo Cygwin root is: %CYG_ROOT%'
- cmd: 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
- cmd: 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
- cmd: 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
- cmd: 'echo Autogen running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; NOCONFIGURE=1 ./autogen.sh --prefix=/usr/local --with-preview=yes"'
- cmd: 'echo Configure running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./configure --host=i686-pc-mingw32"'
- cmd: 'echo Pulling monolite latest...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
- cmd: 'echo Make running...'
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make"'
- cmd: 'echo Installing...'
- cmd: 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
- cmd: '%CYG_ROOT%/bin/bash --login -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
# - cmd: 'echo Building package...'
# - cmd: 'cd %APPVEYOR_BUILD_FOLDER%'
# - cmd: '%NSIS_ROOT%\makensis /DMILESTONE=%APPVEYOR_REPO_BRANCH% /DSOURCE_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER\install\*.* /DBUILDNUM=%APPVEYOR_BUILD_VERSION% monowiz.win32.nsi'
# - cmd: 'Building distribution...'
# - cmd: '%CYG_ROOT%/bin/bash -lc "export CYGWIN=winsymlinks:native; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make dist"'
- 'echo Building...'
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./autogen.sh --prefix=/usr/local --host=i686-pc-mingw32"'
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make -j2"'
- 'echo Installing...'
- 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
- '%CYG_BASH% -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
#
# Disable tests for now
+13 -5
View File
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
#AC_PREREQ([2.62])
AC_INIT(mono, [3.99.0],
AC_INIT(mono, [4.1.0],
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
AC_CONFIG_SRCDIR([README.md])
@@ -454,6 +454,8 @@ AC_CHECK_HEADERS(sys/user.h, [], [],
#endif
])
AC_CHECK_HEADERS(linux/serial.h)
AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
if test x$have_zlib = xyes; then
AC_TRY_COMPILE([#include <zlib.h>], [
@@ -526,6 +528,10 @@ AC_CACHE_CHECK([for clang],
[])
])
AC_ARG_ENABLE(visiblity-hidden,
[ --disable-visibility-hidden disable usage of -fvisiblity=hidden]
disable_visibility_hidden=no, disable_visibility_hidden=yes)
WARN=''
if test x"$GCC" = xyes; then
WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings -Wno-switch -Wno-switch-enum -Wno-unused-value'
@@ -540,10 +546,12 @@ if test x"$GCC" = xyes; then
CFLAGS="$CFLAGS -fwrapv"
CFLAGS="$CFLAGS -DMONO_DLL_EXPORT"
# Don't export any symbols by default
SHARED_CFLAGS="-fvisibility=hidden"
CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB -fvisibility=hidden"
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
if test x"$disable_visibility_hidden" = xno; then
# Don't export any symbols by default
SHARED_CFLAGS="-fvisibility=hidden"
CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB -fvisibility=hidden"
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
fi
ORIG_CFLAGS=$CFLAGS
# Check for the normal version, since gcc ignores unknown -Wno options
+4 -1
View File
@@ -13,11 +13,14 @@
<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.diagnostics" type="System.Diagnostics.SystemDiagnosticsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<sectionGroup name="system.runtime.serialization" type="System.Runtime.Serialization.Configuration.SerializationSectionGroup, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="dataContractSerializer" type="System.Runtime.Serialization.Configuration.DataContractSerializerSection, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
</sectionGroup>
<sectionGroup name="system.web" type="System.Web.Configuration.SystemWebSectionGroup, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="anonymousIdentification" type="System.Web.Configuration.AnonymousIdentificationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="authentication" type="System.Web.Configuration.AuthenticationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
+1 -1
View File
@@ -74,7 +74,7 @@
#define NO_INTR(var,cmd) do { (var) = (cmd); } while ((var) == -1 && errno == EINTR)
#define CLOSE_PIPE(p) do { close (p [0]); close (p [1]); } while (0)
#if defined(__APPLE__) && !defined (__arm__)
#if defined(__APPLE__) && !defined (__arm__) && !defined (__aarch64__)
/* Apple defines this in crt_externs.h but doesn't provide that header for
* arm-apple-darwin9. We'll manually define the symbol on Apple as it does
* in fact exist on all implementations (so far)
+1
View File
@@ -78,6 +78,7 @@ static class Consts
//
public const string AssemblyI18N = "I18N, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
public const string AssemblyMicrosoft_JScript = "Microsoft.JScript, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblyMicrosoft_VisualStudio_Web = "Microsoft.VisualStudio.Web, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+2
View File
@@ -9,7 +9,9 @@ static class AssemblyRef
public const string EcmaPublicKey = "b77a5c561934e089";
public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
public const string MicrosoftJScript = Consts.AssemblyMicrosoft_JScript;
public const string MicrosoftVSDesigner = Consts.AssemblyMicrosoft_VSDesigner;
public const string SystemData = Consts.AssemblySystem_Data;
public const string SystemDesign = Consts.AssemblySystem_Design;
public const string SystemDrawing = Consts.AssemblySystem_Drawing;
public const string SystemWeb = Consts.AssemblySystem_Web;
+1 -1
View File
@@ -40,7 +40,7 @@ class X {
if (!Version.TryParse (field.GetValue (null) as string, out version))
return 4;
if (version < new Version (3, 2))
if (version < new Version (3, 8))
return 5;
return 0;
+3
View File
@@ -166,3 +166,6 @@ $(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp
doc-update-local:
@:
# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
gen-deps:
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
+17 -2
View File
@@ -8,6 +8,18 @@
# All the dep files now land in the same directory so we
# munge in the library name to keep the files from clashing.
# The including makefile can set the following variables:
# LIB_MCS_FLAGS - Command line flags passed to mcs.
# LIB_REFS - This should be a space separated list of assembly names which are added to the mcs
# command line.
#
# All dependent libs become dependent dirs for parallel builds
# Have to rename to handle differences between assembly/directory names
DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS))
LIB_MCS_FLAGS += $(patsubst %,-r:%,$(LIB_REFS))
sourcefile = $(LIBRARY).sources
# If the directory contains the per profile include file, generate list file.
@@ -68,7 +80,7 @@ endif
ifdef RESOURCE_STRINGS
ifdef BOOTSTRAP_PROFILE
MCS_FLAGS_INTERNAL += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
MCS_FLAGS_RESOURCE_STRINGS += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
endif
endif
@@ -267,7 +279,7 @@ endif
$(the_lib): $(the_libdir)/.stamp
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(MCS_FLAGS_RESOURCE_STRINGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
$(Q) $(SN) -R $@ $(LIBRARY_SNK)
ifdef LIBRARY_USE_INTERMEDIATE_FILE
@@ -345,3 +357,6 @@ $(the_libdir)/.doc-stamp: $(the_lib)
$(MDOC_UP)
@echo "doc-stamp" > $@
# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
gen-deps:
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
+1 -1
View File
@@ -65,7 +65,7 @@ do-profile-check: $(depsdir)/.stamp
$(MAKE) -s do-profile-check-monolite ; \
else \
echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
echo "*** You need Mono version 3.2 or better installed to build MCS" 1>&2 ; \
echo "*** You need Mono version 3.8 or better installed to build MCS" 1>&2 ; \
echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
echo "*** The version of '$(BOOTSTRAP_MCS)' is: `$(BOOTSTRAP_MCS) --version`." 1>&2 ; \
exit 1; fi; fi
+56 -1
View File
@@ -28,7 +28,7 @@ ifndef BUILD_TOOLS_PROFILE
BUILD_TOOLS_PROFILE = build
endif
USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS) $(MCS_FLAGS_INTERNAL)
USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
@@ -156,6 +156,12 @@ ifndef PROFILE_SUBDIRS
PROFILE_SUBDIRS = $(SUBDIRS)
endif
# These subdirs can be built in parallel
PROFILE_PARALLEL_SUBDIRS := $($(PROFILE)_PARALLEL_SUBDIRS)
ifndef PROFILE_PARALLEL_SUBDIRS
PROFILE_PARALLEL_SUBDIRS = $(PARALLEL_SUBDIRS)
endif
ifndef FRAMEWORK_VERSION_MAJOR
FRAMEWORK_VERSION_MAJOR = $(basename $(FRAMEWORK_VERSION))
endif
@@ -167,8 +173,57 @@ endif
list='$(PROFILE_SUBDIRS)'; for d in $$list ; do \
(cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
done; \
if [ $* = "all" -a -n "$(PROFILE_PARALLEL_SUBDIRS)" ]; then \
$(MAKE) do-all-parallel ENABLE_PARALLEL_SUBDIR_BUILD=1 || { final_exit="exit 1"; $$dk; } ; \
else \
list='$(PROFILE_PARALLEL_SUBDIRS)'; for d in $$list ; do \
(cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
done; \
fi; \
$$final_exit
#
# Parallel build support
#
# The variable $(PROFILE)_PARALLEL_SUBDIRS should be set to the list of directories
# which could be built in parallel. These directories are built after the directories in
# $(PROFILE)_SUBDIRS.
# Parallel building is currently only supported for the 'all' target.
#
# Each directory's Makefile may define DEP_LIBS and DEP_DIRS to specify the libraries and
# directories it depends on.
#
ifneq ($(PROFILE_PARALLEL_SUBDIRS),)
dep_dirs = .dep_dirs-$(PROFILE)
$(dep_dirs):
@echo "Creating $@..."
list='$(PROFILE_PARALLEL_SUBDIRS)'; \
echo > $@; \
for d in $$list; do \
$(MAKE) -C $$d gen-deps DEPS_TARGET_DIR=$$d DEPS_FILE=$(abspath $@); \
done
-include $(dep_dirs)
endif
.PHONY: gen-deps
# The gen-deps target is in library.make/executable.make so it can pick up
# DEP_LIBS/DEP_DIRS
clean-dep-dir:
$(RM) $(dep_dirs)
clean-local: clean-dep-dir
ifdef ENABLE_PARALLEL_SUBDIR_BUILD
.PHONY: do-all-parallel $(PROFILE_PARALLEL_SUBDIRS)
do-all-parallel: $(PROFILE_PARALLEL_SUBDIRS)
$(PROFILE_PARALLEL_SUBDIRS):
@set . $$MAKEFLAGS; \
cd $@ && $(MAKE)
endif
ifndef DIST_SUBDIRS
DIST_SUBDIRS = $(SUBDIRS) $(DIST_ONLY_SUBDIRS)
endif
+2 -1
View File
@@ -7,7 +7,8 @@ RESOURCE_FILES = resources/relaxng.rng
OTHER_RES = $(RESOURCE_FILES)
LIBRARY = Commons.Xml.Relaxng.dll
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = /r:$(corlib) \
$(foreach r, $(OTHER_RES), /resource:$(r),$(notdir $(r)))
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
EXTRA_DISTFILES = \
@@ -7,7 +7,8 @@ LIBRARY_NAME = ICSharpCode.SharpZipLib.dll
LIBRARY_COMPAT = yes
LIBRARY_SNK = SharpZipLib.key
LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = -r:$(corlib)
NO_TEST = yes
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
+2 -1
View File
@@ -3,7 +3,8 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = Cscompmgd.dll
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
LIB_REFS = System
LIB_MCS_FLAGS = /r:$(corlib)
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
LIBRARY_NAME = cscompmgd.dll
+2 -1
View File
@@ -3,7 +3,8 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = CustomMarshalers.dll
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
LIB_REFS = System
LIB_MCS_FLAGS = /r:$(corlib)
NO_TEST = yes
include ../../build/library.make
@@ -1,187 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D1081004-B9C0-4982-BA68-EB5999440ACD}</ProjectGuid>
<OutputType>Library</OutputType>
<NoWarn>1699</NoWarn>
<OutputPath>./../../class/lib/net_4_5</OutputPath>
<NoStdLib>True</NoStdLib>
<NoConfig>True</NoConfig>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>
</RootNamespace>
<AssemblyName>EntityFramework.SqlServer</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>../ecma.pub</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
is a problem to compile the Mono mscorlib.dll -->
<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DbGeographyAdapter.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DbGeometryAdapter.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DefaultSqlExecutionStrategy.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Expressions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\GlobalSuppressions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\IDbSpatialValue.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\IDbSpatialValueExtensionMethods.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\AssemblyVersion.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\InternalsVisibleTo.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\Resources.SqlServer.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureDbConfiguration.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureExecutionStrategy.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureRetriableExceptionDetector.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlDdlBuilder.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlExecutionStrategyResolver.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\BoolWrapper.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\DmlSqlGenerator.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\ISqlFragment.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\JoinSymbol.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\OptionalColumn.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Sql8ConformanceChecker.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Sql8ExpressionRewriter.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlBuilder.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlFunctionCallHandler.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlGenerator.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlSelectClauseBuilder.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlSelectStatement.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlWriter.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Symbol.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolPair.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolTable.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolUsageManager.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\TopClause.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderManifest.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderServices.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderUtilities.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialDataReader.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialServices.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialServicesForConversions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlTypesAssembly.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlTypesAssemblyLoader.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlVersion.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlVersionUtils.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\Check.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\DbExpressionExtensions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\DebugCheck.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\EdmFunctionExtensions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\FuncExtensions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\IDictionaryExtensions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\MetdataItemExtensions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\PrimitiveTypeExtensions.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\SqlDataReaderWrapper.cs" />
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\TypeUsageExtensions.cs" />
<Compile Include="..\..\..\external\entityframework\src\SharedAssemblyInfo.cs" />
<Compile Include="..\..\..\external\entityframework\src\SharedAssemblyVersionInfo.cs" />␍ </ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
<Name>corlib-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="../System/System-net_4_5.csproj">
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
<Name>System-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
<Name>System.Xml-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
<Name>System.Core-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="../EntityFramework/EntityFramework-net_4_5.csproj">
<Project>{CEE31F03-087E-4164-BBD4-990759B40C3E}</Project>
<Name>EntityFramework-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">
<Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>
<Name>System.Data-net_4_5</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources">
<LogicalName>System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl">
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Project>
@@ -1,55 +0,0 @@
../../../external/entityframework/src/SharedAssemblyInfo.cs
../../../external/entityframework/src/SharedAssemblyVersionInfo.cs
../../../external/entityframework/src/EntityFramework.SqlServer/DbGeographyAdapter.cs
../../../external/entityframework/src/EntityFramework.SqlServer/DbGeometryAdapter.cs
../../../external/entityframework/src/EntityFramework.SqlServer/DefaultSqlExecutionStrategy.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Expressions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/GlobalSuppressions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/IDbSpatialValue.cs
../../../external/entityframework/src/EntityFramework.SqlServer/IDbSpatialValueExtensionMethods.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/AssemblyVersion.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/InternalsVisibleTo.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/Resources.SqlServer.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureDbConfiguration.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureExecutionStrategy.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureRetriableExceptionDetector.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlDdlBuilder.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlExecutionStrategyResolver.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/BoolWrapper.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/DmlSqlGenerator.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialServicesForConversions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlTypesAssemblyLoader.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlVersionUtils.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/Check.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/SqlDataReaderWrapper.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/DbExpressionExtensions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/DebugCheck.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/EdmFunctionExtensions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/MetdataItemExtensions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/FuncExtensions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/IDictionaryExtensions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/ISqlFragment.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/JoinSymbol.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/OptionalColumn.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Sql8ConformanceChecker.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Sql8ExpressionRewriter.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlBuilder.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlFunctionCallHandler.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlGenerator.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlSelectClauseBuilder.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlSelectStatement.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlWriter.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Symbol.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolPair.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolTable.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolUsageManager.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/TopClause.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderManifest.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderServices.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderUtilities.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialDataReader.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialServices.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlTypesAssembly.cs
../../../external/entityframework/src/EntityFramework.SqlServer/SqlVersion.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/PrimitiveTypeExtensions.cs
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/TypeUsageExtensions.cs
@@ -1,28 +0,0 @@
thisdir = class/EntityFramework.SqlServer
SUBDIRS =
include ../../build/rules.make
LIBRARY = EntityFramework.SqlServer.dll
System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources: ../../../external/entityframework/src/EntityFramework.SqlServer/Properties/Resources.SqlServer.resx
$(RESGEN) "$<" "$@"
RESOURCES = \
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml \
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl \
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl \
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl \
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl \
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl \
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl
LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Core.dll -r:EntityFramework.dll -r:System.Data.dll \
-keyfile:../ecma.pub -delaysign -warn:1 \
-resource:System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources \
$(RESOURCES:%=-resource:%)
include ../../build/library.make
$(the_lib): System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources
-1
View File
@@ -1 +0,0 @@
System.Data.Resources.EntityStoreSchemaGenerator.xsd
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
-50
View File
@@ -1,50 +0,0 @@
thisdir = class/EntityFramework
SUBDIRS =
include ../../build/rules.make
LIBRARY = EntityFramework.dll
System.Data.Entity.Properties.Resources.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.resx
$(RESGEN) "$<" "$@"
System.Data.Entity.Properties.Resources.Migrate.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.Migrate.resx
$(RESGEN) "$<" "$@"
System.Data.Entity.Properties.Resources.PowerShell.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.PowerShell.resx
$(RESGEN) "$<" "$@"
RESOURCES = ../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.DbProviderServices.ConceptualSchemaDefinition.csdl \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.DbProviderServices.ConceptualSchemaDefinitionVersion3.csdl \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.ProviderServices.ProviderManifest.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.AnnotationSchema.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CodeGenerationSchema.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_1.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_1_1.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_2.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_3.xsd \
System.Data.Resources.EntityStoreSchemaGenerator.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema_2.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema_3.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_1.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_2.xsd \
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_3.xsd
LIB_MCS_FLAGS = -r:System.Data.dll -r:System.Transactions.dll -r:System.Xml.Linq.dll -r:System.Configuration.dll -r:System.ComponentModel.DataAnnotations.dll -r:System.Runtime.Serialization.dll \
-r:System.dll -r:System.Xml.dll -r:System.Core.dll -r:Microsoft.CSharp.dll -keyfile:../ecma.pub -delaysign -warn:1 \
-resource:System.Data.Entity.Properties.Resources.resources \
-resource:System.Data.Entity.Properties.Resources.Migrate.resources \
-resource:System.Data.Entity.Properties.Resources.PowerShell.resources \
$(RESOURCES:%=-resource:%)
CLEAN_FILES = System.Data.Resources.EntityStoreSchemaGenerator.xsd
System.Data.Resources.EntityStoreSchemaGenerator.xsd:
cp ../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/system.data.resources.entitystoreschemagenerator.xsd System.Data.Resources.EntityStoreSchemaGenerator.xsd
include ../../build/library.make
$(the_lib): System.Data.Resources.EntityStoreSchemaGenerator.xsd \
System.Data.Entity.Properties.Resources.resources \
System.Data.Entity.Properties.Resources.Migrate.resources \
System.Data.Entity.Properties.Resources.PowerShell.resources
+1 -1
View File
@@ -51,4 +51,4 @@ doc-update-local:
@echo "not doing docs"
doc-update-recursive:
@echo "do not recurse the Facades folder"
@echo "do not recurse the Facades folder"
@@ -11,7 +11,8 @@ LIBRARY = System.Collections.Concurrent.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Collections.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.ComponentModel.Annotations.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ComponentModel.DataAnnotations
LIB_REFS = System.ComponentModel.DataAnnotations
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.ComponentModel.EventBasedAsync.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.ComponentModel.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Diagnostics.Debug.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Diagnostics.Tools.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Dynamic.Runtime.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core /r:System
LIB_REFS = System.Core System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
+2 -1
View File
@@ -11,7 +11,8 @@ LIBRARY = System.IO.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Linq.Expressions.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Linq.Parallel.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Linq.Queryable.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
+2 -1
View File
@@ -11,7 +11,8 @@ LIBRARY = System.Linq.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Net.NetworkInformation.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Net.Primitives.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Net.Requests.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.ObjectModel.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Extensions.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.InteropServices.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Numerics.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Numerics
LIB_REFS = System.Numerics
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Serialization.Json.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization
LIB_REFS = System.Runtime.Serialization
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Serialization.Primitives.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization
LIB_REFS = System.Runtime.Serialization
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.Serialization.Xml.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Runtime.Serialization /r:System.Xml
LIB_REFS = System.Runtime.Serialization System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
+2 -1
View File
@@ -11,7 +11,8 @@ LIBRARY = System.Runtime.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.ComponentModel.Composition /r:System.Core
LIB_REFS = System System.ComponentModel.Composition System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.ServiceModel.Http.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel
LIB_REFS = System.ServiceModel
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.ServiceModel.Primitives.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel /r:System.Xml
LIB_REFS = System.ServiceModel System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -20,10 +20,6 @@
// THE SOFTWARE.
//
#if !MONOTOUCH
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.CompressionFormat))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.ClientOperation))]
#endif
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ActionNotSupportedException))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ChannelFactory))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.ChannelFactory<>))]
@@ -44,6 +40,7 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.ChannelManagerBase))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.ChannelParameterCollection))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.CommunicationObject))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.CompressionFormat))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.CustomBinding))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.FaultConverter))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.IChannel))]
@@ -105,6 +102,7 @@
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.OperationDescription))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.OperationDescriptionCollection))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Description.ServiceEndpoint))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.ClientOperation))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.ClientRuntime))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.DispatchOperation))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Dispatcher.DispatchRuntime))]
@@ -11,7 +11,8 @@ LIBRARY = System.ServiceModel.Security.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.ServiceModel
LIB_REFS = System.ServiceModel
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Text.RegularExpressions.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
LIB_REFS = System
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Threading.Tasks.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Core
LIB_REFS = System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Threading.Timer.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
+2 -1
View File
@@ -11,7 +11,8 @@ LIBRARY = System.Threading.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
LIB_REFS = System System.Core
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Xml.ReaderWriter.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml
LIB_REFS = System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Xml.XDocument.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml.Linq /r:System.Xml
LIB_REFS = System.Xml.Linq System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
@@ -11,7 +11,8 @@ LIBRARY = System.Xml.XmlSerializer.dll
KEY_FILE = ../../msfinal.pub
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System.Xml
LIB_REFS = System.Xml
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
PLATFORM_DEBUG_FLAGS =
+2 -2
View File
@@ -3,8 +3,8 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = IBM.Data.DB2.dll
LIB_MCS_FLAGS = /unsafe /r:$(corlib) /r:System.dll \
/r:System.Xml.dll /r:System.Data.dll -warn:1
LIB_REFS = System System.Xml System.Data
LIB_MCS_FLAGS = /unsafe /r:$(corlib) -warn:1
NO_TEST = yes
EXTRA_DISTFILES = ibm.pub
+2 -1
View File
@@ -5,7 +5,8 @@ include ../../build/rules.make
LIBRARY = ICSharpCode.SharpZipLib.dll
LIBRARY_SNK = SharpZipLib.key
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll -warn:1
LIB_REFS = System System.Xml
LIB_MCS_FLAGS = /r:$(corlib) -warn:1
NO_TEST = yes
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
@@ -46,4 +46,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
+1 -1
View File
@@ -109,4 +109,4 @@
<UserProperties REFS-JarPath-mainsoft-web="..\bin\Debug_Java20\Mainsoft.Web.jar" REFS-JarPath-nunit-framework="..\..\..\nunit20\nunit-console\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-system-web="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Web.jar" REFS-JarPath-system-configuration="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Configuration.jar" REFS-JarPath-rt="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\jre5\lib\rt.jar" REFS-JarPath-system-xml="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Xml.jar" REFS-JarPath-system-data="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.Data.jar" REFS-JarPath-system="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\System.jar" REFS-JarPath-mscorlib="..\..\Program Files\Mainsoft\Visual MainWin for J2EE V2\java_refs\framework\mscorlib.jar" />
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
+54 -49
View File
@@ -26,8 +26,8 @@ mobile_common_dirs := \
Mono.Security \
System \
I18N \
System.Xml.Linq \
System.Runtime.Serialization \
System.Xml.Linq \
System.ServiceModel \
System.ServiceModel.Web \
System.Json \
@@ -84,8 +84,7 @@ net_4_5_dirs := \
System.Core \
Mono.Security \
System.Security \
System.Configuration \
I18N \
System.Configuration \
$(resgen_dir) \
System.Drawing \
System.Transactions \
@@ -96,7 +95,7 @@ net_4_5_dirs := \
Accessibility \
Mono.WebBrowser \
System.Runtime.Serialization.Formatters.Soap \
Managed.Windows.Forms \
System.Windows.Forms \
Mono.Data.Sqlite \
System.Web.ApplicationServices \
System.Web \
@@ -105,34 +104,20 @@ net_4_5_dirs := \
System.Configuration.Install \
System.Management \
System.Data.OracleClient \
Microsoft.VisualC \
Cscompmgd \
PEAPI \
Npgsql \
Commons.Xml.Relaxng \
Novell.Directory.Ldap \
Mono.Security.Win32 \
System.DirectoryServices \
System.DirectoryServices.Protocols \
RabbitMQ.Client \
Mono.Messaging \
System.Messaging \
Mono.Messaging.RabbitMQ \
System.ServiceProcess \
System.Drawing.Design \
System.Design \
ICSharpCode.SharpZipLib \
Mono.Http \
Mono.Cairo \
IBM.Data.DB2 \
CustomMarshalers \
Mono.Cecil \
Mono.Cecil.Mdb \
Mono.Debugger.Soft \
SystemWebTestShim \
System.Xml.Linq \
System.ServiceModel.Internals \
System.Runtime.Serialization \
System.Data.DataSetExtensions \
System.Xml.Linq \
System.Data.Linq \
System.Web.Abstractions \
System.Web.Routing \
@@ -142,18 +127,10 @@ net_4_5_dirs := \
System.Web.Extensions \
System.Web.Extensions.Design \
System.Web.DynamicData \
Mono.C5 \
Mono.Management \
Mono.Options \
Mono.Simd \
Mono.Tasklets \
System.Dynamic \
Mono.CSharp \
System.Net \
System.Json \
System.Numerics \
Microsoft.CSharp \
System.Windows.Forms.DataVisualization \
System.Xaml \
WindowsBase \
System.ServiceModel.Activation \
@@ -161,7 +138,41 @@ net_4_5_dirs := \
System.ServiceModel.Discovery \
System.Runtime.Caching \
System.Runtime.DurableInstancing \
Microsoft.Web.Infrastructure \
System.ServiceModel.Web \
System.Net.Http \
System.Net.Http.WebRequest \
System.Web.Razor \
System.Web.WebPages.Deployment \
System.Web.WebPages \
System.Web.WebPages.Razor \
System.Web.Mvc3 \
System.Net.Http.Formatting \
System.Web.Http \
System.Web.Http.SelfHost \
System.Web.Http.WebHost
# These are the subdirs which depends on libs in net_4_5_dirs
# or have proper dependencies between each other
net_4_5_parallel_dirs := \
PEAPI \
I18N \
Mono.Http \
Mono.Cairo \
Mono.Cecil \
Mono.Cecil.Mdb \
Mono.Debugger.Soft \
Mono.C5 \
Mono.Management \
Mono.Options \
Mono.Simd \
Mono.Tasklets \
Mono.CodeContracts \
Mono.Parallel \
Mono.Security.Win32 \
Mono.Messaging.RabbitMQ \
System.Dynamic \
System.Windows.Forms.DataVisualization \
System.Reactive.Interfaces \
System.Reactive.Core \
System.Reactive.Linq \
@@ -173,34 +184,25 @@ net_4_5_dirs := \
System.Reactive.Observable.Aliases \
System.Reactive.Experimental \
System.Reactive.Debugger \
Microsoft.Web.Infrastructure \
WebMatrix.Data \
System.ServiceModel.Web \
System.Data.Services.Client \
System.Data.Services \
System.Json.Microsoft \
System.Data.Entity \
monodoc \
System.Data.DataSetExtensions \
System.Json.Microsoft \
System.Threading.Tasks.Dataflow \
System.ComponentModel.Composition.4.5 \
System.Net.Http \
System.Net.Http.WebRequest \
System.Web.Razor \
System.Web.WebPages.Deployment \
System.Web.WebPages \
System.Web.WebPages.Razor \
System.Web.Mvc3 \
System.Net.Http.Formatting \
System.Web.Http \
System.Web.Http.SelfHost \
System.Web.Http.WebHost \
EntityFramework \
EntityFramework.SqlServer \
Mono.CodeContracts \
System.IO.Compression \
System.IO.Compression.FileSystem \
System.Windows \
System.Xml.Serialization \
System.Numerics \
Novell.Directory.Ldap \
System.DirectoryServices \
System.DirectoryServices.Protocols \
RabbitMQ.Client \
Microsoft.VisualC \
WebMatrix.Data \
monodoc \
$(pcl_facade_dirs)
xbuild_2_0_dirs := \
@@ -221,13 +223,14 @@ mobile_static_SUBDIRS := $(mobile_static_dirs)
mobile_SUBDIRS := $(mobile_dynamic_dirs)
xammac_SUBDIRS := $(xammac_dirs)
net_4_0_SUBDIRS := reference-assemblies
net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs)
net_4_5_PARALLEL_SUBDIRS := $(net_4_5_parallel_dirs) aot-compiler
xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
include ../build/rules.make
SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs)
SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs) $(net_4_5_parallel_dirs)
DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs)
@@ -275,3 +278,5 @@ dist-local: dist-default
csproj-local:
clean-local:
$(RM) -rf $(topdir)/class/lib/$(PROFILE)
@@ -7,6 +7,7 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.Engine.dll
LIB_REFS = System System.Core System.Xml
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll \
@@ -472,7 +472,7 @@ namespace Microsoft.Build.BuildEngine {
BuildItemGroup big;
BuildItem bi = new BuildItem (this);
bi.finalItemSpec = taskitem.ItemSpec;
bi.finalItemSpec = ((ITaskItem2)taskitem).EvaluatedIncludeEscaped;
foreach (DictionaryEntry de in taskitem.CloneCustomMetadata ()) {
bi.unevaluatedMetadata.Add ((string) de.Key, (string) de.Value);
@@ -156,7 +156,7 @@ namespace Microsoft.Build.BuildEngine {
for (int i = 0; i < lists.Count; i++) {
foreach (object o in lists [i]) {
if (o is string)
expressionCollection.Add (MSBuildUtils.Unescape ((string) o));
expressionCollection.Add ((string) o);
else if (!allowItems && o is ItemReference)
expressionCollection.Add (((ItemReference) o).OriginalString);
else if (!allowMd && o is MetadataReference) {
@@ -233,11 +233,11 @@ namespace Microsoft.Build.BuildEngine {
// Trim and Remove empty items
List<ITaskItem> toRemove = new List<ITaskItem> ();
for (int i = 0; i < finalItems.Count; i ++) {
string s = finalItems [i].ItemSpec.Trim ();
string s = ((ITaskItem2)finalItems [i]).EvaluatedIncludeEscaped.Trim ();
if (s.Length == 0)
toRemove.Add (finalItems [i]);
else
finalItems [i].ItemSpec = s;
((ITaskItem2)finalItems [i]).EvaluatedIncludeEscaped = s;
}
foreach (ITaskItem ti in toRemove)
finalItems.Remove (ti);
@@ -105,7 +105,7 @@ namespace Microsoft.Build.BuildEngine
object value;
try {
value = type.InvokeMember (member_name, flags, null, target, args, CultureInfo.InvariantCulture);
} catch (MissingFieldException) {
} catch (MissingMethodException) {
//
// It can be field/constant instead of a property
//
@@ -19,12 +19,13 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -32,7 +33,7 @@
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -98,7 +99,9 @@
<Compile Include="Microsoft.Build.BuildEngine\IReference.cs" />
<Compile Include="Microsoft.Build.BuildEngine\ItemReference.cs" />
<Compile Include="Microsoft.Build.BuildEngine\LogExtensions.cs" />
<Compile Include="Microsoft.Build.BuildEngine\MemberInvocationReference.cs" />
<Compile Include="Microsoft.Build.BuildEngine\MetadataReference.cs" />
<Compile Include="Microsoft.Build.BuildEngine\PredefinedPropertyFunctions.cs" />
<Compile Include="Microsoft.Build.BuildEngine\Project.cs" />
<Compile Include="Microsoft.Build.BuildEngine\ProjectLoadSettings.cs" />
<Compile Include="Microsoft.Build.BuildEngine\PropertyPosition.cs" />
@@ -109,6 +112,7 @@
<Compile Include="Microsoft.Build.BuildEngine\TaskBatchingImpl.cs" />
<Compile Include="Microsoft.Build.BuildEngine\TaskDatabase.cs" />
<Compile Include="Microsoft.Build.BuildEngine\TaskEngine.cs" />
<Compile Include="Microsoft.Build.BuildEngine\TaskExecutionMode.cs" />
<Compile Include="Microsoft.Build.BuildEngine\Token.cs" />
<Compile Include="Microsoft.Build.BuildEngine\Toolset.cs" />
<Compile Include="Microsoft.Build.BuildEngine\ToolsetCollection.cs" />
@@ -126,9 +130,13 @@
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
@@ -137,29 +145,29 @@
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
<Name>corlib\corlib-net_4_5</Name>
<Name>corlib-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
<Name>System\System-net_4_5-2</Name>
<ProjectReference Include="../System/System-net_4_5.csproj">
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
<Name>System-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
<Name>System.Core\System.Core-net_4_5</Name>
<Name>System.Core-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
<Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
<Name>System.XML\System.Xml-net_4_5-1</Name>
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
<Name>System.Xml-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12.csproj">
<ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-xbuild_12.csproj">
<Project>{A5C3FA16-6C9E-4B57-9476-78E959BBC338}</Project>
<Name>Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12</Name>
<Name>Microsoft.Build.Framework-xbuild_12</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12.csproj">
<ProjectReference Include="../Microsoft.Build.Utilities/Microsoft.Build.Utilities-xbuild_12.csproj">
<Project>{4AEF77E9-BB34-44F2-9F35-64D11ECDE2A7}</Project>
<Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12</Name>
<Name>Microsoft.Build.Utilities-xbuild_12</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -7,6 +7,7 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.Framework.dll
LIB_REFS = System
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll
@@ -19,12 +19,13 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -32,7 +33,7 @@
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -114,9 +115,13 @@
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
@@ -125,13 +130,13 @@
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
<Name>corlib\corlib-net_4_5</Name>
<Name>corlib-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
<Name>System\System-net_4_5-2</Name>
<ProjectReference Include="../System/System-net_4_5.csproj">
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
<Name>System-net_4_5</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
+1
View File
@@ -9,6 +9,7 @@ LIBRARY = Microsoft.Build.Tasks.dll
LIBRARY_NAME = Microsoft.Build.Tasks$(NAME_SUFFIX).dll
LIB_REFS = System System.Core System.Xml System.Windows.Forms
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll \
@@ -198,9 +198,9 @@
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
<Name>System.XML\System.Xml-net_2_0-1</Name>
</ProjectReference>
<ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_2_0.csproj">
<ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_2_0.csproj">
<Project>{EC4EB1AA-1E23-4F9A-832A-FED2E5EA9630}</Project>
<Name>Managed.Windows.Forms\System.Windows.Forms-net_2_0</Name>
<Name>System.Windows.Forms\System.Windows.Forms-net_2_0</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_3_5.csproj">
<Project>{C3F8A358-9DA1-423C-8466-58AB30893EB0}</Project>
@@ -103,9 +103,9 @@
<Compile Include="Microsoft.Build.Tasks\AspNetCompiler.cs" />
<Compile Include="Microsoft.Build.Tasks\AssemblyResolver.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignCulture.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignProjectConfiguration.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignTargetPath.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />
<Compile Include="Microsoft.Build.Tasks\CallTarget.cs" />
<Compile Include="Microsoft.Build.Tasks\CodeTaskFactory.cs" />
<Compile Include="Microsoft.Build.Tasks\CombinePath.cs" />
@@ -205,7 +205,7 @@
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
<Name>System.Xml-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
<ProjectReference Include="../System.Windows.Forms/System.Windows.Forms-net_4_5.csproj">
<Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
<Name>System.Windows.Forms-net_4_5</Name>
</ProjectReference>
@@ -19,12 +19,13 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -32,7 +33,7 @@
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -102,10 +103,11 @@
<Compile Include="Microsoft.Build.Tasks\AspNetCompiler.cs" />
<Compile Include="Microsoft.Build.Tasks\AssemblyResolver.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignCulture.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignProjectConfiguration.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignTargetPath.cs" />
<Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />
<Compile Include="Microsoft.Build.Tasks\CallTarget.cs" />
<Compile Include="Microsoft.Build.Tasks\CodeTaskFactory.cs" />
<Compile Include="Microsoft.Build.Tasks\CombinePath.cs" />
<Compile Include="Microsoft.Build.Tasks\CommandLineBuilderExtension.cs" />
<Compile Include="Microsoft.Build.Tasks\Copy.cs" />
@@ -158,6 +160,7 @@
<Compile Include="Microsoft.Build.Tasks\Vbc.cs" />
<Compile Include="Microsoft.Build.Tasks\VCBuild.cs" />
<Compile Include="Microsoft.Build.Tasks\Warning.cs" />
<Compile Include="Microsoft.Build.Tasks\WriteCodeFragment.cs" />
<Compile Include="Microsoft.Build.Tasks\WriteLinesToFile.cs" />
<Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceReader.cs" />
<Compile Include="Mono.XBuild.Tasks.GenerateResourceInternal\PoResourceWriter.cs" />
@@ -171,9 +174,13 @@
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
@@ -182,41 +189,41 @@
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
<Name>corlib\corlib-net_4_5</Name>
<Name>corlib-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
<Name>System\System-net_4_5-2</Name>
<ProjectReference Include="../System/System-net_4_5.csproj">
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
<Name>System-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
<Name>System.Core\System.Core-net_4_5</Name>
<Name>System.Core-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
<Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
<Name>System.XML\System.Xml-net_4_5-1</Name>
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
<Name>System.Xml-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
<ProjectReference Include="..\System.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
<Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>
<Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>
<Name>System.Windows.Forms\System.Windows.Forms-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12.csproj">
<ProjectReference Include="../Microsoft.Build.Utilities/Microsoft.Build.Utilities-xbuild_12.csproj">
<Project>{4AEF77E9-BB34-44F2-9F35-64D11ECDE2A7}</Project>
<Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-xbuild_12</Name>
<Name>Microsoft.Build.Utilities-xbuild_12</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12.csproj">
<ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-xbuild_12.csproj">
<Project>{A5C3FA16-6C9E-4B57-9476-78E959BBC338}</Project>
<Name>Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12</Name>
<Name>Microsoft.Build.Framework-xbuild_12</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-xbuild_12.csproj">
<ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-xbuild_12.csproj">
<Project>{AA157F9D-4256-45F3-A07F-55E8E7E61A07}</Project>
<Name>Microsoft.Build.Engine\Microsoft.Build.Engine-xbuild_12</Name>
<Name>Microsoft.Build.Engine-xbuild_12</Name>
</ProjectReference>
<ProjectReference Include="..\Mono.XBuild.Tasks\Mono.XBuild.Tasks-xbuild_12.csproj">
<ProjectReference Include="../Mono.XBuild.Tasks/Mono.XBuild.Tasks-xbuild_12.csproj">
<Project>{9E6DAF79-050B-4DF1-AD79-F3A848BE960C}</Project>
<Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-xbuild_12</Name>
<Name>Mono.XBuild.Tasks-xbuild_12</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -90,6 +90,26 @@ namespace MonoTests.Microsoft.Build.Tasks {
});
}
[Test]
public void TestLineWithEscapedSemicolon ()
{
string[] lines = new string[] { "abc%3Btest%3B%3B", "%3Bdef" };
CreateProjectAndCheck (full_filepath, lines, false, true, delegate () {
CheckFileExists (full_filepath, true);
CheckLines (full_filepath, new string [] {"abc;test;;", ";def"});
});
}
[Test]
public void TestLineWithEscapedSpace ()
{
string[] lines = new string[] { " %20%20abc%20test ", " def%20%20" };
CreateProjectAndCheck (full_filepath, lines, false, true, delegate () {
CheckFileExists (full_filepath, true);
CheckLines (full_filepath, new string [] {" abc test", "def "});
});
}
[Test]
public void TestNoOverwrite ()
{
@@ -210,7 +230,7 @@ namespace MonoTests.Microsoft.Build.Tasks {
string[] actual = File.ReadAllLines (full_filepath);
Assert.AreEqual (expected != null ? expected.Length : 0, actual.Length, "Number of lines written don't match");
if (expected != null)
if (expected == null)
return;
int i = 0;
foreach (string line in actual)
@@ -8,6 +8,7 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.Utilities.dll
LIBRARY_NAME = Microsoft.Build.Utilities$(NAME_SUFFIX).dll
LIB_REFS = System System.Core System.Xml
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll \
@@ -19,12 +19,13 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -32,7 +33,7 @@
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -47,7 +48,6 @@
<Compile Include="..\..\build\common\Consts.cs" />
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
<Compile Include="..\..\tools\xbuild\XBuildConsts.cs" />
<Compile Include="..\System\System.Collections.Specialized\ProcessStringDictionary.cs" />
<Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="Microsoft.Build.Utilities\AppDomainIsolatedTask.cs" />
<Compile Include="Microsoft.Build.Utilities\CommandLineBuilder.cs" />
@@ -55,6 +55,7 @@
<Compile Include="Microsoft.Build.Utilities\IAsyncOperation.cs" />
<Compile Include="Microsoft.Build.Utilities\IProcessAsyncOperation.cs" />
<Compile Include="Microsoft.Build.Utilities\Logger.cs" />
<Compile Include="Microsoft.Build.Utilities\MSBuildErrorParser.cs" />
<Compile Include="Microsoft.Build.Utilities\ProcessService.cs" />
<Compile Include="Microsoft.Build.Utilities\ProcessWrapper.cs" />
<Compile Include="Microsoft.Build.Utilities\TargetDotNetFrameworkVersion.cs" />
@@ -74,9 +75,13 @@
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
@@ -85,17 +90,25 @@
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
<Name>corlib\corlib-net_4_5</Name>
<Name>corlib-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
<Name>System\System-net_4_5-2</Name>
<ProjectReference Include="../System/System-net_4_5.csproj">
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
<Name>System-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12.csproj">
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
<Name>System.Core-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
<Name>System.Xml-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-xbuild_12.csproj">
<Project>{A5C3FA16-6C9E-4B57-9476-78E959BBC338}</Project>
<Name>Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12</Name>
<Name>Microsoft.Build.Framework-xbuild_12</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -173,7 +173,7 @@ namespace Microsoft.Build.Utilities
}
public override string ToString ()
{
return escapedItemSpec;
return ItemSpec;
}
public string ItemSpec {
+1
View File
@@ -7,6 +7,7 @@ include $(XBUILD_DIR)/xbuild.make
LIBRARY = Microsoft.Build.dll
LIB_REFS = System System.Core System.Xml Microsoft.Build.Engine Microsoft.Build.Framework
LIB_MCS_FLAGS = \
/r:$(corlib) \
/r:System.dll \
@@ -19,12 +19,13 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12;MICROSOFT_BUILD_DLL</DefineConstants>
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE;MICROSOFT_BUILD_DLL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -32,7 +33,7 @@
<DebugType>pdbonly</DebugType>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;XBUILD_12;MICROSOFT_BUILD_DLL</DefineConstants>
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;XBUILD_12;MONO;DISABLE_CAS_USE;MICROSOFT_BUILD_DLL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
@@ -162,9 +163,13 @@
</Target>
-->
<PropertyGroup>
<PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
</PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
</PostBuildEvent>
@@ -173,29 +178,29 @@
</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
<Name>corlib\corlib-net_4_5</Name>
<Name>corlib-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
<Name>System\System-net_4_5-2</Name>
<ProjectReference Include="../System/System-net_4_5.csproj">
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
<Name>System-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
<Name>System.Core\System.Core-net_4_5</Name>
<Name>System.Core-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
<Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
<Name>System.XML\System.Xml-net_4_5-1</Name>
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
<Name>System.Xml-net_4_5</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Engine\Microsoft.Build.Engine-xbuild_12.csproj">
<ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-xbuild_12.csproj">
<Project>{AA157F9D-4256-45F3-A07F-55E8E7E61A07}</Project>
<Name>Microsoft.Build.Engine\Microsoft.Build.Engine-xbuild_12</Name>
<Name>Microsoft.Build.Engine-xbuild_12</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12.csproj">
<ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-xbuild_12.csproj">
<Project>{A5C3FA16-6C9E-4B57-9476-78E959BBC338}</Project>
<Name>Microsoft.Build.Framework\Microsoft.Build.Framework-xbuild_12</Name>
<Name>Microsoft.Build.Framework-xbuild_12</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
@@ -115,8 +115,7 @@
<IISUrl>http://localhost:18572/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<CustomServerUrl></CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
+2 -1
View File
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = Microsoft.CSharp.dll
LIB_MCS_FLAGS = -r:System.Core.dll -r:Mono.CSharp.dll
LIB_REFS = System.Core Mono.CSharp
LIB_MCS_FLAGS =
include ../../build/library.make
+2 -1
View File
@@ -3,7 +3,8 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = Microsoft.VisualC.dll
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
LIB_REFS = System
LIB_MCS_FLAGS = /r:$(corlib)
NO_TEST = yes
include ../../build/library.make
@@ -3,9 +3,8 @@ SUBDIRS =
include ../../build/rules.make
LIBRARY = Microsoft.Web.Infrastructure.dll
LIB_MCS_FLAGS = -r:System.dll \
-r:System.Configuration.dll \
-r:System.Web.dll
LIB_REFS = System System.Configuration System.Web
LIB_MCS_FLAGS =
EXTRA_DISTFILES = $(RESOURCE_FILES)
+1 -1
View File
@@ -120,4 +120,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</Project>
</Project>
+2 -1
View File
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = Mono.C5.dll
LIBRARY_SNK = c5.snk
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll -nowarn:169,219,414,1030,3001,3005,3006
LIB_REFS = System
LIB_MCS_FLAGS = /r:$(corlib) -nowarn:169,219,414,1030,3001,3005,3006
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
EXTRA_DISTFILES = \
+1 -1
View File
@@ -136,4 +136,4 @@
<VisualStudio>
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
+27 -27
View File
@@ -1,27 +1,27 @@
# Makefile for C5 book examples
USERGUIDEFILES= Anagrams.cs Antipatterns.cs CollectionSanity.cs EventPatterns.cs \
Fileindex.cs GConvexHull.cs GNfaToDfa.cs GettingStarted.cs \
Graph.cs Graphcopy.cs HashCodes.cs Jobqueue.cs \
KeywordRecognition.cs ListPatterns.cs ListPatterns.cs \
Locking.cs MultiDictionary.cs PointLocation.cs \
RandomSelection.cs ReadOnlyPatterns.cs Sets.cs \
SortedIterationPatterns.cs SortedIterationPatterns.cs \
SortingPermutation.cs Toposort.cs ViewPatterns.cs WrappedArray.cs
all: c5examples.zip
c5examples.zip: ${USERGUIDEFILES}
rm -f C5.examples.zip
zip C5.examples.zip ${USERGUIDEFILES}
clean:
rm -f C5.examples.zip
rm -f *.dot
rm -f *.exe
rm -f *.ps
rm -f *.eps
.SUFFIXES :
.SUFFIXES : .cs
# Makefile for C5 book examples
USERGUIDEFILES= Anagrams.cs Antipatterns.cs CollectionSanity.cs EventPatterns.cs \
Fileindex.cs GConvexHull.cs GNfaToDfa.cs GettingStarted.cs \
Graph.cs Graphcopy.cs HashCodes.cs Jobqueue.cs \
KeywordRecognition.cs ListPatterns.cs ListPatterns.cs \
Locking.cs MultiDictionary.cs PointLocation.cs \
RandomSelection.cs ReadOnlyPatterns.cs Sets.cs \
SortedIterationPatterns.cs SortedIterationPatterns.cs \
SortingPermutation.cs Toposort.cs ViewPatterns.cs WrappedArray.cs
all: c5examples.zip
c5examples.zip: ${USERGUIDEFILES}
rm -f C5.examples.zip
zip C5.examples.zip ${USERGUIDEFILES}
clean:
rm -f C5.examples.zip
rm -f *.dot
rm -f *.exe
rm -f *.ps
rm -f *.eps
.SUFFIXES :
.SUFFIXES : .cs
@@ -107,4 +107,4 @@
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
</Project>
</Project>
+2 -1
View File
@@ -4,7 +4,8 @@ include ../../build/rules.make
LIBRARY = Mono.CSharp.dll
LIB_MCS_FLAGS = -r:System.Core.dll -r:System.Xml.dll -r:System.dll
LIB_REFS = System.Core System.Xml System
LIB_MCS_FLAGS =
MOBILE_STATIC := $(filter mobile_static monotouch, $(PROFILE))
+1 -1
View File
@@ -262,4 +262,4 @@
<PropertyGroup>
<PreBuildEvent>"$(ProjectDir)..\..\jay\jay" -cvt &lt; "$(ProjectDir)..\..\jay\skeleton.cs" "$(ProjectDir)..\..\mcs\cs-parser.jay" &gt; "$(ProjectDir)cs-parser.cs"</PreBuildEvent>
</PropertyGroup>
</Project>
</Project>
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
Loaded 100 of 3508 files, more files were not shown because too many files have changed in this diff. Show more