Merge pull request #1068 from esdrubal/bug18421
authorJérémie Laval <jeremie.laval@gmail.com>
Fri, 30 May 2014 18:50:35 +0000 (14:50 -0400)
committerJérémie Laval <jeremie.laval@gmail.com>
Fri, 30 May 2014 18:50:35 +0000 (14:50 -0400)
Changed ConcurrentQueue to remove last ref/value. Fixes 18421

315 files changed:
.gitattributes
Makefile.am
autogen.sh
build-mingw32.sh
configure.ac [new file with mode: 0644]
configure.in [deleted file]
libgc/Makefile.direct
libgc/README.Mono
libgc/autogen.sh
libgc/configure.ac [new file with mode: 0644]
libgc/configure.in [deleted file]
libgc/doc/README
libgc/doc/README.changes
libgc/finalize.c
libgc/include/gc.h
libgc/version.h
mcs/build/tests.make
mcs/class/Accessibility/Accessibility-net_4_5.csproj
mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_5.csproj
mcs/class/Cscompmgd/Cscompmgd-net_4_5.csproj
mcs/class/CustomMarshalers/CustomMarshalers-net_4_5.csproj
mcs/class/EntityFramework.SqlServer/EntityFramework.SqlServer-net_4_5.csproj
mcs/class/EntityFramework/EntityFramework-net_4_5.csproj
mcs/class/Facades/Makefile
mcs/class/Facades/System.Collections.Concurrent/System.Collections.Concurrent-net_4_5.csproj
mcs/class/Facades/System.Collections/System.Collections-net_4_5.csproj
mcs/class/Facades/System.ComponentModel.Annotations/System.ComponentModel.Annotations-net_4_5.csproj
mcs/class/Facades/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync-net_4_5.csproj
mcs/class/Facades/System.ComponentModel/System.ComponentModel-net_4_5.csproj
mcs/class/Facades/System.Diagnostics.Contracts/System.Diagnostics.Contracts-net_4_5.csproj
mcs/class/Facades/System.Diagnostics.Debug/System.Diagnostics.Debug-net_4_5.csproj
mcs/class/Facades/System.Diagnostics.Tools/System.Diagnostics.Tools-net_4_5.csproj
mcs/class/Facades/System.Diagnostics.Tracing/System.Diagnostics.Tracing-net_4_5.csproj
mcs/class/Facades/System.Dynamic.Runtime/System.Dynamic.Runtime-net_4_5.csproj
mcs/class/Facades/System.Globalization/System.Globalization-net_4_5.csproj
mcs/class/Facades/System.IO/System.IO-net_4_5.csproj
mcs/class/Facades/System.Linq.Expressions/System.Linq.Expressions-net_4_5.csproj
mcs/class/Facades/System.Linq.Parallel/System.Linq.Parallel-net_4_5.csproj
mcs/class/Facades/System.Linq.Queryable/System.Linq.Queryable-net_4_5.csproj
mcs/class/Facades/System.Linq/System.Linq-net_4_5.csproj
mcs/class/Facades/System.Net.NetworkInformation/System.Net.NetworkInformation-net_4_5.csproj
mcs/class/Facades/System.Net.Primitives/System.Net.Primitives-net_4_5.csproj
mcs/class/Facades/System.Net.Requests/System.Net.Requests-net_4_5.csproj
mcs/class/Facades/System.ObjectModel/System.ObjectModel-net_4_5.csproj
mcs/class/Facades/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration-net_4_5.csproj
mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight-net_4_5.csproj
mcs/class/Facades/System.Reflection.Emit/System.Reflection.Emit-net_4_5.csproj
mcs/class/Facades/System.Reflection.Extensions/System.Reflection.Extensions-net_4_5.csproj
mcs/class/Facades/System.Reflection.Primitives/System.Reflection.Primitives-net_4_5.csproj
mcs/class/Facades/System.Reflection/System.Reflection-net_4_5.csproj
mcs/class/Facades/System.Resources.ResourceManager/System.Resources.ResourceManager-net_4_5.csproj
mcs/class/Facades/System.Runtime.Extensions/System.Runtime.Extensions-net_4_5.csproj
mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/System.Runtime.InteropServices.WindowsRuntime-net_4_5.csproj
mcs/class/Facades/System.Runtime.InteropServices/System.Runtime.InteropServices-net_4_5.csproj
mcs/class/Facades/System.Runtime.Numerics/System.Runtime.Numerics-net_4_5.csproj
mcs/class/Facades/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json-net_4_5.csproj
mcs/class/Facades/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives-net_4_5.csproj
mcs/class/Facades/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml-net_4_5.csproj
mcs/class/Facades/System.Runtime/System.Runtime-net_4_5.csproj
mcs/class/Facades/System.Security.Principal/System.Security.Principal-net_4_5.csproj
mcs/class/Facades/System.ServiceModel.Http/System.ServiceModel.Http-net_4_5.csproj
mcs/class/Facades/System.ServiceModel.Primitives/System.ServiceModel.Primitives-net_4_5.csproj
mcs/class/Facades/System.ServiceModel.Security/AssemblyInfo.cs [new file with mode: 0644]
mcs/class/Facades/System.ServiceModel.Security/Makefile [new file with mode: 0644]
mcs/class/Facades/System.ServiceModel.Security/System.ServiceModel.Security.dll.sources [new file with mode: 0644]
mcs/class/Facades/System.ServiceModel.Security/TypeForwarders.cs [new file with mode: 0644]
mcs/class/Facades/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions-net_4_5.csproj
mcs/class/Facades/System.Text.Encoding/System.Text.Encoding-net_4_5.csproj
mcs/class/Facades/System.Text.RegularExpressions/System.Text.RegularExpressions-net_4_5.csproj
mcs/class/Facades/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel-net_4_5.csproj
mcs/class/Facades/System.Threading.Tasks/System.Threading.Tasks-net_4_5.csproj
mcs/class/Facades/System.Threading.Timer/System.Threading.Timer-net_4_5.csproj
mcs/class/Facades/System.Threading/System.Threading-net_4_5.csproj
mcs/class/Facades/System.Xml.ReaderWriter/System.Xml.ReaderWriter-net_4_5.csproj
mcs/class/Facades/System.Xml.XDocument/System.Xml.XDocument-net_4_5.csproj
mcs/class/Facades/System.Xml.XmlSerializer/System.Xml.XmlSerializer-net_4_5.csproj
mcs/class/I18N/CJK/I18N.CJK-net_4_5.csproj
mcs/class/I18N/Common/I18N-net_4_5.csproj
mcs/class/I18N/MidEast/I18N.MidEast-net_4_5.csproj
mcs/class/I18N/Other/I18N.Other-net_4_5.csproj
mcs/class/I18N/Rare/I18N.Rare-net_4_5.csproj
mcs/class/I18N/West/I18N.West-net_4_5.csproj
mcs/class/IBM.Data.DB2/IBM.Data.DB2-net_4_5.csproj
mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_5.csproj
mcs/class/Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj
mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj
mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AL.cs
mcs/class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks/ALTest.cs
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_5.csproj
mcs/class/Microsoft.Build/Microsoft.Build-net_4_5.csproj
mcs/class/Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj
mcs/class/Microsoft.VisualC/Microsoft.VisualC-net_4_5.csproj
mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj
mcs/class/Mono.C5/Mono.C5-net_4_5.csproj
mcs/class/Mono.CSharp/Mono.CSharp-net_4_5.csproj
mcs/class/Mono.CSharp/Test/Evaluator/TypesTest.cs
mcs/class/Mono.Cairo/Mono.Cairo-net_4_5.csproj
mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_5.csproj
mcs/class/Mono.Cecil/Mono.Cecil-net_4_5.csproj
mcs/class/Mono.CodeContracts/Mono.CodeContracts-net_4_5.csproj
mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter-net_4_5.csproj
mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_5.csproj
mcs/class/Mono.Data.Tds/Mono.Data.Tds-net_4_5.csproj
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft-net_4_5.csproj
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/Connection.cs
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/ObjectMirror.cs
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/ThreadMirror.cs
mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft/VirtualMachine.cs
mcs/class/Mono.Http/Mono.Http-net_4_5.csproj
mcs/class/Mono.Management/Mono.Management-net_4_5.csproj
mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ-net_4_5.csproj
mcs/class/Mono.Messaging/Mono.Messaging-net_4_5.csproj
mcs/class/Mono.Options/Mono.Options-net_4_5.csproj
mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
mcs/class/Mono.Posix/Mono.Posix-net_4_5.csproj
mcs/class/Mono.Security.Win32/Mono.Security.Win32-net_4_5.csproj
mcs/class/Mono.Security/Mono.Security-net_4_5.csproj
mcs/class/Mono.Security/Mono.Security-tests-net_2_0.csproj
mcs/class/Mono.Security/Mono.Security-tests-net_4_0.csproj
mcs/class/Mono.Security/Mono.Security-tests-net_4_5.csproj
mcs/class/Mono.Security/Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtension.cs
mcs/class/Mono.Security/Mono.Security.X509.Extensions/SubjectKeyIdentifierExtension.cs
mcs/class/Mono.Security/Mono.Security_test.dll.sources
mcs/class/Mono.Security/Test/Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtensionTest.cs [new file with mode: 0644]
mcs/class/Mono.Security/Test/Mono.Security.X509.Extensions/SubjectKeyIdentifierExtensionTest.cs [new file with mode: 0644]
mcs/class/Mono.Simd/Mono.Simd-net_4_5.csproj
mcs/class/Mono.Tasklets/Mono.Tasklets-net_4_5.csproj
mcs/class/Mono.WebBrowser/Mono.WebBrowser-net_4_5.csproj
mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_5.csproj
mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_5.csproj
mcs/class/Npgsql/Npgsql-net_4_5.csproj
mcs/class/PEAPI/PEAPI-net_4_5.csproj
mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen-net_4_5.csproj
mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_5.csproj
mcs/class/System.ComponentModel.Composition/System.ComponentModel.Composition-net_4_5.csproj
mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj
mcs/class/System.Configuration.Install/System.Configuration.Install-net_4_5.csproj
mcs/class/System.Configuration/Makefile
mcs/class/System.Configuration/System.Configuration-net_4_5.csproj
mcs/class/System.Core/System.Core-net_4_5.csproj
mcs/class/System.Core/System.Core-plaincore-net_4_5.csproj
mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions-net_4_5.csproj
mcs/class/System.Data.Linq/System.Data.Linq-net_4_5.csproj
mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_5.csproj
mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_5.csproj
mcs/class/System.Data.Services/System.Data.Services-net_4_5.csproj
mcs/class/System.Data/System.Data-net_4_5.csproj
mcs/class/System.Design/System.Design-net_4_5.csproj
mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols-net_4_5.csproj
mcs/class/System.DirectoryServices/System.DirectoryServices-net_4_5.csproj
mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj
mcs/class/System.Drawing/System.Drawing-net_4_5.csproj
mcs/class/System.Dynamic/System.Dynamic-net_4_5.csproj
mcs/class/System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj
mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem-net_4_5.csproj
mcs/class/System.IO.Compression/System.IO.Compression-net_4_5.csproj
mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_5.csproj
mcs/class/System.IdentityModel/System.IdentityModel-net_4_5.csproj
mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_5.csproj
mcs/class/System.Json/System.Json-net_4_5.csproj
mcs/class/System.Management/System.Management-net_4_5.csproj
mcs/class/System.Messaging/System.Messaging-net_4_5.csproj
mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj
mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest-net_4_5.csproj
mcs/class/System.Net.Http/System.Net.Http-net_4_5.csproj
mcs/class/System.Net/System.Net-net_4_5.csproj
mcs/class/System.Numerics/System.Numerics-net_4_5.csproj
mcs/class/System.Reactive.Core/System.Reactive.Core-net_4_5.csproj
mcs/class/System.Reactive.Debugger/System.Reactive.Debugger-net_4_5.csproj
mcs/class/System.Reactive.Experimental/System.Reactive.Experimental-net_4_5.csproj
mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj
mcs/class/System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj
mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases-net_4_5.csproj
mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices-net_4_5.csproj
mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj
mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting-net_4_5.csproj
mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms-net_4_5.csproj
mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading-net_4_5.csproj
mcs/class/System.Runtime.Caching/System.Runtime.Caching-net_4_5.csproj
mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing-net_4_5.csproj
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_5.csproj
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpServerChannel.cs
mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/RemotingThreadPool.cs
mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs
mcs/class/System.Security/System.Security-net_4_5.csproj
mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj
mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_5.csproj
mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing-net_4_5.csproj
mcs/class/System.ServiceModel.Web/System.Runtime.Serialization.Json/JsonSerializationWriter.cs
mcs/class/System.ServiceModel.Web/System.ServiceModel.Web-net_4_5.csproj
mcs/class/System.ServiceModel.Web/Test/System.Runtime.Serialization.Json/DataContractJsonSerializerTest.cs
mcs/class/System.ServiceModel/System.ServiceModel-net_4_5.csproj
mcs/class/System.ServiceModel/System.ServiceModel-plainservice-net_4_5.csproj
mcs/class/System.ServiceProcess/System.ServiceProcess-net_4_5.csproj
mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow-net_4_5.csproj
mcs/class/System.Transactions/System.Transactions-net_4_5.csproj
mcs/class/System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj
mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj
mcs/class/System.Web.DynamicData/System.Web.DynamicData-net_4_5.csproj
mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design-net_4_5.csproj
mcs/class/System.Web.Extensions/System.Web.Extensions-net_4_5.csproj
mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost-net_4_5.csproj
mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost-net_4_5.csproj
mcs/class/System.Web.Http/System.Web.Http-net_4_5.csproj
mcs/class/System.Web.Mvc2/System.Web.Mvc2-net_4_5.csproj
mcs/class/System.Web.Mvc3/System.Web.Mvc3-net_4_5.csproj
mcs/class/System.Web.Razor/System.Web.Razor-net_4_5.csproj
mcs/class/System.Web.Routing/System.Web.Routing-net_4_5.csproj
mcs/class/System.Web.Services/System.Web.Services-net_4_5.csproj
mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_5.csproj
mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_5.csproj
mcs/class/System.Web.WebPages/System.Web.WebPages-net_4_5.csproj
mcs/class/System.Web/System.Web-net_4_5.csproj
mcs/class/System.Web/System.Web-plainweb-net_4_5.csproj
mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization-net_4_5.csproj
mcs/class/System.Windows/System.Windows-net_4_5.csproj
mcs/class/System.XML/Makefile
mcs/class/System.XML/System.Xml-bare-net_4_5.csproj
mcs/class/System.XML/System.Xml-net_4_5.csproj
mcs/class/System.XML/System.Xml.XPath/.gitignore
mcs/class/System.Xaml/System.Xaml-net_4_5.csproj
mcs/class/System.Xml.Linq/System.Xml.Linq-net_4_5.csproj
mcs/class/System.Xml.Serialization/System.Xml.Serialization-net_4_5.csproj
mcs/class/System/System-bare-net_4_5.csproj
mcs/class/System/System-net_4_5.csproj
mcs/class/System/System-secxml-net_4_5.csproj
mcs/class/System/System.Net/HttpWebRequest.cs
mcs/class/System/System.Net/MacProxy.cs
mcs/class/System/System.Net/SimpleAsyncResult.cs
mcs/class/System/System.Net/WebConnectionStream.cs
mcs/class/System/System.Security.Cryptography.X509Certificates/OSX509Certificates.cs
mcs/class/SystemWebTestShim/SystemWebTestShim-net_4_5.csproj
mcs/class/WebMatrix.Data/WebMatrix.Data-net_4_5.csproj
mcs/class/WindowsBase/WindowsBase-net_4_5.csproj
mcs/class/corlib/System.Collections.Concurrent/ConcurrentDictionary.cs
mcs/class/corlib/System.IO/FileInfo.cs
mcs/class/corlib/System.Security.Claims/ClaimsIdentity.cs
mcs/class/corlib/System/Console.iOS.cs
mcs/class/corlib/System/Environment.cs
mcs/class/corlib/Test/System.Collections.Concurrent/ConcurrentDictionaryTests.cs
mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
mcs/class/corlib/corlib-net_4_5.csproj
mcs/class/monodoc/monodoc-net_4_5.csproj
mcs/errors/cs0545-2.cs [new file with mode: 0644]
mcs/errors/cs0546-2.cs [new file with mode: 0644]
mcs/errors/cs1501-16.cs [new file with mode: 0644]
mcs/errors/cs1593-5.cs [new file with mode: 0644]
mcs/errors/cs1617.cs
mcs/errors/cs1644-35.cs [new file with mode: 0644]
mcs/mcs/assembly.cs
mcs/mcs/codegen.cs
mcs/mcs/cs-parser.jay
mcs/mcs/ecore.cs
mcs/mcs/eval.cs
mcs/mcs/expression.cs
mcs/mcs/field.cs
mcs/mcs/mcs-net_4_5.csproj
mcs/mcs/property.cs
mcs/mcs/settings.cs
mcs/mcs/statement.cs
mcs/mcs/typespec.cs
mcs/tests/gtest-etree-01.cs
mcs/tests/gtest-optional-31.cs [new file with mode: 0644]
mcs/tests/test-833.cs
mcs/tests/test-859.cs [new file with mode: 0644]
mcs/tests/test-892.cs [new file with mode: 0644]
mcs/tests/test-893.cs [new file with mode: 0644]
mcs/tests/test-xml-063-ref.xml
mcs/tests/test-xml-063.cs
mcs/tests/ver-il-net_4_5.xml
mcs/tools/msbuild/Main.cs
mcs/tools/msbuild/Makefile
mcs/tools/msbuild/SolutionParser.cs
mcs/tools/msbuild/data/msbuild.rsp [new file with mode: 0644]
mono/io-layer/io.c
mono/metadata/Makefile.am.in
mono/metadata/boehm-gc.c
mono/metadata/gc-internal.h
mono/metadata/icall.c
mono/metadata/reflection.c
mono/metadata/sgen-alloc.c
mono/metadata/sgen-gc.c
mono/metadata/sgen-gc.h
mono/metadata/sgen-new-bridge.c
mono/metadata/sgen-nursery-allocator.c
mono/metadata/sgen-old-bridge.c
mono/metadata/sgen-tarjan-bridge.c
mono/metadata/threads.c
mono/metadata/verify.c
mono/mini/debugger-agent.c
mono/mini/exceptions-amd64.c
mono/mini/mini-codegen.c
mono/mini/mini-llvm.c
mono/mini/mini.h
mono/profiler/decode.c
mono/profiler/proflog.c
mono/tests/Makefile.am
mono/tests/reflection-load-with-context-lib.cs [new file with mode: 0644]
mono/tests/reflection-load-with-context-second-lib.cs [new file with mode: 0644]
mono/tests/reflection-load-with-context.cs [new file with mode: 0644]
mono/utils/atomic.h
mono/utils/gc_wrapper.h
mono/utils/mono-context.h
mono/utils/mono-counters.c
mono/utils/mono-semaphore.c
mono/utils/mono-threads-mach-helper.c
mono/utils/strtod.c
msvc/scripts/csproj.tmpl
msvc/scripts/genproj.cs
support/stdio.c
winconfig.h

index c7e0c474a2dcaab7cec15a4004a7f66ffa893f44..5c4cb01ff15ecaa8cc8e61dd4101ee6985956522 100644 (file)
@@ -1,5 +1,5 @@
 # ensure LF endings on all checkouts
-configure.in crlf=input
+configure.ac crlf=input
 
 # ensure native line endings on checkout
 *.c    crlf
index 30f8cdef0f477fde761d3e515ed5b9faf9aa343e..aa4bd78da9fb33e04fc70cc0b4ea1b5de863da99 100644 (file)
@@ -160,9 +160,9 @@ package-inputs:
        done
        echo "</root>" >> msvc/scripts/order.xml
 
-# Update llvm version in configure.in to the output of $LLVM_DIR/bin/llvm-config --version
+# Update llvm version in configure.ac to the output of $LLVM_DIR/bin/llvm-config --version
 update-llvm-version:
        if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
-       REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.in > tmp && mv tmp configure.in && echo "Version set to $$REV."
+       REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
 
 
index a576ed6672afab5a9697e610ce8b6a9e0265b208..5213ecffd3c8f41d5c323cbbb2104d1a4663380f 100755 (executable)
@@ -37,7 +37,7 @@ if [ -z "$LIBTOOL" ]; then
   fi
 fi
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
   ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed to compile Mono."
@@ -47,8 +47,8 @@ fi
   }
 }
 
-grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
-  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
+grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
+  grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`gettext' installed to compile Mono."
@@ -95,7 +95,7 @@ xlc )
 esac
 
 
-if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
   if test -z "$NO_LIBTOOLIZE" ; then 
     echo "Running libtoolize..."
     ${LIBTOOL}ize --force --copy
@@ -138,7 +138,7 @@ aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
   exit 1
 }
 
-if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
   echo "Running autoheader..."
   autoheader || { echo "**Error**: autoheader failed."; exit 1; }
 fi
index 8bcb5ff973c1eb516b0550121872b754aef841ee..4c8ed8c1dc4f6e04ae258737d01c76442172c609 100755 (executable)
@@ -57,7 +57,7 @@ function setup ()
     CROSS_DLL_DIR="$CROSS_DIR/bin"
     PATH=$CROSS_BIN_DIR:$PATH
 
-    MONO_VERSION=`grep AC_INIT configure.in | cut -d ',' -f 2|tr -d '\[ \]'`
+    MONO_VERSION=`grep AC_INIT configure.ac | cut -d ',' -f 2|tr -d '\[ \]'`
     
     if [ -d ./.git ]; then
        MONO_GIT_COMMIT="`git log -1 --format=format:%t`"
diff --git a/configure.ac b/configure.ac
new file mode 100644 (file)
index 0000000..1dbacb7
--- /dev/null
@@ -0,0 +1,3791 @@
+# Process this file with autoconf to produce a configure script.
+#AC_PREREQ([2.62])
+
+AC_INIT(mono, [3.6.1],
+        [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
+
+AC_CONFIG_SRCDIR([README.md])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CANONICAL_SYSTEM
+AC_CANONICAL_HOST
+
+# Gross hack to enable 'make dist' on automake 1.9+tar 1.14.
+# The extra brackets are to foil regex-based scans.
+m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
+
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign subdir-objects])
+AC_CONFIG_HEADERS([config.h])
+AM_MAINTAINER_MODE
+
+API_VER=2.0
+AC_SUBST(API_VER)
+
+AC_PROG_LN_S
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+case $host_os in
+*cygwin* )
+                echo "Run configure using ./configure --host=i686-pc-mingw32"
+                exit 1
+esac
+
+# In case of cygwin, override LN_S, irrespective of what it determines.
+# The build uses cygwin, but the actual runtime doesn't.
+case $host_os in
+*cygwin* ) LN_S='cp -p';;
+esac
+
+dnl
+dnl libgc checks
+dnl
+
+gc_headers=no
+gc=included
+gc_msg="included Boehm"
+use_included_gc=no
+libgc_configure_args=
+
+if test -d $srcdir/libgc ; then
+  gc_default=included
+else
+  gc_default=boehm
+fi
+
+# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
+# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0
+CPPFLAGS_FOR_LIBGC=$CPPFLAGS
+CFLAGS_FOR_LIBGC=$CFLAGS
+CPPFLAGS_FOR_EGLIB=$CPPFLAGS
+CFLAGS_FOR_EGLIB=$CFLAGS
+
+#
+# These are the flags that need to be stored in the mono.pc file for 
+# compiling code that will embed Mono
+#
+libmono_cflags=""
+libmono_ldflags=""
+AC_SUBST(libmono_cflags)
+AC_SUBST(libmono_ldflags)
+
+# Variable to have relocatable .pc files (lib, or lib64)
+reloc_libdir=`basename ${libdir}`
+AC_SUBST(reloc_libdir)
+
+dnl if linker handles the version script
+no_version_script=no
+
+# Set to yes if Unix sockets cannot be created in an anonymous namespace
+need_link_unlink=no
+
+#Set to extra linker flags to be passed to the runtime binaries (mono /mono-sgen)
+extra_runtime_ldflags=""
+
+# Thread configuration inspired by sleepycat's db
+AC_MSG_CHECKING([host platform characteristics])
+libgc_threads=no
+has_dtrace=no
+parallel_mark=yes
+ikvm_native=yes
+
+case "$host" in
+       powerpc*-*-linux*)
+               # https://bugzilla.novell.com/show_bug.cgi?id=504411
+               disable_munmap=yes
+       ;;
+esac
+
+host_win32=no
+target_win32=no
+platform_android=no
+platform_darwin=no
+case "$host" in
+       *-mingw*|*-*-cygwin*)
+               AC_DEFINE(HOST_WIN32,1,[Host Platform is Win32])
+               AC_DEFINE(DISABLE_PORTABILITY,1,[Disable the io-portability layer])
+               AC_DEFINE(PLATFORM_NO_SYMLINKS,1,[This platform does not support symlinks])
+               host_win32=yes
+               mono_cv_clang=no
+               if test "x$cross_compiling" = "xno"; then
+                       target_win32=yes
+                       if test "x$host" == "x$build" -a "x$host" == "x$target"; then
+                               AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32])
+                       fi
+               else
+                       target_win32=yes
+                       AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32/MinGW])
+                       AC_DEFINE(MINGW_CROSS_COMPILE,1,[Cross-compiling using MinGW])
+               fi
+               HOST_CC="gcc"
+               # Windows 2000 is required that includes Internet Explorer 5.01
+               CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
+               LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32"
+               libmono_cflags="-mms-bitfields -mwindows"
+               libmono_ldflags="-mms-bitfields -mwindows"
+               libdl=
+               libgc_threads=win32
+               gc_default=included
+               with_sigaltstack=no
+               LN_S=cp
+               # This forces libgc to use the DllMain based thread registration code on win32
+               libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes"
+               ;;
+       *-*-*netbsd*)
+               host_win32=no
+               CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
+               libmono_cflags="-D_REENTRANT"
+               LDFLAGS="$LDFLAGS -pthread"
+               CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
+               libmono_ldflags="-pthread"
+               need_link_unlink=yes
+               libdl="-ldl"
+               libgc_threads=pthreads
+               with_sigaltstack=no
+               use_sigposix=yes
+               ;;
+       *-*-*freebsd*)
+               host_win32=no
+               if test "x$PTHREAD_CFLAGS" = "x"; then
+                       CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
+                       libmono_cflags=
+               else
+                       CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
+                       libmono_cflags="$PTHREAD_CFLAGS"
+               fi
+               if test "x$PTHREAD_LIBS" = "x"; then
+                       LDFLAGS="$LDFLAGS -pthread -L/usr/local/lib"
+                       libmono_ldflags="-pthread"
+               else
+                       LDFLAGS="$LDFLAGS $PTHREAD_LIBS -L/usr/local/lib"
+                       libmono_ldflags="$PTHREAD_LIBS"
+               fi
+               CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
+               need_link_unlink=yes
+               AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
+               libdl=
+               libgc_threads=pthreads
+               use_sigposix=yes
+               has_dtrace=yes
+               ;;
+       *-*-*openbsd*)
+               host_win32=no
+               CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DPLATFORM_BSD -D_REENTRANT -DUSE_MMAP"
+               if test "x$disable_munmap" != "xyes"; then
+               CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
+               fi
+               libmono_cflags="-D_THREAD_SAFE -D_REENTRANT"
+               LDFLAGS="$LDFLAGS -pthread"
+               need_link_unlink=yes
+               AC_DEFINE(PTHREAD_POINTER_ID)
+               libdl=
+               gc_default=boehm
+               libgc_threads=pthreads
+               with_sigaltstack=no
+               use_sigposix=yes
+               ;;
+       *-*-linux-android*)
+               host_win32=no
+               platform_android=yes
+               AC_DEFINE(PLATFORM_ANDROID,1,[Targeting the Android platform])
+               AC_DEFINE(TARGET_ANDROID,1,[Targeting the Android platform])
+
+               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
+               if test "x$disable_munmap" != "xyes"; then
+                       CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
+               fi
+               libmono_cflags="-D_REENTRANT"
+               libdl="-ldl"
+               libgc_threads=pthreads
+               use_sigposix=yes
+
+               with_tls=pthread
+               with_sigaltstack=no
+               with_static_mono=no
+
+               # Android doesn't support boehm, as it's missing <link.h>
+               support_boehm=no
+               with_gc=sgen
+
+               # isinf(3) requires -lm; see isinf check below
+               LDFLAGS="$LDFLAGS -lm"
+
+               # Bionic's <pthread.h> sets PTHREAD_STACK_MIN=2*PAGE_SIZE; doesn't define
+               # PAGE_SIZE; breaks mono/io-layer/collection.c
+               # Bionic doesn't provide S_IWRITE; breaks io-layer/io.c
+               CFLAGS="$CFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
+               CXXFLAGS="$CXXFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
+
+               # The configure check can't detect this
+               AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support])
+
+               # to bypass the underscore linker check, can't work when cross-compiling
+               mono_cv_uscore=yes
+               mono_cv_clang=no
+               ;;
+       *-*-linux*)
+               host_win32=no
+               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
+               if test "x$disable_munmap" != "xyes"; then
+                       CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
+               fi
+               libmono_cflags="-D_REENTRANT"
+               libdl="-ldl"
+               libgc_threads=pthreads
+               use_sigposix=yes
+               if test "x$cross_compiling" != "xno"; then
+                       # to bypass the underscore linker check, not
+                       # available during cross-compilation
+                       mono_cv_uscore=no
+                fi
+               case "$host" in
+               aarch64-*)
+                       support_boehm=no
+                       with_gc=sgen
+                       ;;
+               esac
+               ;;
+       *-*-nacl*)
+               host_win32=no
+               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
+               if test "x$disable_munmap" != "xyes"; then
+                       CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
+               fi
+               libmono_cflags="-D_REENTRANT"
+               libdl=
+               libgc_threads=pthreads
+               gc_default=boehm
+               use_sigposix=yes
+               ikvm_native=no
+               AC_DEFINE(DISABLE_SOCKETS,1,[Disable sockets support])
+               AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
+               ;;
+       *-*-hpux*)
+               host_win32=no
+               CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT"
+               # +ESdbgasm only valid on bundled cc on RISC
+               # silently ignored for ia64
+               if test $GCC != "yes"; then
+                       CFLAGS="$CFLAGS +ESdbgasm"
+                       # Arrange for run-time dereferencing of null
+                       # pointers to produce a SIGSEGV signal.
+                       LDFLAGS="$LDFLAGS -z"
+               fi
+               CFLAGS="$CFLAGS +ESdbgasm"
+               LDFLAGS="$LDFLAGS -z"
+               libmono_cflags="-D_REENTRANT"
+               libmono_ldflags="-lpthread"
+               libgc_threads=pthreads
+               need_link_unlink=yes
+               use_sigposix=yes
+               ;;
+       *-*-solaris*)
+               host_win32=no
+               CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP -DPLATFORM_SOLARIS"
+               need_link_unlink=yes
+               libmono_cflags="-D_REENTRANT"
+               libgc_threads=pthreads
+               # This doesn't seem to work on solaris/x86, but the configure test runs
+               with_tls=pthread
+               has_dtrace=yes
+               use_sigposix=yes
+               enable_solaris_tar_check=yes
+               ;;
+       *-*-darwin*)
+               parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
+               host_win32=no
+               platform_darwin=yes
+               target_mach=yes
+               CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
+               CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
+               libmono_cflags="-D_THREAD_SAFE"
+               need_link_unlink=yes
+               AC_DEFINE(PTHREAD_POINTER_ID)
+               AC_DEFINE(USE_MACH_SEMA, 1, [...])
+               no_version_script=yes
+               libdl=
+               libgc_threads=pthreads
+               has_dtrace=yes
+               if test "x$cross_compiling" = "xyes"; then
+                       has_broken_apple_cpp=yes
+               fi
+               dnl Snow Leopard is horribly broken -- it reports itself as i386-apple-darwin*, but
+               dnl its gcc defaults to 64-bit mode.  They have also deprecated the usage of ucontext
+               dnl we need to set some flags to build our 32-bit binaries on 10.6 properly
+               case "$host" in
+                       dnl Snow Leopard and newer config.guess reports as this
+                       i*86-*-darwin*)
+                               BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE"
+                               BROKEN_DARWIN_CPPFLAGS="-D_XOPEN_SOURCE"
+                               CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_CPPFLAGS"
+                               CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS"
+                               CXXFLAGS="$CXXFLAGS $BROKEN_DARWIN_FLAGS"
+                               CCASFLAGS="$CCASFLAGS $BROKEN_DARWIN_FLAGS"
+                               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC $BROKEN_DARWIN_CPPFLAGS"
+                               CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC $BROKEN_DARWIN_FLAGS"
+                               CPPFLAGS_FOR_EGLIB="$CPPFLAGS_FOR_EGLIB $BROKEN_DARWIN_CPPFLAGS"
+                               CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB $BROKEN_DARWIN_FLAGS"
+                               ;;
+                       x*64-*-darwin*)
+                               ;;
+                       arm*-darwin*)
+                               has_dtrace=no
+                               ;;                      
+               esac
+               ;;
+       *-*-haiku*)
+               host_win32=no
+               CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_THREAD_SAFE"
+               libmono_cflags="-D_REENTRANT -D_THREAD_SAFE"
+               libdl=
+               LIBS="$LIBS -lnetwork"
+               need_link_unlink=yes
+               AC_DEFINE(PTHREAD_POINTER_ID)
+               libgc_threads=pthreads
+               use_sigposix=yes
+               ;;
+       *)
+               AC_MSG_WARN([*** Please add $host to configure.ac checks!])
+               host_win32=no
+               libdl="-ldl"
+               ;;
+esac
+AC_MSG_RESULT(ok)
+
+if test x$need_link_unlink = xyes; then
+   AC_DEFINE(NEED_LINK_UNLINK, 1, [Define if Unix sockets cannot be created in an anonymous namespace])
+fi
+
+AC_SUBST(extra_runtime_ldflags)
+AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes)
+AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes)
+AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
+AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
+AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
+AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes)
+
+AC_CHECK_TOOL(CC, gcc, gcc)
+AC_PROG_CC
+AC_CHECK_TOOL(CXX, g++, g++)
+AC_PROG_CXX
+AM_PROG_AS
+AC_PROG_INSTALL
+AC_PROG_AWK
+AM_PROG_CC_C_O
+dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
+: ${CCAS='$(CC)'}
+# Set ASFLAGS if not already set.
+: ${CCASFLAGS='$(CFLAGS)'}
+AC_SUBST(CCAS)
+AC_SUBST(CCASFLAGS)
+
+# AC_PROG_CXX helpfully sets CXX to g++ even if no c++ compiler is found so check
+# GXX instead. See http://lists.gnu.org/archive/html/bug-autoconf/2002-04/msg00056.html
+if test "x$CXX" = "xg++"; then
+       if test "x$GXX" != "xyes"; then
+               # automake/libtool is so broken, it requires g++ even if the c++ sources
+               # are inside automake conditionals
+               AC_MSG_ERROR([You need to install g++])
+       fi
+fi
+
+dnl may require a specific autoconf version
+dnl AC_PROG_CC_FOR_BUILD
+dnl CC_FOR_BUILD not automatically detected
+CC_FOR_BUILD=$CC
+CFLAGS_FOR_BUILD=$CFLAGS
+BUILD_EXEEXT=
+if test "x$cross_compiling" = "xyes"; then
+       CC_FOR_BUILD=cc
+       CFLAGS_FOR_BUILD=
+       BUILD_EXEEXT=""
+fi
+AC_SUBST(CC_FOR_BUILD)
+AC_SUBST(CFLAGS_FOR_BUILD)
+AC_SUBST(HOST_CC)
+AC_SUBST(BUILD_EXEEXT)
+
+AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
+AM_CONDITIONAL(USE_BATCH_FILES, [test x$host_win32 = xyes -a x$cross_compiling = xyes])
+
+# Set STDC_HEADERS
+AC_HEADER_STDC
+AC_LIBTOOL_WIN32_DLL
+# This causes monodis to not link correctly
+#AC_DISABLE_FAST_INSTALL
+AM_PROG_LIBTOOL
+# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
+DOLT
+
+export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+AC_SUBST(export_ldflags)
+
+# Test whenever ld supports -version-script
+AC_PROG_LD
+AC_PROG_LD_GNU
+if test "x$lt_cv_prog_gnu_ld" = "xno"; then
+   no_version_script=yes
+fi
+
+AM_ICONV()
+
+AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
+
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h libproc.h)
+AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h)
+AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h],
+                  [], [], [#include <stddef.h>
+                 #include <sys/socket.h>
+                 #include <linux/socket.h>])
+
+AC_CHECK_HEADERS(sys/user.h, [], [],
+[
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+])
+
+AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
+if test x$have_zlib = xyes; then
+   AC_TRY_COMPILE([#include <zlib.h>], [
+   #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)
+   return 0;
+   #else
+   #error No good zlib found
+   #endif
+   ],[
+       AC_MSG_RESULT(Using system zlib)
+       zlib_msg="system zlib"
+       AC_DEFINE(HAVE_SYS_ZLIB,1,[Have system zlib])
+   ],[
+       AC_MSG_RESULT(Using embedded zlib)
+       have_zlib=no
+       zlib_msg="bundled zlib"
+   ])
+fi
+
+AM_CONDITIONAL(HAVE_ZLIB, test x$have_zlib = xyes)
+AC_DEFINE(HAVE_ZLIB,1,[Have system zlib])
+
+# for mono/metadata/debug-symfile.c
+AC_CHECK_HEADERS(elf.h)
+
+# for support
+AC_CHECK_HEADERS(poll.h)
+AC_CHECK_HEADERS(sys/poll.h)
+AC_CHECK_HEADERS(sys/wait.h)
+AC_CHECK_HEADERS(grp.h)
+AC_CHECK_HEADERS(syslog.h)
+
+# for mono/dis
+AC_CHECK_HEADERS(wchar.h)
+AC_CHECK_HEADERS(ieeefp.h)
+AC_MSG_CHECKING(for isinf)
+AC_TRY_LINK([#include <math.h>], [
+       int f = isinf (1);
+], [
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_ISINF, 1, [isinf available])
+], [
+       # We'll have to use signals
+       AC_MSG_RESULT(no)
+])
+# mingw
+AC_CHECK_FUNCS(_finite, , AC_MSG_CHECKING(for _finite in math.h)
+       AC_TRY_LINK([#include <math.h>], 
+       [ _finite(0.0); ], 
+       AC_DEFINE(HAVE__FINITE, 1, [Have _finite in -lm]) AC_MSG_RESULT(yes),
+       AC_MSG_RESULT(no)))
+
+# for Linux statfs support
+AC_CHECK_HEADERS(linux/magic.h)
+
+# not 64 bit clean in cross-compile
+AC_CHECK_SIZEOF(void *, 4)
+
+AC_CACHE_CHECK([for clang],
+       mono_cv_clang,[
+       AC_TRY_COMPILE([], [
+               #ifdef __clang__
+               #else
+               #error "FAILED"
+               #endif
+               return 0;
+       ],
+       [mono_cv_clang=yes],
+       [mono_cv_clang=no],
+       [])
+])
+
+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'
+               # The runtime code does not respect ANSI C strict aliasing rules
+               CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+               # We rely on signed overflow to behave
+               CFLAGS="$CFLAGS -fwrapv"
+
+               ORIG_CFLAGS=$CFLAGS
+               CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+               AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc)
+               AC_TRY_COMPILE([],[
+                               return 0;
+               ], [
+                  AC_MSG_RESULT(yes)
+               ], [
+                  AC_MSG_RESULT(no)
+                  CFLAGS=$ORIG_CFLAGS
+               ])
+
+               ORIG_CFLAGS=$CFLAGS
+               # Check for the normal version, since gcc ignores unknown -Wno options
+               CFLAGS="$CFLAGS -Wunused-but-set-variable -Werror"
+               AC_MSG_CHECKING(for -Wno-unused-but-set-variable option to gcc)
+               AC_TRY_COMPILE([],[
+                               return 0;
+               ], [
+                  AC_MSG_RESULT(yes)
+                  CFLAGS="$ORIG_CFLAGS -Wno-unused-but-set-variable"
+               ], [
+                  AC_MSG_RESULT(no)
+                  CFLAGS=$ORIG_CFLAGS
+               ])
+
+               if test "x$mono_cv_clang" = "xyes"; then
+                  # https://bugzilla.samba.org/show_bug.cgi?id=8118
+                  WARN="$WARN -Qunused-arguments"
+                  WARN="$WARN -Wno-unused-function -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign"
+               fi
+else
+       # The Sun Forte compiler complains about inline functions that access static variables
+       # so disable all inlining.
+       case "$host" in
+       *-*-solaris*)
+               CFLAGS="$CFLAGS -Dinline="
+               ;;
+       esac
+fi
+CFLAGS="$CFLAGS -g $WARN"
+CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g"
+
+# Where's the 'mcs' source tree?
+if test -d $srcdir/mcs; then
+  mcsdir=mcs
+else
+  mcsdir=../mcs
+fi
+
+AC_ARG_WITH(mcs-path, [  --with-mcs-path=/path/to/mcs      Specify an alternate mcs source tree],
+       if test x$with_mcs_path != "x" -a -d $with_mcs_path ; then
+               mcsdir=$with_mcs_path
+       fi
+)
+
+AC_ARG_WITH(jumptables, [  --with-jumptables=yes,no      enable/disable support for jumptables (ARM-only for now) (defaults to no)],[],[with_jumptables=no])
+
+#
+# A sanity check to catch cases where the package was unpacked
+# with an ancient tar program (Solaris)
+#
+AC_ARG_ENABLE(solaris-tar-check,
+[  --disable-solaris-tar-check    disable solaris tar check],
+   do_solaris_tar_check=no, do_solaris_tar_check=yes)
+
+if test x"$do_solaris_tar_check" = xyes -a x"$enable_solaris_tar_check" = xyes; then
+       AC_MSG_CHECKING(integrity of package)
+       if test -f $mcsdir/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
+       then
+               AC_MSG_RESULT(ok)
+       else
+               errorm="Your mono distribution is incomplete;  if unpacking from a tar file, make sure you use GNU tar;  see http://www.mono-project.com/IncompletePackage for more details"
+               AC_MSG_ERROR([$errorm])
+       fi
+fi
+
+if test "x$with_mcs_path" != "x"; then
+mcs_topdir=$(cd "$mcsdir" && pwd)
+mcs_topdir_from_srcdir=$mcs_topdir
+else
+mcs_topdir=$(cd "$srcdir/$mcsdir" && pwd)
+mcs_topdir_from_srcdir='$(top_builddir)'/$mcsdir
+fi
+
+# Convert mcs_topdir* paths to Windows syntax.
+if test x$cross_compiling$host_win32 = xnoyes; then
+  mcs_topdir=$(cygpath -m $mcs_topdir)
+  case $mcs_topdir_from_srcdir in
+    /cygdrive/*)
+       mcs_topdir_from_srcdir=$(cygpath -m $mcs_topdir_from_srcdir)
+       ;;
+  esac
+fi
+
+AC_SUBST([mcs_topdir])
+AC_SUBST([mcs_topdir_from_srcdir])
+
+# Where's the 'olive' source tree?
+if test -d $srcdir/olive; then
+  olivedir=olive
+else
+  olivedir=../olive
+fi
+
+if test -d $srcdir/$olivedir; then
+olive_topdir='$(top_srcdir)/'$olivedir
+fi
+
+# gettext: prepare the translation directories. 
+# we do not configure the full gettext, as we consume it dynamically from C#
+AM_PO_SUBDIRS
+
+if test "x$USE_NLS" = "xyes"; then
+   AC_CHECK_PROG(HAVE_MSGFMT, msgfmt,yes,no)
+
+   if test "x$HAVE_MSGFMT" = "xno"; then
+         AC_MSG_ERROR([msgfmt not found. You need to install the 'gettext' package, or pass --enable-nls=no to configure.])
+   fi
+fi
+
+AC_ARG_WITH([libgdiplus], 
+       [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to installed)], 
+       [], [with_libgdiplus=installed])
+
+case $with_libgdiplus in
+no|installed) libgdiplus_loc= ;;
+yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;;
+/*) libgdiplus_loc=$with_libgdiplus ;;
+*) libgdiplus_loc=`pwd`/$with_libgdiplus ;;
+esac
+AC_SUBST([libgdiplus_loc])
+
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+pkg_config_path=
+AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir      Change pkg-config dir to custom dir],
+       if test x$with_crosspkgdir = "x"; then
+               if test -s $PKG_CONFIG_PATH; then
+                       pkg_config_path=$PKG_CONFIG_PATH
+               fi
+       else
+               pkg_config_path=$with_crosspkgdir
+               PKG_CONFIG_PATH=$pkg_config_path
+               export PKG_CONFIG_PATH
+       fi
+)
+
+ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\""
+AC_CONFIG_SUBDIRS(eglib)
+
+GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src'
+GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
+BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
+BUILD_GLIB_LIBS="$GLIB_LIBS"
+GMODULE_CFLAGS="$GLIB_CFLAGS"
+GMODULE_LIBS="$GLIB_LIBS"
+  
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GMODULE_CFLAGS)
+AC_SUBST(GMODULE_LIBS)
+AC_SUBST(BUILD_GLIB_CFLAGS)
+AC_SUBST(BUILD_GLIB_LIBS)
+
+AC_ARG_WITH(gc,   [  --with-gc=boehm,included,none  Controls the Boehm GC config, default=included],[gc=$with_gc],[gc=$gc_default])
+
+# Enable support for fast thread-local storage
+# Some systems have broken support, so we allow to disable it.
+AC_ARG_WITH(tls, [  --with-tls=__thread,pthread    select Thread Local Storage implementation (defaults to __thread)],[],[with_tls=__thread])
+
+# Enable support for using sigaltstack for SIGSEGV and stack overflow handling
+# This does not work on some platforms (bug #55253)
+AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack (defaults to yes)],[],[with_sigaltstack=yes])
+
+AC_ARG_WITH(static_mono, [  --with-static_mono=yes,no      link mono statically to libmono (faster) (defaults to yes)],[],[with_static_mono=yes])
+AC_ARG_WITH(shared_mono, [  --with-shared_mono=yes,no      build a shared libmono library (defaults to yes)],[],[with_shared_mono=yes])
+# Same as --with-shared_mono=no
+AC_ARG_ENABLE(libraries, [  --disable-libraries disable the build of libmono], enable_libraries=$enableval, enable_libraries=yes)
+
+if test "x$enable_static" = "xno"; then
+   with_static_mono=no
+fi
+
+if test "x$enable_shared" = "xno"; then
+   with_shared_mono=no
+fi
+
+if test "x$enable_libraries" = "xno"; then
+   with_shared_mono=no
+fi
+
+AM_CONDITIONAL(DISABLE_LIBRARIES, test x$enable_libraries = xno)
+
+case $host in
+*nacl* ) with_shared_mono=yes;;
+esac
+
+if test "x$host_win32" = "xyes"; then
+   # Boehm GC requires the runtime to be in its own dll
+   with_static_mono=no
+fi
+
+AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
+AM_CONDITIONAL(SHARED_MONO, test x$with_shared_mono != xno)
+AC_ARG_ENABLE(mcs-build, [  --disable-mcs-build disable the build of the mcs directory], try_mcs_build=$enableval, enable_mcs_build=yes)
+
+AC_ARG_WITH(xen_opt,   [  --with-xen_opt=yes,no          Enable Xen-specific behaviour (defaults to yes)],[],[with_xen_opt=yes])
+if test "x$with_xen_opt" = "xyes" -a "x$mono_cv_clang" = "xno"; then
+       AC_DEFINE(MONO_XEN_OPT, 1, [Xen-specific behaviour])
+       ORIG_CFLAGS=$CFLAGS
+       CFLAGS="$CFLAGS -mno-tls-direct-seg-refs"
+       AC_MSG_CHECKING(for -mno-tls-direct-seg-refs option to gcc)
+       AC_TRY_COMPILE([], [
+               return 0;
+       ], [
+          AC_MSG_RESULT(yes)
+          # Pass it to libgc as well
+          CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs"
+       ], [
+          AC_MSG_RESULT(no)
+          CFLAGS=$ORIG_CFLAGS
+       ])
+fi
+
+AC_ARG_ENABLE(small-config, [  --enable-small-config Enable tweaks to reduce requirements (and capabilities)], enable_small_config=$enableval, enable_small_config=no)
+
+if test x$enable_small_config = xyes; then
+       AC_DEFINE(MONO_SMALL_CONFIG,1,[Reduce runtime requirements (and capabilities)])
+       CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DSMALL_CONFIG"
+fi
+
+AC_ARG_ENABLE(system-aot, [  --enable-system-aot  Enable the Ahead-Of-Time compilation of system assemblies during the build (on by default on some platforms)], enable_system_aot=$enableval, enable_system_aot=default)
+
+DISABLED_FEATURES=none
+
+AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsystems.
+     LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, 
+     reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting,
+        security, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
+[
+       for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
+               eval "mono_feature_disable_$feature='yes'"
+       done
+       DISABLED_FEATURES=$enable_minimal
+       disabled="Disabled:      $enable_minimal"
+],[])
+
+AC_DEFINE_UNQUOTED(DISABLED_FEATURES, "$DISABLED_FEATURES", [String of disabled features])
+
+if test "x$mono_feature_disable_aot" = "xyes"; then
+       AC_DEFINE(DISABLE_AOT_COMPILER, 1, [Disable AOT Compiler])
+       AC_MSG_NOTICE([Disabled AOT compiler])
+fi
+
+if test "x$mono_feature_disable_profiler" = "xyes"; then
+       AC_DEFINE(DISABLE_PROFILER, 1, [Disable default profiler support])
+       AC_MSG_NOTICE([Disabled support for the profiler])
+fi
+AM_CONDITIONAL(DISABLE_PROFILER, test x$mono_feature_disable_profiler = xyes)
+
+if test "x$mono_feature_disable_decimal" = "xyes"; then
+       AC_DEFINE(DISABLE_DECIMAL, 1, [Disable System.Decimal support])
+       AC_MSG_NOTICE([Disabled support for decimal])
+fi
+
+if test "x$mono_feature_disable_pinvoke" = "xyes"; then
+       AC_DEFINE(DISABLE_PINVOKE, 1, [Disable P/Invoke support])
+       AC_MSG_NOTICE([Disabled support for P/Invoke])
+fi
+
+if test "x$mono_feature_disable_debug" = "xyes"; then
+       AC_DEFINE(DISABLE_DEBUG, 1, [Disable runtime debugging support])
+       AC_MSG_NOTICE([Disabled support for runtime debugging])
+fi
+
+if test "x$mono_feature_disable_reflection_emit" = "xyes"; then
+       AC_DEFINE(DISABLE_REFLECTION_EMIT, 1, [Disable reflection emit support])
+       mono_feature_disable_reflection_emit_save=yes
+       AC_MSG_NOTICE([Disabled support for Reflection.Emit])
+fi
+
+if test "x$mono_feature_disable_reflection_emit_save" = "xyes"; then
+       AC_DEFINE(DISABLE_REFLECTION_EMIT_SAVE, 1, [Disable assembly saving support in reflection emit])
+       AC_MSG_NOTICE([Disabled support for Reflection.Emit.Save])
+fi
+
+if test "x$mono_feature_disable_large_code" = "xyes"; then
+       AC_DEFINE(DISABLE_LARGE_CODE, 1, [Disable support for huge assemblies])
+       AC_MSG_NOTICE([Disabled support for large assemblies])
+fi
+
+if test "x$mono_feature_disable_logging" = "xyes"; then
+       AC_DEFINE(DISABLE_LOGGING, 1, [Disable support debug logging])
+       AC_MSG_NOTICE([Disabled support for logging])
+fi
+
+if test "x$mono_feature_disable_com" = "xyes"; then
+       AC_DEFINE(DISABLE_COM, 1, [Disable COM support])
+       AC_MSG_NOTICE([Disabled COM support])
+fi
+
+if test "x$mono_feature_disable_ssa" = "xyes"; then
+       AC_DEFINE(DISABLE_SSA, 1, [Disable advanced SSA JIT optimizations])
+       AC_MSG_NOTICE([Disabled SSA JIT optimizations])
+fi
+
+if test "x$mono_feature_disable_generics" = "xyes"; then
+       AC_DEFINE(DISABLE_GENERICS, 1, [Disable generics support])
+       AC_MSG_NOTICE([Disabled Generics Support])
+fi
+
+if test "x$mono_feature_disable_shadowcopy" = "xyes"; then
+       AC_DEFINE(DISABLE_SHADOW_COPY, 1, [Disable Shadow Copy for AppDomains])
+       AC_MSG_NOTICE([Disabled Shadow copy for AppDomains])
+fi
+
+if test "x$mono_feature_disable_portability" = "xyes"; then
+       AC_DEFINE(DISABLE_PORTABILITY, 1, [Disables the IO portability layer])
+       AC_MSG_NOTICE([Disabled IO Portability layer])
+fi
+
+if test "x$mono_feature_disable_attach" = "xyes"; then
+       AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
+       AC_MSG_NOTICE([Disabled agent attach])
+fi
+
+if test "x$mono_feature_disable_full_messages" = "xyes"; then
+       AC_DEFINE(DISABLE_FULL_MESSAGES, 1, [Disables building in the full table of WAPI messages])
+       AC_MSG_NOTICE([Disabled full messages for Win32 errors, only core message strings shipped])
+fi
+
+if test "x$mono_feature_disable_verifier" = "xyes"; then
+       AC_DEFINE(DISABLE_VERIFIER, 1, [Disables the verifier])
+       AC_MSG_NOTICE([Disabled the metadata and IL verifiers])
+fi
+
+if test "x$mono_feature_disable_jit" = "xyes"; then
+       AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode will be supported by the runtime.])
+       AC_MSG_NOTICE([Disabled the JIT engine, only full AOT will be supported])
+fi
+
+AM_CONDITIONAL(DISABLE_JIT, test x$mono_feature_disable_jit = xyes)
+
+if test "x$mono_feature_disable_simd" = "xyes"; then
+       AC_DEFINE(DISABLE_SIMD, 1, [Disable SIMD intrinsics related optimizations.])
+       AC_MSG_NOTICE([Disabled SIMD support])
+fi
+
+if test "x$mono_feature_disable_soft_debug" = "xyes"; then
+       AC_DEFINE(DISABLE_SOFT_DEBUG, 1, [Disable Soft Debugger Agent.])
+       AC_MSG_NOTICE([Disabled Soft Debugger.])
+fi
+
+if test "x$mono_feature_disable_perfcounters" = "xyes"; then
+       AC_DEFINE(DISABLE_PERFCOUNTERS, 1, [Disable Performance Counters.])
+       AC_MSG_NOTICE([Disabled Performance Counters.])
+fi
+if test "x$mono_feature_disable_normalization" = "xyes"; then
+       AC_DEFINE(DISABLE_NORMALIZATION, 1, [Disable String normalization support.])
+       AC_MSG_NOTICE([Disabled String normalization support.])
+fi
+
+if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then
+       AC_DEFINE(DISABLE_ASSEMBLY_REMAPPING, 1, [Disable assembly remapping.])
+       AC_MSG_NOTICE([Disabled Assembly remapping.])
+fi
+
+if test "x$mono_feature_disable_shared_perfcounters" = "xyes"; then
+       AC_DEFINE(DISABLE_SHARED_PERFCOUNTERS, 1, [Disable shared perfcounters.])
+       AC_MSG_NOTICE([Disabled Shared perfcounters.])
+fi
+
+if test "x$mono_feature_disable_appdomains" = "xyes"; then
+       AC_DEFINE(DISABLE_APPDOMAINS, 1, [Disable support for multiple appdomains.])
+       AC_MSG_NOTICE([Disabled support for multiple appdomains.])
+fi
+
+if test "x$mono_feature_disable_remoting" = "xyes"; then
+       AC_DEFINE(DISABLE_REMOTING, 1, [Disable remoting support (This disables type proxies and make com non-functional)])
+       AC_MSG_NOTICE([Disabled remoting])
+fi
+
+if test "x$mono_feature_disable_security" = "xyes"; then
+       AC_DEFINE(DISABLE_SECURITY, 1, [Disable CAS/CoreCLR security])
+       AC_MSG_NOTICE([Disabled CAS/CoreCLR security manager (used e.g. for Moonlight)])
+fi
+
+if test "x$mono_feature_disable_sgen_remset" = "xyes"; then
+       AC_DEFINE(DISABLE_SGEN_REMSET, 1, [Disable wbarrier=remset support in SGEN.])
+       AC_MSG_NOTICE([Disabled wbarrier=remset support in SGEN.])
+fi
+
+if test "x$mono_feature_disable_sgen_marksweep_par" = "xyes"; then
+       AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_PAR, 1, [Disable major=marksweep-par support in SGEN.])
+       AC_MSG_NOTICE([Disabled major=marksweep-par support in SGEN.])
+fi
+
+if test "x$mono_feature_disable_sgen_marksweep_fixed" = "xyes"; then
+       AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_FIXED, 1, [Disable major=marksweep-fixed support in SGEN.])
+       AC_MSG_NOTICE([Disabled major=marksweep-fixed support in SGEN.])
+fi
+
+if test "x$mono_feature_disable_sgen_marksweep_fixed_par" = "xyes"; then
+       AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_FIXED_PAR, 1, [Disable major=marksweep-fixed-par support in SGEN.])
+       AC_MSG_NOTICE([Disabled major=marksweep-fixed-par support in SGEN.])
+fi
+
+if test "x$mono_feature_disable_sgen_copying" = "xyes"; then
+       AC_DEFINE(DISABLE_SGEN_MAJOR_COPYING, 1, [Disable major=copying support in SGEN.])
+       AC_MSG_NOTICE([Disabled major=copying support in SGEN.])
+fi
+
+AC_ARG_ENABLE(executables, [  --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
+AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno)
+
+has_extension_module=no
+AC_ARG_ENABLE(extension-module, [  --enable-extension-module=LIST enable the core-extensions from LIST],
+[
+       for extension in `echo "$enable_extension_module" | sed -e "s/,/ /g"`; do
+               if test x$extension = xdefault ; then
+                       has_extension_module=yes;
+               fi
+       done
+       if test x$enable_extension_module = xyes; then
+               has_extension_module=yes;
+       fi
+], [])
+
+AM_CONDITIONAL([HAS_EXTENSION_MODULE], [test x$has_extension_module != xno])
+
+if test x$has_extension_module != xno ; then
+       AC_DEFINE([ENABLE_EXTENSION_MODULE], 1, [Extension module enabled])
+       AC_MSG_NOTICE([Enabling mono extension module.])
+fi
+
+AC_ARG_ENABLE(gsharing, [  --enable-gsharing Enable gsharing], enable_gsharing=$enableval, enable_gsharing=no)
+if test x$enable_gsharing = xyes; then
+       AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharing])
+fi
+
+AC_ARG_ENABLE(native-types, [  --enable-native-types Enable native types], enable_native_types=$enableval, enable_native_types=no)
+if test x$enable_native_types = xyes; then
+       AC_DEFINE(MONO_NATIVE_TYPES,1,[native types])
+fi
+
+AC_MSG_CHECKING(for visibility __attribute__)
+AC_COMPILE_IFELSE([
+       AC_LANG_SOURCE([[
+               void __attribute__ ((visibility ("hidden"))) doit (void) {}
+               int main () { doit (); return 0; }
+       ]])
+], [
+   have_visibility_hidden=yes
+   AC_MSG_RESULT(yes)
+], [
+   have_visibility_hidden=no
+   AC_MSG_RESULT(no)
+])
+
+AC_MSG_CHECKING(for deprecated __attribute__)
+AC_TRY_COMPILE([
+     int doit (void) __attribute__ ((deprecated));
+     int doit (void) { return 0; }
+], [
+       return 0;
+], [
+   have_deprecated=yes
+   AC_MSG_RESULT(yes)
+], [
+   have_deprecated=no
+   AC_MSG_RESULT(no)
+])
+
+AC_ARG_ENABLE(parallel-mark, [  --enable-parallel-mark     Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=$parallel_mark)
+if test x$enable_parallel_mark = xyes; then
+       libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
+fi
+
+AC_ARG_ENABLE(boehm, [  --disable-boehm            Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
+AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
+
+dnl
+dnl Boehm GC configuration
+dnl
+LIBGC_CPPFLAGS=
+LIBGC_LIBS=
+LIBGC_STATIC_LIBS=
+libgc_dir=
+case "x$gc" in
+       xboehm|xbohem|xyes)
+               AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes)
+               AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
+
+               if test "x$found_boehm" != "xyes"; then
+                       AC_MSG_ERROR("GC requested but libgc not found! Install libgc or run configure with --with-gc=none.")
+               fi
+               if test "x$gc_headers" != "xyes"; then
+                       AC_MSG_ERROR("GC requested but header files not found! You may need to install them by hand.")
+               fi
+
+               LIBGC_LIBS="-lgc $libdl"
+               LIBGC_STATIC_LIBS="$LIBGC_LIBS"
+               libmono_ldflags="$libmono_ldflags -lgc"
+               BOEHM_DEFINES="-DHAVE_BOEHM_GC"
+
+               # AC_CHECK_FUNCS does not work for some reason...
+               AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl)
+               if test "x$found_gcj_malloc" = "xyes"; then
+                       BOEHM_DEFINES="-DHAVE_GC_GCJ_MALLOC $BOEHM_DEFINES"
+                       AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "System Boehm (with typed GC)", [GC description])
+                       gc_msg="System Boehm with typed GC"
+               else
+                       AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "System Boehm (no typed GC)", [GC description])
+                       gc_msg="System Boehm (without typed GC)"
+               fi
+               AC_CHECK_LIB(gc, GC_enable, found_gc_enable="yes",,$libdl)
+               if test "x$found_gc_enable" = "xyes"; then
+                       BOEHM_DEFINES="-DHAVE_GC_ENABLE $BOEHM_DEFINES"
+               fi
+
+               # check whether we need to explicitly allow
+                       # thread registering
+                       AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl)
+                       if test "x$found_allow_register_threads" = "xyes"; then
+                        AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration])
+                       fi
+
+               ;;
+
+       xincluded)
+               use_included_gc=yes
+               libgc_dir=libgc
+
+               LIBGC_CPPFLAGS='-I$(top_srcdir)/libgc/include'
+               LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
+               LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la'
+
+               BOEHM_DEFINES="-DHAVE_BOEHM_GC -DHAVE_GC_H -DUSE_INCLUDED_LIBGC -DHAVE_GC_GCJ_MALLOC -DHAVE_GC_ENABLE"
+
+               if test x$target_win32 = xyes; then
+                       BOEHM_DEFINES="$BOEHM_DEFINES -DGC_NOT_DLL"
+                       CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DGC_BUILD -DGC_NOT_DLL"
+               fi
+
+               gc_msg="bundled Boehm GC with typed GC"
+               if test x$enable_parallel_mark = xyes; then
+                       AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "Included Boehm (with typed GC and Parallel Mark)", [GC description])
+                       gc_msg="$gc_msg and parallel mark"
+               else
+                       AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "Included Boehm (with typed GC)", [GC description])
+               fi
+               ;;
+
+       xsgen)
+               AC_MSG_WARN("Use --with-sgen instead, --with-gc= controls Boehm configuration")
+               ;;
+
+       xnone)
+               AC_MSG_WARN("Compiling mono without GC.")
+               AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "none", [GC description])
+               AC_DEFINE(HAVE_NULL_GC,1,[No GC support.])
+               ;;
+       *)
+               AC_MSG_ERROR([Invalid argument to --with-gc.])
+               ;;
+esac
+
+AC_ARG_WITH(large-heap, [  --with-large-heap=yes,no       Enable support for GC heaps larger than 3GB (defaults to no)], [large_heap=$withval], [large_heap=no])
+if test "x$large_heap" = "xyes"; then
+   CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
+fi
+
+AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
+AC_SUBST(LIBGC_CPPFLAGS)
+AC_SUBST(LIBGC_LIBS)
+AC_SUBST(LIBGC_STATIC_LIBS)
+AC_SUBST(libgc_dir)
+AC_SUBST(BOEHM_DEFINES)
+
+dnl
+dnl End of libgc checks
+dnl
+
+dnl *************************************
+dnl *** Checks for zero length arrays ***
+dnl *************************************
+AC_MSG_CHECKING(whether $CC supports zero length arrays)
+AC_TRY_COMPILE([
+       struct s {
+               int  length;
+               char data [0];
+       };
+], [], [
+       AC_MSG_RESULT(yes)
+       AC_DEFINE_UNQUOTED(MONO_ZERO_LEN_ARRAY, 0, [Length of zero length arrays])
+], [
+       AC_MSG_RESULT(no)
+       AC_DEFINE_UNQUOTED(MONO_ZERO_LEN_ARRAY, 1, [Length of zero length arrays])
+])
+
+AC_CHECK_HEADERS(nacl/nacl_dyncode.h)
+
+if test x$target_win32 = xno; then
+
+       dnl hires monotonic clock support
+       AC_SEARCH_LIBS(clock_gettime, rt)
+
+       dnl dynamic loader support
+       AC_CHECK_FUNC(dlopen, DL_LIB="",
+               AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", dl_support=no)
+       )
+       if test x$dl_support = xno; then
+               AC_MSG_WARN([No dynamic loading support available])
+       else
+               LIBS="$LIBS $DL_LIB"
+               AC_DEFINE(HAVE_DL_LOADER,1,[dlopen-based dynamic loader available])
+               dnl from glib's configure.ac
+               AC_CACHE_CHECK([for preceeding underscore in symbols],
+                       mono_cv_uscore,[
+                       AC_TRY_RUN([#include <dlfcn.h>
+                       int mono_underscore_test (void) { return 42; }
+                       int main() {
+                         void *f1 = (void*)0, *f2 = (void*)0, *handle;
+                         handle = dlopen ((void*)0, 0);
+                         if (handle) {
+                           f1 = dlsym (handle, "mono_underscore_test");
+                           f2 = dlsym (handle, "_mono_underscore_test");
+                         } return (!f2 || f1);
+                       }],
+                               [mono_cv_uscore=yes],
+                               [mono_cv_uscore=no],
+                       [])
+               ])
+               if test "x$mono_cv_uscore" = "xyes"; then
+                       MONO_DL_NEED_USCORE=1
+               else
+                       MONO_DL_NEED_USCORE=0
+               fi
+               AC_SUBST(MONO_DL_NEED_USCORE)
+               AC_CHECK_FUNC(dlerror)
+       fi
+
+       dnl ******************************************************************
+       dnl *** Checks for the IKVM JNI interface library                  ***
+       dnl ******************************************************************
+       AC_ARG_WITH(ikvm-native, [  --with-ikvm-native=yes,no      build the IKVM JNI interface library (defaults to yes)],[with_ikvm_native=$withval],[with_ikvm_native=$ikvm_native])
+
+       ikvm_native_dir=
+       if test x$with_ikvm_native = xyes; then
+               ikvm_native_dir=ikvm-native
+               jdk_headers_found="IKVM Native"
+       fi
+
+       AC_SUBST(ikvm_native_dir)
+
+       AC_CHECK_HEADERS(execinfo.h)
+
+       AC_CHECK_HEADERS(sys/auxv.h)
+
+       AC_CHECK_FUNCS(getgrgid_r)
+       AC_CHECK_FUNCS(getgrnam_r)
+       AC_CHECK_FUNCS(getpwnam_r)
+       AC_CHECK_FUNCS(getpwuid_r)
+       AC_CHECK_FUNCS(getresuid)
+       AC_CHECK_FUNCS(setresuid)
+       AC_CHECK_FUNCS(kqueue)
+       AC_CHECK_FUNCS(backtrace_symbols)
+       AC_CHECK_FUNCS(mkstemp)
+       AC_CHECK_FUNCS(mmap)
+       AC_CHECK_FUNCS(madvise)
+       AC_CHECK_FUNCS(getrusage)
+       AC_CHECK_FUNCS(getpriority)
+       AC_CHECK_FUNCS(setpriority)
+       AC_CHECK_FUNCS(dl_iterate_phdr)
+       AC_CHECK_FUNCS(dladdr)
+       AC_CHECK_FUNCS(sysconf)
+
+       AC_CHECK_FUNCS(sched_setaffinity)
+       AC_CHECK_FUNCS(sched_getcpu)
+
+       dnl ****************************************************************
+       dnl *** Check for sched_setaffinity from glibc versions before   ***
+       dnl *** 2.3.4. The older versions of the function only take 2    ***
+       dnl *** parameters, not 3.                                       ***
+       dnl ***                                                          ***
+       dnl *** Because the interface change was not made in a minor     ***
+       dnl *** version rev, the __GLIBC__ and __GLIBC_MINOR__ macros    ***
+       dnl *** won't always indicate the interface sched_affinity has.  ***
+       dnl ****************************************************************
+       AC_MSG_CHECKING(for sched_setaffinity from glibc < 2.3.4)
+       AC_TRY_COMPILE([#include <sched.h>], [
+            int mask = 1; 
+            sched_setaffinity(0, &mask);
+                       return 0;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY, 1, [Have GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY])
+       ], [
+               # We have the new, three-parameter version
+               AC_MSG_RESULT(no)
+       ])
+
+
+       dnl ******************************************************************
+       dnl *** Check for large file support                               ***
+       dnl *** (If we were using autoconf 2.50 we'd use AC_SYS_LARGEFILE) ***
+       dnl ******************************************************************
+       
+       # Check that off_t can represent 2**63 - 1 correctly, working around
+       # potential compiler bugs.  Defines LARGE_FILE_SUPPORT, adds $1 to
+       # CPPFLAGS and sets $large_offt to yes if the test succeeds
+       large_offt=no
+       AC_DEFUN([LARGE_FILES], [
+               large_CPPFLAGS=$CPPFLAGS
+               CPPFLAGS="$CPPFLAGS $1"
+               AC_TRY_COMPILE([
+                       #include <sys/types.h>
+                       #include <limits.h>
+               ], [
+                       /* Lifted this compile time assert method from: http://www.jaggersoft.com/pubs/CVu11_3.html */
+                       #define COMPILE_TIME_ASSERT(pred) \
+                               switch(0){case 0:case pred:;}
+                       COMPILE_TIME_ASSERT(sizeof(off_t) * CHAR_BIT == 64);
+               ], [
+                       AC_MSG_RESULT(ok)
+                       AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support])
+                       large_CPPFLAGS="$large_CPPFLAGS $1"
+                       large_offt=yes
+               ], [
+                       AC_MSG_RESULT(no)
+               ])
+               CPPFLAGS=$large_CPPFLAGS
+       ])
+
+       AC_MSG_CHECKING(if off_t is 64 bits wide)
+       LARGE_FILES("")
+       if test $large_offt = no; then
+               AC_MSG_CHECKING(if _FILE_OFFSET_BITS=64 gives 64 bit off_t)
+               LARGE_FILES("-D_FILE_OFFSET_BITS=64")
+       fi
+       if test $large_offt = no; then
+               AC_MSG_WARN([No 64 bit file size support available])
+       fi
+       
+       dnl *****************************
+       dnl *** Checks for libsocket  ***
+       dnl *****************************
+       AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
+
+       case "$host" in
+               *-*-*freebsd*)
+                       dnl *****************************
+                       dnl *** Checks for libinotify ***
+                       dnl *****************************
+                       AC_CHECK_LIB(inotify, inotify_init, LIBS="$LIBS -linotify")
+       esac
+
+       dnl *******************************
+       dnl *** Checks for MSG_NOSIGNAL ***
+       dnl *******************************
+       AC_MSG_CHECKING(for MSG_NOSIGNAL)
+       AC_TRY_COMPILE([#include <sys/socket.h>], [
+               int f = MSG_NOSIGNAL;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, [Have MSG_NOSIGNAL])
+       ], [
+               # We'll have to use signals
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *****************************
+       dnl *** Checks for IPPROTO_IP ***
+       dnl *****************************
+       AC_MSG_CHECKING(for IPPROTO_IP)
+       AC_TRY_COMPILE([#include <netinet/in.h>], [
+               int level = IPPROTO_IP;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IPPROTO_IP, 1, [Have IPPROTO_IP])
+       ], [
+               # We'll have to use getprotobyname
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *******************************
+       dnl *** Checks for IPPROTO_IPV6 ***
+       dnl *******************************
+       AC_MSG_CHECKING(for IPPROTO_IPV6)
+       AC_TRY_COMPILE([#include <netinet/in.h>], [
+               int level = IPPROTO_IPV6;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IPPROTO_IPV6, 1, [Have IPPROTO_IPV6])
+       ], [
+               # We'll have to use getprotobyname
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl ******************************
+       dnl *** Checks for IPPROTO_TCP ***
+       dnl ******************************
+       AC_MSG_CHECKING(for IPPROTO_TCP)
+       AC_TRY_COMPILE([#include <netinet/in.h>], [
+               int level = IPPROTO_TCP;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IPPROTO_TCP, 1, [Have IPPROTO_TCP])
+       ], [
+               # We'll have to use getprotobyname
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *****************************
+       dnl *** Checks for SOL_IP     ***
+       dnl *****************************
+       AC_MSG_CHECKING(for SOL_IP)
+       AC_TRY_COMPILE([#include <netdb.h>], [
+               int level = SOL_IP;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SOL_IP, 1, [Have SOL_IP])
+       ], [
+               # We'll have to use getprotobyname
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *****************************
+       dnl *** Checks for SOL_IPV6     ***
+       dnl *****************************
+       AC_MSG_CHECKING(for SOL_IPV6)
+       AC_TRY_COMPILE([#include <netdb.h>], [
+               int level = SOL_IPV6;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SOL_IPV6, 1, [Have SOL_IPV6])
+       ], [
+               # We'll have to use getprotobyname
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *****************************
+       dnl *** Checks for SOL_TCP    ***
+       dnl *****************************
+       AC_MSG_CHECKING(for SOL_TCP)
+       AC_TRY_COMPILE([#include <netdb.h>], [
+               int level = SOL_TCP;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SOL_TCP, 1, [Have SOL_TCP])
+       ], [
+               # We'll have to use getprotobyname
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *****************************
+       dnl *** Checks for IP_PKTINFO ***
+       dnl *****************************
+       AC_MSG_CHECKING(for IP_PKTINFO)
+       AC_TRY_COMPILE([#include <linux/in.h>], [
+               int level = IP_PKTINFO;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IP_PKTINFO, 1, [Have IP_PKTINFO])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *****************************
+       dnl *** Checks for IPV6_PKTINFO ***
+       dnl *****************************
+       AC_MSG_CHECKING(for IPV6_PKTINFO)
+       AC_TRY_COMPILE([#include <netdb.h>], [
+               int level = IPV6_PKTINFO;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IPV6_PKTINFO, 1, [Have IPV6_PKTINFO])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Checks for IP_DONTFRAG     ***
+       dnl **********************************
+       AC_MSG_CHECKING(for IP_DONTFRAG)
+       AC_TRY_COMPILE([#include <netinet/in.h>], [
+               int level = IP_DONTFRAG;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IP_DONTFRAG, 1, [Have IP_DONTFRAG])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Checks for IP_DONTFRAGMENT ***
+       dnl **********************************
+       AC_MSG_CHECKING(for IP_DONTFRAGMENT)
+       AC_TRY_COMPILE([#include <Ws2ipdef.h>], [
+               int level = IP_DONTFRAGMENT;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IP_DONTFRAGMENT, 1, [Have IP_DONTFRAGMENT])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Checks for IP_MTU_DISCOVER ***
+       dnl **********************************
+       AC_MSG_CHECKING(for IP_MTU_DISCOVER)
+       AC_TRY_COMPILE([#include <linux/in.h>], [
+               int level = IP_MTU_DISCOVER;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IP_MTU_DISCOVER, 1, [Have IP_MTU_DISCOVER])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl **********************************
+       dnl *** Checks for  IP_PMTUDISC_DO ***
+       dnl **********************************
+       AC_MSG_CHECKING(for IP_PMTUDISC_DO)
+       AC_TRY_COMPILE([#include <linux/in.h>], [
+               int level = IP_PMTUDISC_DO;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IP_PMTUDISC_DO, 1, [Have IP_PMTUDISC_DO])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *********************************
+       dnl *** Check for struct ip_mreqn ***
+       dnl *********************************
+       AC_MSG_CHECKING(for struct ip_mreqn)
+       AC_TRY_COMPILE([#include <netinet/in.h>], [
+               struct ip_mreqn mreq;
+               mreq.imr_address.s_addr = 0;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_STRUCT_IP_MREQN, 1, [Have struct ip_mreqn])
+       ], [
+               # We'll just have to try and use struct ip_mreq
+               AC_MSG_RESULT(no)
+               AC_MSG_CHECKING(for struct ip_mreq)
+               AC_TRY_COMPILE([#include <netinet/in.h>], [
+                       struct ip_mreq mreq;
+                       mreq.imr_interface.s_addr = 0;
+               ], [
+                       # Yes, we have it...
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_STRUCT_IP_MREQ, 1, [Have struct ip_mreq])
+               ], [
+                       # No multicast support
+                       AC_MSG_RESULT(no)
+               ])
+       ])
+       
+       dnl **********************************
+       dnl *** Check for gethostbyname2_r ***
+       dnl **********************************
+       AC_MSG_CHECKING(for gethostbyname2_r)
+               AC_TRY_LINK([#include <netdb.h>], [
+               gethostbyname2_r(NULL,0,NULL,NULL,0,NULL,NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETHOSTBYNAME2_R, 1, [Have gethostbyname2_r])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+
+       dnl *****************************
+       dnl *** Checks for libnsl     ***
+       dnl *****************************
+       AC_CHECK_FUNC(gethostbyaddr, , AC_CHECK_LIB(nsl, gethostbyaddr, LIBS="$LIBS -lnsl"))
+
+       AC_CHECK_FUNCS(inet_pton inet_aton)
+
+       dnl ***********************************************
+       dnl *** Checks for size of sockaddr_un.sun_path ***
+       dnl ***********************************************
+       # AC_CHECK_SIZEOF can't cope with struct members :-(
+       AC_MSG_CHECKING(size of sockaddr_un.sun_path)
+       AC_CACHE_VAL(mono_cv_sizeof_sunpath,
+               [AC_TRY_RUN([
+                       #include <sys/types.h>
+                       #include <stdio.h>
+                       #include <sys/un.h>
+
+                       int main(void) {
+                               struct sockaddr_un sock_un;
+                               FILE *f=fopen("conftestval", "w");
+                               if(!f) exit(1);
+                               fprintf(f, "%d\n", sizeof(sock_un.sun_path));
+                               exit(0);
+                       }
+               ], mono_cv_sizeof_sunpath=`cat conftestval`,
+                  mono_cv_sizeof_sunpath=0,
+                  mono_cv_sizeof_sunpath=0)])dnl
+       AC_MSG_RESULT($mono_cv_sizeof_sunpath)
+       AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $mono_cv_sizeof_sunpath, [Sizeof sock_un.sun_path])
+
+       dnl *****************************
+       dnl *** Checks for libxnet    ***
+       dnl *****************************
+       case "${host}" in
+               *solaris* )
+                       AC_MSG_CHECKING(for Solaris XPG4 support)
+                       if test -f /usr/lib/libxnet.so; then
+                               CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+                               CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+                               CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
+                               LIBS="$LIBS -lxnet"
+                               AC_MSG_RESULT(yes)
+                       else
+                               AC_MSG_RESULT(no)
+                       fi
+
+                       if test "$GCC" = "yes"; then
+                               CFLAGS="$CFLAGS -Wno-char-subscripts"
+                       fi
+               ;;
+       esac
+
+       dnl *****************************
+       dnl *** Checks for libpthread ***
+       dnl *****************************
+# on FreeBSD -STABLE, the pthreads functions all reside in libc_r
+# and libpthread does not exist
+#
+       case "${host}" in
+               *-*-*freebsd*)
+                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
+               ;;
+               *-*-*openbsd*)
+                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
+               ;;
+               *)
+                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+               ;;
+       esac
+       AC_CHECK_HEADERS(pthread.h)
+       AC_CHECK_HEADERS(pthread_np.h)
+       AC_CHECK_FUNCS(pthread_mutex_timedlock)
+       AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_setname_np)
+       AC_CHECK_FUNCS(pthread_kill)
+       AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
+       AC_TRY_COMPILE([ #include <pthread.h>], [
+               pthread_mutexattr_t attr;
+               pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+       ], [
+               AC_MSG_RESULT(ok)
+       ], [
+               AC_MSG_RESULT(no)
+               AC_ERROR(Posix system lacks support for recursive mutexes)
+       ])
+       AC_CHECK_FUNCS(pthread_attr_setstacksize)
+       AC_CHECK_FUNCS(pthread_attr_getstack pthread_attr_getstacksize)
+       AC_CHECK_FUNCS(pthread_get_stacksize_np pthread_get_stackaddr_np)
+
+       dnl ***********************************
+       dnl *** Checks for signals
+       dnl ***********************************
+       AC_CHECK_HEADERS(signal.h)
+       AC_CHECK_FUNCS(sigaction)
+
+       dnl ***********************************
+       dnl *** Checks for working __thread ***
+       dnl ***********************************
+       AC_MSG_CHECKING(for working __thread)
+       if test "x$with_tls" != "x__thread"; then
+               AC_MSG_RESULT(disabled)
+       elif test "x$cross_compiling" = "xyes"; then
+               AC_MSG_RESULT(cross compiling, assuming yes)
+       else
+               AC_TRY_RUN([
+                       #if defined(__APPLE__) && defined(__clang__)
+                       #error "__thread does not currently work with clang on Mac OS X"
+                       #endif
+                       
+                       #include <pthread.h>
+                       __thread int i;
+                       static int res1, res2;
+
+                       void thread_main (void *arg)
+                       {
+                               i = arg;
+                               sleep (1);
+                               if (arg == 1)
+                                       res1 = (i == arg);
+                               else
+                                       res2 = (i == arg);
+                       }
+
+                       int main () {
+                               pthread_t t1, t2;
+
+                               i = 5;
+
+                               pthread_create (&t1, NULL, thread_main, 1);
+                               pthread_create (&t2, NULL, thread_main, 2);
+
+                               pthread_join (t1, NULL);
+                               pthread_join (t2, NULL);
+
+                               return !(res1 + res2 == 2);
+                       }
+               ], [
+                               AC_MSG_RESULT(yes)
+               ], [
+                               AC_MSG_RESULT(no)
+                               with_tls=pthread
+               ])
+       fi
+
+       dnl **************************************
+       dnl *** Checks for working sigaltstack ***
+       dnl **************************************
+       AC_MSG_CHECKING(for working sigaltstack)
+       if test "x$with_sigaltstack" != "xyes"; then
+               AC_MSG_RESULT(disabled)
+       elif test "x$cross_compiling" = "xyes"; then
+               AC_MSG_RESULT(cross compiling, assuming yes)
+       else
+               AC_TRY_RUN([
+                       #include <stdio.h>
+                       #include <stdlib.h>
+                       #include <unistd.h>
+                       #include <signal.h>
+                       #include <pthread.h>
+                       #include <sys/wait.h>
+                       #if defined(__FreeBSD__) || defined(__NetBSD__)
+                       #define SA_STACK SA_ONSTACK
+                       #endif
+                       static void
+                       sigsegv_signal_handler (int _dummy, siginfo_t *info, void *context)
+                       {
+                               exit (0);
+                       }
+
+                       volatile char*__ptr = NULL;
+                       static void *
+                       loop (void *ignored)
+                       {
+                               *__ptr = 0;
+                               return NULL;
+                       }
+
+                       static void
+                       child ()
+                       {
+                               struct sigaction sa;
+                       #ifdef __APPLE__
+                               stack_t sas;
+                       #else
+                               struct sigaltstack sas;
+                       #endif
+                               pthread_t id;
+                               pthread_attr_t attr;
+
+                               sa.sa_sigaction = sigsegv_signal_handler;
+                               sigemptyset (&sa.sa_mask);
+                               sa.sa_flags = SA_SIGINFO | SA_ONSTACK;
+                               if (sigaction (SIGSEGV, &sa, NULL) == -1) {
+                                       perror ("sigaction");
+                                       return;
+                               }
+
+                               /* x86 darwin deliver segfaults using SIGBUS */
+                               if (sigaction (SIGBUS, &sa, NULL) == -1) {
+                                       perror ("sigaction");
+                                       return;
+                               }
+                               sas.ss_sp = malloc (SIGSTKSZ);
+                               sas.ss_size = SIGSTKSZ;
+                               sas.ss_flags = 0;
+                               if (sigaltstack (&sas, NULL) == -1) {
+                                       perror ("sigaltstack");
+                                       return;
+                               }
+
+                               pthread_attr_init (&attr);
+                               if (pthread_create(&id, &attr, loop, &attr) != 0) {
+                                       printf ("pthread_create\n");
+                                       return;
+                               }
+
+                               sleep (100);
+                       }
+
+                       int
+                       main ()
+                       {
+                               pid_t son;
+                               int status;
+                               int i;
+
+                               son = fork ();
+                               if (son == -1) {
+                                       return 1;
+                               }
+
+                               if (son == 0) {
+                                       child ();
+                                       return 0;
+                               }
+
+                               for (i = 0; i < 300; ++i) {
+                                       waitpid (son, &status, WNOHANG);
+                                       if (WIFEXITED (status) && WEXITSTATUS (status) == 0)
+                                               return 0;
+                                       usleep (10000);
+                               }
+
+                               kill (son, SIGKILL);
+                               return 1;
+                       }
+
+               ], [
+                               AC_MSG_RESULT(yes)
+                               AC_DEFINE(HAVE_WORKING_SIGALTSTACK, 1, [Have a working sigaltstack])
+               ], [
+                               with_sigaltstack=no
+                               AC_MSG_RESULT(no)
+               ])
+       fi
+
+       dnl ********************************
+       dnl *** Checks for semaphore lib ***
+       dnl ********************************
+       # 'Real Time' functions on Solaris
+       # posix4 on Solaris 2.6
+       # pthread (first!) on Linux
+       AC_SEARCH_LIBS(sem_init, pthread rt posix4) 
+
+       AC_SEARCH_LIBS(shm_open, pthread rt posix4) 
+       AC_CHECK_FUNCS(shm_open)
+
+       dnl ********************************
+       dnl *** Checks for timezone stuff **
+       dnl ********************************
+       AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+               AC_TRY_COMPILE([
+                       #include <time.h>
+                       ], [
+                       struct tm tm;
+                       tm.tm_gmtoff = 1;
+                       ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+       if test $ac_cv_struct_tm_gmtoff = yes; then
+               AC_DEFINE(HAVE_TM_GMTOFF, 1, [Have tm_gmtoff])
+       else
+               AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
+                       AC_TRY_COMPILE([
+                               #include <time.h>
+                       ], [
+                               timezone = 1;
+                       ], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+               if test $ac_cv_var_timezone = yes; then
+                       AC_DEFINE(HAVE_TIMEZONE, 1, [Have timezone variable])
+               else
+                       AC_ERROR(unable to find a way to determine timezone)
+               fi
+       fi
+
+       dnl *********************************
+       dnl *** Checks for math functions ***
+       dnl *********************************
+       AC_SEARCH_LIBS(sqrtf, m)
+       if test "x$has_broken_apple_cpp" != "xyes"; then
+               AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
+                       AC_TRY_LINK([#include <math.h>], 
+                       [ finite(0.0); ], 
+                       AC_DEFINE(HAVE_FINITE, 1, [Have finite in -lm]) AC_MSG_RESULT(yes),
+                       AC_MSG_RESULT(no)))
+       fi
+        AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h)
+                AC_TRY_LINK([#include <math.h>], 
+                [ isfinite(0.0); ], 
+                AC_DEFINE(HAVE_ISFINITE, 1, [Have isfinite]) AC_MSG_RESULT(yes),
+                AC_MSG_RESULT(no)))
+
+       dnl ****************************************************************
+       dnl *** Checks for working poll() (macosx defines it but doesn't ***
+       dnl *** have it in the library (duh))                            ***
+       dnl ****************************************************************
+       AC_CHECK_FUNCS(poll)
+
+       dnl *************************
+       dnl *** Check for signbit ***
+       dnl *************************
+       AC_MSG_CHECKING(for signbit)
+       AC_TRY_LINK([#include <math.h>], [
+               int s = signbit(1.0);
+       ], [
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_SIGNBIT, 1, [Have signbit])
+       ], [
+               AC_MSG_RESULT(no)
+       ]) 
+
+       dnl **********************************
+       dnl *** epoll                      ***
+       dnl **********************************
+       if test "x$ac_cv_header_nacl_nacl_dyncode_h" = "xno"; then
+               AC_CHECK_HEADERS(sys/epoll.h)
+               haveepoll=no
+               AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
+               if test "x$haveepoll" = "xyes" -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
+                       AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
+               fi
+       fi
+
+       havekqueue=no
+
+       AC_CHECK_HEADERS(sys/event.h)
+       AC_CHECK_FUNCS(kqueue, [havekqueue=yes], )
+
+       dnl **************************************
+       dnl * Darwin has a race that prevents us from using reliably:
+       dnl * http://lists.apple.com/archives/darwin-dev/2011/Jun/msg00016.html
+       dnl * Since kqueue is mostly used for scaling large web servers, 
+       dnl * and very few folks run Mono on large web servers on OSX, falling
+       dnl * back 
+       dnl **************************************
+       if test "x$havekqueue" = "xyes" -a "x$ac_cv_header_sys_event_h" = "xyes"; then
+               if test "x$platform_darwin" = "xno"; then
+                       AC_DEFINE(USE_KQUEUE_FOR_THREADPOOL, 1, [Use kqueue for the threadpool])
+               fi
+       fi
+
+       dnl ******************************
+       dnl *** Checks for SIOCGIFCONF ***
+       dnl ******************************
+       AC_CHECK_HEADERS(sys/ioctl.h)
+       AC_CHECK_HEADERS(net/if.h, [], [],
+          [
+          #ifdef HAVE_SYS_TYPES_H
+          # include <sys/types.h>
+          #endif
+          #ifdef HAVE_SYS_SOCKET_H
+          # include <sys/socket.h>
+          #endif
+          ])
+       AC_MSG_CHECKING(for ifreq)
+       AC_TRY_COMPILE([
+               #include <stdio.h>
+               #include <sys/ioctl.h>
+               #include <net/if.h>
+               ], [
+               struct ifconf ifc;
+               struct ifreq *ifr;
+               void *x;
+               ifc.ifc_len = 0;
+               ifc.ifc_buf = NULL;
+               x = (void *) &ifr->ifr_addr;
+               ],[
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_SIOCGIFCONF, 1, [Can get interface list])
+               ], [
+                       AC_MSG_RESULT(no)
+               ])
+       dnl **********************************
+       dnl ***     Checks for sin_len     ***
+       dnl **********************************
+       AC_MSG_CHECKING(for sockaddr_in.sin_len)
+       AC_TRY_COMPILE([
+               #include <netinet/in.h>
+               ], [
+               struct sockaddr_in saddr;
+               saddr.sin_len = sizeof (saddr);
+               ],[
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN, 1, [sockaddr_in has sin_len])
+               ], [
+                       AC_MSG_RESULT(no)
+               ])      
+       dnl **********************************
+       dnl ***    Checks for sin6_len     ***
+       dnl **********************************
+       AC_MSG_CHECKING(for sockaddr_in6.sin6_len)
+       AC_TRY_COMPILE([
+               #include <netinet/in.h>
+               ], [
+               struct sockaddr_in6 saddr6;
+               saddr6.sin6_len = sizeof (saddr6);
+               ],[
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_SOCKADDR_IN6_SIN_LEN, 1, [sockaddr_in6 has sin6_len])
+               ], [
+                       AC_MSG_RESULT(no)
+               ])
+       dnl **********************************
+       dnl *** Check for getifaddrs       ***
+       dnl **********************************
+       AC_MSG_CHECKING(for getifaddrs)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <sys/types.h>
+               #include <sys/socket.h>
+               #include <ifaddrs.h>
+       ], [
+               getifaddrs(NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_GETIFADDRS, 1, [Have getifaddrs])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+       dnl **********************************
+       dnl *** Check for if_nametoindex   ***
+       dnl **********************************
+       AC_MSG_CHECKING(for if_nametoindex)
+               AC_TRY_LINK([
+               #include <stdio.h>
+               #include <sys/types.h>
+               #include <sys/socket.h>
+               #include <net/if.h>
+       ], [
+               if_nametoindex(NULL);
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_IF_NAMETOINDEX, 1, [Have if_nametoindex])
+       ], [
+               AC_MSG_RESULT(no)
+       ])
+                       
+       dnl **********************************
+       dnl *** Checks for MonoPosixHelper ***
+       dnl **********************************
+       AC_CHECK_HEADERS(checklist.h)
+       AC_CHECK_HEADERS(pathconf.h)
+       AC_CHECK_HEADERS(fstab.h)
+       AC_CHECK_HEADERS(attr/xattr.h)
+       AC_CHECK_HEADERS(sys/extattr.h)
+       AC_CHECK_HEADERS(sys/sendfile.h)
+       AC_CHECK_HEADERS(sys/statvfs.h)
+       AC_CHECK_HEADERS(sys/statfs.h)
+       AC_CHECK_HEADERS(sys/vfstab.h)
+       AC_CHECK_HEADERS(sys/xattr.h)
+       AC_CHECK_HEADERS(sys/mman.h)
+       AC_CHECK_HEADERS(sys/param.h)
+       AC_CHECK_HEADERS(sys/mount.h, [], [],
+               [
+               #ifdef HAVE_SYS_PARAM_H
+               # include <sys/param.h>
+               #endif
+               ])
+       AC_CHECK_HEADERS(sys/mount.h)
+       AC_CHECK_FUNCS(confstr)
+       AC_CHECK_FUNCS(seekdir telldir)
+       AC_CHECK_FUNCS(getdomainname)
+       AC_CHECK_FUNCS(setdomainname)
+       AC_CHECK_FUNCS(endgrent getgrent fgetgrent setgrent)
+       AC_CHECK_FUNCS(setgroups)
+       AC_CHECK_FUNCS(endpwent getpwent fgetpwent setpwent)
+       AC_CHECK_FUNCS(getfsstat)
+       AC_CHECK_FUNCS(lutimes futimes)
+       AC_CHECK_FUNCS(mremap)
+       AC_CHECK_FUNCS(remap_file_pages)
+       AC_CHECK_FUNCS(posix_fadvise)
+       AC_CHECK_FUNCS(posix_fallocate)
+       AC_CHECK_FUNCS(posix_madvise)
+       AC_CHECK_FUNCS(vsnprintf)
+       AC_CHECK_FUNCS(sendfile)
+       AC_CHECK_FUNCS(gethostid sethostid)
+       AC_CHECK_FUNCS(sethostname)
+       AC_CHECK_FUNCS(statfs)
+       AC_CHECK_FUNCS(fstatfs)
+       AC_CHECK_FUNCS(statvfs)
+       AC_CHECK_FUNCS(fstatvfs)
+       AC_CHECK_FUNCS(stime)
+       AC_CHECK_FUNCS(strerror_r)
+       AC_CHECK_FUNCS(ttyname_r)
+       AC_CHECK_FUNCS(psignal)
+       AC_CHECK_FUNCS(getlogin_r)
+       AC_CHECK_FUNCS(lockf)
+       AC_CHECK_FUNCS(swab)
+       AC_CHECK_FUNCS(setusershell endusershell)
+       AC_CHECK_FUNCS(futimens utimensat)
+       AC_CHECK_FUNCS(fstatat mknodat readlinkat)
+       AC_CHECK_FUNCS(readv writev preadv pwritev)
+       AC_CHECK_FUNCS(setpgid)
+       AC_CHECK_SIZEOF(size_t)
+       AC_CHECK_TYPES([blksize_t], [AC_DEFINE(HAVE_BLKSIZE_T)], , 
+               [#include <sys/types.h>
+                #include <sys/stat.h>
+                #include <unistd.h>])
+       AC_CHECK_TYPES([blkcnt_t], [AC_DEFINE(HAVE_BLKCNT_T)], ,
+               [#include <sys/types.h>
+                #include <sys/stat.h>
+                #include <unistd.h>])
+       AC_CHECK_TYPES([suseconds_t], [AC_DEFINE(HAVE_SUSECONDS_T)], ,
+               [#include <sys/time.h>])
+       AC_CHECK_TYPES([struct flock], [AC_DEFINE(HAVE_STRUCT_FLOCK)], ,
+               [#include <unistd.h>
+                #include <fcntl.h>])
+       AC_CHECK_TYPES([struct iovec], [AC_DEFINE(HAVE_STRUCT_IOVEC)], ,
+               [#include <sys/uio.h>])
+       AC_CHECK_TYPES([struct pollfd], [AC_DEFINE(HAVE_STRUCT_POLLFD)], ,
+               [#include <sys/poll.h>])
+       AC_CHECK_TYPES([struct stat], [AC_DEFINE(HAVE_STRUCT_STAT)], ,
+               [#include <sys/types.h>
+                #include <sys/stat.h>
+                #include <unistd.h>])
+       AC_CHECK_TYPES([struct timespec], [AC_DEFINE(HAVE_STRUCT_TIMESPEC)], ,
+               [#include <time.h>])
+       AC_CHECK_TYPES([struct timeval], [AC_DEFINE(HAVE_STRUCT_TIMEVAL)], ,
+               [#include <sys/time.h>
+                #include <sys/types.h>
+                #include <utime.h>])
+       AC_CHECK_TYPES([struct timezone], [AC_DEFINE(HAVE_STRUCT_TIMEZONE)], ,
+               [#include <sys/time.h>])
+       AC_CHECK_TYPES([struct utimbuf], [AC_DEFINE(HAVE_STRUCT_UTIMBUF)], ,
+               [#include <sys/types.h>
+                #include <utime.h>])
+       AC_CHECK_MEMBERS(
+               [struct dirent.d_off, struct dirent.d_reclen, struct dirent.d_type],,, 
+               [#include <sys/types.h>
+                #include <dirent.h>])
+       AC_CHECK_MEMBERS(
+               [struct passwd.pw_gecos],,, 
+               [#include <sys/types.h>
+                #include <pwd.h>])
+       AC_CHECK_MEMBERS(
+               [struct statfs.f_flags],,, 
+               [#include <sys/types.h>
+                #include <sys/vfs.h>])
+       AC_CHECK_MEMBERS(
+               [struct stat.st_atim, struct stat.st_mtim, struct stat.st_ctim],,, 
+               [#include <sys/types.h>
+                #include <sys/stat.h>
+                #include <unistd.h>])
+
+       dnl Favour xattr through glibc, but use libattr if we have to
+       AC_CHECK_FUNC(lsetxattr, ,
+               AC_CHECK_LIB(attr, lsetxattr, XATTR_LIB="-lattr",)
+       )
+       AC_SUBST(XATTR_LIB)
+
+       dnl kinfo_proc.kp_proc works on darwin but fails on other simil-bsds
+       AC_CHECK_MEMBERS(
+               [struct kinfo_proc.kp_proc],,, 
+               [#include <sys/types.h>
+                #include <sys/param.h>
+                #include <sys/sysctl.h>
+                #include <sys/proc.h>
+                ])
+
+       dnl *********************************
+       dnl *** Checks for Windows compilation ***
+       dnl *********************************
+       AC_CHECK_HEADERS(sys/time.h)
+       AC_CHECK_HEADERS(sys/param.h)
+       AC_CHECK_HEADERS(dirent.h)
+
+       dnl ******************************************
+       dnl *** Checks for OSX and iOS compilation ***
+       dnl ******************************************
+       AC_CHECK_HEADERS(CommonCrypto/CommonDigest.h)
+
+       dnl *********************************
+       dnl *** Check for Console 2.0 I/O ***
+       dnl *********************************
+       AC_CHECK_HEADERS([curses.h])
+       AC_CHECK_HEADERS([term.h], [], [],
+       [#if HAVE_CURSES_H
+        #include <curses.h>
+        #endif
+       ])
+       AC_CHECK_HEADERS([termios.h])
+
+       dnl * This is provided in io-layer, but on windows it's only available
+       dnl * on xp+
+       AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available])
+else
+       dnl *********************************
+       dnl *** Checks for Windows compilation ***
+       dnl *********************************
+       AC_CHECK_HEADERS(winternl.h)
+
+       jdk_headers_found=no
+       AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
+       AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
+       AC_CHECK_LIB(ole32, main, LIBS="$LIBS -lole32", AC_ERROR(bad mingw install?))
+       AC_CHECK_LIB(winmm, main, LIBS="$LIBS -lwinmm", AC_ERROR(bad mingw install?))
+       AC_CHECK_LIB(oleaut32, main, LIBS="$LIBS -loleaut32", AC_ERROR(bad mingw install?))
+       AC_CHECK_LIB(advapi32, main, LIBS="$LIBS -ladvapi32", AC_ERROR(bad mingw install?))
+       AC_CHECK_LIB(version, main, LIBS="$LIBS -lversion", AC_ERROR(bad mingw install?))
+
+       dnl *********************************
+       dnl *** Check for struct ip_mreqn ***
+       dnl *********************************
+       AC_MSG_CHECKING(for struct ip_mreqn)
+       AC_TRY_COMPILE([#include <ws2tcpip.h>], [
+               struct ip_mreqn mreq;
+               mreq.imr_address.s_addr = 0;
+       ], [
+               # Yes, we have it...
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_STRUCT_IP_MREQN)
+       ], [
+               # We'll just have to try and use struct ip_mreq
+               AC_MSG_RESULT(no)
+               AC_MSG_CHECKING(for struct ip_mreq)
+               AC_TRY_COMPILE([#include <ws2tcpip.h>], [
+                       struct ip_mreq mreq;
+                       mreq.imr_interface.s_addr = 0;
+               ], [
+                       # Yes, we have it...
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_STRUCT_IP_MREQ)
+               ], [
+                       # No multicast support
+                       AC_MSG_RESULT(no)
+               ])
+       ])
+       AC_CHECK_FUNCS(GetProcessId)
+       AC_CHECK_DECLS(InterlockedExchange64, [], [], [[#include <windows.h>]])
+       AC_CHECK_DECLS(InterlockedCompareExchange64, [], [], [[#include <windows.h>]])
+       AC_CHECK_DECLS(InterlockedDecrement64, [], [], [[#include <windows.h>]])
+       AC_CHECK_DECLS(InterlockedIncrement64, [], [], [[#include <windows.h>]])
+       AC_CHECK_DECLS(InterlockedAdd, [], [], [[#include <windows.h>]])
+       AC_CHECK_DECLS(InterlockedAdd64, [], [], [[#include <windows.h>]])
+       AC_CHECK_DECLS(__readfsdword, [], [], [[#include <windows.h>]])
+fi
+
+dnl socklen_t check
+AC_MSG_CHECKING(for socklen_t)
+AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+],[
+  socklen_t foo;
+],[
+ac_cv_c_socklen_t=yes
+       AC_DEFINE(HAVE_SOCKLEN_T, 1, [Have socklen_t])
+       AC_MSG_RESULT(yes)
+],[
+       AC_MSG_RESULT(no)
+])
+
+AC_MSG_CHECKING(for array element initializer support)
+AC_TRY_COMPILE([#include <sys/socket.h>], [
+       const int array[] = {[1] = 2,};
+], [
+       # Yes, we have it...
+       AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_ARRAY_ELEM_INIT,1,[Supports C99 array initialization])
+], [
+       # We'll have to use signals
+       AC_MSG_RESULT(no)
+])
+
+AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
+       # Simply calling trunc (0.0) is no good since gcc will optimize the call away
+       AC_TRY_LINK([#include <math.h>], 
+       [ static void *p = &trunc; ],
+       [
+               AC_DEFINE(HAVE_TRUNC) 
+               AC_MSG_RESULT(yes)
+               ac_cv_trunc=yes
+       ],
+       AC_MSG_RESULT(no)))
+
+if test "x$ac_cv_truncl" != "xyes"; then
+   AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL, 1, [Has the 'aintl' function]) LIBS="$LIBS -lsunmath"])
+fi
+
+AC_CHECK_FUNCS(round)
+AC_CHECK_FUNCS(rint)
+AC_CHECK_FUNCS(execvp)
+
+dnl ****************************
+dnl *** Look for /dev/random ***
+dnl ****************************
+
+AC_MSG_CHECKING([if usage of random device is requested])
+AC_ARG_ENABLE(dev-random,
+[  --disable-dev-random    disable the use of the random device (enabled by default)],
+try_dev_random=$enableval, try_dev_random=yes)
+
+AC_MSG_RESULT($try_dev_random)
+
+case "{$build}" in
+    *-openbsd*)
+    NAME_DEV_RANDOM="/dev/srandom"
+    ;;
+
+dnl Win32 does not have /dev/random, they have their own method...
+
+    *-mingw*|*-*-cygwin*)
+    ac_cv_have_dev_random=no
+    ;;
+
+dnl Everywhere else, it's /dev/random
+
+    *)
+    NAME_DEV_RANDOM="/dev/random"
+    ;;
+esac
+
+AC_DEFINE_UNQUOTED(NAME_DEV_RANDOM, "$NAME_DEV_RANDOM", [Name of /dev/random])
+
+dnl Now check if the device actually exists
+
+if test "x$try_dev_random" = "xyes"; then
+    AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
+    [if test -r "$NAME_DEV_RANDOM" ; then
+        ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
+    if test "x$ac_cv_have_dev_random" = "xyes"; then
+        AC_DEFINE(HAVE_CRYPT_RNG, 1, [Have /dev/random])
+    fi
+else
+    AC_MSG_CHECKING(for random device)
+    ac_cv_have_dev_random=no
+    AC_MSG_RESULT(has been disabled)
+fi
+
+if test "x$host_win32" = "xyes"; then
+    AC_DEFINE(HAVE_CRYPT_RNG)
+fi
+
+if test "x$ac_cv_have_dev_random" = "xno" \
+    && test "x$host_win32" = "xno"; then
+    AC_MSG_WARN([[
+***
+*** A system-provided entropy source was not found on this system.
+*** Because of this, the System.Security.Cryptography random number generator
+*** will throw a NotImplemented exception.
+***
+*** If you are seeing this message, and you know your system DOES have an
+*** entropy collection in place, please contact <crichton@gimp.org> and
+*** provide information about the system and how to access the random device.
+***
+*** Otherwise you can install either egd or prngd and set the environment
+*** variable MONO_EGD_SOCKET to point to the daemon's socket to use that.
+***]])
+fi
+AC_MSG_CHECKING([if inter-process shared handles are requested])
+AC_ARG_ENABLE(shared-handles, [  --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
+AC_MSG_RESULT($try_shared_handles)
+if test "x$try_shared_handles" != "xyes"; then
+       AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles])
+       AC_SUBST(DISABLE_SHARED_HANDLES)
+fi
+
+AC_ARG_ENABLE(bcl-opt, [  --disable-bcl-opt    BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes)
+
+AC_ARG_ENABLE(nunit-tests, [  --enable-nunit-tests     Run the nunit tests of the class library on 'make check'])
+AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
+
+AC_MSG_CHECKING([if big-arrays are to be enabled])
+AC_ARG_ENABLE(big-arrays,  [  --enable-big-arrays      Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
+if test "x$enable_big_arrays" = "xyes" ; then
+    if  test "x$ac_cv_sizeof_void_p" = "x8"; then
+       AC_DEFINE(MONO_BIG_ARRAYS,1,[Enable the allocation and indexing of arrays greater than Int32.MaxValue])
+    else
+        AC_MSG_ERROR([The allocation and indexing of arrays greater than Int32.MaxValue is not supported on this platform.])
+    fi
+fi
+AC_MSG_RESULT($enable_big_arrays)
+
+dnl **************
+dnl *** DTRACE ***
+dnl **************
+
+AC_ARG_ENABLE(dtrace,[  --enable-dtrace        Enable DTrace probes], enable_dtrace=$enableval, enable_dtrace=$has_dtrace)
+
+if test "x$enable_dtrace" = "xyes"; then
+   if test "x$has_dtrace" = "xno"; then
+         AC_MSG_ERROR([DTrace probes are not supported on this platform.])
+   fi
+   AC_PATH_PROG(DTRACE, [dtrace], [no], [$PATH:/usr/sbin])
+   if test "x$DTRACE" = "xno"; then
+         AC_MSG_RESULT([dtrace utility not found, dtrace support disabled.])
+         enable_dtrace=no
+   elif ! $DTRACE -h -s $srcdir/data/mono.d > /dev/null 2>&1; then
+         AC_MSG_RESULT([dtrace doesn't support -h option, dtrace support disabled.])
+         enable_dtrace=no
+   fi
+fi
+
+dtrace_g=no
+if test "x$enable_dtrace" = "xyes"; then
+       AC_DEFINE(ENABLE_DTRACE, 1, [Enable DTrace probes])
+       DTRACEFLAGS=
+       if test "x$ac_cv_sizeof_void_p" = "x8"; then
+               case "$host" in
+                       powerpc-*-darwin*)
+                       DTRACEFLAGS="-arch ppc64"
+                       ;;
+                       i*86-*-darwin*)
+                       DTRACEFLAGS="-arch x86_64"
+                       ;;
+                       *)
+                       DTRACEFLAGS=-64
+                       ;;
+               esac
+       else
+               case "$host" in
+                       powerpc-*-darwin*)
+                       DTRACEFLAGS="-arch ppc"
+                       ;;
+                       i*86-*-darwin*)
+                       DTRACEFLAGS="-arch i386"
+                       ;;
+                       *)
+                       DTRACEFLAGS=-32
+                       ;;
+               esac
+       fi
+       AC_SUBST(DTRACEFLAGS)
+       case "$host" in
+               *-*-solaris*)
+               dtrace_g=yes
+               ;;
+       esac
+       AC_CHECK_HEADERS([sys/sdt.h])
+fi
+AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes])
+AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes])
+
+dnl **************
+dnl ***  NaCl  ***
+dnl **************
+
+AC_ARG_ENABLE(nacl_codegen, [  --enable-nacl-codegen      Enable Native Client code generation], enable_nacl_codegen=$enableval, enable_nacl_codegen=no)
+AC_ARG_ENABLE(nacl_gc, [  --enable-nacl-gc           Enable Native Client garbage collection], enable_nacl_gc=$enableval, enable_nacl_gc=no)
+
+AM_CONDITIONAL(NACL_CODEGEN, test x$enable_nacl_codegen != xno)
+
+dnl
+dnl Hack to use system mono for operations in build/install not allowed in NaCl.
+dnl
+nacl_self_host=""
+if test "x$ac_cv_header_nacl_nacl_dyncode_h" = "xyes"; then
+   nacl_self_host="nacl_self_host"
+fi
+AC_SUBST(nacl_self_host)
+
+if test "x$enable_nacl_codegen" = "xyes"; then
+   MONO_NACL_ALIGN_MASK_OFF=1
+   AC_DEFINE(TARGET_NACL, 1, [...])
+   AC_DEFINE(__native_client_codegen__, 1, [...])
+else
+   MONO_NACL_ALIGN_MASK_OFF=0
+   AC_DEFINE(__default_codegen__, 1, [...])
+fi
+if test "x$enable_nacl_gc" = "xyes"; then
+   if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
+      INSTRUMENT_CFLAG="-finstrument-for-thread-suspension"
+   else
+      # Not yet implemented
+      INSTRUMENT_CFLAG=""
+   fi
+   CPPFLAGS="$CPPFLAGS $INSTRUMENT_CFLAG -D__native_client_gc__"
+fi
+AC_SUBST(MONO_NACL_ALIGN_MASK_OFF)
+
+dnl **************
+dnl ***  LLVM  ***
+dnl **************
+
+AC_ARG_ENABLE(llvm,[  --enable-llvm    Enable the LLVM back-end], enable_llvm=$enableval, enable_llvm=no)
+AC_ARG_ENABLE(loadedllvm,[  --enable-loadedllvm        Load the LLVM back-end dynamically], enable_llvm=$enableval && enable_loadedllvm=$enableval, enable_loadedllvm=no)
+AC_ARG_ENABLE(llvm-version-check,[  --enable-llvm-version-check Check that the LLVM matches the version expected by mono], enable_llvm_version_check=$enableval, enable_llvm_version_check=no)
+
+AC_ARG_WITH(llvm, [  --with-llvm=<llvm prefix>    Enable the LLVM back-end], enable_llvm=yes,)
+
+if test "x$enable_llvm" = "xyes"; then
+   if test "x$with_llvm" != "x"; then
+         LLVM_CONFIG=$with_llvm/bin/llvm-config
+         if test ! -x $LLVM_CONFIG; then
+                AC_MSG_ERROR([LLVM executable $LLVM_CONFIG not found.])
+      fi
+   else
+      AC_PATH_PROG(LLVM_CONFIG, llvm-config, no)
+      if test "x$LLVM_CONFIG" = "xno"; then
+            AC_MSG_ERROR([llvm-config not found.])
+      fi
+   fi
+
+   llvm_codegen="x86codegen"
+   case "$target" in
+   arm*)
+               llvm_codegen="armcodegen"
+               ;;
+   esac
+
+   # The output of --cflags seems to include optimizations flags too
+   LLVM_CFLAGS=`$LLVM_CONFIG --cflags | sed -e 's/-O2//g' | sed -e 's/-O0//g' | sed -e 's/-fomit-frame-pointer//g' | sed -e 's/-fPIC//g'`
+   # LLVM is compiled with -fno-rtti, so we need this too, since our classes inherit
+   # from LLVM classes.
+   LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti"
+   LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+   # This might include empty lines
+   LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -`
+   if test "x$host" != "x$target"; then
+      # No need for jit libs
+      LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter`
+   else
+      LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit mcjit $llvm_codegen`
+   fi
+   LLVM_LIBS="$LLVM_LIBS $LLVM_LDFLAGS $LLVM_SYSTEM_LIBS -lstdc++"
+
+   expected_llvm_version="3.4svn-mono-mono/e656cac"
+
+   # Should be something like '2.6' or '2.7svn'
+   llvm_version=`$LLVM_CONFIG --version`
+   major_version=`echo $llvm_version | cut -c 1`
+   minor_version=`echo $llvm_version | cut -c 3`
+   llvm_api_version=`$LLVM_CONFIG --mono-api-version 2>/dev/null`
+   AC_MSG_CHECKING(LLVM version)
+   AC_MSG_RESULT($llvm_version)
+   if echo $llvm_version | grep -q 'mono'; then
+         if test "x$enable_llvm_version_check" == "xyes"; then
+                if test "$llvm_version" != "$expected_llvm_version"; then
+                       AC_MSG_ERROR([Expected llvm version $expected_llvm_version, but llvm-config --version returned $llvm_version"])
+                fi
+         fi
+         if test "x$llvm_api_version" = "x"; then
+               LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=0"
+               LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=0"
+         else
+               LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=$llvm_api_version"
+               LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version"
+         fi
+   else
+         AC_MSG_ERROR([Compiling with stock LLVM is not supported, please use the Mono LLVM repo at https://github.com/mono/llvm, with the GIT branch which matches this version of mono, i.e. 'mono-2-10' for Mono 2.10.])
+   fi
+
+   AC_DEFINE_UNQUOTED(LLVM_MAJOR_VERSION, $major_version, [Major version of LLVM libraries])
+   AC_DEFINE_UNQUOTED(LLVM_MINOR_VERSION, $minor_version, [Minor version of LLVM libraries])
+   AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties])
+
+   # Have to pass these on the command line since mini-llvm-cpp.h already includes
+   # llvm's config.h
+   LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MAJOR_VERSION=$major_version -DLLVM_MINOR_VERSION=$minor_version"
+
+   AC_SUBST(LLVM_CFLAGS)
+   AC_SUBST(LLVM_CXXFLAGS)
+   AC_SUBST(LLVM_LIBS)
+   AC_SUBST(LLVM_LDFLAGS)
+   AC_DEFINE(ENABLE_LLVM, 1, [Enable the LLVM back end])
+fi
+
+AM_CONDITIONAL(ENABLE_LLVM, [test x$enable_llvm = xyes])
+if test "x$enable_loadedllvm" = "xyes"; then
+   AC_DEFINE(MONO_LLVM_LOADED, 1, [The LLVM back end is dynamically loaded])
+fi
+AM_CONDITIONAL(LOADED_LLVM, [test x$enable_loadedllvm = xyes])
+
+TARGET="unknown"
+ACCESS_UNALIGNED="yes"
+
+JIT_SUPPORTED=no
+INTERP_SUPPORTED=no
+LIBC="libc.so.6"
+INTL="libc.so.6"
+SQLITE="libsqlite.so.0"
+SQLITE3="libsqlite3.so.0"
+X11="libX11.so"
+XINERAMA="libXinerama.so"
+
+sizeof_register="SIZEOF_VOID_P"
+
+jit_wanted=true
+interp_wanted=false
+sgen_supported=false
+boehm_supported=true
+case "$host" in
+       mips*)
+               TARGET=MIPS;
+               arch_target=mips;
+               sgen_supported=true
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+
+               AC_MSG_CHECKING(for mips n32)
+               AC_TRY_COMPILE([],[
+               #if _MIPS_SIM != _ABIN32
+               #error Not mips n32
+               #endif
+               return 0;
+               ],[
+               AC_MSG_RESULT(yes)
+               sizeof_register=8
+               ],[
+               AC_MSG_RESULT(no)
+               ])
+               ;;
+       i*86-*-*)
+               TARGET=X86;
+               arch_target=x86;
+               JIT_SUPPORTED=yes
+               case $host_os in
+                 solaris*)
+                       LIBC="libc.so"
+                       INTL="libintl.so"
+                       if test "x$ac_cv_sizeof_void_p" = "x8"; then
+                               TARGET=AMD64
+                               arch_target=amd64
+                       fi
+
+                       # On solaris 10 x86, gcc prints a warning saying 'visibility attribute not supported on this configuration; ignored', but linking fails. A test case:
+                       # int astruct __attribute__ ((visibility ("hidden")));
+                       # void foo ()
+                       # {
+                       #       void *p = &astruct;
+                       # }
+                       # gcc -fPIC --shared -o libfoo.so foo.c
+                       # yields:
+                       # foo.c:6: warning: visibility attribute not supported in this configuration; ignored
+                       # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally
+                       have_visibility_hidden=no
+                       sgen_supported=true
+                       ;;
+                 mingw*|cygwin*)
+                       sgen_supported=true
+                       have_visibility_hidden=no                 
+                       ;;
+                 haiku*)
+                       LIBC=libroot.so
+                       ;;
+                 linux*)
+                       sgen_supported=true
+                       AOT_SUPPORTED="yes"
+                       ;;
+                 darwin*)
+                       sgen_supported=true
+                       AOT_SUPPORTED="yes"
+                       ;;
+                 darwin*|openbsd*|freebsd*)
+                       sgen_supported=true
+                       ;;
+               esac
+               ;;
+       x86_64-*-* | amd64-*-*)
+               TARGET=AMD64;
+               arch_target=amd64;
+               JIT_SUPPORTED=yes
+               if test "x$ac_cv_sizeof_void_p" = "x4"; then
+                       AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
+                       sizeof_register=8
+               fi
+               case $host_os in
+                 linux*)
+                       sgen_supported=true
+                       AOT_SUPPORTED="yes"
+                       ;;
+                 darwin*|openbsd*|freebsd*)
+                       sgen_supported=true
+                       ;;
+               esac
+               case "$host" in
+                       x86_64-*-nacl*)
+                               AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
+                               sizeof_register=8
+                               ;;
+               esac
+               ;;
+       ia64-*-*)
+               TARGET=IA64
+               arch_target=ia64
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               LIBC="libc.so.6.1"
+               INTL="libc.so.6.1"
+               AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
+               libmono_ldflags="-lunwind"
+               ;;
+       sparc*-*-*)
+               if test "x$ac_cv_sizeof_void_p" = "x8"; then
+                  TARGET=SPARC64
+               else
+                       TARGET=SPARC
+               fi
+               arch_target=sparc;
+               JIT_SUPPORTED=yes
+               ACCESS_UNALIGNED="no"
+               case $host_os in
+                 linux*) ;;
+                 *)
+                       LIBC="libc.so"
+                       INTL="libintl.so"
+               esac
+               if test x"$GCC" = xyes; then
+                       # We don't support v8 cpus
+                       CFLAGS="$CFLAGS -Wno-cast-align -mcpu=v9"
+               fi
+               if test x"$AR" = xfalse; then
+                       AC_MSG_ERROR([The required utility 'ar' is not found in your PATH. Usually it can be found in /usr/ccs/bin.])
+               fi
+               sgen_supported=true
+               ;;
+       *-mingw*|*-*-cygwin*)
+               # When this is enabled, it leads to very strange crashes at runtime (gcc-3.4.4)
+               have_visibility_hidden=no
+               INTL="intl"
+               ;;
+       macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
+        powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* )
+               if test "x$ac_cv_sizeof_void_p" = "x8"; then
+                       TARGET=POWERPC64;
+                       CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__"
+                       CFLAGS="$CFLAGS -mminimal-toc"
+               else
+                       TARGET=POWERPC;
+                       CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
+               fi
+               arch_target=ppc;
+               JIT_SUPPORTED=yes
+               case $host_os in
+                 linux*|darwin*)
+                       sgen_supported=true
+                       ;;
+               esac
+               ;;
+       arm*-darwin*)
+               TARGET=ARM;
+               arch_target=arm;
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
+               # libgc's gc_locks.h depends on this
+           CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC"
+               sgen_supported=true
+               ;;
+       arm*-linux*)
+               TARGET=ARM;
+               arch_target=arm;
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               sgen_supported=true
+               AOT_SUPPORTED="yes"
+               CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
+               ;;
+# TODO: make proper support for NaCl host.
+#        arm*-*nacl)
+#              TARGET=ARM;
+#              arch_target=arm;
+#              ACCESS_UNALIGNED="no"
+#              JIT_SUPPORTED=yes
+#              sgen_supported=true
+#              AOT_SUPPORTED="no"
+#              ;;
+       aarch64-*)
+               # https://lkml.org/lkml/2012/7/15/133
+               TARGET=ARM64
+               arch_target=arm64
+               JIT_SUPPORTED=yes
+               sgen_supported=true
+               boehm_supported=false
+               ;;
+       s390x-*-linux*)
+               TARGET=S390X;
+               arch_target=s390x;
+               ACCESS_UNALIGNED="yes"
+               JIT_SUPPORTED=yes
+               sgen_supported=true
+               CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
+               ;;
+esac
+
+HOST=$TARGET
+
+if test "x$host" != "x$target"; then
+   AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode])
+   enable_mcs_build=no
+   case "$target" in
+   arm*-darwin*)
+               TARGET=ARM;
+               arch_target=arm;
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
+               jit_wanted=true
+               # Can't use tls, since it depends on the runtime detection of tls offsets
+               # in mono-compiler.h
+               with_tls=pthread
+               ;;
+   powerpc64-ps3-linux-gnu)
+               TARGET=POWERPC64
+               arch_target=powerpc64
+               AC_DEFINE(TARGET_PS3, 1, [...])
+               # It would be better to just use TARGET_POWERPC64, but lots of code already
+               # uses this define
+               AC_DEFINE(__mono_ppc64__, 1, [...])
+               AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
+               sizeof_register=8
+               target_byte_order=G_BIG_ENDIAN
+               ;;
+
+   powerpc64-xbox360-linux-gnu)
+               TARGET=POWERPC64
+               arch_target=powerpc64
+               AC_DEFINE(TARGET_XBOX360, 1, [...])
+               # It would be better to just use TARGET_POWERPC64, but lots of code already
+               # uses this define
+               sizeof_register=8
+               target_byte_order=G_BIG_ENDIAN
+               ;;
+   x86_64-*-nacl)
+               TARGET=AMD64
+               arch_target=amd64
+               AC_DEFINE(TARGET_AMD64, 1, [...])
+               AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
+               sizeof_register=8
+               ;;
+# TODO: make proper support for NaCl target.
+#   arm*-*nacl)
+#              TARGET=ARM
+#              arch_target=arm
+#              AC_DEFINE(TARGET_ARM, 1, [...])
+#              ACCESS_UNALIGNED="no"
+#              JIT_SUPPORTED=yes
+#              sizeof_register=4
+#               CPPFLAGS="$CPPFLAGS \
+#                    -D__ARM_EABI__ \
+#                    -D__arm__ \
+#                    -D__portable_native_client__ \
+#                    -Dtimezone=_timezone \
+#                    -DDISABLE_SOCKETS \
+#                    -DDISABLE_ATTACH \
+#                    -DUSE_NEWLIB"
+#              jit_wanted=true
+               # Can't use tls, since it depends on the runtime detection of tls offsets
+               # in mono-compiler.h
+#              with_tls=pthread
+#              ;;
+   i686-*-nacl)
+               TARGET=X86
+               arch_target=x86
+               AC_DEFINE(TARGET_X86, 1, [...])
+               sizeof_register=4
+               ;;
+   arm*-linux-*)
+               TARGET=ARM;
+               arch_target=arm;
+               AC_DEFINE(TARGET_ARM, 1, [...])
+               AC_DEFINE(TARGET_ANDROID, 1, [...])
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
+               jit_wanted=true
+               # Can't use tls, since it depends on the runtime detection of tls offsets
+               # in mono-compiler.h
+               with_tls=pthread
+               target_mach=no
+               case "$target" in
+               armv7l-unknown-linux-gnueabi*)
+                       # TEGRA
+                       CPPFLAGS="$CPPFLAGS"
+                       ;;
+               armv5-*-linux-androideabi*)
+                       CPPFLAGS="$CPPFLAGS"
+                       ;;
+               esac
+               ;;
+       aarch64-*)
+               TARGET=ARM64
+               JIT_SUPPORTED=yes
+               jit_wanted=true
+               ;;
+       *)
+               AC_MSG_ERROR([Cross compiling is not supported for target $target])
+       esac
+fi
+
+case "$TARGET" in
+X86)
+       AC_DEFINE(TARGET_X86, 1, [...])
+       ;;
+AMD64)
+       AC_DEFINE(TARGET_AMD64, 1, [...])
+       ;;
+ARM)
+       AC_DEFINE(TARGET_ARM, 1, [...])
+       ;;
+ARM64)
+       AC_DEFINE(TARGET_ARM64, 1, [...])
+       ;;
+POWERPC)
+       AC_DEFINE(TARGET_POWERPC, 1, [...])
+       ;;
+POWERPC64)
+       AC_DEFINE(TARGET_POWERPC, 1, [...])
+       AC_DEFINE(TARGET_POWERPC64, 1, [...])
+       ;;
+S390X)
+       AC_DEFINE(TARGET_S390X, 1, [...])
+       ;;
+MIPS)
+       AC_DEFINE(TARGET_MIPS, 1, [...])
+       ;;
+IA64)
+       AC_DEFINE(TARGET_IA64, 1, [...])
+       ;;
+SPARC)
+       AC_DEFINE(TARGET_SPARC, 1, [...])
+       ;;
+SPARC64)
+       AC_DEFINE(TARGET_SPARC64, 1, [...])
+       ;;
+esac
+
+dnl Use GCC atomic ops if they work on the target.
+if test x$GCC = "xyes"; then
+       case $TARGET in
+       X86 | AMD64 | ARM | ARM64 | POWERPC | POWERPC64 | MIPS | S390X | SPARC | SPARC64)
+               AC_DEFINE(USE_GCC_ATOMIC_OPS, 1, [...])
+               ;;
+       esac
+fi
+
+if test "x$target_mach" = "xyes"; then
+   if test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64"; then
+         AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
+         CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
+         CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
+   else
+       AC_TRY_COMPILE([#include "TargetConditionals.h"],[
+       #if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
+       #error fail this for ios
+       #endif
+       return 0;
+       ], [
+                 AC_DEFINE(TARGET_OSX,1,[The JIT/AOT targets OSX])
+          CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_OSX"
+          CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_OSX"
+       ], [
+          AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
+          CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
+          CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
+       ])
+       fi
+   AC_DEFINE(TARGET_MACH,1,[The JIT/AOT targets Apple platforms])
+fi
+
+if test "x$sizeof_register" = "x4"; then
+   AC_DEFINE(SIZEOF_REGISTER,4,[size of machine integer registers])
+elif test "x$sizeof_register" = "x8"; then
+   AC_DEFINE(SIZEOF_REGISTER,8,[size of machine integer registers])
+else
+   AC_DEFINE(SIZEOF_REGISTER,SIZEOF_VOID_P,[size of machine integer registers])
+fi
+
+if test "x$target_byte_order" = "xG_BIG_ENDIAN"; then
+   AC_DEFINE(TARGET_BYTE_ORDER,G_BIG_ENDIAN,[byte order of target])
+elif test "x$target_byte_order" = "xG_LITTLE_ENDIAN"; then
+   AC_DEFINE(TARGET_BYTE_ORDER,G_LITTLE_ENDIAN,[byte order of target])
+else
+   AC_DEFINE(TARGET_BYTE_ORDER,G_BYTE_ORDER,[byte order of target])
+fi
+
+if test "x$have_visibility_hidden" = "xyes"; then
+   AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute])
+fi
+
+if test "x$have_deprecated" = "xyes"; then
+   AC_DEFINE(HAVE_DEPRECATED, 1, [Support for the deprecated attribute])
+fi
+
+dnl 
+dnl Simple Generational checks (sgen)
+dnl
+if $sgen_supported; then
+   build_sgen_default=yes
+else
+   build_sgen_default=no
+fi
+SGEN_DEFINES=
+AC_ARG_WITH(sgen, [  --with-sgen=yes,no             Extra Generational GC, default=yes],[buildsgen=$with_sgen],[buildsgen=$build_sgen_default])
+if test x$buildsgen = xyes; then
+   if $sgen_supported; then
+       SGEN_DEFINES="-DHAVE_SGEN_GC -DHAVE_MOVING_COLLECTOR"
+       gc_msg="sgen and $gc_msg"
+   else
+       buildsgen=no
+       AC_MSG_WARN("Sgen is not supported on this platform")
+   fi
+fi
+AC_SUBST(SGEN_DEFINES)
+AM_CONDITIONAL(SUPPORT_SGEN, test x$buildsgen = xyes)
+
+USEJIT=false
+if test x$JIT_SUPPORTED = xyes; then
+   if $jit_wanted; then
+      USEJIT=true
+      jit_status="Building and using the JIT"
+   else
+      if $interp_wanted; then
+         jit_status="Building the JIT, defaulting to the interpreter"
+      else
+         AC_ERROR(No JIT or interpreter support available or selected.)
+      fi
+   fi
+else
+   if test x$interp_wanted = xtrue; then
+      jit_status="interpreter"
+   else
+      AC_ERROR(No JIT or interpreter support available or selected.)
+   fi
+fi
+
+AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
+
+libsuffix=".so"
+
+case "$host" in
+     *-*-darwin*)
+       libsuffix=".dylib"
+       LIBC="libc.dylib"
+       INTL="libintl.dylib"
+       SQLITE="libsqlite.0.dylib"
+       SQLITE3="libsqlite3.0.dylib"
+       X11="libX11.dylib"
+       ;;
+     *-*-*netbsd*)
+       LIBC="libc.so.12"
+       INTL="libintl.so.0"
+       ;;
+    *-*-*freebsd*)
+       LIBC="libc.so"
+       INTL="libintl.so"
+       SQLITE="libsqlite.so"
+       SQLITE3="libsqlite3.so"
+       ;;
+    *-*-*openbsd*)
+       LIBC="libc.so"
+       INTL="libintl.so"
+        SQLITE="libsqlite.so"
+        SQLITE3="libsqlite3.so"
+       ;;
+    *-*-*linux*)
+       AC_PATH_X
+       dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh`
+       AC_MSG_CHECKING(for the soname of libX11.so)
+       for i in $x_libraries $dlsearch_path; do
+               for r in 4 5 6; do
+                       if test -f $i/libX11.so.$r; then
+                               X11=libX11.so.$r
+                               AC_MSG_RESULT($X11)
+                       fi
+               done
+       done
+       
+       if test "x$X11" = "xlibX11.so"; then
+               AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? Assuming libX11.so.6...]);
+               X11=libX11.so.6
+       fi
+       AC_MSG_CHECKING(for the soname of libXinerama.so)
+       for i in $x_libraries $dlsearch_path; do
+               for r in 1 2 3; do
+                       if test -f $i/libXinerama.so.$r; then
+                               XINERAMA=libXinerama.so.$r
+                               AC_MSG_RESULT($XINERAMA)
+                       fi
+               done
+       done
+       if test "x$XINERAMA" = "xlibXinerama.so"; then
+               AC_MSG_WARN([Could not find Xinerama development libs. Support for multiple monitors might not work...]);
+       fi
+       ;;
+esac
+
+
+AC_SUBST(libsuffix)
+
+if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
+       if test "x$with_tls" = "x__thread"; then
+               #
+               # On some linux distributions, TLS works in executables, but linking 
+               # against a shared library containing TLS fails with:
+               # undefined reference to `__tls_get_addr'
+               #
+               rm -f conftest.c conftest.so conftest
+               echo "static __thread int foo; int main () { foo = 5; return 0; }" > conftest.c
+               $CC -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1
+               $CC -o conftest conftest.so > /dev/null 2>&1
+               if test ! -f conftest; then
+                  AC_MSG_WARN([Disabling usage of __thread.]);
+                  with_tls=pthread
+               fi
+               rm -f conftest.c conftest.so conftest
+       fi
+fi
+
+AC_ARG_ENABLE(icall-symbol-map,[  --enable-icall-symbol-map Generate tables which map icall functions to their C symbols], icall_symbol_map=$enableval, icall_symbol_map=no)
+if test "x$icall_symbol_map" = "xyes"; then
+   AC_DEFINE(ENABLE_ICALL_SYMBOL_MAP, 1, [Icall symbol map enabled])
+fi
+
+AC_ARG_ENABLE(icall-export,[  --enable-icall-export Export icall functions], icall_export=$enableval, icall_export=no)
+if test "x$icall_export" = "xyes"; then
+   AC_DEFINE(ENABLE_ICALL_EXPORT, 1, [Icall export enabled])
+fi
+
+AC_ARG_ENABLE(icall-tables,[  --disable-icall-tables Disable the runtime lookup of icalls], icall_tables=$enableval, icall_tables=yes)
+if test "x$icall_tables" = "xno"; then
+   AC_DEFINE(DISABLE_ICALL_TABLES, 1, [Icall tables disabled])
+fi
+
+if test "x$with_tls" = "x__thread"; then
+       AC_DEFINE(HAVE_KW_THREAD, 1, [Have __thread keyword])
+       # Pass the information to libgc
+       CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS"
+       AC_MSG_CHECKING(if the tls_model attribute is supported)
+       AC_TRY_COMPILE([static __thread int foo __attribute__((tls_model("initial-exec")));], [
+               ], [
+                       AC_MSG_RESULT(yes)
+                       AC_DEFINE(HAVE_TLS_MODEL_ATTR, 1, [tls_model available])
+               ], [
+                       AC_MSG_RESULT(no)
+       ])
+fi
+
+if test ${TARGET} = ARM; then
+       dnl ******************************************
+       dnl *** Check to see what FPU is available ***
+       dnl ******************************************
+       AC_MSG_CHECKING(which FPU to use)
+
+       #
+       # This is a bit tricky:
+       #
+       # if (__ARM_PCS_VFP) {
+       #       /* mfloat-abi=hard == VFP with hard ABI */
+       # } elif (!__SOFTFP__) {
+       #       /* mfloat-abi=softfp == VFP with soft ABI */
+       # } else {
+       #       /* mfloat-abi=soft == no VFP */
+       # }
+       #
+       # The exception is iOS (w/ GCC) where none of the above
+       # are defined (but iOS always uses the 'softfp' ABI).
+       #
+       # No support for FPA.
+       #
+
+       fpu=NONE
+
+       # iOS GCC always uses the 'softfp' ABI.
+       if test x"$GCC" = xyes && test x$platform_darwin = xyes; then
+               fpu=VFP
+       fi
+
+       # Are we using the 'hard' ABI?
+       if test x$fpu = xNONE; then
+               AC_TRY_COMPILE([], [
+                       #ifndef __ARM_PCS_VFP
+                       #error "Float ABI is not 'hard'"
+                       #endif
+                       return 0;
+               ], [
+                       fpu=VFP_HARD
+               ], [
+                       fpu=NONE
+               ])
+       fi
+
+       # No 'hard' ABI. 'soft' or 'softfp'?
+       if test x$fpu = xNONE; then
+               AC_TRY_COMPILE([], [
+                       #ifdef __SOFTFP__
+                       #error "Float ABI is not 'softfp'"
+                       #endif
+                       return 0;
+               ], [
+                       fpu=VFP
+               ], [
+                       fpu=NONE
+               ])
+       fi
+
+       AC_MSG_RESULT($fpu)
+       CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
+       unset fpu
+
+       dnl *********************************************
+       dnl *** Check which ARM version(s) we can use ***
+       dnl *********************************************
+       AC_MSG_CHECKING(which ARM version to use)
+
+       AC_TRY_COMPILE([], [
+               #if !defined(__ARM_ARCH_5T__) && !defined(__ARM_ARCH_5TE__) && !defined(__ARM_ARCH_5TEJ__)
+               #error Not on ARM v5.
+               #endif
+               return 0;
+       ], [
+               arm_v5=yes
+
+               arm_ver=ARMv5
+       ], [])
+
+       AC_TRY_COMPILE([], [
+               #if !defined(__ARM_ARCH_6J__) && !defined(__ARM_ARCH_6ZK__) && !defined(__ARM_ARCH_6K__) && !defined(__ARM_ARCH_6T2__) && !defined(__ARM_ARCH_6M__)
+               #error Not on ARM v6.
+               #endif
+               return 0;
+       ], [
+               arm_v5=yes
+               arm_v6=yes
+
+               arm_ver=ARMv6
+       ], [])
+
+       AC_TRY_COMPILE([], [
+               #if !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_7R__) && !defined(__ARM_ARCH_7EM__) && !defined(__ARM_ARCH_7M__) && !defined(__ARM_ARCH_7S__)
+               #error Not on ARM v7.
+               #endif
+               return 0;
+       ], [
+               arm_v5=yes
+               arm_v6=yes
+               arm_v7=yes
+
+               arm_ver=ARMv7
+       ], [])
+
+       AC_MSG_RESULT($arm_ver)
+
+       if test x$arm_v5 = xyes; then
+               AC_DEFINE(HAVE_ARMV5, 1, [ARM v5])
+               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV5=1"
+       fi
+
+       if test x$arm_v6 = xyes; then
+               AC_DEFINE(HAVE_ARMV6, 1, [ARM v6])
+               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV6=1"
+       fi
+
+       if test x$arm_v7 = xyes; then
+               AC_DEFINE(HAVE_ARMV7, 1, [ARM v7])
+               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV7=1"
+       fi
+fi
+
+if test ${TARGET} = ARM; then
+       if test "x${with_jumptables}" = "xyes"; then
+                AC_DEFINE(USE_JUMP_TABLES, 1, Use jump tables in JIT)
+        fi
+fi
+
+if test ${TARGET} = unknown; then
+       CPPFLAGS="$CPPFLAGS -DNO_PORT"
+       AC_MSG_WARN("mono has not been ported to $host: some things may not work.")
+fi
+
+if test ${ACCESS_UNALIGNED} = no; then
+       CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
+fi
+
+case "x$gc" in
+       xincluded)
+               # Pass CPPFLAGS to libgc configure
+               # We should use a separate variable for this to avoid passing useless and
+               # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
+               # This should be executed late so we pick up the final version of CPPFLAGS
+               # The problem with this approach, is that during a reconfigure, the main
+               # configure scripts gets invoked with these arguments, so we use separate
+               # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS.
+               TMP_CPPFLAGS="$CPPFLAGS $CPPFLAGS_FOR_LIBGC"
+               if test x$TARGET = xSPARC -o x$TARGET = xSPARC64; then
+                       TMP_CPPFLAGS=`echo $TMP_CPPFLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//g'`
+               fi
+               # Don't pass -finstrument-for-thread-suspension in, 
+               # if these are instrumented it will be very bad news 
+               # (infinite recursion, undefined parking behavior, etc)
+               TMP_CPPFLAGS=`echo $TMP_CPPFLAGS | sed -e 's/-finstrument-for-thread-suspension//g'`
+               ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$TMP_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
+               AC_CONFIG_SUBDIRS(libgc)
+               ;;
+esac
+
+AC_ARG_WITH(profile2,  [  --with-profile2=yes,no          If you want to install the 2.0/3.5 FX (defaults to yes)],            [], [with_profile2=yes])
+AC_ARG_WITH(profile4,  [  --with-profile4=yes,no          If you want to install the 4.0 FX (defaults to yes)],                [], [with_profile4=yes])
+AC_ARG_WITH(profile4_5,[  --with-profile4_5=yes,no        If you want to install the 4.5 FX (defaults to yes)],                [], [with_profile4_5=yes])
+AC_ARG_WITH(monodroid, [  --with-monodroid=yes,no         If you want to build the MonoDroid assemblies (defaults to no)],     [], [with_monodroid=no])
+AC_ARG_WITH(monotouch, [  --with-monotouch=yes,no,only    If you want to build the MonoTouch assemblies (defaults to no)],     [], [with_monotouch=no])
+AC_ARG_WITH(xammac,    [  --with-xammac=yes,no,only       If you want to build the Xamarin.Mac assemblies (defaults to no)],   [], [with_xammac=no])
+
+OPROFILE=no
+AC_ARG_WITH(oprofile,[  --with-oprofile=no,<oprofile install dir>   Enable oprofile support (defaults to no)],[
+       if test x$with_oprofile != xno; then
+           oprofile_include=$with_oprofile/include
+           if test ! -f $oprofile_include/opagent.h; then
+                 AC_MSG_ERROR([oprofile include file not found at $oprofile_include/opagent.h])
+               fi
+           OPROFILE=yes
+               OPROFILE_CFLAGS="-I$oprofile_include"
+           OPROFILE_LIBS="-L$with_oprofile/lib/oprofile -lopagent"
+           AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
+       fi
+])
+
+MALLOC_MEMPOOLS=no
+AC_ARG_WITH(malloc_mempools,[  --with-malloc-mempools=yes,no  Use malloc for each single mempool allocation (only for runtime debugging, defaults to no)],[
+       if test x$with_malloc_mempools = xyes; then
+               MALLOC_MEMPOOLS=yes
+               AC_DEFINE(USE_MALLOC_FOR_MEMPOOLS,1,[Use malloc for each single mempool allocation])
+       fi
+])
+
+
+DISABLE_MCS_DOCS=no
+AC_ARG_WITH(mcs_docs,[  --with-mcs-docs=yes,no         If you want to build the documentation under mcs (defaults to yes)],[
+       if test x$with_mcs_docs != xyes; then
+               DISABLE_MCS_DOCS=yes
+       fi
+])
+if test x$with_profile4 != xyes; then
+       DISABLE_MCS_DOCS=yes
+fi
+
+AC_ARG_WITH(lazy_gc_thread_creation, [  --with-lazy-gc-thread-creation=yes|no      Enable lazy runtime thread creation, embedding host must do it explicitly (defaults to no)],[
+       if test x$with_lazy_gc_thread_creation != xno ; then
+               AC_DEFINE(LAZY_GC_THREAD_CREATION,1,[Enable lazy gc thread creation by the embedding host.])
+       fi
+], [with_lazy_gc_thread_creation=no])
+
+AC_CHECK_HEADER([malloc.h], 
+               [AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1], 
+                       [Define to 1 if you have /usr/include/malloc.h.])],,)
+
+if test x"$GCC" = xyes; then
+       # Implicit function declarations are not 64 bit safe
+       # Do this late, since this causes lots of configure tests to fail
+       CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+       # jay has a lot of implicit declarations
+       JAY_CFLAGS="-Wno-implicit-function-declaration"
+fi
+
+# When --disable-shared is used, libtool transforms libmono-2.0.la into libmono-2.0.so
+# instead of libmono-static.a
+if test "x$enable_shared" = "xno" -a "x$enable_executables" = "xyes"; then
+   LIBMONO_LA=libmini-static.la
+else
+   if test x$buildsgen = xyes; then
+      LIBMONO_LA=libmonosgen-$API_VER.la
+   else
+      LIBMONO_LA=libmonoboehm-$API_VER.la
+   fi
+fi
+AC_SUBST(LIBMONO_LA)
+
+dnl
+dnl Consistency settings
+dnl
+if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
+   DISABLE_MCS_DOCS=yes
+   with_profile2=no
+   with_profile4=no
+   with_profile4_5=no
+   with_monodroid=no
+   with_monotouch=no
+   with_xammac=no
+fi
+
+if test x$DISABLE_MCS_DOCS = xyes; then
+   docs_dir=""
+else
+   docs_dir=docs
+fi
+AC_SUBST(docs_dir)
+
+## Maybe should also disable if mcsdir is invalid.  Let's punt the issue for now.
+AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno])
+
+AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
+AC_SUBST(OPROFILE_CFLAGS)
+AC_SUBST(OPROFILE_LIBS)
+
+libmono_ldflags="$libmono_ldflags $LIBS"
+
+AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes])
+AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
+AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes])
+AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
+AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
+AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
+AM_CONDITIONAL(ONLY_MONOTOUCH, [test "x$with_monotouch" = "xonly"])
+AM_CONDITIONAL(ONLY_XAMMAC, [test "x$with_xammac" = "xonly"])
+
+AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
+AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
+AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+AM_CONDITIONAL(SPARC64, test x$TARGET = xSPARC64)
+AM_CONDITIONAL(X86, test x$TARGET = xX86)
+AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64)
+AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
+AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
+AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
+AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64)
+AM_CONDITIONAL(ARM, test x$TARGET = xARM)
+AM_CONDITIONAL(ARM64, test x$TARGET = xARM64)
+AM_CONDITIONAL(S390X, test x$TARGET = xS390X)
+AM_CONDITIONAL(HOST_X86, test x$HOST = xX86)
+AM_CONDITIONAL(HOST_AMD64, test x$HOST = xAMD64)
+AM_CONDITIONAL(HOST_ARM, test x$HOST = xARM)
+AM_CONDITIONAL(HOST_ARM64, test x$HOST = xARM64)
+AM_CONDITIONAL(CROSS_COMPILE, test "x$host" != "x$target")
+
+AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
+AM_CONDITIONAL(INTERP_SUPPORTED, test x$interp_wanted = xtrue)
+AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
+
+AC_SUBST(LIBC)
+AC_SUBST(INTL)
+AC_SUBST(SQLITE)
+AC_SUBST(SQLITE3)
+AC_SUBST(X11)
+AC_SUBST(XINERAMA)
+AC_DEFINE_UNQUOTED(ARCHITECTURE,"$arch_target",[The architecture this is running on])
+AC_SUBST(arch_target)
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+
+mono_build_root=`pwd`
+AC_SUBST(mono_build_root)
+
+if test x$USEJIT = xtrue; then
+  mono_runtime=mono/mini/mono
+else
+  mono_runtime=mono/interpreter/mint
+fi
+AC_SUBST(mono_runtime)
+
+mono_cfg_root=$mono_build_root/runtime
+if test x$host_win32 = xyes; then
+  if test "x$cross_compiling" = "xno"; then
+    mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
+  else
+    mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\'`\\etc
+  fi
+else
+  mono_cfg_dir=$mono_cfg_root/etc
+fi
+AC_SUBST(mono_cfg_dir)
+
+AC_CONFIG_FILES([po/mcs/Makefile.in])
+
+AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
+AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/1.0
+    cd runtime/etc/mono/1.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_1_1/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0
+    cd runtime/etc/mono/2.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_2_0/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/web.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0
+    cd runtime/etc/mono/2.0
+    rm -f web.config
+    $LN_S $reldir/data/net_2_0/web.config web.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini],
+[   depth=../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/
+    cd runtime/etc/mono/
+    rm -f browscap.ini
+    $LN_S $reldir/data/browscap.ini browscap.ini
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
+[   depth=../../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/
+    cd runtime/etc/mono/2.0/Browsers
+    rm -f Compat.browser
+    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/Browsers/Compat.browser],
+[   depth=../../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/4.0/Browsers/
+    cd runtime/etc/mono/4.0/Browsers
+    rm -f Compat.browser
+    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/Browsers/Compat.browser],
+[   depth=../../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/4.5/Browsers/
+    cd runtime/etc/mono/4.5/Browsers
+    rm -f Compat.browser
+    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/4.0
+    cd runtime/etc/mono/4.0
+    rm -f machine.config
+    $LN_S $reldir/data/net_4_0/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/web.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/4.0
+    cd runtime/etc/mono/4.0
+    rm -f web.config
+    $LN_S $reldir/data/net_4_0/web.config web.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/machine.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/4.5
+    cd runtime/etc/mono/4.5
+    rm -f machine.config
+    $LN_S $reldir/data/net_4_5/machine.config machine.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/web.config],
+[   depth=../../../..
+    case $srcdir in
+    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
+    .) reldir=$depth ;;
+    *) reldir=$depth/$srcdir ;;
+    esac
+    $ac_aux_dir/install-sh -d runtime/etc/mono/4.5
+    cd runtime/etc/mono/4.5
+    rm -f web.config
+    $LN_S $reldir/data/net_4_5/web.config web.config
+    cd $depth
+],[LN_S='$LN_S'])
+
+AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
+
+AC_OUTPUT([
+Makefile
+mono-core.spec
+mono-uninstalled.pc
+scripts/mono-find-provides
+scripts/mono-find-requires
+mono/Makefile
+mono/utils/Makefile
+mono/metadata/Makefile
+mono/dis/Makefile
+mono/cil/Makefile
+mono/arch/Makefile
+mono/arch/x86/Makefile
+mono/arch/amd64/Makefile
+mono/arch/ppc/Makefile
+mono/arch/sparc/Makefile
+mono/arch/s390x/Makefile
+mono/arch/arm/Makefile
+mono/arch/arm64/Makefile
+mono/arch/ia64/Makefile
+mono/arch/mips/Makefile
+mono/interpreter/Makefile
+mono/tests/Makefile
+mono/tests/tests-config
+mono/tests/assemblyresolve/Makefile
+mono/tests/cas/Makefile
+mono/tests/cas/assembly/Makefile
+mono/tests/cas/demand/Makefile
+mono/tests/cas/inheritance/Makefile
+mono/tests/cas/linkdemand/Makefile
+mono/tests/cas/threads/Makefile
+mono/tests/gc-descriptors/Makefile
+mono/unit-tests/Makefile
+mono/benchmark/Makefile
+mono/monograph/Makefile
+mono/io-layer/Makefile
+mono/mini/Makefile
+mono/profiler/Makefile
+m4/Makefile
+ikvm-native/Makefile
+scripts/Makefile
+man/Makefile
+docs/Makefile
+data/Makefile
+data/net_2_0/Makefile
+data/net_4_0/Makefile
+data/net_4_5/Makefile
+data/net_2_0/Browsers/Makefile
+data/net_4_0/Browsers/Makefile
+data/net_4_5/Browsers/Makefile
+data/mint.pc
+data/mono-2.pc
+data/monosgen-2.pc
+data/mono.pc
+data/mono-cairo.pc
+data/mono-nunit.pc
+data/mono-options.pc
+data/mono-lineeditor.pc
+data/monodoc.pc
+data/dotnet.pc
+data/dotnet35.pc
+data/wcf.pc
+data/cecil.pc
+data/system.web.extensions_1.0.pc
+data/system.web.extensions.design_1.0.pc
+data/system.web.mvc.pc
+data/system.web.mvc2.pc
+data/system.web.mvc3.pc
+data/aspnetwebstack.pc
+data/reactive.pc
+samples/Makefile
+support/Makefile
+data/config
+tools/Makefile
+tools/locale-builder/Makefile
+tools/sgen/Makefile
+runtime/Makefile
+msvc/Makefile
+po/Makefile
+])
+
+# Update all submodules recursively to ensure everything is checked out
+$srcdir/scripts/update_submodules
+
+if test x$host_win32 = xyes; then
+   # Get rid of 'cyg' prefixes in library names
+   sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
+   # libtool seems to inherit -mno-cygwin from our CFLAGS, and uses it to compile its executable
+   # wrapper scripts which use exec(). gcc has no problem compiling+linking this, but the resulting
+   # executable doesn't work...
+   sed -e "s,-mno-cygwin,,g" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
+fi
+
+if test x$platform_darwin = xyes; then
+   # This doesn't seem to be required and it slows down parallel builds
+   sed -e 's,lock_old_archive_extraction=yes,lock_old_archive_extraction=no,g' < libtool > libtool.new && mv libtool.new libtool && chmod +x libtool
+fi
+
+(
+  case $prefix in
+  NONE) prefix=$ac_default_prefix ;;
+  esac
+  case $exec_prefix in
+  NONE) exec_prefix='${prefix}' ;;
+  esac
+
+  #
+  # If we are cross compiling, we don't build in the mcs/ tree.  Let us not clobber
+  # any existing config.make.  This allows people to share the same source tree
+  # with different build directories, one native and one cross
+  #
+  if test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
+
+    test -w $mcs_topdir/build || chmod +w $mcs_topdir/build
+
+    echo "prefix=$prefix" > $mcs_topdir/build/config.make
+    echo "exec_prefix=$exec_prefix" >> $mcs_topdir/build/config.make
+    echo "sysconfdir=$sysconfdir" >> $mcs_topdir/build/config.make
+    echo 'mono_libdir=${exec_prefix}/lib' >> $mcs_topdir/build/config.make
+    echo 'IL_FLAGS = /debug' >> $mcs_topdir/build/config.make
+    echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $mcs_topdir/build/config.make
+    echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $mcs_topdir/build/config.make
+    echo "JAY_CFLAGS = $JAY_CFLAGS" >> $mcs_topdir/build/config.make
+
+    case $INSTALL in
+    [[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
+    *) mcs_INSTALL=$mono_build_root/$INSTALL ;;
+    esac
+
+    echo "INSTALL = $mcs_INSTALL" >> $mcs_topdir/build/config.make
+
+    export VERSION
+    [myver=$($AWK 'BEGIN {
+      split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".")
+      if(length(vsplit [1]) > 4) {
+        split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".")
+      }
+      print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
+    }')]
+
+    echo "MONO_VERSION = $myver" >> $mcs_topdir/build/config.make
+
+    if test x$platform_darwin = xyes; then
+      echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make
+    fi
+
+       if test x$AOT_SUPPORTED = xyes -a x$enable_system_aot = xdefault; then
+          enable_system_aot=yes
+       fi
+
+       if test "x$enable_loadedllvm" = "xyes"; then
+          # This seems to fail on the x86 buildbots
+          enable_system_aot=no
+       fi
+
+    if test x$host_win32 = xno -a x$enable_system_aot = xyes; then
+      echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make
+    fi
+
+    if test x$DISABLE_MCS_DOCS = xyes; then
+      echo "DISABLE_MCS_DOCS = yes" >> $mcs_topdir/build/config.make
+    fi
+
+    if test x$has_extension_module != xno; then
+        echo "EXTENSION_MODULE = 1" >> $srcdir/$mcsdir/build/config.make
+    fi
+
+       default_profile=net_2_0
+    if test -z "$INSTALL_4_0_TRUE"; then :
+               default_profile=net_4_0
+    fi
+    if test -z "$INSTALL_MONODROID_TRUE"; then :
+               default_profile=monodroid
+    fi
+    if test -z "$INSTALL_MONOTOUCH_TRUE"; then :
+               default_profile=monotouch
+    fi
+       if test -z "$INSTALL_XAMMAC_TRUE"; then :
+               default_profile=xammac
+       fi
+    if test -z "$INSTALL_4_5_TRUE"; then :
+               default_profile=net_4_5
+    fi
+    
+    echo "DEFAULT_PROFILE = $default_profile" >> $srcdir/$mcsdir/build/config.make
+    
+    if test "x$test_bcl_opt" = "xyes"; then    
+      echo "BCL_OPTIMIZE = 1" >> $srcdir/$mcsdir/build/config.make
+    fi
+
+  fi
+
+  # if we have an olive folder, override the default settings
+  if test -d $olivedir; then
+
+    if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
+
+      test -w $srcdir/$olivedir/build || chmod +w $srcdir/$olivedir/build
+
+      echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
+      echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
+      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
+      echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
+      echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
+      echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
+    fi
+  fi
+
+)
+
+libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
+
+echo "
+        mcs source:    $mcsdir
+
+   Engine:
+       GC:            $gc_msg 
+       TLS:           $with_tls
+       SIGALTSTACK:   $with_sigaltstack
+       Engine:        $jit_status
+       oprofile:      $OPROFILE
+       BigArrays:     $enable_big_arrays
+       DTrace:        $enable_dtrace
+       LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
+
+   Libraries:
+       .NET 2.0/3.5:  $with_profile2
+       .NET 4.0:      $with_profile4
+       .NET 4.5:      $with_profile4_5
+       MonoDroid:     $with_monodroid
+       MonoTouch:     $with_monotouch
+       Xamarin.Mac:   $with_xammac
+       JNI support:   $jdk_headers_found
+       libgdiplus:    $libgdiplus_msg
+       zlib:          $zlib_msg
+       $disabled
+"
+if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then
+   AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexpected bugs)
+fi
diff --git a/configure.in b/configure.in
deleted file mode 100644 (file)
index 32c3efe..0000000
+++ /dev/null
@@ -1,3791 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-#AC_PREREQ([2.62])
-
-AC_INIT(mono, [3.4.1],
-        [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
-
-AC_CONFIG_SRCDIR([README.md])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_SYSTEM
-AC_CANONICAL_HOST
-
-# Gross hack to enable 'make dist' on automake 1.9+tar 1.14.
-# The extra brackets are to foil regex-based scans.
-m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
-
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign subdir-objects])
-AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE
-
-API_VER=2.0
-AC_SUBST(API_VER)
-
-AC_PROG_LN_S
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-case $host_os in
-*cygwin* )
-                echo "Run configure using ./configure --host=i686-pc-mingw32"
-                exit 1
-esac
-
-# In case of cygwin, override LN_S, irrespective of what it determines.
-# The build uses cygwin, but the actual runtime doesn't.
-case $host_os in
-*cygwin* ) LN_S='cp -p';;
-esac
-
-dnl
-dnl libgc checks
-dnl
-
-gc_headers=no
-gc=included
-gc_msg="included Boehm"
-use_included_gc=no
-libgc_configure_args=
-
-if test -d $srcdir/libgc ; then
-  gc_default=included
-else
-  gc_default=boehm
-fi
-
-# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
-# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0
-CPPFLAGS_FOR_LIBGC=$CPPFLAGS
-CFLAGS_FOR_LIBGC=$CFLAGS
-CPPFLAGS_FOR_EGLIB=$CPPFLAGS
-CFLAGS_FOR_EGLIB=$CFLAGS
-
-#
-# These are the flags that need to be stored in the mono.pc file for 
-# compiling code that will embed Mono
-#
-libmono_cflags=""
-libmono_ldflags=""
-AC_SUBST(libmono_cflags)
-AC_SUBST(libmono_ldflags)
-
-# Variable to have relocatable .pc files (lib, or lib64)
-reloc_libdir=`basename ${libdir}`
-AC_SUBST(reloc_libdir)
-
-dnl if linker handles the version script
-no_version_script=no
-
-# Set to yes if Unix sockets cannot be created in an anonymous namespace
-need_link_unlink=no
-
-#Set to extra linker flags to be passed to the runtime binaries (mono /mono-sgen)
-extra_runtime_ldflags=""
-
-# Thread configuration inspired by sleepycat's db
-AC_MSG_CHECKING([host platform characteristics])
-libgc_threads=no
-has_dtrace=no
-parallel_mark=yes
-ikvm_native=yes
-
-case "$host" in
-       powerpc*-*-linux*)
-               # https://bugzilla.novell.com/show_bug.cgi?id=504411
-               disable_munmap=yes
-       ;;
-esac
-
-host_win32=no
-target_win32=no
-platform_android=no
-platform_darwin=no
-case "$host" in
-       *-mingw*|*-*-cygwin*)
-               AC_DEFINE(HOST_WIN32,1,[Host Platform is Win32])
-               AC_DEFINE(DISABLE_PORTABILITY,1,[Disable the io-portability layer])
-               AC_DEFINE(PLATFORM_NO_SYMLINKS,1,[This platform does not support symlinks])
-               host_win32=yes
-               mono_cv_clang=no
-               if test "x$cross_compiling" = "xno"; then
-                       target_win32=yes
-                       if test "x$host" == "x$build" -a "x$host" == "x$target"; then
-                               AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32])
-                       fi
-               else
-                       target_win32=yes
-                       AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32/MinGW])
-                       AC_DEFINE(MINGW_CROSS_COMPILE,1,[Cross-compiling using MinGW])
-               fi
-               HOST_CC="gcc"
-               # Windows 2000 is required that includes Internet Explorer 5.01
-               CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
-               LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32"
-               libmono_cflags="-mms-bitfields -mwindows"
-               libmono_ldflags="-mms-bitfields -mwindows"
-               libdl=
-               libgc_threads=win32
-               gc_default=included
-               with_sigaltstack=no
-               LN_S=cp
-               # This forces libgc to use the DllMain based thread registration code on win32
-               libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes"
-               ;;
-       *-*-*netbsd*)
-               host_win32=no
-               CPPFLAGS="$CPPFLAGS -D_REENTRANT -DGC_NETBSD_THREADS -D_GNU_SOURCE"
-               libmono_cflags="-D_REENTRANT"
-               LDFLAGS="$LDFLAGS -pthread"
-               CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
-               libmono_ldflags="-pthread"
-               need_link_unlink=yes
-               libdl="-ldl"
-               libgc_threads=pthreads
-               with_sigaltstack=no
-               use_sigposix=yes
-               ;;
-       *-*-*freebsd*)
-               host_win32=no
-               if test "x$PTHREAD_CFLAGS" = "x"; then
-                       CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
-                       libmono_cflags=
-               else
-                       CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
-                       libmono_cflags="$PTHREAD_CFLAGS"
-               fi
-               if test "x$PTHREAD_LIBS" = "x"; then
-                       LDFLAGS="$LDFLAGS -pthread -L/usr/local/lib"
-                       libmono_ldflags="-pthread"
-               else
-                       LDFLAGS="$LDFLAGS $PTHREAD_LIBS -L/usr/local/lib"
-                       libmono_ldflags="$PTHREAD_LIBS"
-               fi
-               CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
-               need_link_unlink=yes
-               AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
-               libdl=
-               libgc_threads=pthreads
-               use_sigposix=yes
-               has_dtrace=yes
-               ;;
-       *-*-*openbsd*)
-               host_win32=no
-               CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_OPENBSD_THREADS -DPLATFORM_BSD -D_REENTRANT -DUSE_MMAP"
-               if test "x$disable_munmap" != "xyes"; then
-               CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
-               fi
-               libmono_cflags="-D_THREAD_SAFE -D_REENTRANT"
-               LDFLAGS="$LDFLAGS -pthread"
-               need_link_unlink=yes
-               AC_DEFINE(PTHREAD_POINTER_ID)
-               libdl=
-               gc_default=boehm
-               libgc_threads=pthreads
-               with_sigaltstack=no
-               use_sigposix=yes
-               ;;
-       *-*-linux-android*)
-               host_win32=no
-               platform_android=yes
-               AC_DEFINE(PLATFORM_ANDROID,1,[Targeting the Android platform])
-               AC_DEFINE(TARGET_ANDROID,1,[Targeting the Android platform])
-
-               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
-               if test "x$disable_munmap" != "xyes"; then
-                       CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
-               fi
-               libmono_cflags="-D_REENTRANT"
-               libdl="-ldl"
-               libgc_threads=pthreads
-               use_sigposix=yes
-
-               with_tls=pthread
-               with_sigaltstack=no
-               with_static_mono=no
-
-               # Android doesn't support boehm, as it's missing <link.h>
-               support_boehm=no
-               with_gc=sgen
-
-               # isinf(3) requires -lm; see isinf check below
-               LDFLAGS="$LDFLAGS -lm"
-
-               # Bionic's <pthread.h> sets PTHREAD_STACK_MIN=2*PAGE_SIZE; doesn't define
-               # PAGE_SIZE; breaks mono/io-layer/collection.c
-               # Bionic doesn't provide S_IWRITE; breaks io-layer/io.c
-               CFLAGS="$CFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
-               CXXFLAGS="$CXXFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR"
-
-               # The configure check can't detect this
-               AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support])
-
-               # to bypass the underscore linker check, can't work when cross-compiling
-               mono_cv_uscore=yes
-               mono_cv_clang=no
-               ;;
-       *-*-linux*)
-               host_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
-               if test "x$disable_munmap" != "xyes"; then
-                       CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
-               fi
-               libmono_cflags="-D_REENTRANT"
-               libdl="-ldl"
-               libgc_threads=pthreads
-               use_sigposix=yes
-               if test "x$cross_compiling" != "xno"; then
-                       # to bypass the underscore linker check, not
-                       # available during cross-compilation
-                       mono_cv_uscore=no
-                fi
-               case "$host" in
-               aarch64-*)
-                       support_boehm=no
-                       with_gc=sgen
-                       ;;
-               esac
-               ;;
-       *-*-nacl*)
-               host_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP"
-               if test "x$disable_munmap" != "xyes"; then
-                       CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP"
-               fi
-               libmono_cflags="-D_REENTRANT"
-               libdl=
-               libgc_threads=pthreads
-               gc_default=boehm
-               use_sigposix=yes
-               ikvm_native=no
-               AC_DEFINE(DISABLE_SOCKETS,1,[Disable sockets support])
-               AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
-               ;;
-       *-*-hpux*)
-               host_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_HPUX_THREADS -D_HPUX_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_REENTRANT"
-               # +ESdbgasm only valid on bundled cc on RISC
-               # silently ignored for ia64
-               if test $GCC != "yes"; then
-                       CFLAGS="$CFLAGS +ESdbgasm"
-                       # Arrange for run-time dereferencing of null
-                       # pointers to produce a SIGSEGV signal.
-                       LDFLAGS="$LDFLAGS -z"
-               fi
-               CFLAGS="$CFLAGS +ESdbgasm"
-               LDFLAGS="$LDFLAGS -z"
-               libmono_cflags="-D_REENTRANT"
-               libmono_ldflags="-lpthread"
-               libgc_threads=pthreads
-               need_link_unlink=yes
-               use_sigposix=yes
-               ;;
-       *-*-solaris*)
-               host_win32=no
-               CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP -DPLATFORM_SOLARIS"
-               need_link_unlink=yes
-               libmono_cflags="-D_REENTRANT"
-               libgc_threads=pthreads
-               # This doesn't seem to work on solaris/x86, but the configure test runs
-               with_tls=pthread
-               has_dtrace=yes
-               use_sigposix=yes
-               enable_solaris_tar_check=yes
-               ;;
-       *-*-darwin*)
-               parallel_mark="Disabled_Currently_Hangs_On_MacOSX"
-               host_win32=no
-               platform_darwin=yes
-               target_mach=yes
-               CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
-               CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
-               libmono_cflags="-D_THREAD_SAFE"
-               need_link_unlink=yes
-               AC_DEFINE(PTHREAD_POINTER_ID)
-               AC_DEFINE(USE_MACH_SEMA, 1, [...])
-               no_version_script=yes
-               libdl=
-               libgc_threads=pthreads
-               has_dtrace=yes
-               if test "x$cross_compiling" = "xyes"; then
-                       has_broken_apple_cpp=yes
-               fi
-               dnl Snow Leopard is horribly broken -- it reports itself as i386-apple-darwin*, but
-               dnl its gcc defaults to 64-bit mode.  They have also deprecated the usage of ucontext
-               dnl we need to set some flags to build our 32-bit binaries on 10.6 properly
-               case "$host" in
-                       dnl Snow Leopard and newer config.guess reports as this
-                       i*86-*-darwin*)
-                               BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE"
-                               BROKEN_DARWIN_CPPFLAGS="-D_XOPEN_SOURCE"
-                               CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_CPPFLAGS"
-                               CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS"
-                               CXXFLAGS="$CXXFLAGS $BROKEN_DARWIN_FLAGS"
-                               CCASFLAGS="$CCASFLAGS $BROKEN_DARWIN_FLAGS"
-                               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC $BROKEN_DARWIN_CPPFLAGS"
-                               CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC $BROKEN_DARWIN_FLAGS"
-                               CPPFLAGS_FOR_EGLIB="$CPPFLAGS_FOR_EGLIB $BROKEN_DARWIN_CPPFLAGS"
-                               CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB $BROKEN_DARWIN_FLAGS"
-                               ;;
-                       x*64-*-darwin*)
-                               ;;
-                       arm*-darwin*)
-                               has_dtrace=no
-                               ;;                      
-               esac
-               ;;
-       *-*-haiku*)
-               host_win32=no
-               CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_THREAD_SAFE"
-               libmono_cflags="-D_REENTRANT -D_THREAD_SAFE"
-               libdl=
-               LIBS="$LIBS -lnetwork"
-               need_link_unlink=yes
-               AC_DEFINE(PTHREAD_POINTER_ID)
-               libgc_threads=pthreads
-               use_sigposix=yes
-               ;;
-       *)
-               AC_MSG_WARN([*** Please add $host to configure.in checks!])
-               host_win32=no
-               libdl="-ldl"
-               ;;
-esac
-AC_MSG_RESULT(ok)
-
-if test x$need_link_unlink = xyes; then
-   AC_DEFINE(NEED_LINK_UNLINK, 1, [Define if Unix sockets cannot be created in an anonymous namespace])
-fi
-
-AC_SUBST(extra_runtime_ldflags)
-AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes)
-AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes)
-AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
-AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
-AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
-AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes)
-
-AC_CHECK_TOOL(CC, gcc, gcc)
-AC_PROG_CC
-AC_CHECK_TOOL(CXX, g++, g++)
-AC_PROG_CXX
-AM_PROG_AS
-AC_PROG_INSTALL
-AC_PROG_AWK
-AM_PROG_CC_C_O
-dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
-: ${CCAS='$(CC)'}
-# Set ASFLAGS if not already set.
-: ${CCASFLAGS='$(CFLAGS)'}
-AC_SUBST(CCAS)
-AC_SUBST(CCASFLAGS)
-
-# AC_PROG_CXX helpfully sets CXX to g++ even if no c++ compiler is found so check
-# GXX instead. See http://lists.gnu.org/archive/html/bug-autoconf/2002-04/msg00056.html
-if test "x$CXX" = "xg++"; then
-       if test "x$GXX" != "xyes"; then
-               # automake/libtool is so broken, it requires g++ even if the c++ sources
-               # are inside automake conditionals
-               AC_MSG_ERROR([You need to install g++])
-       fi
-fi
-
-dnl may require a specific autoconf version
-dnl AC_PROG_CC_FOR_BUILD
-dnl CC_FOR_BUILD not automatically detected
-CC_FOR_BUILD=$CC
-CFLAGS_FOR_BUILD=$CFLAGS
-BUILD_EXEEXT=
-if test "x$cross_compiling" = "xyes"; then
-       CC_FOR_BUILD=cc
-       CFLAGS_FOR_BUILD=
-       BUILD_EXEEXT=""
-fi
-AC_SUBST(CC_FOR_BUILD)
-AC_SUBST(CFLAGS_FOR_BUILD)
-AC_SUBST(HOST_CC)
-AC_SUBST(BUILD_EXEEXT)
-
-AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
-AM_CONDITIONAL(USE_BATCH_FILES, [test x$host_win32 = xyes -a x$cross_compiling = xyes])
-
-# Set STDC_HEADERS
-AC_HEADER_STDC
-AC_LIBTOOL_WIN32_DLL
-# This causes monodis to not link correctly
-#AC_DISABLE_FAST_INSTALL
-AM_PROG_LIBTOOL
-# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
-DOLT
-
-export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-AC_SUBST(export_ldflags)
-
-# Test whenever ld supports -version-script
-AC_PROG_LD
-AC_PROG_LD_GNU
-if test "x$lt_cv_prog_gnu_ld" = "xno"; then
-   no_version_script=yes
-fi
-
-AM_ICONV()
-
-AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
-
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h libproc.h)
-AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h)
-AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h],
-                  [], [], [#include <stddef.h>
-                 #include <sys/socket.h>
-                 #include <linux/socket.h>])
-
-AC_CHECK_HEADERS(sys/user.h, [], [],
-[
-#ifdef HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-])
-
-AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
-if test x$have_zlib = xyes; then
-   AC_TRY_COMPILE([#include <zlib.h>], [
-   #if defined(ZLIB_VERNUM) && (ZLIB_VERNUM >= 0x1230)
-   return 0;
-   #else
-   #error No good zlib found
-   #endif
-   ],[
-       AC_MSG_RESULT(Using system zlib)
-       zlib_msg="system zlib"
-       AC_DEFINE(HAVE_SYS_ZLIB,1,[Have system zlib])
-   ],[
-       AC_MSG_RESULT(Using embedded zlib)
-       have_zlib=no
-       zlib_msg="bundled zlib"
-   ])
-fi
-
-AM_CONDITIONAL(HAVE_ZLIB, test x$have_zlib = xyes)
-AC_DEFINE(HAVE_ZLIB,1,[Have system zlib])
-
-# for mono/metadata/debug-symfile.c
-AC_CHECK_HEADERS(elf.h)
-
-# for support
-AC_CHECK_HEADERS(poll.h)
-AC_CHECK_HEADERS(sys/poll.h)
-AC_CHECK_HEADERS(sys/wait.h)
-AC_CHECK_HEADERS(grp.h)
-AC_CHECK_HEADERS(syslog.h)
-
-# for mono/dis
-AC_CHECK_HEADERS(wchar.h)
-AC_CHECK_HEADERS(ieeefp.h)
-AC_MSG_CHECKING(for isinf)
-AC_TRY_LINK([#include <math.h>], [
-       int f = isinf (1);
-], [
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(HAVE_ISINF, 1, [isinf available])
-], [
-       # We'll have to use signals
-       AC_MSG_RESULT(no)
-])
-# mingw
-AC_CHECK_FUNCS(_finite, , AC_MSG_CHECKING(for _finite in math.h)
-       AC_TRY_LINK([#include <math.h>], 
-       [ _finite(0.0); ], 
-       AC_DEFINE(HAVE__FINITE, 1, [Have _finite in -lm]) AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no)))
-
-# for Linux statfs support
-AC_CHECK_HEADERS(linux/magic.h)
-
-# not 64 bit clean in cross-compile
-AC_CHECK_SIZEOF(void *, 4)
-
-AC_CACHE_CHECK([for clang],
-       mono_cv_clang,[
-       AC_TRY_COMPILE([], [
-               #ifdef __clang__
-               #else
-               #error "FAILED"
-               #endif
-               return 0;
-       ],
-       [mono_cv_clang=yes],
-       [mono_cv_clang=no],
-       [])
-])
-
-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'
-               # The runtime code does not respect ANSI C strict aliasing rules
-               CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-               # We rely on signed overflow to behave
-               CFLAGS="$CFLAGS -fwrapv"
-
-               ORIG_CFLAGS=$CFLAGS
-               CFLAGS="$CFLAGS -Wdeclaration-after-statement"
-               AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc)
-               AC_TRY_COMPILE([],[
-                               return 0;
-               ], [
-                  AC_MSG_RESULT(yes)
-               ], [
-                  AC_MSG_RESULT(no)
-                  CFLAGS=$ORIG_CFLAGS
-               ])
-
-               ORIG_CFLAGS=$CFLAGS
-               # Check for the normal version, since gcc ignores unknown -Wno options
-               CFLAGS="$CFLAGS -Wunused-but-set-variable -Werror"
-               AC_MSG_CHECKING(for -Wno-unused-but-set-variable option to gcc)
-               AC_TRY_COMPILE([],[
-                               return 0;
-               ], [
-                  AC_MSG_RESULT(yes)
-                  CFLAGS="$ORIG_CFLAGS -Wno-unused-but-set-variable"
-               ], [
-                  AC_MSG_RESULT(no)
-                  CFLAGS=$ORIG_CFLAGS
-               ])
-
-               if test "x$mono_cv_clang" = "xyes"; then
-                  # https://bugzilla.samba.org/show_bug.cgi?id=8118
-                  WARN="$WARN -Qunused-arguments"
-                  WARN="$WARN -Wno-unused-function -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign"
-               fi
-else
-       # The Sun Forte compiler complains about inline functions that access static variables
-       # so disable all inlining.
-       case "$host" in
-       *-*-solaris*)
-               CFLAGS="$CFLAGS -Dinline="
-               ;;
-       esac
-fi
-CFLAGS="$CFLAGS -g $WARN"
-CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g"
-
-# Where's the 'mcs' source tree?
-if test -d $srcdir/mcs; then
-  mcsdir=mcs
-else
-  mcsdir=../mcs
-fi
-
-AC_ARG_WITH(mcs-path, [  --with-mcs-path=/path/to/mcs      Specify an alternate mcs source tree],
-       if test x$with_mcs_path != "x" -a -d $with_mcs_path ; then
-               mcsdir=$with_mcs_path
-       fi
-)
-
-AC_ARG_WITH(jumptables, [  --with-jumptables=yes,no      enable/disable support for jumptables (ARM-only for now) (defaults to no)],[],[with_jumptables=no])
-
-#
-# A sanity check to catch cases where the package was unpacked
-# with an ancient tar program (Solaris)
-#
-AC_ARG_ENABLE(solaris-tar-check,
-[  --disable-solaris-tar-check    disable solaris tar check],
-   do_solaris_tar_check=no, do_solaris_tar_check=yes)
-
-if test x"$do_solaris_tar_check" = xyes -a x"$enable_solaris_tar_check" = xyes; then
-       AC_MSG_CHECKING(integrity of package)
-       if test -f $mcsdir/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapTypeMapper.cs
-       then
-               AC_MSG_RESULT(ok)
-       else
-               errorm="Your mono distribution is incomplete;  if unpacking from a tar file, make sure you use GNU tar;  see http://www.mono-project.com/IncompletePackage for more details"
-               AC_MSG_ERROR([$errorm])
-       fi
-fi
-
-if test "x$with_mcs_path" != "x"; then
-mcs_topdir=$(cd "$mcsdir" && pwd)
-mcs_topdir_from_srcdir=$mcs_topdir
-else
-mcs_topdir=$(cd "$srcdir/$mcsdir" && pwd)
-mcs_topdir_from_srcdir='$(top_builddir)'/$mcsdir
-fi
-
-# Convert mcs_topdir* paths to Windows syntax.
-if test x$cross_compiling$host_win32 = xnoyes; then
-  mcs_topdir=$(cygpath -m $mcs_topdir)
-  case $mcs_topdir_from_srcdir in
-    /cygdrive/*)
-       mcs_topdir_from_srcdir=$(cygpath -m $mcs_topdir_from_srcdir)
-       ;;
-  esac
-fi
-
-AC_SUBST([mcs_topdir])
-AC_SUBST([mcs_topdir_from_srcdir])
-
-# Where's the 'olive' source tree?
-if test -d $srcdir/olive; then
-  olivedir=olive
-else
-  olivedir=../olive
-fi
-
-if test -d $srcdir/$olivedir; then
-olive_topdir='$(top_srcdir)/'$olivedir
-fi
-
-# gettext: prepare the translation directories. 
-# we do not configure the full gettext, as we consume it dynamically from C#
-AM_PO_SUBDIRS
-
-if test "x$USE_NLS" = "xyes"; then
-   AC_CHECK_PROG(HAVE_MSGFMT, msgfmt,yes,no)
-
-   if test "x$HAVE_MSGFMT" = "xno"; then
-         AC_MSG_ERROR([msgfmt not found. You need to install the 'gettext' package, or pass --enable-nls=no to configure.])
-   fi
-fi
-
-AC_ARG_WITH([libgdiplus], 
-       [  --with-libgdiplus=installed|sibling|<path>   Override the libgdiplus used for System.Drawing tests (defaults to installed)], 
-       [], [with_libgdiplus=installed])
-
-case $with_libgdiplus in
-no|installed) libgdiplus_loc= ;;
-yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;;
-/*) libgdiplus_loc=$with_libgdiplus ;;
-*) libgdiplus_loc=`pwd`/$with_libgdiplus ;;
-esac
-AC_SUBST([libgdiplus_loc])
-
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-pkg_config_path=
-AC_ARG_WITH(crosspkgdir, [  --with-crosspkgdir=/path/to/pkg-config/dir      Change pkg-config dir to custom dir],
-       if test x$with_crosspkgdir = "x"; then
-               if test -s $PKG_CONFIG_PATH; then
-                       pkg_config_path=$PKG_CONFIG_PATH
-               fi
-       else
-               pkg_config_path=$with_crosspkgdir
-               PKG_CONFIG_PATH=$pkg_config_path
-               export PKG_CONFIG_PATH
-       fi
-)
-
-ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\""
-AC_CONFIG_SUBDIRS(eglib)
-
-GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src'
-GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
-BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
-BUILD_GLIB_LIBS="$GLIB_LIBS"
-GMODULE_CFLAGS="$GLIB_CFLAGS"
-GMODULE_LIBS="$GLIB_LIBS"
-  
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-AC_SUBST(GMODULE_CFLAGS)
-AC_SUBST(GMODULE_LIBS)
-AC_SUBST(BUILD_GLIB_CFLAGS)
-AC_SUBST(BUILD_GLIB_LIBS)
-
-AC_ARG_WITH(gc,   [  --with-gc=boehm,included,none  Controls the Boehm GC config, default=included],[gc=$with_gc],[gc=$gc_default])
-
-# Enable support for fast thread-local storage
-# Some systems have broken support, so we allow to disable it.
-AC_ARG_WITH(tls, [  --with-tls=__thread,pthread    select Thread Local Storage implementation (defaults to __thread)],[],[with_tls=__thread])
-
-# Enable support for using sigaltstack for SIGSEGV and stack overflow handling
-# This does not work on some platforms (bug #55253)
-AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack (defaults to yes)],[],[with_sigaltstack=yes])
-
-AC_ARG_WITH(static_mono, [  --with-static_mono=yes,no      link mono statically to libmono (faster) (defaults to yes)],[],[with_static_mono=yes])
-AC_ARG_WITH(shared_mono, [  --with-shared_mono=yes,no      build a shared libmono library (defaults to yes)],[],[with_shared_mono=yes])
-# Same as --with-shared_mono=no
-AC_ARG_ENABLE(libraries, [  --disable-libraries disable the build of libmono], enable_libraries=$enableval, enable_libraries=yes)
-
-if test "x$enable_static" = "xno"; then
-   with_static_mono=no
-fi
-
-if test "x$enable_shared" = "xno"; then
-   with_shared_mono=no
-fi
-
-if test "x$enable_libraries" = "xno"; then
-   with_shared_mono=no
-fi
-
-AM_CONDITIONAL(DISABLE_LIBRARIES, test x$enable_libraries = xno)
-
-case $host in
-*nacl* ) with_shared_mono=yes;;
-esac
-
-if test "x$host_win32" = "xyes"; then
-   # Boehm GC requires the runtime to be in its own dll
-   with_static_mono=no
-fi
-
-AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
-AM_CONDITIONAL(SHARED_MONO, test x$with_shared_mono != xno)
-AC_ARG_ENABLE(mcs-build, [  --disable-mcs-build disable the build of the mcs directory], try_mcs_build=$enableval, enable_mcs_build=yes)
-
-AC_ARG_WITH(xen_opt,   [  --with-xen_opt=yes,no          Enable Xen-specific behaviour (defaults to yes)],[],[with_xen_opt=yes])
-if test "x$with_xen_opt" = "xyes" -a "x$mono_cv_clang" = "xno"; then
-       AC_DEFINE(MONO_XEN_OPT, 1, [Xen-specific behaviour])
-       ORIG_CFLAGS=$CFLAGS
-       CFLAGS="$CFLAGS -mno-tls-direct-seg-refs"
-       AC_MSG_CHECKING(for -mno-tls-direct-seg-refs option to gcc)
-       AC_TRY_COMPILE([], [
-               return 0;
-       ], [
-          AC_MSG_RESULT(yes)
-          # Pass it to libgc as well
-          CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs"
-       ], [
-          AC_MSG_RESULT(no)
-          CFLAGS=$ORIG_CFLAGS
-       ])
-fi
-
-AC_ARG_ENABLE(small-config, [  --enable-small-config Enable tweaks to reduce requirements (and capabilities)], enable_small_config=$enableval, enable_small_config=no)
-
-if test x$enable_small_config = xyes; then
-       AC_DEFINE(MONO_SMALL_CONFIG,1,[Reduce runtime requirements (and capabilities)])
-       CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DSMALL_CONFIG"
-fi
-
-AC_ARG_ENABLE(system-aot, [  --enable-system-aot  Enable the Ahead-Of-Time compilation of system assemblies during the build (on by default on some platforms)], enable_system_aot=$enableval, enable_system_aot=default)
-
-DISABLED_FEATURES=none
-
-AC_ARG_ENABLE(minimal, [  --enable-minimal=LIST      drop support for LIST subsystems.
-     LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, 
-     reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting,
-        security, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
-[
-       for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
-               eval "mono_feature_disable_$feature='yes'"
-       done
-       DISABLED_FEATURES=$enable_minimal
-       disabled="Disabled:      $enable_minimal"
-],[])
-
-AC_DEFINE_UNQUOTED(DISABLED_FEATURES, "$DISABLED_FEATURES", [String of disabled features])
-
-if test "x$mono_feature_disable_aot" = "xyes"; then
-       AC_DEFINE(DISABLE_AOT_COMPILER, 1, [Disable AOT Compiler])
-       AC_MSG_NOTICE([Disabled AOT compiler])
-fi
-
-if test "x$mono_feature_disable_profiler" = "xyes"; then
-       AC_DEFINE(DISABLE_PROFILER, 1, [Disable default profiler support])
-       AC_MSG_NOTICE([Disabled support for the profiler])
-fi
-AM_CONDITIONAL(DISABLE_PROFILER, test x$mono_feature_disable_profiler = xyes)
-
-if test "x$mono_feature_disable_decimal" = "xyes"; then
-       AC_DEFINE(DISABLE_DECIMAL, 1, [Disable System.Decimal support])
-       AC_MSG_NOTICE([Disabled support for decimal])
-fi
-
-if test "x$mono_feature_disable_pinvoke" = "xyes"; then
-       AC_DEFINE(DISABLE_PINVOKE, 1, [Disable P/Invoke support])
-       AC_MSG_NOTICE([Disabled support for P/Invoke])
-fi
-
-if test "x$mono_feature_disable_debug" = "xyes"; then
-       AC_DEFINE(DISABLE_DEBUG, 1, [Disable runtime debugging support])
-       AC_MSG_NOTICE([Disabled support for runtime debugging])
-fi
-
-if test "x$mono_feature_disable_reflection_emit" = "xyes"; then
-       AC_DEFINE(DISABLE_REFLECTION_EMIT, 1, [Disable reflection emit support])
-       mono_feature_disable_reflection_emit_save=yes
-       AC_MSG_NOTICE([Disabled support for Reflection.Emit])
-fi
-
-if test "x$mono_feature_disable_reflection_emit_save" = "xyes"; then
-       AC_DEFINE(DISABLE_REFLECTION_EMIT_SAVE, 1, [Disable assembly saving support in reflection emit])
-       AC_MSG_NOTICE([Disabled support for Reflection.Emit.Save])
-fi
-
-if test "x$mono_feature_disable_large_code" = "xyes"; then
-       AC_DEFINE(DISABLE_LARGE_CODE, 1, [Disable support for huge assemblies])
-       AC_MSG_NOTICE([Disabled support for large assemblies])
-fi
-
-if test "x$mono_feature_disable_logging" = "xyes"; then
-       AC_DEFINE(DISABLE_LOGGING, 1, [Disable support debug logging])
-       AC_MSG_NOTICE([Disabled support for logging])
-fi
-
-if test "x$mono_feature_disable_com" = "xyes"; then
-       AC_DEFINE(DISABLE_COM, 1, [Disable COM support])
-       AC_MSG_NOTICE([Disabled COM support])
-fi
-
-if test "x$mono_feature_disable_ssa" = "xyes"; then
-       AC_DEFINE(DISABLE_SSA, 1, [Disable advanced SSA JIT optimizations])
-       AC_MSG_NOTICE([Disabled SSA JIT optimizations])
-fi
-
-if test "x$mono_feature_disable_generics" = "xyes"; then
-       AC_DEFINE(DISABLE_GENERICS, 1, [Disable generics support])
-       AC_MSG_NOTICE([Disabled Generics Support])
-fi
-
-if test "x$mono_feature_disable_shadowcopy" = "xyes"; then
-       AC_DEFINE(DISABLE_SHADOW_COPY, 1, [Disable Shadow Copy for AppDomains])
-       AC_MSG_NOTICE([Disabled Shadow copy for AppDomains])
-fi
-
-if test "x$mono_feature_disable_portability" = "xyes"; then
-       AC_DEFINE(DISABLE_PORTABILITY, 1, [Disables the IO portability layer])
-       AC_MSG_NOTICE([Disabled IO Portability layer])
-fi
-
-if test "x$mono_feature_disable_attach" = "xyes"; then
-       AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
-       AC_MSG_NOTICE([Disabled agent attach])
-fi
-
-if test "x$mono_feature_disable_full_messages" = "xyes"; then
-       AC_DEFINE(DISABLE_FULL_MESSAGES, 1, [Disables building in the full table of WAPI messages])
-       AC_MSG_NOTICE([Disabled full messages for Win32 errors, only core message strings shipped])
-fi
-
-if test "x$mono_feature_disable_verifier" = "xyes"; then
-       AC_DEFINE(DISABLE_VERIFIER, 1, [Disables the verifier])
-       AC_MSG_NOTICE([Disabled the metadata and IL verifiers])
-fi
-
-if test "x$mono_feature_disable_jit" = "xyes"; then
-       AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode will be supported by the runtime.])
-       AC_MSG_NOTICE([Disabled the JIT engine, only full AOT will be supported])
-fi
-
-AM_CONDITIONAL(DISABLE_JIT, test x$mono_feature_disable_jit = xyes)
-
-if test "x$mono_feature_disable_simd" = "xyes"; then
-       AC_DEFINE(DISABLE_SIMD, 1, [Disable SIMD intrinsics related optimizations.])
-       AC_MSG_NOTICE([Disabled SIMD support])
-fi
-
-if test "x$mono_feature_disable_soft_debug" = "xyes"; then
-       AC_DEFINE(DISABLE_SOFT_DEBUG, 1, [Disable Soft Debugger Agent.])
-       AC_MSG_NOTICE([Disabled Soft Debugger.])
-fi
-
-if test "x$mono_feature_disable_perfcounters" = "xyes"; then
-       AC_DEFINE(DISABLE_PERFCOUNTERS, 1, [Disable Performance Counters.])
-       AC_MSG_NOTICE([Disabled Performance Counters.])
-fi
-if test "x$mono_feature_disable_normalization" = "xyes"; then
-       AC_DEFINE(DISABLE_NORMALIZATION, 1, [Disable String normalization support.])
-       AC_MSG_NOTICE([Disabled String normalization support.])
-fi
-
-if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then
-       AC_DEFINE(DISABLE_ASSEMBLY_REMAPPING, 1, [Disable assembly remapping.])
-       AC_MSG_NOTICE([Disabled Assembly remapping.])
-fi
-
-if test "x$mono_feature_disable_shared_perfcounters" = "xyes"; then
-       AC_DEFINE(DISABLE_SHARED_PERFCOUNTERS, 1, [Disable shared perfcounters.])
-       AC_MSG_NOTICE([Disabled Shared perfcounters.])
-fi
-
-if test "x$mono_feature_disable_appdomains" = "xyes"; then
-       AC_DEFINE(DISABLE_APPDOMAINS, 1, [Disable support for multiple appdomains.])
-       AC_MSG_NOTICE([Disabled support for multiple appdomains.])
-fi
-
-if test "x$mono_feature_disable_remoting" = "xyes"; then
-       AC_DEFINE(DISABLE_REMOTING, 1, [Disable remoting support (This disables type proxies and make com non-functional)])
-       AC_MSG_NOTICE([Disabled remoting])
-fi
-
-if test "x$mono_feature_disable_security" = "xyes"; then
-       AC_DEFINE(DISABLE_SECURITY, 1, [Disable CAS/CoreCLR security])
-       AC_MSG_NOTICE([Disabled CAS/CoreCLR security manager (used e.g. for Moonlight)])
-fi
-
-if test "x$mono_feature_disable_sgen_remset" = "xyes"; then
-       AC_DEFINE(DISABLE_SGEN_REMSET, 1, [Disable wbarrier=remset support in SGEN.])
-       AC_MSG_NOTICE([Disabled wbarrier=remset support in SGEN.])
-fi
-
-if test "x$mono_feature_disable_sgen_marksweep_par" = "xyes"; then
-       AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_PAR, 1, [Disable major=marksweep-par support in SGEN.])
-       AC_MSG_NOTICE([Disabled major=marksweep-par support in SGEN.])
-fi
-
-if test "x$mono_feature_disable_sgen_marksweep_fixed" = "xyes"; then
-       AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_FIXED, 1, [Disable major=marksweep-fixed support in SGEN.])
-       AC_MSG_NOTICE([Disabled major=marksweep-fixed support in SGEN.])
-fi
-
-if test "x$mono_feature_disable_sgen_marksweep_fixed_par" = "xyes"; then
-       AC_DEFINE(DISABLE_SGEN_MAJOR_MARKSWEEP_FIXED_PAR, 1, [Disable major=marksweep-fixed-par support in SGEN.])
-       AC_MSG_NOTICE([Disabled major=marksweep-fixed-par support in SGEN.])
-fi
-
-if test "x$mono_feature_disable_sgen_copying" = "xyes"; then
-       AC_DEFINE(DISABLE_SGEN_MAJOR_COPYING, 1, [Disable major=copying support in SGEN.])
-       AC_MSG_NOTICE([Disabled major=copying support in SGEN.])
-fi
-
-AC_ARG_ENABLE(executables, [  --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
-AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno)
-
-has_extension_module=no
-AC_ARG_ENABLE(extension-module, [  --enable-extension-module=LIST enable the core-extensions from LIST],
-[
-       for extension in `echo "$enable_extension_module" | sed -e "s/,/ /g"`; do
-               if test x$extension = xdefault ; then
-                       has_extension_module=yes;
-               fi
-       done
-       if test x$enable_extension_module = xyes; then
-               has_extension_module=yes;
-       fi
-], [])
-
-AM_CONDITIONAL([HAS_EXTENSION_MODULE], [test x$has_extension_module != xno])
-
-if test x$has_extension_module != xno ; then
-       AC_DEFINE([ENABLE_EXTENSION_MODULE], 1, [Extension module enabled])
-       AC_MSG_NOTICE([Enabling mono extension module.])
-fi
-
-AC_ARG_ENABLE(gsharing, [  --enable-gsharing Enable gsharing], enable_gsharing=$enableval, enable_gsharing=no)
-if test x$enable_gsharing = xyes; then
-       AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharing])
-fi
-
-AC_ARG_ENABLE(native-types, [  --enable-native-types Enable native types], enable_native_types=$enableval, enable_native_types=no)
-if test x$enable_native_types = xyes; then
-       AC_DEFINE(MONO_NATIVE_TYPES,1,[native types])
-fi
-
-AC_MSG_CHECKING(for visibility __attribute__)
-AC_COMPILE_IFELSE([
-       AC_LANG_SOURCE([[
-               void __attribute__ ((visibility ("hidden"))) doit (void) {}
-               int main () { doit (); return 0; }
-       ]])
-], [
-   have_visibility_hidden=yes
-   AC_MSG_RESULT(yes)
-], [
-   have_visibility_hidden=no
-   AC_MSG_RESULT(no)
-])
-
-AC_MSG_CHECKING(for deprecated __attribute__)
-AC_TRY_COMPILE([
-     int doit (void) __attribute__ ((deprecated));
-     int doit (void) { return 0; }
-], [
-       return 0;
-], [
-   have_deprecated=yes
-   AC_MSG_RESULT(yes)
-], [
-   have_deprecated=no
-   AC_MSG_RESULT(no)
-])
-
-AC_ARG_ENABLE(parallel-mark, [  --enable-parallel-mark     Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=$parallel_mark)
-if test x$enable_parallel_mark = xyes; then
-       libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
-fi
-
-AC_ARG_ENABLE(boehm, [  --disable-boehm            Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
-AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
-
-dnl
-dnl Boehm GC configuration
-dnl
-LIBGC_CPPFLAGS=
-LIBGC_LIBS=
-LIBGC_STATIC_LIBS=
-libgc_dir=
-case "x$gc" in
-       xboehm|xbohem|xyes)
-               AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes)
-               AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
-
-               if test "x$found_boehm" != "xyes"; then
-                       AC_MSG_ERROR("GC requested but libgc not found! Install libgc or run configure with --with-gc=none.")
-               fi
-               if test "x$gc_headers" != "xyes"; then
-                       AC_MSG_ERROR("GC requested but header files not found! You may need to install them by hand.")
-               fi
-
-               LIBGC_LIBS="-lgc $libdl"
-               LIBGC_STATIC_LIBS="$LIBGC_LIBS"
-               libmono_ldflags="$libmono_ldflags -lgc"
-               BOEHM_DEFINES="-DHAVE_BOEHM_GC"
-
-               # AC_CHECK_FUNCS does not work for some reason...
-               AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl)
-               if test "x$found_gcj_malloc" = "xyes"; then
-                       BOEHM_DEFINES="-DHAVE_GC_GCJ_MALLOC $BOEHM_DEFINES"
-                       AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "System Boehm (with typed GC)", [GC description])
-                       gc_msg="System Boehm with typed GC"
-               else
-                       AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "System Boehm (no typed GC)", [GC description])
-                       gc_msg="System Boehm (without typed GC)"
-               fi
-               AC_CHECK_LIB(gc, GC_enable, found_gc_enable="yes",,$libdl)
-               if test "x$found_gc_enable" = "xyes"; then
-                       BOEHM_DEFINES="-DHAVE_GC_ENABLE $BOEHM_DEFINES"
-               fi
-
-               # check whether we need to explicitly allow
-                       # thread registering
-                       AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl)
-                       if test "x$found_allow_register_threads" = "xyes"; then
-                        AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration])
-                       fi
-
-               ;;
-
-       xincluded)
-               use_included_gc=yes
-               libgc_dir=libgc
-
-               LIBGC_CPPFLAGS='-I$(top_srcdir)/libgc/include'
-               LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
-               LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la'
-
-               BOEHM_DEFINES="-DHAVE_BOEHM_GC -DHAVE_GC_H -DUSE_INCLUDED_LIBGC -DHAVE_GC_GCJ_MALLOC -DHAVE_GC_ENABLE"
-
-               if test x$target_win32 = xyes; then
-                       BOEHM_DEFINES="$BOEHM_DEFINES -DGC_NOT_DLL"
-                       CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DGC_BUILD -DGC_NOT_DLL"
-               fi
-
-               gc_msg="bundled Boehm GC with typed GC"
-               if test x$enable_parallel_mark = xyes; then
-                       AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "Included Boehm (with typed GC and Parallel Mark)", [GC description])
-                       gc_msg="$gc_msg and parallel mark"
-               else
-                       AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "Included Boehm (with typed GC)", [GC description])
-               fi
-               ;;
-
-       xsgen)
-               AC_MSG_WARN("Use --with-sgen instead, --with-gc= controls Boehm configuration")
-               ;;
-
-       xnone)
-               AC_MSG_WARN("Compiling mono without GC.")
-               AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "none", [GC description])
-               AC_DEFINE(HAVE_NULL_GC,1,[No GC support.])
-               ;;
-       *)
-               AC_MSG_ERROR([Invalid argument to --with-gc.])
-               ;;
-esac
-
-AC_ARG_WITH(large-heap, [  --with-large-heap=yes,no       Enable support for GC heaps larger than 3GB (defaults to no)], [large_heap=$withval], [large_heap=no])
-if test "x$large_heap" = "xyes"; then
-   CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
-fi
-
-AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
-AC_SUBST(LIBGC_CPPFLAGS)
-AC_SUBST(LIBGC_LIBS)
-AC_SUBST(LIBGC_STATIC_LIBS)
-AC_SUBST(libgc_dir)
-AC_SUBST(BOEHM_DEFINES)
-
-dnl
-dnl End of libgc checks
-dnl
-
-dnl *************************************
-dnl *** Checks for zero length arrays ***
-dnl *************************************
-AC_MSG_CHECKING(whether $CC supports zero length arrays)
-AC_TRY_COMPILE([
-       struct s {
-               int  length;
-               char data [0];
-       };
-], [], [
-       AC_MSG_RESULT(yes)
-       AC_DEFINE_UNQUOTED(MONO_ZERO_LEN_ARRAY, 0, [Length of zero length arrays])
-], [
-       AC_MSG_RESULT(no)
-       AC_DEFINE_UNQUOTED(MONO_ZERO_LEN_ARRAY, 1, [Length of zero length arrays])
-])
-
-AC_CHECK_HEADERS(nacl/nacl_dyncode.h)
-
-if test x$target_win32 = xno; then
-
-       dnl hires monotonic clock support
-       AC_SEARCH_LIBS(clock_gettime, rt)
-
-       dnl dynamic loader support
-       AC_CHECK_FUNC(dlopen, DL_LIB="",
-               AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", dl_support=no)
-       )
-       if test x$dl_support = xno; then
-               AC_MSG_WARN([No dynamic loading support available])
-       else
-               LIBS="$LIBS $DL_LIB"
-               AC_DEFINE(HAVE_DL_LOADER,1,[dlopen-based dynamic loader available])
-               dnl from glib's configure.in
-               AC_CACHE_CHECK([for preceeding underscore in symbols],
-                       mono_cv_uscore,[
-                       AC_TRY_RUN([#include <dlfcn.h>
-                       int mono_underscore_test (void) { return 42; }
-                       int main() {
-                         void *f1 = (void*)0, *f2 = (void*)0, *handle;
-                         handle = dlopen ((void*)0, 0);
-                         if (handle) {
-                           f1 = dlsym (handle, "mono_underscore_test");
-                           f2 = dlsym (handle, "_mono_underscore_test");
-                         } return (!f2 || f1);
-                       }],
-                               [mono_cv_uscore=yes],
-                               [mono_cv_uscore=no],
-                       [])
-               ])
-               if test "x$mono_cv_uscore" = "xyes"; then
-                       MONO_DL_NEED_USCORE=1
-               else
-                       MONO_DL_NEED_USCORE=0
-               fi
-               AC_SUBST(MONO_DL_NEED_USCORE)
-               AC_CHECK_FUNC(dlerror)
-       fi
-
-       dnl ******************************************************************
-       dnl *** Checks for the IKVM JNI interface library                  ***
-       dnl ******************************************************************
-       AC_ARG_WITH(ikvm-native, [  --with-ikvm-native=yes,no      build the IKVM JNI interface library (defaults to yes)],[with_ikvm_native=$withval],[with_ikvm_native=$ikvm_native])
-
-       ikvm_native_dir=
-       if test x$with_ikvm_native = xyes; then
-               ikvm_native_dir=ikvm-native
-               jdk_headers_found="IKVM Native"
-       fi
-
-       AC_SUBST(ikvm_native_dir)
-
-       AC_CHECK_HEADERS(execinfo.h)
-
-       AC_CHECK_HEADERS(sys/auxv.h)
-
-       AC_CHECK_FUNCS(getgrgid_r)
-       AC_CHECK_FUNCS(getgrnam_r)
-       AC_CHECK_FUNCS(getpwnam_r)
-       AC_CHECK_FUNCS(getpwuid_r)
-       AC_CHECK_FUNCS(getresuid)
-       AC_CHECK_FUNCS(setresuid)
-       AC_CHECK_FUNCS(kqueue)
-       AC_CHECK_FUNCS(backtrace_symbols)
-       AC_CHECK_FUNCS(mkstemp)
-       AC_CHECK_FUNCS(mmap)
-       AC_CHECK_FUNCS(madvise)
-       AC_CHECK_FUNCS(getrusage)
-       AC_CHECK_FUNCS(getpriority)
-       AC_CHECK_FUNCS(setpriority)
-       AC_CHECK_FUNCS(dl_iterate_phdr)
-       AC_CHECK_FUNCS(dladdr)
-       AC_CHECK_FUNCS(sysconf)
-
-       AC_CHECK_FUNCS(sched_setaffinity)
-       AC_CHECK_FUNCS(sched_getcpu)
-
-       dnl ****************************************************************
-       dnl *** Check for sched_setaffinity from glibc versions before   ***
-       dnl *** 2.3.4. The older versions of the function only take 2    ***
-       dnl *** parameters, not 3.                                       ***
-       dnl ***                                                          ***
-       dnl *** Because the interface change was not made in a minor     ***
-       dnl *** version rev, the __GLIBC__ and __GLIBC_MINOR__ macros    ***
-       dnl *** won't always indicate the interface sched_affinity has.  ***
-       dnl ****************************************************************
-       AC_MSG_CHECKING(for sched_setaffinity from glibc < 2.3.4)
-       AC_TRY_COMPILE([#include <sched.h>], [
-            int mask = 1; 
-            sched_setaffinity(0, &mask);
-                       return 0;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY, 1, [Have GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY])
-       ], [
-               # We have the new, three-parameter version
-               AC_MSG_RESULT(no)
-       ])
-
-
-       dnl ******************************************************************
-       dnl *** Check for large file support                               ***
-       dnl *** (If we were using autoconf 2.50 we'd use AC_SYS_LARGEFILE) ***
-       dnl ******************************************************************
-       
-       # Check that off_t can represent 2**63 - 1 correctly, working around
-       # potential compiler bugs.  Defines LARGE_FILE_SUPPORT, adds $1 to
-       # CPPFLAGS and sets $large_offt to yes if the test succeeds
-       large_offt=no
-       AC_DEFUN([LARGE_FILES], [
-               large_CPPFLAGS=$CPPFLAGS
-               CPPFLAGS="$CPPFLAGS $1"
-               AC_TRY_COMPILE([
-                       #include <sys/types.h>
-                       #include <limits.h>
-               ], [
-                       /* Lifted this compile time assert method from: http://www.jaggersoft.com/pubs/CVu11_3.html */
-                       #define COMPILE_TIME_ASSERT(pred) \
-                               switch(0){case 0:case pred:;}
-                       COMPILE_TIME_ASSERT(sizeof(off_t) * CHAR_BIT == 64);
-               ], [
-                       AC_MSG_RESULT(ok)
-                       AC_DEFINE(HAVE_LARGE_FILE_SUPPORT, 1, [Have large file support])
-                       large_CPPFLAGS="$large_CPPFLAGS $1"
-                       large_offt=yes
-               ], [
-                       AC_MSG_RESULT(no)
-               ])
-               CPPFLAGS=$large_CPPFLAGS
-       ])
-
-       AC_MSG_CHECKING(if off_t is 64 bits wide)
-       LARGE_FILES("")
-       if test $large_offt = no; then
-               AC_MSG_CHECKING(if _FILE_OFFSET_BITS=64 gives 64 bit off_t)
-               LARGE_FILES("-D_FILE_OFFSET_BITS=64")
-       fi
-       if test $large_offt = no; then
-               AC_MSG_WARN([No 64 bit file size support available])
-       fi
-       
-       dnl *****************************
-       dnl *** Checks for libsocket  ***
-       dnl *****************************
-       AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
-
-       case "$host" in
-               *-*-*freebsd*)
-                       dnl *****************************
-                       dnl *** Checks for libinotify ***
-                       dnl *****************************
-                       AC_CHECK_LIB(inotify, inotify_init, LIBS="$LIBS -linotify")
-       esac
-
-       dnl *******************************
-       dnl *** Checks for MSG_NOSIGNAL ***
-       dnl *******************************
-       AC_MSG_CHECKING(for MSG_NOSIGNAL)
-       AC_TRY_COMPILE([#include <sys/socket.h>], [
-               int f = MSG_NOSIGNAL;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_MSG_NOSIGNAL, 1, [Have MSG_NOSIGNAL])
-       ], [
-               # We'll have to use signals
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *****************************
-       dnl *** Checks for IPPROTO_IP ***
-       dnl *****************************
-       AC_MSG_CHECKING(for IPPROTO_IP)
-       AC_TRY_COMPILE([#include <netinet/in.h>], [
-               int level = IPPROTO_IP;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IPPROTO_IP, 1, [Have IPPROTO_IP])
-       ], [
-               # We'll have to use getprotobyname
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *******************************
-       dnl *** Checks for IPPROTO_IPV6 ***
-       dnl *******************************
-       AC_MSG_CHECKING(for IPPROTO_IPV6)
-       AC_TRY_COMPILE([#include <netinet/in.h>], [
-               int level = IPPROTO_IPV6;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IPPROTO_IPV6, 1, [Have IPPROTO_IPV6])
-       ], [
-               # We'll have to use getprotobyname
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl ******************************
-       dnl *** Checks for IPPROTO_TCP ***
-       dnl ******************************
-       AC_MSG_CHECKING(for IPPROTO_TCP)
-       AC_TRY_COMPILE([#include <netinet/in.h>], [
-               int level = IPPROTO_TCP;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IPPROTO_TCP, 1, [Have IPPROTO_TCP])
-       ], [
-               # We'll have to use getprotobyname
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *****************************
-       dnl *** Checks for SOL_IP     ***
-       dnl *****************************
-       AC_MSG_CHECKING(for SOL_IP)
-       AC_TRY_COMPILE([#include <netdb.h>], [
-               int level = SOL_IP;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_SOL_IP, 1, [Have SOL_IP])
-       ], [
-               # We'll have to use getprotobyname
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *****************************
-       dnl *** Checks for SOL_IPV6     ***
-       dnl *****************************
-       AC_MSG_CHECKING(for SOL_IPV6)
-       AC_TRY_COMPILE([#include <netdb.h>], [
-               int level = SOL_IPV6;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_SOL_IPV6, 1, [Have SOL_IPV6])
-       ], [
-               # We'll have to use getprotobyname
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *****************************
-       dnl *** Checks for SOL_TCP    ***
-       dnl *****************************
-       AC_MSG_CHECKING(for SOL_TCP)
-       AC_TRY_COMPILE([#include <netdb.h>], [
-               int level = SOL_TCP;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_SOL_TCP, 1, [Have SOL_TCP])
-       ], [
-               # We'll have to use getprotobyname
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *****************************
-       dnl *** Checks for IP_PKTINFO ***
-       dnl *****************************
-       AC_MSG_CHECKING(for IP_PKTINFO)
-       AC_TRY_COMPILE([#include <linux/in.h>], [
-               int level = IP_PKTINFO;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IP_PKTINFO, 1, [Have IP_PKTINFO])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *****************************
-       dnl *** Checks for IPV6_PKTINFO ***
-       dnl *****************************
-       AC_MSG_CHECKING(for IPV6_PKTINFO)
-       AC_TRY_COMPILE([#include <netdb.h>], [
-               int level = IPV6_PKTINFO;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IPV6_PKTINFO, 1, [Have IPV6_PKTINFO])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl **********************************
-       dnl *** Checks for IP_DONTFRAG     ***
-       dnl **********************************
-       AC_MSG_CHECKING(for IP_DONTFRAG)
-       AC_TRY_COMPILE([#include <netinet/in.h>], [
-               int level = IP_DONTFRAG;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IP_DONTFRAG, 1, [Have IP_DONTFRAG])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl **********************************
-       dnl *** Checks for IP_DONTFRAGMENT ***
-       dnl **********************************
-       AC_MSG_CHECKING(for IP_DONTFRAGMENT)
-       AC_TRY_COMPILE([#include <Ws2ipdef.h>], [
-               int level = IP_DONTFRAGMENT;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IP_DONTFRAGMENT, 1, [Have IP_DONTFRAGMENT])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl **********************************
-       dnl *** Checks for IP_MTU_DISCOVER ***
-       dnl **********************************
-       AC_MSG_CHECKING(for IP_MTU_DISCOVER)
-       AC_TRY_COMPILE([#include <linux/in.h>], [
-               int level = IP_MTU_DISCOVER;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IP_MTU_DISCOVER, 1, [Have IP_MTU_DISCOVER])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl **********************************
-       dnl *** Checks for  IP_PMTUDISC_DO ***
-       dnl **********************************
-       AC_MSG_CHECKING(for IP_PMTUDISC_DO)
-       AC_TRY_COMPILE([#include <linux/in.h>], [
-               int level = IP_PMTUDISC_DO;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IP_PMTUDISC_DO, 1, [Have IP_PMTUDISC_DO])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *********************************
-       dnl *** Check for struct ip_mreqn ***
-       dnl *********************************
-       AC_MSG_CHECKING(for struct ip_mreqn)
-       AC_TRY_COMPILE([#include <netinet/in.h>], [
-               struct ip_mreqn mreq;
-               mreq.imr_address.s_addr = 0;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_STRUCT_IP_MREQN, 1, [Have struct ip_mreqn])
-       ], [
-               # We'll just have to try and use struct ip_mreq
-               AC_MSG_RESULT(no)
-               AC_MSG_CHECKING(for struct ip_mreq)
-               AC_TRY_COMPILE([#include <netinet/in.h>], [
-                       struct ip_mreq mreq;
-                       mreq.imr_interface.s_addr = 0;
-               ], [
-                       # Yes, we have it...
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_STRUCT_IP_MREQ, 1, [Have struct ip_mreq])
-               ], [
-                       # No multicast support
-                       AC_MSG_RESULT(no)
-               ])
-       ])
-       
-       dnl **********************************
-       dnl *** Check for gethostbyname2_r ***
-       dnl **********************************
-       AC_MSG_CHECKING(for gethostbyname2_r)
-               AC_TRY_LINK([#include <netdb.h>], [
-               gethostbyname2_r(NULL,0,NULL,NULL,0,NULL,NULL);
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_GETHOSTBYNAME2_R, 1, [Have gethostbyname2_r])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-
-       dnl *****************************
-       dnl *** Checks for libnsl     ***
-       dnl *****************************
-       AC_CHECK_FUNC(gethostbyaddr, , AC_CHECK_LIB(nsl, gethostbyaddr, LIBS="$LIBS -lnsl"))
-
-       AC_CHECK_FUNCS(inet_pton inet_aton)
-
-       dnl ***********************************************
-       dnl *** Checks for size of sockaddr_un.sun_path ***
-       dnl ***********************************************
-       # AC_CHECK_SIZEOF can't cope with struct members :-(
-       AC_MSG_CHECKING(size of sockaddr_un.sun_path)
-       AC_CACHE_VAL(mono_cv_sizeof_sunpath,
-               [AC_TRY_RUN([
-                       #include <sys/types.h>
-                       #include <stdio.h>
-                       #include <sys/un.h>
-
-                       int main(void) {
-                               struct sockaddr_un sock_un;
-                               FILE *f=fopen("conftestval", "w");
-                               if(!f) exit(1);
-                               fprintf(f, "%d\n", sizeof(sock_un.sun_path));
-                               exit(0);
-                       }
-               ], mono_cv_sizeof_sunpath=`cat conftestval`,
-                  mono_cv_sizeof_sunpath=0,
-                  mono_cv_sizeof_sunpath=0)])dnl
-       AC_MSG_RESULT($mono_cv_sizeof_sunpath)
-       AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $mono_cv_sizeof_sunpath, [Sizeof sock_un.sun_path])
-
-       dnl *****************************
-       dnl *** Checks for libxnet    ***
-       dnl *****************************
-       case "${host}" in
-               *solaris* )
-                       AC_MSG_CHECKING(for Solaris XPG4 support)
-                       if test -f /usr/lib/libxnet.so; then
-                               CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
-                               CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
-                               CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
-                               LIBS="$LIBS -lxnet"
-                               AC_MSG_RESULT(yes)
-                       else
-                               AC_MSG_RESULT(no)
-                       fi
-
-                       if test "$GCC" = "yes"; then
-                               CFLAGS="$CFLAGS -Wno-char-subscripts"
-                       fi
-               ;;
-       esac
-
-       dnl *****************************
-       dnl *** Checks for libpthread ***
-       dnl *****************************
-# on FreeBSD -STABLE, the pthreads functions all reside in libc_r
-# and libpthread does not exist
-#
-       case "${host}" in
-               *-*-*freebsd*)
-                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
-               ;;
-               *-*-*openbsd*)
-                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
-               ;;
-               *)
-                       AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
-               ;;
-       esac
-       AC_CHECK_HEADERS(pthread.h)
-       AC_CHECK_HEADERS(pthread_np.h)
-       AC_CHECK_FUNCS(pthread_mutex_timedlock)
-       AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_setname_np)
-       AC_CHECK_FUNCS(pthread_kill)
-       AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
-       AC_TRY_COMPILE([ #include <pthread.h>], [
-               pthread_mutexattr_t attr;
-               pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-       ], [
-               AC_MSG_RESULT(ok)
-       ], [
-               AC_MSG_RESULT(no)
-               AC_ERROR(Posix system lacks support for recursive mutexes)
-       ])
-       AC_CHECK_FUNCS(pthread_attr_setstacksize)
-       AC_CHECK_FUNCS(pthread_attr_getstack pthread_attr_getstacksize)
-       AC_CHECK_FUNCS(pthread_get_stacksize_np pthread_get_stackaddr_np)
-
-       dnl ***********************************
-       dnl *** Checks for signals
-       dnl ***********************************
-       AC_CHECK_HEADERS(signal.h)
-       AC_CHECK_FUNCS(sigaction)
-
-       dnl ***********************************
-       dnl *** Checks for working __thread ***
-       dnl ***********************************
-       AC_MSG_CHECKING(for working __thread)
-       if test "x$with_tls" != "x__thread"; then
-               AC_MSG_RESULT(disabled)
-       elif test "x$cross_compiling" = "xyes"; then
-               AC_MSG_RESULT(cross compiling, assuming yes)
-       else
-               AC_TRY_RUN([
-                       #if defined(__APPLE__) && defined(__clang__)
-                       #error "__thread does not currently work with clang on Mac OS X"
-                       #endif
-                       
-                       #include <pthread.h>
-                       __thread int i;
-                       static int res1, res2;
-
-                       void thread_main (void *arg)
-                       {
-                               i = arg;
-                               sleep (1);
-                               if (arg == 1)
-                                       res1 = (i == arg);
-                               else
-                                       res2 = (i == arg);
-                       }
-
-                       int main () {
-                               pthread_t t1, t2;
-
-                               i = 5;
-
-                               pthread_create (&t1, NULL, thread_main, 1);
-                               pthread_create (&t2, NULL, thread_main, 2);
-
-                               pthread_join (t1, NULL);
-                               pthread_join (t2, NULL);
-
-                               return !(res1 + res2 == 2);
-                       }
-               ], [
-                               AC_MSG_RESULT(yes)
-               ], [
-                               AC_MSG_RESULT(no)
-                               with_tls=pthread
-               ])
-       fi
-
-       dnl **************************************
-       dnl *** Checks for working sigaltstack ***
-       dnl **************************************
-       AC_MSG_CHECKING(for working sigaltstack)
-       if test "x$with_sigaltstack" != "xyes"; then
-               AC_MSG_RESULT(disabled)
-       elif test "x$cross_compiling" = "xyes"; then
-               AC_MSG_RESULT(cross compiling, assuming yes)
-       else
-               AC_TRY_RUN([
-                       #include <stdio.h>
-                       #include <stdlib.h>
-                       #include <unistd.h>
-                       #include <signal.h>
-                       #include <pthread.h>
-                       #include <sys/wait.h>
-                       #if defined(__FreeBSD__) || defined(__NetBSD__)
-                       #define SA_STACK SA_ONSTACK
-                       #endif
-                       static void
-                       sigsegv_signal_handler (int _dummy, siginfo_t *info, void *context)
-                       {
-                               exit (0);
-                       }
-
-                       volatile char*__ptr = NULL;
-                       static void *
-                       loop (void *ignored)
-                       {
-                               *__ptr = 0;
-                               return NULL;
-                       }
-
-                       static void
-                       child ()
-                       {
-                               struct sigaction sa;
-                       #ifdef __APPLE__
-                               stack_t sas;
-                       #else
-                               struct sigaltstack sas;
-                       #endif
-                               pthread_t id;
-                               pthread_attr_t attr;
-
-                               sa.sa_sigaction = sigsegv_signal_handler;
-                               sigemptyset (&sa.sa_mask);
-                               sa.sa_flags = SA_SIGINFO | SA_ONSTACK;
-                               if (sigaction (SIGSEGV, &sa, NULL) == -1) {
-                                       perror ("sigaction");
-                                       return;
-                               }
-
-                               /* x86 darwin deliver segfaults using SIGBUS */
-                               if (sigaction (SIGBUS, &sa, NULL) == -1) {
-                                       perror ("sigaction");
-                                       return;
-                               }
-                               sas.ss_sp = malloc (SIGSTKSZ);
-                               sas.ss_size = SIGSTKSZ;
-                               sas.ss_flags = 0;
-                               if (sigaltstack (&sas, NULL) == -1) {
-                                       perror ("sigaltstack");
-                                       return;
-                               }
-
-                               pthread_attr_init (&attr);
-                               if (pthread_create(&id, &attr, loop, &attr) != 0) {
-                                       printf ("pthread_create\n");
-                                       return;
-                               }
-
-                               sleep (100);
-                       }
-
-                       int
-                       main ()
-                       {
-                               pid_t son;
-                               int status;
-                               int i;
-
-                               son = fork ();
-                               if (son == -1) {
-                                       return 1;
-                               }
-
-                               if (son == 0) {
-                                       child ();
-                                       return 0;
-                               }
-
-                               for (i = 0; i < 300; ++i) {
-                                       waitpid (son, &status, WNOHANG);
-                                       if (WIFEXITED (status) && WEXITSTATUS (status) == 0)
-                                               return 0;
-                                       usleep (10000);
-                               }
-
-                               kill (son, SIGKILL);
-                               return 1;
-                       }
-
-               ], [
-                               AC_MSG_RESULT(yes)
-                               AC_DEFINE(HAVE_WORKING_SIGALTSTACK, 1, [Have a working sigaltstack])
-               ], [
-                               with_sigaltstack=no
-                               AC_MSG_RESULT(no)
-               ])
-       fi
-
-       dnl ********************************
-       dnl *** Checks for semaphore lib ***
-       dnl ********************************
-       # 'Real Time' functions on Solaris
-       # posix4 on Solaris 2.6
-       # pthread (first!) on Linux
-       AC_SEARCH_LIBS(sem_init, pthread rt posix4) 
-
-       AC_SEARCH_LIBS(shm_open, pthread rt posix4) 
-       AC_CHECK_FUNCS(shm_open)
-
-       dnl ********************************
-       dnl *** Checks for timezone stuff **
-       dnl ********************************
-       AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-               AC_TRY_COMPILE([
-                       #include <time.h>
-                       ], [
-                       struct tm tm;
-                       tm.tm_gmtoff = 1;
-                       ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
-       if test $ac_cv_struct_tm_gmtoff = yes; then
-               AC_DEFINE(HAVE_TM_GMTOFF, 1, [Have tm_gmtoff])
-       else
-               AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
-                       AC_TRY_COMPILE([
-                               #include <time.h>
-                       ], [
-                               timezone = 1;
-                       ], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
-               if test $ac_cv_var_timezone = yes; then
-                       AC_DEFINE(HAVE_TIMEZONE, 1, [Have timezone variable])
-               else
-                       AC_ERROR(unable to find a way to determine timezone)
-               fi
-       fi
-
-       dnl *********************************
-       dnl *** Checks for math functions ***
-       dnl *********************************
-       AC_SEARCH_LIBS(sqrtf, m)
-       if test "x$has_broken_apple_cpp" != "xyes"; then
-               AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
-                       AC_TRY_LINK([#include <math.h>], 
-                       [ finite(0.0); ], 
-                       AC_DEFINE(HAVE_FINITE, 1, [Have finite in -lm]) AC_MSG_RESULT(yes),
-                       AC_MSG_RESULT(no)))
-       fi
-        AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h)
-                AC_TRY_LINK([#include <math.h>], 
-                [ isfinite(0.0); ], 
-                AC_DEFINE(HAVE_ISFINITE, 1, [Have isfinite]) AC_MSG_RESULT(yes),
-                AC_MSG_RESULT(no)))
-
-       dnl ****************************************************************
-       dnl *** Checks for working poll() (macosx defines it but doesn't ***
-       dnl *** have it in the library (duh))                            ***
-       dnl ****************************************************************
-       AC_CHECK_FUNCS(poll)
-
-       dnl *************************
-       dnl *** Check for signbit ***
-       dnl *************************
-       AC_MSG_CHECKING(for signbit)
-       AC_TRY_LINK([#include <math.h>], [
-               int s = signbit(1.0);
-       ], [
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_SIGNBIT, 1, [Have signbit])
-       ], [
-               AC_MSG_RESULT(no)
-       ]) 
-
-       dnl **********************************
-       dnl *** epoll                      ***
-       dnl **********************************
-       if test "x$ac_cv_header_nacl_nacl_dyncode_h" = "xno"; then
-               AC_CHECK_HEADERS(sys/epoll.h)
-               haveepoll=no
-               AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
-               if test "x$haveepoll" = "xyes" -a "x$ac_cv_header_sys_epoll_h" = "xyes"; then
-                       AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
-               fi
-       fi
-
-       havekqueue=no
-
-       AC_CHECK_HEADERS(sys/event.h)
-       AC_CHECK_FUNCS(kqueue, [havekqueue=yes], )
-
-       dnl **************************************
-       dnl * Darwin has a race that prevents us from using reliably:
-       dnl * http://lists.apple.com/archives/darwin-dev/2011/Jun/msg00016.html
-       dnl * Since kqueue is mostly used for scaling large web servers, 
-       dnl * and very few folks run Mono on large web servers on OSX, falling
-       dnl * back 
-       dnl **************************************
-       if test "x$havekqueue" = "xyes" -a "x$ac_cv_header_sys_event_h" = "xyes"; then
-               if test "x$platform_darwin" = "xno"; then
-                       AC_DEFINE(USE_KQUEUE_FOR_THREADPOOL, 1, [Use kqueue for the threadpool])
-               fi
-       fi
-
-       dnl ******************************
-       dnl *** Checks for SIOCGIFCONF ***
-       dnl ******************************
-       AC_CHECK_HEADERS(sys/ioctl.h)
-       AC_CHECK_HEADERS(net/if.h, [], [],
-          [
-          #ifdef HAVE_SYS_TYPES_H
-          # include <sys/types.h>
-          #endif
-          #ifdef HAVE_SYS_SOCKET_H
-          # include <sys/socket.h>
-          #endif
-          ])
-       AC_MSG_CHECKING(for ifreq)
-       AC_TRY_COMPILE([
-               #include <stdio.h>
-               #include <sys/ioctl.h>
-               #include <net/if.h>
-               ], [
-               struct ifconf ifc;
-               struct ifreq *ifr;
-               void *x;
-               ifc.ifc_len = 0;
-               ifc.ifc_buf = NULL;
-               x = (void *) &ifr->ifr_addr;
-               ],[
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_SIOCGIFCONF, 1, [Can get interface list])
-               ], [
-                       AC_MSG_RESULT(no)
-               ])
-       dnl **********************************
-       dnl ***     Checks for sin_len     ***
-       dnl **********************************
-       AC_MSG_CHECKING(for sockaddr_in.sin_len)
-       AC_TRY_COMPILE([
-               #include <netinet/in.h>
-               ], [
-               struct sockaddr_in saddr;
-               saddr.sin_len = sizeof (saddr);
-               ],[
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_SOCKADDR_IN_SIN_LEN, 1, [sockaddr_in has sin_len])
-               ], [
-                       AC_MSG_RESULT(no)
-               ])      
-       dnl **********************************
-       dnl ***    Checks for sin6_len     ***
-       dnl **********************************
-       AC_MSG_CHECKING(for sockaddr_in6.sin6_len)
-       AC_TRY_COMPILE([
-               #include <netinet/in.h>
-               ], [
-               struct sockaddr_in6 saddr6;
-               saddr6.sin6_len = sizeof (saddr6);
-               ],[
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_SOCKADDR_IN6_SIN_LEN, 1, [sockaddr_in6 has sin6_len])
-               ], [
-                       AC_MSG_RESULT(no)
-               ])
-       dnl **********************************
-       dnl *** Check for getifaddrs       ***
-       dnl **********************************
-       AC_MSG_CHECKING(for getifaddrs)
-               AC_TRY_LINK([
-               #include <stdio.h>
-               #include <sys/types.h>
-               #include <sys/socket.h>
-               #include <ifaddrs.h>
-       ], [
-               getifaddrs(NULL);
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_GETIFADDRS, 1, [Have getifaddrs])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-       dnl **********************************
-       dnl *** Check for if_nametoindex   ***
-       dnl **********************************
-       AC_MSG_CHECKING(for if_nametoindex)
-               AC_TRY_LINK([
-               #include <stdio.h>
-               #include <sys/types.h>
-               #include <sys/socket.h>
-               #include <net/if.h>
-       ], [
-               if_nametoindex(NULL);
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_IF_NAMETOINDEX, 1, [Have if_nametoindex])
-       ], [
-               AC_MSG_RESULT(no)
-       ])
-                       
-       dnl **********************************
-       dnl *** Checks for MonoPosixHelper ***
-       dnl **********************************
-       AC_CHECK_HEADERS(checklist.h)
-       AC_CHECK_HEADERS(pathconf.h)
-       AC_CHECK_HEADERS(fstab.h)
-       AC_CHECK_HEADERS(attr/xattr.h)
-       AC_CHECK_HEADERS(sys/extattr.h)
-       AC_CHECK_HEADERS(sys/sendfile.h)
-       AC_CHECK_HEADERS(sys/statvfs.h)
-       AC_CHECK_HEADERS(sys/statfs.h)
-       AC_CHECK_HEADERS(sys/vfstab.h)
-       AC_CHECK_HEADERS(sys/xattr.h)
-       AC_CHECK_HEADERS(sys/mman.h)
-       AC_CHECK_HEADERS(sys/param.h)
-       AC_CHECK_HEADERS(sys/mount.h, [], [],
-               [
-               #ifdef HAVE_SYS_PARAM_H
-               # include <sys/param.h>
-               #endif
-               ])
-       AC_CHECK_HEADERS(sys/mount.h)
-       AC_CHECK_FUNCS(confstr)
-       AC_CHECK_FUNCS(seekdir telldir)
-       AC_CHECK_FUNCS(getdomainname)
-       AC_CHECK_FUNCS(setdomainname)
-       AC_CHECK_FUNCS(endgrent getgrent fgetgrent setgrent)
-       AC_CHECK_FUNCS(setgroups)
-       AC_CHECK_FUNCS(endpwent getpwent fgetpwent setpwent)
-       AC_CHECK_FUNCS(getfsstat)
-       AC_CHECK_FUNCS(lutimes futimes)
-       AC_CHECK_FUNCS(mremap)
-       AC_CHECK_FUNCS(remap_file_pages)
-       AC_CHECK_FUNCS(posix_fadvise)
-       AC_CHECK_FUNCS(posix_fallocate)
-       AC_CHECK_FUNCS(posix_madvise)
-       AC_CHECK_FUNCS(vsnprintf)
-       AC_CHECK_FUNCS(sendfile)
-       AC_CHECK_FUNCS(gethostid sethostid)
-       AC_CHECK_FUNCS(sethostname)
-       AC_CHECK_FUNCS(statfs)
-       AC_CHECK_FUNCS(fstatfs)
-       AC_CHECK_FUNCS(statvfs)
-       AC_CHECK_FUNCS(fstatvfs)
-       AC_CHECK_FUNCS(stime)
-       AC_CHECK_FUNCS(strerror_r)
-       AC_CHECK_FUNCS(ttyname_r)
-       AC_CHECK_FUNCS(psignal)
-       AC_CHECK_FUNCS(getlogin_r)
-       AC_CHECK_FUNCS(lockf)
-       AC_CHECK_FUNCS(swab)
-       AC_CHECK_FUNCS(setusershell endusershell)
-       AC_CHECK_FUNCS(futimens utimensat)
-       AC_CHECK_FUNCS(fstatat mknodat readlinkat)
-       AC_CHECK_FUNCS(readv writev preadv pwritev)
-       AC_CHECK_FUNCS(setpgid)
-       AC_CHECK_SIZEOF(size_t)
-       AC_CHECK_TYPES([blksize_t], [AC_DEFINE(HAVE_BLKSIZE_T)], , 
-               [#include <sys/types.h>
-                #include <sys/stat.h>
-                #include <unistd.h>])
-       AC_CHECK_TYPES([blkcnt_t], [AC_DEFINE(HAVE_BLKCNT_T)], ,
-               [#include <sys/types.h>
-                #include <sys/stat.h>
-                #include <unistd.h>])
-       AC_CHECK_TYPES([suseconds_t], [AC_DEFINE(HAVE_SUSECONDS_T)], ,
-               [#include <sys/time.h>])
-       AC_CHECK_TYPES([struct flock], [AC_DEFINE(HAVE_STRUCT_FLOCK)], ,
-               [#include <unistd.h>
-                #include <fcntl.h>])
-       AC_CHECK_TYPES([struct iovec], [AC_DEFINE(HAVE_STRUCT_IOVEC)], ,
-               [#include <sys/uio.h>])
-       AC_CHECK_TYPES([struct pollfd], [AC_DEFINE(HAVE_STRUCT_POLLFD)], ,
-               [#include <sys/poll.h>])
-       AC_CHECK_TYPES([struct stat], [AC_DEFINE(HAVE_STRUCT_STAT)], ,
-               [#include <sys/types.h>
-                #include <sys/stat.h>
-                #include <unistd.h>])
-       AC_CHECK_TYPES([struct timespec], [AC_DEFINE(HAVE_STRUCT_TIMESPEC)], ,
-               [#include <time.h>])
-       AC_CHECK_TYPES([struct timeval], [AC_DEFINE(HAVE_STRUCT_TIMEVAL)], ,
-               [#include <sys/time.h>
-                #include <sys/types.h>
-                #include <utime.h>])
-       AC_CHECK_TYPES([struct timezone], [AC_DEFINE(HAVE_STRUCT_TIMEZONE)], ,
-               [#include <sys/time.h>])
-       AC_CHECK_TYPES([struct utimbuf], [AC_DEFINE(HAVE_STRUCT_UTIMBUF)], ,
-               [#include <sys/types.h>
-                #include <utime.h>])
-       AC_CHECK_MEMBERS(
-               [struct dirent.d_off, struct dirent.d_reclen, struct dirent.d_type],,, 
-               [#include <sys/types.h>
-                #include <dirent.h>])
-       AC_CHECK_MEMBERS(
-               [struct passwd.pw_gecos],,, 
-               [#include <sys/types.h>
-                #include <pwd.h>])
-       AC_CHECK_MEMBERS(
-               [struct statfs.f_flags],,, 
-               [#include <sys/types.h>
-                #include <sys/vfs.h>])
-       AC_CHECK_MEMBERS(
-               [struct stat.st_atim, struct stat.st_mtim, struct stat.st_ctim],,, 
-               [#include <sys/types.h>
-                #include <sys/stat.h>
-                #include <unistd.h>])
-
-       dnl Favour xattr through glibc, but use libattr if we have to
-       AC_CHECK_FUNC(lsetxattr, ,
-               AC_CHECK_LIB(attr, lsetxattr, XATTR_LIB="-lattr",)
-       )
-       AC_SUBST(XATTR_LIB)
-
-       dnl kinfo_proc.kp_proc works on darwin but fails on other simil-bsds
-       AC_CHECK_MEMBERS(
-               [struct kinfo_proc.kp_proc],,, 
-               [#include <sys/types.h>
-                #include <sys/param.h>
-                #include <sys/sysctl.h>
-                #include <sys/proc.h>
-                ])
-
-       dnl *********************************
-       dnl *** Checks for Windows compilation ***
-       dnl *********************************
-       AC_CHECK_HEADERS(sys/time.h)
-       AC_CHECK_HEADERS(sys/param.h)
-       AC_CHECK_HEADERS(dirent.h)
-
-       dnl ******************************************
-       dnl *** Checks for OSX and iOS compilation ***
-       dnl ******************************************
-       AC_CHECK_HEADERS(CommonCrypto/CommonDigest.h)
-
-       dnl *********************************
-       dnl *** Check for Console 2.0 I/O ***
-       dnl *********************************
-       AC_CHECK_HEADERS([curses.h])
-       AC_CHECK_HEADERS([term.h], [], [],
-       [#if HAVE_CURSES_H
-        #include <curses.h>
-        #endif
-       ])
-       AC_CHECK_HEADERS([termios.h])
-
-       dnl * This is provided in io-layer, but on windows it's only available
-       dnl * on xp+
-       AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available])
-else
-       dnl *********************************
-       dnl *** Checks for Windows compilation ***
-       dnl *********************************
-       AC_CHECK_HEADERS(winternl.h)
-
-       jdk_headers_found=no
-       AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
-       AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
-       AC_CHECK_LIB(ole32, main, LIBS="$LIBS -lole32", AC_ERROR(bad mingw install?))
-       AC_CHECK_LIB(winmm, main, LIBS="$LIBS -lwinmm", AC_ERROR(bad mingw install?))
-       AC_CHECK_LIB(oleaut32, main, LIBS="$LIBS -loleaut32", AC_ERROR(bad mingw install?))
-       AC_CHECK_LIB(advapi32, main, LIBS="$LIBS -ladvapi32", AC_ERROR(bad mingw install?))
-       AC_CHECK_LIB(version, main, LIBS="$LIBS -lversion", AC_ERROR(bad mingw install?))
-
-       dnl *********************************
-       dnl *** Check for struct ip_mreqn ***
-       dnl *********************************
-       AC_MSG_CHECKING(for struct ip_mreqn)
-       AC_TRY_COMPILE([#include <ws2tcpip.h>], [
-               struct ip_mreqn mreq;
-               mreq.imr_address.s_addr = 0;
-       ], [
-               # Yes, we have it...
-               AC_MSG_RESULT(yes)
-               AC_DEFINE(HAVE_STRUCT_IP_MREQN)
-       ], [
-               # We'll just have to try and use struct ip_mreq
-               AC_MSG_RESULT(no)
-               AC_MSG_CHECKING(for struct ip_mreq)
-               AC_TRY_COMPILE([#include <ws2tcpip.h>], [
-                       struct ip_mreq mreq;
-                       mreq.imr_interface.s_addr = 0;
-               ], [
-                       # Yes, we have it...
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_STRUCT_IP_MREQ)
-               ], [
-                       # No multicast support
-                       AC_MSG_RESULT(no)
-               ])
-       ])
-       AC_CHECK_FUNCS(GetProcessId)
-       AC_CHECK_DECLS(InterlockedExchange64, [], [], [[#include <windows.h>]])
-       AC_CHECK_DECLS(InterlockedCompareExchange64, [], [], [[#include <windows.h>]])
-       AC_CHECK_DECLS(InterlockedDecrement64, [], [], [[#include <windows.h>]])
-       AC_CHECK_DECLS(InterlockedIncrement64, [], [], [[#include <windows.h>]])
-       AC_CHECK_DECLS(InterlockedAdd, [], [], [[#include <windows.h>]])
-       AC_CHECK_DECLS(InterlockedAdd64, [], [], [[#include <windows.h>]])
-       AC_CHECK_DECLS(__readfsdword, [], [], [[#include <windows.h>]])
-fi
-
-dnl socklen_t check
-AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-],[
-  socklen_t foo;
-],[
-ac_cv_c_socklen_t=yes
-       AC_DEFINE(HAVE_SOCKLEN_T, 1, [Have socklen_t])
-       AC_MSG_RESULT(yes)
-],[
-       AC_MSG_RESULT(no)
-])
-
-AC_MSG_CHECKING(for array element initializer support)
-AC_TRY_COMPILE([#include <sys/socket.h>], [
-       const int array[] = {[1] = 2,};
-], [
-       # Yes, we have it...
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(HAVE_ARRAY_ELEM_INIT,1,[Supports C99 array initialization])
-], [
-       # We'll have to use signals
-       AC_MSG_RESULT(no)
-])
-
-AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
-       # Simply calling trunc (0.0) is no good since gcc will optimize the call away
-       AC_TRY_LINK([#include <math.h>], 
-       [ static void *p = &trunc; ],
-       [
-               AC_DEFINE(HAVE_TRUNC) 
-               AC_MSG_RESULT(yes)
-               ac_cv_trunc=yes
-       ],
-       AC_MSG_RESULT(no)))
-
-if test "x$ac_cv_truncl" != "xyes"; then
-   AC_CHECK_LIB(sunmath, aintl, [ AC_DEFINE(HAVE_AINTL, 1, [Has the 'aintl' function]) LIBS="$LIBS -lsunmath"])
-fi
-
-AC_CHECK_FUNCS(round)
-AC_CHECK_FUNCS(rint)
-AC_CHECK_FUNCS(execvp)
-
-dnl ****************************
-dnl *** Look for /dev/random ***
-dnl ****************************
-
-AC_MSG_CHECKING([if usage of random device is requested])
-AC_ARG_ENABLE(dev-random,
-[  --disable-dev-random    disable the use of the random device (enabled by default)],
-try_dev_random=$enableval, try_dev_random=yes)
-
-AC_MSG_RESULT($try_dev_random)
-
-case "{$build}" in
-    *-openbsd*)
-    NAME_DEV_RANDOM="/dev/srandom"
-    ;;
-
-dnl Win32 does not have /dev/random, they have their own method...
-
-    *-mingw*|*-*-cygwin*)
-    ac_cv_have_dev_random=no
-    ;;
-
-dnl Everywhere else, it's /dev/random
-
-    *)
-    NAME_DEV_RANDOM="/dev/random"
-    ;;
-esac
-
-AC_DEFINE_UNQUOTED(NAME_DEV_RANDOM, "$NAME_DEV_RANDOM", [Name of /dev/random])
-
-dnl Now check if the device actually exists
-
-if test "x$try_dev_random" = "xyes"; then
-    AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
-    [if test -r "$NAME_DEV_RANDOM" ; then
-        ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
-    if test "x$ac_cv_have_dev_random" = "xyes"; then
-        AC_DEFINE(HAVE_CRYPT_RNG, 1, [Have /dev/random])
-    fi
-else
-    AC_MSG_CHECKING(for random device)
-    ac_cv_have_dev_random=no
-    AC_MSG_RESULT(has been disabled)
-fi
-
-if test "x$host_win32" = "xyes"; then
-    AC_DEFINE(HAVE_CRYPT_RNG)
-fi
-
-if test "x$ac_cv_have_dev_random" = "xno" \
-    && test "x$host_win32" = "xno"; then
-    AC_MSG_WARN([[
-***
-*** A system-provided entropy source was not found on this system.
-*** Because of this, the System.Security.Cryptography random number generator
-*** will throw a NotImplemented exception.
-***
-*** If you are seeing this message, and you know your system DOES have an
-*** entropy collection in place, please contact <crichton@gimp.org> and
-*** provide information about the system and how to access the random device.
-***
-*** Otherwise you can install either egd or prngd and set the environment
-*** variable MONO_EGD_SOCKET to point to the daemon's socket to use that.
-***]])
-fi
-AC_MSG_CHECKING([if inter-process shared handles are requested])
-AC_ARG_ENABLE(shared-handles, [  --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
-AC_MSG_RESULT($try_shared_handles)
-if test "x$try_shared_handles" != "xyes"; then
-       AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles])
-       AC_SUBST(DISABLE_SHARED_HANDLES)
-fi
-
-AC_ARG_ENABLE(bcl-opt, [  --disable-bcl-opt    BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes)
-
-AC_ARG_ENABLE(nunit-tests, [  --enable-nunit-tests     Run the nunit tests of the class library on 'make check'])
-AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
-
-AC_MSG_CHECKING([if big-arrays are to be enabled])
-AC_ARG_ENABLE(big-arrays,  [  --enable-big-arrays      Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
-if test "x$enable_big_arrays" = "xyes" ; then
-    if  test "x$ac_cv_sizeof_void_p" = "x8"; then
-       AC_DEFINE(MONO_BIG_ARRAYS,1,[Enable the allocation and indexing of arrays greater than Int32.MaxValue])
-    else
-        AC_MSG_ERROR([The allocation and indexing of arrays greater than Int32.MaxValue is not supported on this platform.])
-    fi
-fi
-AC_MSG_RESULT($enable_big_arrays)
-
-dnl **************
-dnl *** DTRACE ***
-dnl **************
-
-AC_ARG_ENABLE(dtrace,[  --enable-dtrace        Enable DTrace probes], enable_dtrace=$enableval, enable_dtrace=$has_dtrace)
-
-if test "x$enable_dtrace" = "xyes"; then
-   if test "x$has_dtrace" = "xno"; then
-         AC_MSG_ERROR([DTrace probes are not supported on this platform.])
-   fi
-   AC_PATH_PROG(DTRACE, [dtrace], [no], [$PATH:/usr/sbin])
-   if test "x$DTRACE" = "xno"; then
-         AC_MSG_RESULT([dtrace utility not found, dtrace support disabled.])
-         enable_dtrace=no
-   elif ! $DTRACE -h -s $srcdir/data/mono.d > /dev/null 2>&1; then
-         AC_MSG_RESULT([dtrace doesn't support -h option, dtrace support disabled.])
-         enable_dtrace=no
-   fi
-fi
-
-dtrace_g=no
-if test "x$enable_dtrace" = "xyes"; then
-       AC_DEFINE(ENABLE_DTRACE, 1, [Enable DTrace probes])
-       DTRACEFLAGS=
-       if test "x$ac_cv_sizeof_void_p" = "x8"; then
-               case "$host" in
-                       powerpc-*-darwin*)
-                       DTRACEFLAGS="-arch ppc64"
-                       ;;
-                       i*86-*-darwin*)
-                       DTRACEFLAGS="-arch x86_64"
-                       ;;
-                       *)
-                       DTRACEFLAGS=-64
-                       ;;
-               esac
-       else
-               case "$host" in
-                       powerpc-*-darwin*)
-                       DTRACEFLAGS="-arch ppc"
-                       ;;
-                       i*86-*-darwin*)
-                       DTRACEFLAGS="-arch i386"
-                       ;;
-                       *)
-                       DTRACEFLAGS=-32
-                       ;;
-               esac
-       fi
-       AC_SUBST(DTRACEFLAGS)
-       case "$host" in
-               *-*-solaris*)
-               dtrace_g=yes
-               ;;
-       esac
-       AC_CHECK_HEADERS([sys/sdt.h])
-fi
-AM_CONDITIONAL(ENABLE_DTRACE, [test x$enable_dtrace = xyes])
-AM_CONDITIONAL(DTRACE_G_REQUIRED, [test x$dtrace_g = xyes])
-
-dnl **************
-dnl ***  NaCl  ***
-dnl **************
-
-AC_ARG_ENABLE(nacl_codegen, [  --enable-nacl-codegen      Enable Native Client code generation], enable_nacl_codegen=$enableval, enable_nacl_codegen=no)
-AC_ARG_ENABLE(nacl_gc, [  --enable-nacl-gc           Enable Native Client garbage collection], enable_nacl_gc=$enableval, enable_nacl_gc=no)
-
-AM_CONDITIONAL(NACL_CODEGEN, test x$enable_nacl_codegen != xno)
-
-dnl
-dnl Hack to use system mono for operations in build/install not allowed in NaCl.
-dnl
-nacl_self_host=""
-if test "x$ac_cv_header_nacl_nacl_dyncode_h" = "xyes"; then
-   nacl_self_host="nacl_self_host"
-fi
-AC_SUBST(nacl_self_host)
-
-if test "x$enable_nacl_codegen" = "xyes"; then
-   MONO_NACL_ALIGN_MASK_OFF=1
-   AC_DEFINE(TARGET_NACL, 1, [...])
-   AC_DEFINE(__native_client_codegen__, 1, [...])
-else
-   MONO_NACL_ALIGN_MASK_OFF=0
-   AC_DEFINE(__default_codegen__, 1, [...])
-fi
-if test "x$enable_nacl_gc" = "xyes"; then
-   if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
-      INSTRUMENT_CFLAG="-finstrument-for-thread-suspension"
-   else
-      # Not yet implemented
-      INSTRUMENT_CFLAG=""
-   fi
-   CPPFLAGS="$CPPFLAGS $INSTRUMENT_CFLAG -D__native_client_gc__"
-fi
-AC_SUBST(MONO_NACL_ALIGN_MASK_OFF)
-
-dnl **************
-dnl ***  LLVM  ***
-dnl **************
-
-AC_ARG_ENABLE(llvm,[  --enable-llvm    Enable the LLVM back-end], enable_llvm=$enableval, enable_llvm=no)
-AC_ARG_ENABLE(loadedllvm,[  --enable-loadedllvm        Load the LLVM back-end dynamically], enable_llvm=$enableval && enable_loadedllvm=$enableval, enable_loadedllvm=no)
-AC_ARG_ENABLE(llvm-version-check,[  --enable-llvm-version-check Check that the LLVM matches the version expected by mono], enable_llvm_version_check=$enableval, enable_llvm_version_check=no)
-
-AC_ARG_WITH(llvm, [  --with-llvm=<llvm prefix>    Enable the LLVM back-end], enable_llvm=yes,)
-
-if test "x$enable_llvm" = "xyes"; then
-   if test "x$with_llvm" != "x"; then
-         LLVM_CONFIG=$with_llvm/bin/llvm-config
-         if test ! -x $LLVM_CONFIG; then
-                AC_MSG_ERROR([LLVM executable $LLVM_CONFIG not found.])
-      fi
-   else
-      AC_PATH_PROG(LLVM_CONFIG, llvm-config, no)
-      if test "x$LLVM_CONFIG" = "xno"; then
-            AC_MSG_ERROR([llvm-config not found.])
-      fi
-   fi
-
-   llvm_codegen="x86codegen"
-   case "$target" in
-   arm*)
-               llvm_codegen="armcodegen"
-               ;;
-   esac
-
-   # The output of --cflags seems to include optimizations flags too
-   LLVM_CFLAGS=`$LLVM_CONFIG --cflags | sed -e 's/-O2//g' | sed -e 's/-O0//g' | sed -e 's/-fomit-frame-pointer//g' | sed -e 's/-fPIC//g'`
-   # LLVM is compiled with -fno-rtti, so we need this too, since our classes inherit
-   # from LLVM classes.
-   LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti"
-   LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
-   # This might include empty lines
-   LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -`
-   if test "x$host" != "x$target"; then
-      # No need for jit libs
-      LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter`
-   else
-      LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit mcjit $llvm_codegen`
-   fi
-   LLVM_LIBS="$LLVM_LIBS $LLVM_LDFLAGS $LLVM_SYSTEM_LIBS -lstdc++"
-
-   expected_llvm_version="3.4svn-mono-mono/e656cac"
-
-   # Should be something like '2.6' or '2.7svn'
-   llvm_version=`$LLVM_CONFIG --version`
-   major_version=`echo $llvm_version | cut -c 1`
-   minor_version=`echo $llvm_version | cut -c 3`
-   llvm_api_version=`$LLVM_CONFIG --mono-api-version 2>/dev/null`
-   AC_MSG_CHECKING(LLVM version)
-   AC_MSG_RESULT($llvm_version)
-   if echo $llvm_version | grep -q 'mono'; then
-         if test "x$enable_llvm_version_check" == "xyes"; then
-                if test "$llvm_version" != "$expected_llvm_version"; then
-                       AC_MSG_ERROR([Expected llvm version $expected_llvm_version, but llvm-config --version returned $llvm_version"])
-                fi
-         fi
-         if test "x$llvm_api_version" = "x"; then
-               LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=0"
-               LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=0"
-         else
-               LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=$llvm_api_version"
-               LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version"
-         fi
-   else
-         AC_MSG_ERROR([Compiling with stock LLVM is not supported, please use the Mono LLVM repo at https://github.com/mono/llvm, with the GIT branch which matches this version of mono, i.e. 'mono-2-10' for Mono 2.10.])
-   fi
-
-   AC_DEFINE_UNQUOTED(LLVM_MAJOR_VERSION, $major_version, [Major version of LLVM libraries])
-   AC_DEFINE_UNQUOTED(LLVM_MINOR_VERSION, $minor_version, [Minor version of LLVM libraries])
-   AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties])
-
-   # Have to pass these on the command line since mini-llvm-cpp.h already includes
-   # llvm's config.h
-   LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MAJOR_VERSION=$major_version -DLLVM_MINOR_VERSION=$minor_version"
-
-   AC_SUBST(LLVM_CFLAGS)
-   AC_SUBST(LLVM_CXXFLAGS)
-   AC_SUBST(LLVM_LIBS)
-   AC_SUBST(LLVM_LDFLAGS)
-   AC_DEFINE(ENABLE_LLVM, 1, [Enable the LLVM back end])
-fi
-
-AM_CONDITIONAL(ENABLE_LLVM, [test x$enable_llvm = xyes])
-if test "x$enable_loadedllvm" = "xyes"; then
-   AC_DEFINE(MONO_LLVM_LOADED, 1, [The LLVM back end is dynamically loaded])
-fi
-AM_CONDITIONAL(LOADED_LLVM, [test x$enable_loadedllvm = xyes])
-
-TARGET="unknown"
-ACCESS_UNALIGNED="yes"
-
-JIT_SUPPORTED=no
-INTERP_SUPPORTED=no
-LIBC="libc.so.6"
-INTL="libc.so.6"
-SQLITE="libsqlite.so.0"
-SQLITE3="libsqlite3.so.0"
-X11="libX11.so"
-XINERAMA="libXinerama.so"
-
-sizeof_register="SIZEOF_VOID_P"
-
-jit_wanted=true
-interp_wanted=false
-sgen_supported=false
-boehm_supported=true
-case "$host" in
-       mips*)
-               TARGET=MIPS;
-               arch_target=mips;
-               sgen_supported=true
-               ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
-
-               AC_MSG_CHECKING(for mips n32)
-               AC_TRY_COMPILE([],[
-               #if _MIPS_SIM != _ABIN32
-               #error Not mips n32
-               #endif
-               return 0;
-               ],[
-               AC_MSG_RESULT(yes)
-               sizeof_register=8
-               ],[
-               AC_MSG_RESULT(no)
-               ])
-               ;;
-       i*86-*-*)
-               TARGET=X86;
-               arch_target=x86;
-               JIT_SUPPORTED=yes
-               case $host_os in
-                 solaris*)
-                       LIBC="libc.so"
-                       INTL="libintl.so"
-                       if test "x$ac_cv_sizeof_void_p" = "x8"; then
-                               TARGET=AMD64
-                               arch_target=amd64
-                       fi
-
-                       # On solaris 10 x86, gcc prints a warning saying 'visibility attribute not supported on this configuration; ignored', but linking fails. A test case:
-                       # int astruct __attribute__ ((visibility ("hidden")));
-                       # void foo ()
-                       # {
-                       #       void *p = &astruct;
-                       # }
-                       # gcc -fPIC --shared -o libfoo.so foo.c
-                       # yields:
-                       # foo.c:6: warning: visibility attribute not supported in this configuration; ignored
-                       # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally
-                       have_visibility_hidden=no
-                       sgen_supported=true
-                       ;;
-                 mingw*|cygwin*)
-                       sgen_supported=true
-                       have_visibility_hidden=no                 
-                       ;;
-                 haiku*)
-                       LIBC=libroot.so
-                       ;;
-                 linux*)
-                       sgen_supported=true
-                       AOT_SUPPORTED="yes"
-                       ;;
-                 darwin*)
-                       sgen_supported=true
-                       AOT_SUPPORTED="yes"
-                       ;;
-                 darwin*|openbsd*|freebsd*)
-                       sgen_supported=true
-                       ;;
-               esac
-               ;;
-       x86_64-*-* | amd64-*-*)
-               TARGET=AMD64;
-               arch_target=amd64;
-               JIT_SUPPORTED=yes
-               if test "x$ac_cv_sizeof_void_p" = "x4"; then
-                       AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
-                       sizeof_register=8
-               fi
-               case $host_os in
-                 linux*)
-                       sgen_supported=true
-                       AOT_SUPPORTED="yes"
-                       ;;
-                 darwin*|openbsd*|freebsd*)
-                       sgen_supported=true
-                       ;;
-               esac
-               case "$host" in
-                       x86_64-*-nacl*)
-                               AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
-                               sizeof_register=8
-                               ;;
-               esac
-               ;;
-       ia64-*-*)
-               TARGET=IA64
-               arch_target=ia64
-               ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
-               LIBC="libc.so.6.1"
-               INTL="libc.so.6.1"
-               AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
-               libmono_ldflags="-lunwind"
-               ;;
-       sparc*-*-*)
-               if test "x$ac_cv_sizeof_void_p" = "x8"; then
-                  TARGET=SPARC64
-               else
-                       TARGET=SPARC
-               fi
-               arch_target=sparc;
-               JIT_SUPPORTED=yes
-               ACCESS_UNALIGNED="no"
-               case $host_os in
-                 linux*) ;;
-                 *)
-                       LIBC="libc.so"
-                       INTL="libintl.so"
-               esac
-               if test x"$GCC" = xyes; then
-                       # We don't support v8 cpus
-                       CFLAGS="$CFLAGS -Wno-cast-align -mcpu=v9"
-               fi
-               if test x"$AR" = xfalse; then
-                       AC_MSG_ERROR([The required utility 'ar' is not found in your PATH. Usually it can be found in /usr/ccs/bin.])
-               fi
-               sgen_supported=true
-               ;;
-       *-mingw*|*-*-cygwin*)
-               # When this is enabled, it leads to very strange crashes at runtime (gcc-3.4.4)
-               have_visibility_hidden=no
-               INTL="intl"
-               ;;
-       macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \
-        powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* )
-               if test "x$ac_cv_sizeof_void_p" = "x8"; then
-                       TARGET=POWERPC64;
-                       CPPFLAGS="$CPPFLAGS -D__mono_ppc__ -D__mono_ppc64__"
-                       CFLAGS="$CFLAGS -mminimal-toc"
-               else
-                       TARGET=POWERPC;
-                       CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
-               fi
-               arch_target=ppc;
-               JIT_SUPPORTED=yes
-               case $host_os in
-                 linux*|darwin*)
-                       sgen_supported=true
-                       ;;
-               esac
-               ;;
-       arm*-darwin*)
-               TARGET=ARM;
-               arch_target=arm;
-               ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
-               CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
-               # libgc's gc_locks.h depends on this
-           CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC"
-               sgen_supported=true
-               ;;
-       arm*-linux*)
-               TARGET=ARM;
-               arch_target=arm;
-               ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
-               sgen_supported=true
-               AOT_SUPPORTED="yes"
-               CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
-               ;;
-# TODO: make proper support for NaCl host.
-#        arm*-*nacl)
-#              TARGET=ARM;
-#              arch_target=arm;
-#              ACCESS_UNALIGNED="no"
-#              JIT_SUPPORTED=yes
-#              sgen_supported=true
-#              AOT_SUPPORTED="no"
-#              ;;
-       aarch64-*)
-               # https://lkml.org/lkml/2012/7/15/133
-               TARGET=ARM64
-               arch_target=arm64
-               JIT_SUPPORTED=yes
-               sgen_supported=true
-               boehm_supported=false
-               ;;
-       s390x-*-linux*)
-               TARGET=S390X;
-               arch_target=s390x;
-               ACCESS_UNALIGNED="yes"
-               JIT_SUPPORTED=yes
-               sgen_supported=true
-               CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
-               ;;
-esac
-
-HOST=$TARGET
-
-if test "x$host" != "x$target"; then
-   AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode])
-   enable_mcs_build=no
-   case "$target" in
-   arm*-darwin*)
-               TARGET=ARM;
-               arch_target=arm;
-               ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
-               CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
-               jit_wanted=true
-               # Can't use tls, since it depends on the runtime detection of tls offsets
-               # in mono-compiler.h
-               with_tls=pthread
-               ;;
-   powerpc64-ps3-linux-gnu)
-               TARGET=POWERPC64
-               arch_target=powerpc64
-               AC_DEFINE(TARGET_PS3, 1, [...])
-               # It would be better to just use TARGET_POWERPC64, but lots of code already
-               # uses this define
-               AC_DEFINE(__mono_ppc64__, 1, [...])
-               AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
-               sizeof_register=8
-               target_byte_order=G_BIG_ENDIAN
-               ;;
-
-   powerpc64-xbox360-linux-gnu)
-               TARGET=POWERPC64
-               arch_target=powerpc64
-               AC_DEFINE(TARGET_XBOX360, 1, [...])
-               # It would be better to just use TARGET_POWERPC64, but lots of code already
-               # uses this define
-               sizeof_register=8
-               target_byte_order=G_BIG_ENDIAN
-               ;;
-   x86_64-*-nacl)
-               TARGET=AMD64
-               arch_target=amd64
-               AC_DEFINE(TARGET_AMD64, 1, [...])
-               AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
-               sizeof_register=8
-               ;;
-# TODO: make proper support for NaCl target.
-#   arm*-*nacl)
-#              TARGET=ARM
-#              arch_target=arm
-#              AC_DEFINE(TARGET_ARM, 1, [...])
-#              ACCESS_UNALIGNED="no"
-#              JIT_SUPPORTED=yes
-#              sizeof_register=4
-#               CPPFLAGS="$CPPFLAGS \
-#                    -D__ARM_EABI__ \
-#                    -D__arm__ \
-#                    -D__portable_native_client__ \
-#                    -Dtimezone=_timezone \
-#                    -DDISABLE_SOCKETS \
-#                    -DDISABLE_ATTACH \
-#                    -DUSE_NEWLIB"
-#              jit_wanted=true
-               # Can't use tls, since it depends on the runtime detection of tls offsets
-               # in mono-compiler.h
-#              with_tls=pthread
-#              ;;
-   i686-*-nacl)
-               TARGET=X86
-               arch_target=x86
-               AC_DEFINE(TARGET_X86, 1, [...])
-               sizeof_register=4
-               ;;
-   arm*-linux-*)
-               TARGET=ARM;
-               arch_target=arm;
-               AC_DEFINE(TARGET_ARM, 1, [...])
-               AC_DEFINE(TARGET_ANDROID, 1, [...])
-               ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
-               CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
-               jit_wanted=true
-               # Can't use tls, since it depends on the runtime detection of tls offsets
-               # in mono-compiler.h
-               with_tls=pthread
-               target_mach=no
-               case "$target" in
-               armv7l-unknown-linux-gnueabi*)
-                       # TEGRA
-                       CPPFLAGS="$CPPFLAGS"
-                       ;;
-               armv5-*-linux-androideabi*)
-                       CPPFLAGS="$CPPFLAGS"
-                       ;;
-               esac
-               ;;
-       aarch64-*)
-               TARGET=ARM64
-               JIT_SUPPORTED=yes
-               jit_wanted=true
-               ;;
-       *)
-               AC_MSG_ERROR([Cross compiling is not supported for target $target])
-       esac
-fi
-
-case "$TARGET" in
-X86)
-       AC_DEFINE(TARGET_X86, 1, [...])
-       ;;
-AMD64)
-       AC_DEFINE(TARGET_AMD64, 1, [...])
-       ;;
-ARM)
-       AC_DEFINE(TARGET_ARM, 1, [...])
-       ;;
-ARM64)
-       AC_DEFINE(TARGET_ARM64, 1, [...])
-       ;;
-POWERPC)
-       AC_DEFINE(TARGET_POWERPC, 1, [...])
-       ;;
-POWERPC64)
-       AC_DEFINE(TARGET_POWERPC, 1, [...])
-       AC_DEFINE(TARGET_POWERPC64, 1, [...])
-       ;;
-S390X)
-       AC_DEFINE(TARGET_S390X, 1, [...])
-       ;;
-MIPS)
-       AC_DEFINE(TARGET_MIPS, 1, [...])
-       ;;
-IA64)
-       AC_DEFINE(TARGET_IA64, 1, [...])
-       ;;
-SPARC)
-       AC_DEFINE(TARGET_SPARC, 1, [...])
-       ;;
-SPARC64)
-       AC_DEFINE(TARGET_SPARC64, 1, [...])
-       ;;
-esac
-
-dnl Use GCC atomic ops if they work on the target.
-if test x$GCC = "xyes"; then
-       case $TARGET in
-       X86 | AMD64 | ARM | ARM64 | POWERPC | POWERPC64 | MIPS | S390X | SPARC | SPARC64)
-               AC_DEFINE(USE_GCC_ATOMIC_OPS, 1, [...])
-               ;;
-       esac
-fi
-
-if test "x$target_mach" = "xyes"; then
-   if test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64"; then
-         AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
-         CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
-         CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
-   else
-       AC_TRY_COMPILE([#include "TargetConditionals.h"],[
-       #if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
-       #error fail this for ios
-       #endif
-       return 0;
-       ], [
-                 AC_DEFINE(TARGET_OSX,1,[The JIT/AOT targets OSX])
-          CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_OSX"
-          CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_OSX"
-       ], [
-          AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
-          CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
-          CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
-       ])
-       fi
-   AC_DEFINE(TARGET_MACH,1,[The JIT/AOT targets Apple platforms])
-fi
-
-if test "x$sizeof_register" = "x4"; then
-   AC_DEFINE(SIZEOF_REGISTER,4,[size of machine integer registers])
-elif test "x$sizeof_register" = "x8"; then
-   AC_DEFINE(SIZEOF_REGISTER,8,[size of machine integer registers])
-else
-   AC_DEFINE(SIZEOF_REGISTER,SIZEOF_VOID_P,[size of machine integer registers])
-fi
-
-if test "x$target_byte_order" = "xG_BIG_ENDIAN"; then
-   AC_DEFINE(TARGET_BYTE_ORDER,G_BIG_ENDIAN,[byte order of target])
-elif test "x$target_byte_order" = "xG_LITTLE_ENDIAN"; then
-   AC_DEFINE(TARGET_BYTE_ORDER,G_LITTLE_ENDIAN,[byte order of target])
-else
-   AC_DEFINE(TARGET_BYTE_ORDER,G_BYTE_ORDER,[byte order of target])
-fi
-
-if test "x$have_visibility_hidden" = "xyes"; then
-   AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute])
-fi
-
-if test "x$have_deprecated" = "xyes"; then
-   AC_DEFINE(HAVE_DEPRECATED, 1, [Support for the deprecated attribute])
-fi
-
-dnl 
-dnl Simple Generational checks (sgen)
-dnl
-if $sgen_supported; then
-   build_sgen_default=yes
-else
-   build_sgen_default=no
-fi
-SGEN_DEFINES=
-AC_ARG_WITH(sgen, [  --with-sgen=yes,no             Extra Generational GC, default=yes],[buildsgen=$with_sgen],[buildsgen=$build_sgen_default])
-if test x$buildsgen = xyes; then
-   if $sgen_supported; then
-       SGEN_DEFINES="-DHAVE_SGEN_GC -DHAVE_MOVING_COLLECTOR"
-       gc_msg="sgen and $gc_msg"
-   else
-       buildsgen=no
-       AC_MSG_WARN("Sgen is not supported on this platform")
-   fi
-fi
-AC_SUBST(SGEN_DEFINES)
-AM_CONDITIONAL(SUPPORT_SGEN, test x$buildsgen = xyes)
-
-USEJIT=false
-if test x$JIT_SUPPORTED = xyes; then
-   if $jit_wanted; then
-      USEJIT=true
-      jit_status="Building and using the JIT"
-   else
-      if $interp_wanted; then
-         jit_status="Building the JIT, defaulting to the interpreter"
-      else
-         AC_ERROR(No JIT or interpreter support available or selected.)
-      fi
-   fi
-else
-   if test x$interp_wanted = xtrue; then
-      jit_status="interpreter"
-   else
-      AC_ERROR(No JIT or interpreter support available or selected.)
-   fi
-fi
-
-AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
-
-libsuffix=".so"
-
-case "$host" in
-     *-*-darwin*)
-       libsuffix=".dylib"
-       LIBC="libc.dylib"
-       INTL="libintl.dylib"
-       SQLITE="libsqlite.0.dylib"
-       SQLITE3="libsqlite3.0.dylib"
-       X11="libX11.dylib"
-       ;;
-     *-*-*netbsd*)
-       LIBC="libc.so.12"
-       INTL="libintl.so.0"
-       ;;
-    *-*-*freebsd*)
-       LIBC="libc.so"
-       INTL="libintl.so"
-       SQLITE="libsqlite.so"
-       SQLITE3="libsqlite3.so"
-       ;;
-    *-*-*openbsd*)
-       LIBC="libc.so"
-       INTL="libintl.so"
-        SQLITE="libsqlite.so"
-        SQLITE3="libsqlite3.so"
-       ;;
-    *-*-*linux*)
-       AC_PATH_X
-       dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh`
-       AC_MSG_CHECKING(for the soname of libX11.so)
-       for i in $x_libraries $dlsearch_path; do
-               for r in 4 5 6; do
-                       if test -f $i/libX11.so.$r; then
-                               X11=libX11.so.$r
-                               AC_MSG_RESULT($X11)
-                       fi
-               done
-       done
-       
-       if test "x$X11" = "xlibX11.so"; then
-               AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? Assuming libX11.so.6...]);
-               X11=libX11.so.6
-       fi
-       AC_MSG_CHECKING(for the soname of libXinerama.so)
-       for i in $x_libraries $dlsearch_path; do
-               for r in 1 2 3; do
-                       if test -f $i/libXinerama.so.$r; then
-                               XINERAMA=libXinerama.so.$r
-                               AC_MSG_RESULT($XINERAMA)
-                       fi
-               done
-       done
-       if test "x$XINERAMA" = "xlibXinerama.so"; then
-               AC_MSG_WARN([Could not find Xinerama development libs. Support for multiple monitors might not work...]);
-       fi
-       ;;
-esac
-
-
-AC_SUBST(libsuffix)
-
-if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
-       if test "x$with_tls" = "x__thread"; then
-               #
-               # On some linux distributions, TLS works in executables, but linking 
-               # against a shared library containing TLS fails with:
-               # undefined reference to `__tls_get_addr'
-               #
-               rm -f conftest.c conftest.so conftest
-               echo "static __thread int foo; int main () { foo = 5; return 0; }" > conftest.c
-               $CC -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1
-               $CC -o conftest conftest.so > /dev/null 2>&1
-               if test ! -f conftest; then
-                  AC_MSG_WARN([Disabling usage of __thread.]);
-                  with_tls=pthread
-               fi
-               rm -f conftest.c conftest.so conftest
-       fi
-fi
-
-AC_ARG_ENABLE(icall-symbol-map,[  --enable-icall-symbol-map Generate tables which map icall functions to their C symbols], icall_symbol_map=$enableval, icall_symbol_map=no)
-if test "x$icall_symbol_map" = "xyes"; then
-   AC_DEFINE(ENABLE_ICALL_SYMBOL_MAP, 1, [Icall symbol map enabled])
-fi
-
-AC_ARG_ENABLE(icall-export,[  --enable-icall-export Export icall functions], icall_export=$enableval, icall_export=no)
-if test "x$icall_export" = "xyes"; then
-   AC_DEFINE(ENABLE_ICALL_EXPORT, 1, [Icall export enabled])
-fi
-
-AC_ARG_ENABLE(icall-tables,[  --disable-icall-tables Disable the runtime lookup of icalls], icall_tables=$enableval, icall_tables=yes)
-if test "x$icall_tables" = "xno"; then
-   AC_DEFINE(DISABLE_ICALL_TABLES, 1, [Icall tables disabled])
-fi
-
-if test "x$with_tls" = "x__thread"; then
-       AC_DEFINE(HAVE_KW_THREAD, 1, [Have __thread keyword])
-       # Pass the information to libgc
-       CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS"
-       AC_MSG_CHECKING(if the tls_model attribute is supported)
-       AC_TRY_COMPILE([static __thread int foo __attribute__((tls_model("initial-exec")));], [
-               ], [
-                       AC_MSG_RESULT(yes)
-                       AC_DEFINE(HAVE_TLS_MODEL_ATTR, 1, [tls_model available])
-               ], [
-                       AC_MSG_RESULT(no)
-       ])
-fi
-
-if test ${TARGET} = ARM; then
-       dnl ******************************************
-       dnl *** Check to see what FPU is available ***
-       dnl ******************************************
-       AC_MSG_CHECKING(which FPU to use)
-
-       #
-       # This is a bit tricky:
-       #
-       # if (__ARM_PCS_VFP) {
-       #       /* mfloat-abi=hard == VFP with hard ABI */
-       # } elif (!__SOFTFP__) {
-       #       /* mfloat-abi=softfp == VFP with soft ABI */
-       # } else {
-       #       /* mfloat-abi=soft == no VFP */
-       # }
-       #
-       # The exception is iOS (w/ GCC) where none of the above
-       # are defined (but iOS always uses the 'softfp' ABI).
-       #
-       # No support for FPA.
-       #
-
-       fpu=NONE
-
-       # iOS GCC always uses the 'softfp' ABI.
-       if test x"$GCC" = xyes && test x$platform_darwin = xyes; then
-               fpu=VFP
-       fi
-
-       # Are we using the 'hard' ABI?
-       if test x$fpu = xNONE; then
-               AC_TRY_COMPILE([], [
-                       #ifndef __ARM_PCS_VFP
-                       #error "Float ABI is not 'hard'"
-                       #endif
-                       return 0;
-               ], [
-                       fpu=VFP_HARD
-               ], [
-                       fpu=NONE
-               ])
-       fi
-
-       # No 'hard' ABI. 'soft' or 'softfp'?
-       if test x$fpu = xNONE; then
-               AC_TRY_COMPILE([], [
-                       #ifdef __SOFTFP__
-                       #error "Float ABI is not 'softfp'"
-                       #endif
-                       return 0;
-               ], [
-                       fpu=VFP
-               ], [
-                       fpu=NONE
-               ])
-       fi
-
-       AC_MSG_RESULT($fpu)
-       CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
-       unset fpu
-
-       dnl *********************************************
-       dnl *** Check which ARM version(s) we can use ***
-       dnl *********************************************
-       AC_MSG_CHECKING(which ARM version to use)
-
-       AC_TRY_COMPILE([], [
-               #if !defined(__ARM_ARCH_5T__) && !defined(__ARM_ARCH_5TE__) && !defined(__ARM_ARCH_5TEJ__)
-               #error Not on ARM v5.
-               #endif
-               return 0;
-       ], [
-               arm_v5=yes
-
-               arm_ver=ARMv5
-       ], [])
-
-       AC_TRY_COMPILE([], [
-               #if !defined(__ARM_ARCH_6J__) && !defined(__ARM_ARCH_6ZK__) && !defined(__ARM_ARCH_6K__) && !defined(__ARM_ARCH_6T2__) && !defined(__ARM_ARCH_6M__)
-               #error Not on ARM v6.
-               #endif
-               return 0;
-       ], [
-               arm_v5=yes
-               arm_v6=yes
-
-               arm_ver=ARMv6
-       ], [])
-
-       AC_TRY_COMPILE([], [
-               #if !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_7R__) && !defined(__ARM_ARCH_7EM__) && !defined(__ARM_ARCH_7M__) && !defined(__ARM_ARCH_7S__)
-               #error Not on ARM v7.
-               #endif
-               return 0;
-       ], [
-               arm_v5=yes
-               arm_v6=yes
-               arm_v7=yes
-
-               arm_ver=ARMv7
-       ], [])
-
-       AC_MSG_RESULT($arm_ver)
-
-       if test x$arm_v5 = xyes; then
-               AC_DEFINE(HAVE_ARMV5, 1, [ARM v5])
-               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV5=1"
-       fi
-
-       if test x$arm_v6 = xyes; then
-               AC_DEFINE(HAVE_ARMV6, 1, [ARM v6])
-               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV6=1"
-       fi
-
-       if test x$arm_v7 = xyes; then
-               AC_DEFINE(HAVE_ARMV7, 1, [ARM v7])
-               CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DHAVE_ARMV7=1"
-       fi
-fi
-
-if test ${TARGET} = ARM; then
-       if test "x${with_jumptables}" = "xyes"; then
-                AC_DEFINE(USE_JUMP_TABLES, 1, Use jump tables in JIT)
-        fi
-fi
-
-if test ${TARGET} = unknown; then
-       CPPFLAGS="$CPPFLAGS -DNO_PORT"
-       AC_MSG_WARN("mono has not been ported to $host: some things may not work.")
-fi
-
-if test ${ACCESS_UNALIGNED} = no; then
-       CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
-fi
-
-case "x$gc" in
-       xincluded)
-               # Pass CPPFLAGS to libgc configure
-               # We should use a separate variable for this to avoid passing useless and
-               # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
-               # This should be executed late so we pick up the final version of CPPFLAGS
-               # The problem with this approach, is that during a reconfigure, the main
-               # configure scripts gets invoked with these arguments, so we use separate
-               # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS.
-               TMP_CPPFLAGS="$CPPFLAGS $CPPFLAGS_FOR_LIBGC"
-               if test x$TARGET = xSPARC -o x$TARGET = xSPARC64; then
-                       TMP_CPPFLAGS=`echo $TMP_CPPFLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//g'`
-               fi
-               # Don't pass -finstrument-for-thread-suspension in, 
-               # if these are instrumented it will be very bad news 
-               # (infinite recursion, undefined parking behavior, etc)
-               TMP_CPPFLAGS=`echo $TMP_CPPFLAGS | sed -e 's/-finstrument-for-thread-suspension//g'`
-               ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$TMP_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
-               AC_CONFIG_SUBDIRS(libgc)
-               ;;
-esac
-
-AC_ARG_WITH(profile2,  [  --with-profile2=yes,no          If you want to install the 2.0/3.5 FX (defaults to yes)],            [], [with_profile2=yes])
-AC_ARG_WITH(profile4,  [  --with-profile4=yes,no          If you want to install the 4.0 FX (defaults to yes)],                [], [with_profile4=yes])
-AC_ARG_WITH(profile4_5,[  --with-profile4_5=yes,no        If you want to install the 4.5 FX (defaults to yes)],                [], [with_profile4_5=yes])
-AC_ARG_WITH(monodroid, [  --with-monodroid=yes,no         If you want to build the MonoDroid assemblies (defaults to no)],     [], [with_monodroid=no])
-AC_ARG_WITH(monotouch, [  --with-monotouch=yes,no,only    If you want to build the MonoTouch assemblies (defaults to no)],     [], [with_monotouch=no])
-AC_ARG_WITH(xammac,    [  --with-xammac=yes,no,only       If you want to build the Xamarin.Mac assemblies (defaults to no)],   [], [with_xammac=no])
-
-OPROFILE=no
-AC_ARG_WITH(oprofile,[  --with-oprofile=no,<oprofile install dir>   Enable oprofile support (defaults to no)],[
-       if test x$with_oprofile != xno; then
-           oprofile_include=$with_oprofile/include
-           if test ! -f $oprofile_include/opagent.h; then
-                 AC_MSG_ERROR([oprofile include file not found at $oprofile_include/opagent.h])
-               fi
-           OPROFILE=yes
-               OPROFILE_CFLAGS="-I$oprofile_include"
-           OPROFILE_LIBS="-L$with_oprofile/lib/oprofile -lopagent"
-           AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
-       fi
-])
-
-MALLOC_MEMPOOLS=no
-AC_ARG_WITH(malloc_mempools,[  --with-malloc-mempools=yes,no  Use malloc for each single mempool allocation (only for runtime debugging, defaults to no)],[
-       if test x$with_malloc_mempools = xyes; then
-               MALLOC_MEMPOOLS=yes
-               AC_DEFINE(USE_MALLOC_FOR_MEMPOOLS,1,[Use malloc for each single mempool allocation])
-       fi
-])
-
-
-DISABLE_MCS_DOCS=no
-AC_ARG_WITH(mcs_docs,[  --with-mcs-docs=yes,no         If you want to build the documentation under mcs (defaults to yes)],[
-       if test x$with_mcs_docs != xyes; then
-               DISABLE_MCS_DOCS=yes
-       fi
-])
-if test x$with_profile4 != xyes; then
-       DISABLE_MCS_DOCS=yes
-fi
-
-AC_ARG_WITH(lazy_gc_thread_creation, [  --with-lazy-gc-thread-creation=yes|no      Enable lazy runtime thread creation, embedding host must do it explicitly (defaults to no)],[
-       if test x$with_lazy_gc_thread_creation != xno ; then
-               AC_DEFINE(LAZY_GC_THREAD_CREATION,1,[Enable lazy gc thread creation by the embedding host.])
-       fi
-], [with_lazy_gc_thread_creation=no])
-
-AC_CHECK_HEADER([malloc.h], 
-               [AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1], 
-                       [Define to 1 if you have /usr/include/malloc.h.])],,)
-
-if test x"$GCC" = xyes; then
-       # Implicit function declarations are not 64 bit safe
-       # Do this late, since this causes lots of configure tests to fail
-       CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
-       # jay has a lot of implicit declarations
-       JAY_CFLAGS="-Wno-implicit-function-declaration"
-fi
-
-# When --disable-shared is used, libtool transforms libmono-2.0.la into libmono-2.0.so
-# instead of libmono-static.a
-if test "x$enable_shared" = "xno" -a "x$enable_executables" = "xyes"; then
-   LIBMONO_LA=libmini-static.la
-else
-   if test x$buildsgen = xyes; then
-      LIBMONO_LA=libmonosgen-$API_VER.la
-   else
-      LIBMONO_LA=libmonoboehm-$API_VER.la
-   fi
-fi
-AC_SUBST(LIBMONO_LA)
-
-dnl
-dnl Consistency settings
-dnl
-if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
-   DISABLE_MCS_DOCS=yes
-   with_profile2=no
-   with_profile4=no
-   with_profile4_5=no
-   with_monodroid=no
-   with_monotouch=no
-   with_xammac=no
-fi
-
-if test x$DISABLE_MCS_DOCS = xyes; then
-   docs_dir=""
-else
-   docs_dir=docs
-fi
-AC_SUBST(docs_dir)
-
-## Maybe should also disable if mcsdir is invalid.  Let's punt the issue for now.
-AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno])
-
-AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
-AC_SUBST(OPROFILE_CFLAGS)
-AC_SUBST(OPROFILE_LIBS)
-
-libmono_ldflags="$libmono_ldflags $LIBS"
-
-AM_CONDITIONAL(INSTALL_2_0, [test "x$with_profile2" = xyes])
-AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
-AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes])
-AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
-AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
-AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
-AM_CONDITIONAL(ONLY_MONOTOUCH, [test "x$with_monotouch" = "xonly"])
-AM_CONDITIONAL(ONLY_XAMMAC, [test "x$with_xammac" = "xonly"])
-
-AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
-AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
-AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
-AM_CONDITIONAL(SPARC64, test x$TARGET = xSPARC64)
-AM_CONDITIONAL(X86, test x$TARGET = xX86)
-AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64)
-AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
-AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
-AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
-AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64)
-AM_CONDITIONAL(ARM, test x$TARGET = xARM)
-AM_CONDITIONAL(ARM64, test x$TARGET = xARM64)
-AM_CONDITIONAL(S390X, test x$TARGET = xS390X)
-AM_CONDITIONAL(HOST_X86, test x$HOST = xX86)
-AM_CONDITIONAL(HOST_AMD64, test x$HOST = xAMD64)
-AM_CONDITIONAL(HOST_ARM, test x$HOST = xARM)
-AM_CONDITIONAL(HOST_ARM64, test x$HOST = xARM64)
-AM_CONDITIONAL(CROSS_COMPILE, test "x$host" != "x$target")
-
-AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
-AM_CONDITIONAL(INTERP_SUPPORTED, test x$interp_wanted = xtrue)
-AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
-
-AC_SUBST(LIBC)
-AC_SUBST(INTL)
-AC_SUBST(SQLITE)
-AC_SUBST(SQLITE3)
-AC_SUBST(X11)
-AC_SUBST(XINERAMA)
-AC_DEFINE_UNQUOTED(ARCHITECTURE,"$arch_target",[The architecture this is running on])
-AC_SUBST(arch_target)
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-
-mono_build_root=`pwd`
-AC_SUBST(mono_build_root)
-
-if test x$USEJIT = xtrue; then
-  mono_runtime=mono/mini/mono
-else
-  mono_runtime=mono/interpreter/mint
-fi
-AC_SUBST(mono_runtime)
-
-mono_cfg_root=$mono_build_root/runtime
-if test x$host_win32 = xyes; then
-  if test "x$cross_compiling" = "xno"; then
-    mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
-  else
-    mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\'`\\etc
-  fi
-else
-  mono_cfg_dir=$mono_cfg_root/etc
-fi
-AC_SUBST(mono_cfg_dir)
-
-AC_CONFIG_FILES([po/mcs/Makefile.in])
-
-AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
-AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
-[   depth=../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/1.0
-    cd runtime/etc/mono/1.0
-    rm -f machine.config
-    $LN_S $reldir/data/net_1_1/machine.config machine.config
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/machine.config],
-[   depth=../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0
-    cd runtime/etc/mono/2.0
-    rm -f machine.config
-    $LN_S $reldir/data/net_2_0/machine.config machine.config
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/web.config],
-[   depth=../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0
-    cd runtime/etc/mono/2.0
-    rm -f web.config
-    $LN_S $reldir/data/net_2_0/web.config web.config
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/browscap.ini],
-[   depth=../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/
-    cd runtime/etc/mono/
-    rm -f browscap.ini
-    $LN_S $reldir/data/browscap.ini browscap.ini
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
-[   depth=../../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/2.0/Browsers/
-    cd runtime/etc/mono/2.0/Browsers
-    rm -f Compat.browser
-    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/Browsers/Compat.browser],
-[   depth=../../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/4.0/Browsers/
-    cd runtime/etc/mono/4.0/Browsers
-    rm -f Compat.browser
-    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/Browsers/Compat.browser],
-[   depth=../../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/4.5/Browsers/
-    cd runtime/etc/mono/4.5/Browsers
-    rm -f Compat.browser
-    $LN_S $reldir/data/Browsers/Compat.browser Compat.browser
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/machine.config],
-[   depth=../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/4.0
-    cd runtime/etc/mono/4.0
-    rm -f machine.config
-    $LN_S $reldir/data/net_4_0/machine.config machine.config
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/web.config],
-[   depth=../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/4.0
-    cd runtime/etc/mono/4.0
-    rm -f web.config
-    $LN_S $reldir/data/net_4_0/web.config web.config
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/machine.config],
-[   depth=../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/4.5
-    cd runtime/etc/mono/4.5
-    rm -f machine.config
-    $LN_S $reldir/data/net_4_5/machine.config machine.config
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/web.config],
-[   depth=../../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono/4.5
-    cd runtime/etc/mono/4.5
-    rm -f web.config
-    $LN_S $reldir/data/net_4_5/web.config web.config
-    cd $depth
-],[LN_S='$LN_S'])
-
-AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
-
-AC_OUTPUT([
-Makefile
-mono-core.spec
-mono-uninstalled.pc
-scripts/mono-find-provides
-scripts/mono-find-requires
-mono/Makefile
-mono/utils/Makefile
-mono/metadata/Makefile
-mono/dis/Makefile
-mono/cil/Makefile
-mono/arch/Makefile
-mono/arch/x86/Makefile
-mono/arch/amd64/Makefile
-mono/arch/ppc/Makefile
-mono/arch/sparc/Makefile
-mono/arch/s390x/Makefile
-mono/arch/arm/Makefile
-mono/arch/arm64/Makefile
-mono/arch/ia64/Makefile
-mono/arch/mips/Makefile
-mono/interpreter/Makefile
-mono/tests/Makefile
-mono/tests/tests-config
-mono/tests/assemblyresolve/Makefile
-mono/tests/cas/Makefile
-mono/tests/cas/assembly/Makefile
-mono/tests/cas/demand/Makefile
-mono/tests/cas/inheritance/Makefile
-mono/tests/cas/linkdemand/Makefile
-mono/tests/cas/threads/Makefile
-mono/tests/gc-descriptors/Makefile
-mono/unit-tests/Makefile
-mono/benchmark/Makefile
-mono/monograph/Makefile
-mono/io-layer/Makefile
-mono/mini/Makefile
-mono/profiler/Makefile
-m4/Makefile
-ikvm-native/Makefile
-scripts/Makefile
-man/Makefile
-docs/Makefile
-data/Makefile
-data/net_2_0/Makefile
-data/net_4_0/Makefile
-data/net_4_5/Makefile
-data/net_2_0/Browsers/Makefile
-data/net_4_0/Browsers/Makefile
-data/net_4_5/Browsers/Makefile
-data/mint.pc
-data/mono-2.pc
-data/monosgen-2.pc
-data/mono.pc
-data/mono-cairo.pc
-data/mono-nunit.pc
-data/mono-options.pc
-data/mono-lineeditor.pc
-data/monodoc.pc
-data/dotnet.pc
-data/dotnet35.pc
-data/wcf.pc
-data/cecil.pc
-data/system.web.extensions_1.0.pc
-data/system.web.extensions.design_1.0.pc
-data/system.web.mvc.pc
-data/system.web.mvc2.pc
-data/system.web.mvc3.pc
-data/aspnetwebstack.pc
-data/reactive.pc
-samples/Makefile
-support/Makefile
-data/config
-tools/Makefile
-tools/locale-builder/Makefile
-tools/sgen/Makefile
-runtime/Makefile
-msvc/Makefile
-po/Makefile
-])
-
-# Update all submodules recursively to ensure everything is checked out
-$srcdir/scripts/update_submodules
-
-if test x$host_win32 = xyes; then
-   # Get rid of 'cyg' prefixes in library names
-   sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
-   # libtool seems to inherit -mno-cygwin from our CFLAGS, and uses it to compile its executable
-   # wrapper scripts which use exec(). gcc has no problem compiling+linking this, but the resulting
-   # executable doesn't work...
-   sed -e "s,-mno-cygwin,,g" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
-fi
-
-if test x$platform_darwin = xyes; then
-   # This doesn't seem to be required and it slows down parallel builds
-   sed -e 's,lock_old_archive_extraction=yes,lock_old_archive_extraction=no,g' < libtool > libtool.new && mv libtool.new libtool && chmod +x libtool
-fi
-
-(
-  case $prefix in
-  NONE) prefix=$ac_default_prefix ;;
-  esac
-  case $exec_prefix in
-  NONE) exec_prefix='${prefix}' ;;
-  esac
-
-  #
-  # If we are cross compiling, we don't build in the mcs/ tree.  Let us not clobber
-  # any existing config.make.  This allows people to share the same source tree
-  # with different build directories, one native and one cross
-  #
-  if test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
-
-    test -w $mcs_topdir/build || chmod +w $mcs_topdir/build
-
-    echo "prefix=$prefix" > $mcs_topdir/build/config.make
-    echo "exec_prefix=$exec_prefix" >> $mcs_topdir/build/config.make
-    echo "sysconfdir=$sysconfdir" >> $mcs_topdir/build/config.make
-    echo 'mono_libdir=${exec_prefix}/lib' >> $mcs_topdir/build/config.make
-    echo 'IL_FLAGS = /debug' >> $mcs_topdir/build/config.make
-    echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $mcs_topdir/build/config.make
-    echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $mcs_topdir/build/config.make
-    echo "JAY_CFLAGS = $JAY_CFLAGS" >> $mcs_topdir/build/config.make
-
-    case $INSTALL in
-    [[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
-    *) mcs_INSTALL=$mono_build_root/$INSTALL ;;
-    esac
-
-    echo "INSTALL = $mcs_INSTALL" >> $mcs_topdir/build/config.make
-
-    export VERSION
-    [myver=$($AWK 'BEGIN {
-      split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".")
-      if(length(vsplit [1]) > 4) {
-        split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".")
-      }
-      print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
-    }')]
-
-    echo "MONO_VERSION = $myver" >> $mcs_topdir/build/config.make
-
-    if test x$platform_darwin = xyes; then
-      echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make
-    fi
-
-       if test x$AOT_SUPPORTED = xyes -a x$enable_system_aot = xdefault; then
-          enable_system_aot=yes
-       fi
-
-       if test "x$enable_loadedllvm" = "xyes"; then
-          # This seems to fail on the x86 buildbots
-          enable_system_aot=no
-       fi
-
-    if test x$host_win32 = xno -a x$enable_system_aot = xyes; then
-      echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make
-    fi
-
-    if test x$DISABLE_MCS_DOCS = xyes; then
-      echo "DISABLE_MCS_DOCS = yes" >> $mcs_topdir/build/config.make
-    fi
-
-    if test x$has_extension_module != xno; then
-        echo "EXTENSION_MODULE = 1" >> $srcdir/$mcsdir/build/config.make
-    fi
-
-       default_profile=net_2_0
-    if test -z "$INSTALL_4_0_TRUE"; then :
-               default_profile=net_4_0
-    fi
-    if test -z "$INSTALL_MONODROID_TRUE"; then :
-               default_profile=monodroid
-    fi
-    if test -z "$INSTALL_MONOTOUCH_TRUE"; then :
-               default_profile=monotouch
-    fi
-       if test -z "$INSTALL_XAMMAC_TRUE"; then :
-               default_profile=xammac
-       fi
-    if test -z "$INSTALL_4_5_TRUE"; then :
-               default_profile=net_4_5
-    fi
-    
-    echo "DEFAULT_PROFILE = $default_profile" >> $srcdir/$mcsdir/build/config.make
-    
-    if test "x$test_bcl_opt" = "xyes"; then    
-      echo "BCL_OPTIMIZE = 1" >> $srcdir/$mcsdir/build/config.make
-    fi
-
-  fi
-
-  # if we have an olive folder, override the default settings
-  if test -d $olivedir; then
-
-    if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
-
-      test -w $srcdir/$olivedir/build || chmod +w $srcdir/$olivedir/build
-
-      echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
-      echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
-      echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
-      echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
-      echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
-      echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
-    fi
-  fi
-
-)
-
-libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
-
-echo "
-        mcs source:    $mcsdir
-
-   Engine:
-       GC:            $gc_msg 
-       TLS:           $with_tls
-       SIGALTSTACK:   $with_sigaltstack
-       Engine:        $jit_status
-       oprofile:      $OPROFILE
-       BigArrays:     $enable_big_arrays
-       DTrace:        $enable_dtrace
-       LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm)
-
-   Libraries:
-       .NET 2.0/3.5:  $with_profile2
-       .NET 4.0:      $with_profile4
-       .NET 4.5:      $with_profile4_5
-       MonoDroid:     $with_monodroid
-       MonoTouch:     $with_monotouch
-       Xamarin.Mac:   $with_xammac
-       JNI support:   $jdk_headers_found
-       libgdiplus:    $libgdiplus_msg
-       zlib:          $zlib_msg
-       $disabled
-"
-if test x$with_static_mono = xno -a "x$host_win32" != "xyes"; then
-   AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexpected bugs)
-fi
index 1f03b511c3b298c6fc71abcdbfc3bc2d090d944e..8b4dff1fb73f4d315793d370fc99b8b9a9fa3e6f 100644 (file)
@@ -331,7 +331,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
 TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
        tests/leak_test.c tests/thread_leak_test.c tests/middle.c
 
-GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
+GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
                 libtool.m4 install-sh configure.host Makefile.in \
                 aclocal.m4 config.sub config.guess \
                 include/Makefile.am include/Makefile.in \
index bf2fbf7df7ae99df3c6207fd7bddd4785018c2f6..559d3ec493225613625077655994455c6dfca6c5 100644 (file)
@@ -5,8 +5,8 @@ This is a modified version of Boehm GC 6.1 for Mono.
   - Makefile changes:
 
     libgc has a lot of configurable options which are AC_DEFINE()d in its
-    configure.in.  To make it easier to build and bundle it with Mono, I
-    replaced most of the orignal configure.in and the makefiles with custom
+    configure.ac.  To make it easier to build and bundle it with Mono, I
+    replaced most of the orignal configure.ac and the makefiles with custom
     versions which just define what we actually need for Mono.
 
     This means that you can just run configure in this directory and it'll
@@ -58,7 +58,7 @@ This is a modified version of Boehm GC 6.1 for Mono.
 
         cvs diff -u -r LIBGC
 
-  When importing new upstream versions, don't import the new configure.in or any of the
+  When importing new upstream versions, don't import the new configure.ac or any of the
   Makefile.am's; they've been replaced by custom versions.  Just import all the new source
   files and it should be fine.
 
index 376c387885677ce108f2841a1faa8061a235fa29..10ae8cf6831ad2b6fe0977605ab8e6113ff3045e 100755 (executable)
@@ -22,7 +22,7 @@ if [ -z "$LIBTOOL" ]; then
   fi
 fi
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
   ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed to compile Mono."
@@ -32,8 +32,8 @@ fi
   }
 }
 
-grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
-  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
+grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
+  grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`gettext' installed to compile Mono."
@@ -80,7 +80,7 @@ xlc )
 esac
 
 
-if grep "^AC_PROG_LIBTOOL" configure.in >/dev/null; then
+if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then
   if test -z "$NO_LIBTOOLIZE" ; then 
     echo "Running libtoolize..."
     ${LIBTOOL}ize --force --copy
@@ -99,7 +99,7 @@ aclocal $ACLOCAL_FLAGS || {
   exit 1
 }
 
-if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
+if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
   echo "Running autoheader..."
   autoheader || { echo "**Error**: autoheader failed."; exit 1; }
 fi
diff --git a/libgc/configure.ac b/libgc/configure.ac
new file mode 100644 (file)
index 0000000..837e2cb
--- /dev/null
@@ -0,0 +1,550 @@
+# Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved.
+# 
+# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+# OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+# 
+# Permission is hereby granted to use or copy this program
+# for any purpose,  provided the above notices are retained on all copies.
+# Permission to modify the code and to distribute modified code is granted,
+# provided the above notices are retained, and a notice that the code was
+# modified is included with the above copyright notice.
+#
+# Original author: Tom Tromey
+# Modified by: Grzegorz Jakacki <jakacki at acm dot org>
+
+dnl Process this file with autoconf to produce configure.
+
+AC_PREREQ([2.53])
+AC_INIT([libgc-mono], [6.6], [Hans_Boehm@hp.com])
+
+AM_INIT_AUTOMAKE([1.9 no-define foreign])
+AC_CONFIG_SRCDIR(gcj_mlc.c)
+AC_CONFIG_MACRO_DIR([m4])
+AC_CANONICAL_HOST
+
+AC_SUBST(PACKAGE)
+AC_SUBST(GC_VERSION)
+
+AC_PROG_CC
+AC_PROG_CXX
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+dnl automake 1.6 and later need the AM_PROG_AS macro.
+ifdef([AM_PROG_AS],[AM_PROG_AS],[])
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib, :)  # :)
+
+AC_PROG_INSTALL
+
+AM_MAINTAINER_MODE
+
+. [$]{srcdir}/configure.host
+
+# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono 
+# configure, because of autoconf brokeness
+if test "x$CPPFLAGS_FOR_LIBGC" != "x"; then
+   CPPFLAGS=$CPPFLAGS_FOR_LIBGC
+fi
+if test "x$CFLAGS_FOR_LIBGC" != "x"; then
+   CFLAGS=$CFLAGS_FOR_LIBGC
+fi
+
+GC_CFLAGS=${gc_cflags}
+AC_SUBST(GC_CFLAGS)
+
+case $enable_embed_check in
+no) ;;
+*) AC_MSG_ERROR([This module is now part of 'mono' and cannot be built as a stand-alone module any longer.]) ;;
+esac
+
+THREADS=$with_libgc_threads
+
+AC_ARG_ENABLE(win32-dllmain,
+[  --enable-win32-dllmain    Define the DllMain function in win32_threads.c even if the collector is not built as a dll],
+)
+
+AC_ARG_ENABLE(parallel-mark,
+[  --enable-parallel-mark      parallelize marking and free list construction],
+   [case "$THREADS" in
+      no | none | single)
+       AC_MSG_ERROR([Parallel mark requires --enable-threads=x spec])
+       ;;
+    esac]
+)
+
+AC_ARG_ENABLE(cplusplus,
+[  --enable-cplusplus          install C++ support],
+)
+
+AM_CPPFLAGS=-I${srcdir}/include
+THREADDLLIBS=
+## Libraries needed to support dynamic loading and/or threads.
+case "$THREADS" in
+ no | none | single)
+    THREADS=none
+    ;;
+ posix | pthreads)
+    THREADS=posix
+    AC_CHECK_LIB(pthread, pthread_self, THREADDLLIBS="-lpthread",,)
+    case "$host" in
+     x86-*-linux* | ia64-*-linux* | i386-*-linux* | i486-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha*-*-linux* | s390*-*-linux* | sparc*-*-linux* | powerpc-*-linux*)
+       AC_DEFINE(GC_LINUX_THREADS)
+       AC_DEFINE(_REENTRANT)
+        if test "${enable_parallel_mark}" = yes; then
+         AC_DEFINE(PARALLEL_MARK)
+       fi
+       AC_DEFINE(THREAD_LOCAL_ALLOC)
+       ;;
+     *-*-linux* | *-*-nacl*)
+       AC_DEFINE(GC_LINUX_THREADS)
+       AC_DEFINE(_REENTRANT)
+       ;;
+     *-*-aix*)
+       AC_DEFINE(GC_AIX_THREADS)
+       AC_DEFINE(_REENTRANT)
+       ;;
+     *-*-hpux*)
+       AC_MSG_WARN("Only HP/UX 11 threads are supported.")
+       AC_DEFINE(GC_HPUX_THREADS)
+       AC_DEFINE(_POSIX_C_SOURCE,199506L)
+       if test "${enable_parallel_mark}" = yes; then
+         AC_DEFINE(PARALLEL_MARK)
+       fi
+       AC_DEFINE(THREAD_LOCAL_ALLOC)
+       THREADDLLIBS="-lpthread -lrt"
+       ;;
+      *-*-freebsd*)
+       AC_DEFINE(GC_FREEBSD_THREADS)
+       if test "x$PTHREAD_CFLAGS" != "x"; then
+               AM_CPPFLAGS="$AM_CPPFLAGS $PTHREAD_CFLAGS"
+       fi
+       if test "x$PTHREAD_LIBS" = "x"; then
+               THREADDLLIBS=-pthread
+       else
+               THREADDLLIBS="$PTHREAD_LIBS"
+       fi
+       AC_DEFINE(THREAD_LOCAL_ALLOC)
+       ;;
+     *-*-solaris*)
+       AC_DEFINE(GC_SOLARIS_THREADS)
+       AC_DEFINE(GC_SOLARIS_PTHREADS)
+       ;;
+     *-*-irix*)
+       AC_DEFINE(GC_IRIX_THREADS)
+       ;;
+     *-*-cygwin*)
+       AC_DEFINE(GC_WIN32_THREADS)
+       ;;
+     *-*-darwin*)
+       AC_DEFINE(GC_DARWIN_THREADS)
+       AC_DEFINE(THREAD_LOCAL_ALLOC)
+       if test "${enable_parallel_mark}" = yes; then
+         AC_DEFINE(PARALLEL_MARK)
+       fi
+       ;;
+     *-*-netbsd*)
+       AC_DEFINE(GC_NETBSD_THREADS)
+       if test "${enable_parallel_mark}" = yes; then
+         AC_DEFINE(PARALLEL_MARK)
+       fi
+       AC_DEFINE(THREAD_LOCAL_ALLOC)
+       ;;
+     *-*-openbsd*)
+       AC_DEFINE(GC_OPENBSD_THREADS)
+       if test "${enable_parallel_mark}" = yes; then
+         AC_DEFINE(PARALLEL_MARK)
+       fi
+       AC_DEFINE(THREAD_LOCAL_ALLOC)
+       ;;
+     *-*-osf*)
+       AC_DEFINE(GC_OSF1_THREADS)
+        if test "${enable_parallel_mark}" = yes; then
+         AC_DEFINE(PARALLEL_MARK)
+         AC_DEFINE(THREAD_LOCAL_ALLOC)
+         # May want to enable it in other cases, too.
+         # Measurements havent yet been done.
+       fi
+       AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
+       THREADDLLIBS="-lpthread -lrt"
+       ;;
+      *)
+       AC_MSG_ERROR("Pthreads not supported by the GC on this platform.")
+       ;;
+    esac
+    ;;
+ win32)
+    AC_DEFINE(GC_WIN32_THREADS)
+    dnl Wine getenv may not return NULL for missing entry
+    AC_DEFINE(NO_GETENV)
+       if test "${enable_win32_dllmain}" = yes; then
+          AC_DEFINE(GC_INSIDE_DLL)
+       fi
+    ;;
+ dgux386)
+    THREADS=dgux386
+    AC_MSG_RESULT($THREADDLLIBS)
+    # Use pthread GCC  switch
+    THREADDLLIBS=-pthread
+    if test "${enable_parallel_mark}" = yes; then
+        AC_DEFINE(PARALLEL_MARK)
+    fi
+    AC_DEFINE(THREAD_LOCAL_ALLOC)
+    AC_DEFINE(GC_DGUX386_THREADS)
+    AC_DEFINE(DGUX_THREADS)
+    # Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
+    AM_CPPFLAGS="-pthread $AM_CPPFLAGS"
+    ;;
+ aix)
+    THREADS=posix
+    THREADDLLIBS=-lpthread
+    AC_DEFINE(GC_AIX_THREADS)
+    AC_DEFINE(_REENTRANT)
+    ;;
+ decosf1 | irix | mach | os2 | solaris | dce | vxworks)
+    AC_MSG_ERROR(thread package $THREADS not yet supported)
+    ;;
+ *)
+    AC_MSG_ERROR($THREADS is an unknown thread package)
+    ;;
+esac
+AC_SUBST(THREADDLLIBS)
+
+case "$host" in 
+   powerpc-*-darwin*)
+      powerpc_darwin=true
+      ;;
+esac
+AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue)
+
+# Check if the GCC builtin __sync_bool_compare_and_swap is available.
+# It is preferred in gc_locks.h for PPC as GCC 4.4 has a problem with the inline assembly there.
+AC_MSG_CHECKING(for __sync_bool_compare_and_swap)
+AC_TRY_COMPILE([],[
+volatile unsigned int foo = 0;
+int main(int argc, char** argv) {
+    unsigned int r1 = __sync_bool_compare_and_swap(&foo, 0, 1);
+    return 0;
+}
+], [
+AC_MSG_RESULT(yes)
+AC_DEFINE(HAS___SYNC_BOOL_COMPARE_AND_SWAP)
+], [
+AC_MSG_RESULT(no)
+])
+
+AC_MSG_CHECKING(for xlc)
+AC_TRY_COMPILE([],[
+ #ifndef __xlC__
+ # error
+ #endif
+], [compiler_xlc=yes], [compiler_xlc=no])
+AC_MSG_RESULT($compiler_xlc)
+AM_CONDITIONAL(COMPILER_XLC,test $compiler_xlc = yes)
+if test $compiler_xlc = yes -a "$powerpc_darwin" = true; then
+  # the darwin stack-frame-walking code is completely broken on xlc
+  AC_DEFINE(DARWIN_DONT_PARSE_STACK)
+fi
+
+# We never want libdl on darwin. It is a fake libdl that just ends up making
+# dyld calls anyway
+case "$host" in
+  *-*-darwin*) ;;
+  *) 
+    AC_CHECK_LIB(dl, dlopen, THREADDLLIBS="$THREADDLLIBS -ldl")
+    ;;
+esac
+
+AC_SUBST(EXTRA_TEST_LIBS)
+
+target_all=libgc.la
+AC_SUBST(target_all)
+
+dnl If the target is an eCos system, use the appropriate eCos
+dnl I/O routines.
+dnl FIXME: this should not be a local option but a global target
+dnl system; at present there is no eCos target.
+TARGET_ECOS="no"
+AC_ARG_WITH(ecos,
+[  --with-ecos             enable runtime eCos target support],
+TARGET_ECOS="$with_ecos"
+)
+
+addobjs=
+addlibs=
+addincludes=
+addtests=
+CXXAM_CPPFLAGS=
+case "$TARGET_ECOS" in
+   no)
+      ;;
+   *)
+      AC_DEFINE(ECOS)
+      CXXINCLUDES="-I${TARGET_ECOS}/include"
+      addobjs="$addobjs ecos.lo"
+      ;;
+esac
+
+if test "${enable_cplusplus}" = yes; then
+      addincludes="$addincludes include/gc_cpp.h include/gc_allocator.h"
+      addtests="$addtests test_cpp"
+fi
+
+AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
+
+AC_SUBST(CXX)
+
+AC_SUBST(AM_CPPFLAGS)
+AC_SUBST(CXXINCLUDES)
+
+# Configuration of shared libraries
+#
+AC_MSG_CHECKING(whether to build shared libraries)
+AC_ENABLE_SHARED
+
+case "$host" in
+ alpha-*-openbsd*)
+     enable_shared=no
+     AC_MSG_RESULT(no)
+     ;;
+ *)
+     AC_MSG_RESULT(yes)
+     ;;
+esac
+
+# Configuration of machine-dependent code
+#
+AC_MSG_CHECKING(which machine-dependent code should be used) 
+machdep=
+case "$host" in
+ alpha-*-openbsd*)
+    machdep="alpha_mach_dep.lo"
+    if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
+       AC_MSG_WARN(OpenBSD/Alpha without dlopen(). Shared library support is disabled)
+    fi
+    ;;
+ alpha*-*-linux*)
+    machdep="alpha_mach_dep.lo"
+    ;;
+ i?86-*-solaris2.[[89]] | i?86-*-solaris2.1?)
+    AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
+    ;;
+ mipstx39-*-elf*)
+    machdep="mips_ultrix_mach_dep.lo"
+    AC_DEFINE(STACKBASE, __stackbase)
+    AC_DEFINE(DATASTART_IS_ETEXT)
+    ;;
+ mips-dec-ultrix*)
+    machdep="mips_ultrix_mach-dep.lo"
+    ;;
+ mips-nec-sysv*|mips-unknown-sysv*)
+    ;;
+ mips*-*-linux*) 
+    ;; 
+ mips-*-*)
+    machdep="mips_sgi_mach_dep.lo"
+    AC_DEFINE(NO_EXECUTE_PERMISSION)
+    ;;
+ sparc-*-netbsd*)
+    machdep="sparc_netbsd_mach_dep.lo"
+    ;;
+ sparc-sun-solaris2.3)
+    machdep="sparc_mach_dep.lo"
+    AC_DEFINE(SUNOS53_SHARED_LIB)
+    ;;
+ sparc*-sun-solaris2.*)
+    machdep="sparc_mach_dep.lo"
+    ;;
+ ia64-*-*)
+     machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
+       target_ia64=true
+    ;;
+ *-*-nacl*)
+    AC_DEFINE(NO_EXECUTE_PERMISSION)
+    ;;
+esac
+if test x"$machdep" = x; then
+AC_MSG_RESULT($machdep)
+   machdep="mach_dep.lo"
+fi
+addobjs="$addobjs $machdep"
+#
+# Adding object files directly to _LIBADD breaks -j builds, so we need to add the sources
+# instead, but _SOURCES can't contain autoconf substitutions, so add them using automake
+# conditionals.
+#
+#AC_SUBST(addobjs)
+AC_SUBST(addincludes)
+AC_SUBST(addlibs)
+AC_SUBST(addtests)
+
+AM_CONDITIONAL(TARGET_IA64,test x$target_ia64 = xtrue)
+
+AC_PROG_LIBTOOL
+# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
+DOLT
+
+#
+# Check for AViiON Machines running DGUX
+#
+ac_is_dgux=no
+AC_CHECK_HEADER(sys/dg_sys_info.h,
+[ac_is_dgux=yes;])
+
+    ## :GOTCHA: we do not check anything but sys/dg_sys_info.h
+if test $ac_is_dgux = yes; then
+    if test "$enable_full_debug" = "yes"; then
+      CFLAGS="-g -mstandard -DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
+      CXXFLAGS="-g -mstandard -DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
+    else
+      CFLAGS="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
+      CXXFLAGS="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
+    fi
+    AC_SUBST(CFLAGS)
+    AC_SUBST(CXXFLAGS)
+fi
+
+dnl We use these options to decide which functions to include.
+AC_ARG_WITH(target-subdir,
+[  --with-target-subdir=SUBDIR
+                          configuring with a cross compiler])
+AC_ARG_WITH(cross-host,
+[  --with-cross-host=HOST  configuring with a cross compiler])
+
+# automake wants to see AC_EXEEXT.  But we don't need it.  And having
+# it is actually a problem, because the compiler we're passed can't
+# necessarily do a full link.  So we fool automake here.
+if false; then
+  # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
+  # to nothing, so nothing would remain between `then' and `fi' if it
+  # were not for the `:' below.
+  :
+  AC_EXEEXT
+fi
+
+AC_MSG_CHECKING([for threads package to use])
+AC_MSG_RESULT($THREADS)
+
+dnl As of 4.13a2, the collector will not properly work on Solaris when
+dnl built with gcc and -O.  So we remove -O in the appropriate case.
+dnl Not needed anymore on Solaris.
+AC_MSG_CHECKING(whether Solaris gcc optimization fix is necessary)
+case "$host" in
+ *aix*)
+    if test "$GCC" = yes; then
+       AC_MSG_RESULT(yes)
+       new_CFLAGS=
+       for i in $CFLAGS; do
+         case "$i" in
+          -O*)
+             ;;
+          *)
+             new_CFLAGS="$new_CFLAGS $i"
+             ;;
+         esac
+       done
+       CFLAGS="$new_CFLAGS"
+    else
+       AC_MSG_RESULT(no)
+    fi
+    ;;
+ *) AC_MSG_RESULT(no) ;;
+esac
+
+dnl We need to override the top-level CFLAGS.  This is how we do it.
+MY_CFLAGS="$CFLAGS"
+AC_SUBST(MY_CFLAGS)
+
+dnl Include defines that have become de facto standard.
+dnl ALL_INTERIOR_POINTERS can be overridden in startup code.
+AC_DEFINE(SILENT)
+AC_DEFINE(NO_SIGNALS)
+AC_DEFINE(NO_EXECUTE_PERMISSION)
+dnl AC_DEFINE(ALL_INTERIOR_POINTERS)
+
+dnl By default, make the library as general as possible.
+AC_DEFINE(JAVA_FINALIZATION)
+AC_DEFINE(GC_GCJ_SUPPORT)
+AC_DEFINE(ATOMIC_UNCOLLECTABLE)
+
+dnl This is something of a hack.  When cross-compiling we turn off
+dnl some functionality.  We also enable the "small" configuration.
+dnl These is only correct when targetting an embedded system.  FIXME.
+if test -n "${with_cross_host}"; then
+   AC_DEFINE(NO_SIGSET)
+   AC_DEFINE(NO_CLOCK)
+   AC_DEFINE(SMALL_CONFIG)
+   AC_DEFINE(NO_DEBUGGING)
+fi
+
+UNWINDLIBS=
+AC_ARG_ENABLE(full-debug,
+[  --enable-full-debug include full support for pointer backtracing etc.],
+[ if test "$enable_full_debug" = "yes"; then
+    AC_MSG_WARN("Should define GC_DEBUG and use debug alloc. in clients.")
+    AC_DEFINE(KEEP_BACK_PTRS)
+    AC_DEFINE(DBG_HDRS_ALL)
+    case $host in
+      ia64-*-linux* )
+       AC_DEFINE(MAKE_BACK_GRAPH)
+       AC_DEFINE(SAVE_CALL_COUNT, 8)
+        AC_CHECK_LIB(unwind, backtrace, [
+         AC_DEFINE(GC_HAVE_BUILTIN_BACKTRACE)
+         UNWINDLIBS=-lunwind
+         AC_MSG_WARN("Client code may need to link against libunwind.")
+       ])
+      ;;
+      x86-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* )
+       AC_DEFINE(MAKE_BACK_GRAPH)
+       AC_MSG_WARN("Client must not use -fomit-frame-pointer.")
+       AC_DEFINE(SAVE_CALL_COUNT, 8)
+      ;;
+      i[3456]86-*-dgux*)
+       AC_DEFINE(MAKE_BACK_GRAPH)
+      ;;
+    esac ]
+  fi)
+
+AC_SUBST(UNWINDLIBS)
+
+AC_ARG_ENABLE(redirect-malloc,
+[  --enable-redirect-malloc  redirect malloc and friends to GC routines])
+
+if test "${enable_redirect_malloc}" = yes; then
+    if test "${enable_full_debug}" = yes; then
+       AC_DEFINE(REDIRECT_MALLOC, GC_debug_malloc_replacement)
+       AC_DEFINE(REDIRECT_REALLOC, GC_debug_realloc_replacement)
+       AC_DEFINE(REDIRECT_FREE, GC_debug_free)
+    else
+       AC_DEFINE(REDIRECT_MALLOC, GC_malloc)
+    fi
+fi
+
+AC_DEFINE(_IN_LIBGC)
+
+AC_ARG_ENABLE(gc-assertions,
+[  --enable-gc-assertions  collector-internal assertion checking])
+if test "${enable_gc_assertions}" = yes; then
+    AC_DEFINE(GC_ASSERTIONS)
+fi
+
+AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet libgc build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
+AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
+
+if test "${multilib}" = "yes"; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
+
+AC_OUTPUT(Makefile
+m4/Makefile
+include/Makefile
+include/private/Makefile
+doc/Makefile,,
+srcdir=${srcdir}
+host=${host}
+CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+CC="${CC}"
+DEFS="$DEFS"
+)
diff --git a/libgc/configure.in b/libgc/configure.in
deleted file mode 100644 (file)
index 837e2cb..0000000
+++ /dev/null
@@ -1,550 +0,0 @@
-# Copyright (c) 1999-2001 by Red Hat, Inc. All rights reserved.
-# 
-# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
-# OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
-# 
-# Permission is hereby granted to use or copy this program
-# for any purpose,  provided the above notices are retained on all copies.
-# Permission to modify the code and to distribute modified code is granted,
-# provided the above notices are retained, and a notice that the code was
-# modified is included with the above copyright notice.
-#
-# Original author: Tom Tromey
-# Modified by: Grzegorz Jakacki <jakacki at acm dot org>
-
-dnl Process this file with autoconf to produce configure.
-
-AC_PREREQ([2.53])
-AC_INIT([libgc-mono], [6.6], [Hans_Boehm@hp.com])
-
-AM_INIT_AUTOMAKE([1.9 no-define foreign])
-AC_CONFIG_SRCDIR(gcj_mlc.c)
-AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_HOST
-
-AC_SUBST(PACKAGE)
-AC_SUBST(GC_VERSION)
-
-AC_PROG_CC
-AC_PROG_CXX
-
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-dnl automake 1.6 and later need the AM_PROG_AS macro.
-ifdef([AM_PROG_AS],[AM_PROG_AS],[])
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)  # :)
-
-AC_PROG_INSTALL
-
-AM_MAINTAINER_MODE
-
-. [$]{srcdir}/configure.host
-
-# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono 
-# configure, because of autoconf brokeness
-if test "x$CPPFLAGS_FOR_LIBGC" != "x"; then
-   CPPFLAGS=$CPPFLAGS_FOR_LIBGC
-fi
-if test "x$CFLAGS_FOR_LIBGC" != "x"; then
-   CFLAGS=$CFLAGS_FOR_LIBGC
-fi
-
-GC_CFLAGS=${gc_cflags}
-AC_SUBST(GC_CFLAGS)
-
-case $enable_embed_check in
-no) ;;
-*) AC_MSG_ERROR([This module is now part of 'mono' and cannot be built as a stand-alone module any longer.]) ;;
-esac
-
-THREADS=$with_libgc_threads
-
-AC_ARG_ENABLE(win32-dllmain,
-[  --enable-win32-dllmain    Define the DllMain function in win32_threads.c even if the collector is not built as a dll],
-)
-
-AC_ARG_ENABLE(parallel-mark,
-[  --enable-parallel-mark      parallelize marking and free list construction],
-   [case "$THREADS" in
-      no | none | single)
-       AC_MSG_ERROR([Parallel mark requires --enable-threads=x spec])
-       ;;
-    esac]
-)
-
-AC_ARG_ENABLE(cplusplus,
-[  --enable-cplusplus          install C++ support],
-)
-
-AM_CPPFLAGS=-I${srcdir}/include
-THREADDLLIBS=
-## Libraries needed to support dynamic loading and/or threads.
-case "$THREADS" in
- no | none | single)
-    THREADS=none
-    ;;
- posix | pthreads)
-    THREADS=posix
-    AC_CHECK_LIB(pthread, pthread_self, THREADDLLIBS="-lpthread",,)
-    case "$host" in
-     x86-*-linux* | ia64-*-linux* | i386-*-linux* | i486-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha*-*-linux* | s390*-*-linux* | sparc*-*-linux* | powerpc-*-linux*)
-       AC_DEFINE(GC_LINUX_THREADS)
-       AC_DEFINE(_REENTRANT)
-        if test "${enable_parallel_mark}" = yes; then
-         AC_DEFINE(PARALLEL_MARK)
-       fi
-       AC_DEFINE(THREAD_LOCAL_ALLOC)
-       ;;
-     *-*-linux* | *-*-nacl*)
-       AC_DEFINE(GC_LINUX_THREADS)
-       AC_DEFINE(_REENTRANT)
-       ;;
-     *-*-aix*)
-       AC_DEFINE(GC_AIX_THREADS)
-       AC_DEFINE(_REENTRANT)
-       ;;
-     *-*-hpux*)
-       AC_MSG_WARN("Only HP/UX 11 threads are supported.")
-       AC_DEFINE(GC_HPUX_THREADS)
-       AC_DEFINE(_POSIX_C_SOURCE,199506L)
-       if test "${enable_parallel_mark}" = yes; then
-         AC_DEFINE(PARALLEL_MARK)
-       fi
-       AC_DEFINE(THREAD_LOCAL_ALLOC)
-       THREADDLLIBS="-lpthread -lrt"
-       ;;
-      *-*-freebsd*)
-       AC_DEFINE(GC_FREEBSD_THREADS)
-       if test "x$PTHREAD_CFLAGS" != "x"; then
-               AM_CPPFLAGS="$AM_CPPFLAGS $PTHREAD_CFLAGS"
-       fi
-       if test "x$PTHREAD_LIBS" = "x"; then
-               THREADDLLIBS=-pthread
-       else
-               THREADDLLIBS="$PTHREAD_LIBS"
-       fi
-       AC_DEFINE(THREAD_LOCAL_ALLOC)
-       ;;
-     *-*-solaris*)
-       AC_DEFINE(GC_SOLARIS_THREADS)
-       AC_DEFINE(GC_SOLARIS_PTHREADS)
-       ;;
-     *-*-irix*)
-       AC_DEFINE(GC_IRIX_THREADS)
-       ;;
-     *-*-cygwin*)
-       AC_DEFINE(GC_WIN32_THREADS)
-       ;;
-     *-*-darwin*)
-       AC_DEFINE(GC_DARWIN_THREADS)
-       AC_DEFINE(THREAD_LOCAL_ALLOC)
-       if test "${enable_parallel_mark}" = yes; then
-         AC_DEFINE(PARALLEL_MARK)
-       fi
-       ;;
-     *-*-netbsd*)
-       AC_DEFINE(GC_NETBSD_THREADS)
-       if test "${enable_parallel_mark}" = yes; then
-         AC_DEFINE(PARALLEL_MARK)
-       fi
-       AC_DEFINE(THREAD_LOCAL_ALLOC)
-       ;;
-     *-*-openbsd*)
-       AC_DEFINE(GC_OPENBSD_THREADS)
-       if test "${enable_parallel_mark}" = yes; then
-         AC_DEFINE(PARALLEL_MARK)
-       fi
-       AC_DEFINE(THREAD_LOCAL_ALLOC)
-       ;;
-     *-*-osf*)
-       AC_DEFINE(GC_OSF1_THREADS)
-        if test "${enable_parallel_mark}" = yes; then
-         AC_DEFINE(PARALLEL_MARK)
-         AC_DEFINE(THREAD_LOCAL_ALLOC)
-         # May want to enable it in other cases, too.
-         # Measurements havent yet been done.
-       fi
-       AM_CPPFLAGS="$AM_CPPFLAGS -pthread"
-       THREADDLLIBS="-lpthread -lrt"
-       ;;
-      *)
-       AC_MSG_ERROR("Pthreads not supported by the GC on this platform.")
-       ;;
-    esac
-    ;;
- win32)
-    AC_DEFINE(GC_WIN32_THREADS)
-    dnl Wine getenv may not return NULL for missing entry
-    AC_DEFINE(NO_GETENV)
-       if test "${enable_win32_dllmain}" = yes; then
-          AC_DEFINE(GC_INSIDE_DLL)
-       fi
-    ;;
- dgux386)
-    THREADS=dgux386
-    AC_MSG_RESULT($THREADDLLIBS)
-    # Use pthread GCC  switch
-    THREADDLLIBS=-pthread
-    if test "${enable_parallel_mark}" = yes; then
-        AC_DEFINE(PARALLEL_MARK)
-    fi
-    AC_DEFINE(THREAD_LOCAL_ALLOC)
-    AC_DEFINE(GC_DGUX386_THREADS)
-    AC_DEFINE(DGUX_THREADS)
-    # Enable _POSIX4A_DRAFT10_SOURCE with flag -pthread
-    AM_CPPFLAGS="-pthread $AM_CPPFLAGS"
-    ;;
- aix)
-    THREADS=posix
-    THREADDLLIBS=-lpthread
-    AC_DEFINE(GC_AIX_THREADS)
-    AC_DEFINE(_REENTRANT)
-    ;;
- decosf1 | irix | mach | os2 | solaris | dce | vxworks)
-    AC_MSG_ERROR(thread package $THREADS not yet supported)
-    ;;
- *)
-    AC_MSG_ERROR($THREADS is an unknown thread package)
-    ;;
-esac
-AC_SUBST(THREADDLLIBS)
-
-case "$host" in 
-   powerpc-*-darwin*)
-      powerpc_darwin=true
-      ;;
-esac
-AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue)
-
-# Check if the GCC builtin __sync_bool_compare_and_swap is available.
-# It is preferred in gc_locks.h for PPC as GCC 4.4 has a problem with the inline assembly there.
-AC_MSG_CHECKING(for __sync_bool_compare_and_swap)
-AC_TRY_COMPILE([],[
-volatile unsigned int foo = 0;
-int main(int argc, char** argv) {
-    unsigned int r1 = __sync_bool_compare_and_swap(&foo, 0, 1);
-    return 0;
-}
-], [
-AC_MSG_RESULT(yes)
-AC_DEFINE(HAS___SYNC_BOOL_COMPARE_AND_SWAP)
-], [
-AC_MSG_RESULT(no)
-])
-
-AC_MSG_CHECKING(for xlc)
-AC_TRY_COMPILE([],[
- #ifndef __xlC__
- # error
- #endif
-], [compiler_xlc=yes], [compiler_xlc=no])
-AC_MSG_RESULT($compiler_xlc)
-AM_CONDITIONAL(COMPILER_XLC,test $compiler_xlc = yes)
-if test $compiler_xlc = yes -a "$powerpc_darwin" = true; then
-  # the darwin stack-frame-walking code is completely broken on xlc
-  AC_DEFINE(DARWIN_DONT_PARSE_STACK)
-fi
-
-# We never want libdl on darwin. It is a fake libdl that just ends up making
-# dyld calls anyway
-case "$host" in
-  *-*-darwin*) ;;
-  *) 
-    AC_CHECK_LIB(dl, dlopen, THREADDLLIBS="$THREADDLLIBS -ldl")
-    ;;
-esac
-
-AC_SUBST(EXTRA_TEST_LIBS)
-
-target_all=libgc.la
-AC_SUBST(target_all)
-
-dnl If the target is an eCos system, use the appropriate eCos
-dnl I/O routines.
-dnl FIXME: this should not be a local option but a global target
-dnl system; at present there is no eCos target.
-TARGET_ECOS="no"
-AC_ARG_WITH(ecos,
-[  --with-ecos             enable runtime eCos target support],
-TARGET_ECOS="$with_ecos"
-)
-
-addobjs=
-addlibs=
-addincludes=
-addtests=
-CXXAM_CPPFLAGS=
-case "$TARGET_ECOS" in
-   no)
-      ;;
-   *)
-      AC_DEFINE(ECOS)
-      CXXINCLUDES="-I${TARGET_ECOS}/include"
-      addobjs="$addobjs ecos.lo"
-      ;;
-esac
-
-if test "${enable_cplusplus}" = yes; then
-      addincludes="$addincludes include/gc_cpp.h include/gc_allocator.h"
-      addtests="$addtests test_cpp"
-fi
-
-AM_CONDITIONAL(CPLUSPLUS, test "${enable_cplusplus}" = yes)
-
-AC_SUBST(CXX)
-
-AC_SUBST(AM_CPPFLAGS)
-AC_SUBST(CXXINCLUDES)
-
-# Configuration of shared libraries
-#
-AC_MSG_CHECKING(whether to build shared libraries)
-AC_ENABLE_SHARED
-
-case "$host" in
- alpha-*-openbsd*)
-     enable_shared=no
-     AC_MSG_RESULT(no)
-     ;;
- *)
-     AC_MSG_RESULT(yes)
-     ;;
-esac
-
-# Configuration of machine-dependent code
-#
-AC_MSG_CHECKING(which machine-dependent code should be used) 
-machdep=
-case "$host" in
- alpha-*-openbsd*)
-    machdep="alpha_mach_dep.lo"
-    if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
-       AC_MSG_WARN(OpenBSD/Alpha without dlopen(). Shared library support is disabled)
-    fi
-    ;;
- alpha*-*-linux*)
-    machdep="alpha_mach_dep.lo"
-    ;;
- i?86-*-solaris2.[[89]] | i?86-*-solaris2.1?)
-    AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
-    ;;
- mipstx39-*-elf*)
-    machdep="mips_ultrix_mach_dep.lo"
-    AC_DEFINE(STACKBASE, __stackbase)
-    AC_DEFINE(DATASTART_IS_ETEXT)
-    ;;
- mips-dec-ultrix*)
-    machdep="mips_ultrix_mach-dep.lo"
-    ;;
- mips-nec-sysv*|mips-unknown-sysv*)
-    ;;
- mips*-*-linux*) 
-    ;; 
- mips-*-*)
-    machdep="mips_sgi_mach_dep.lo"
-    AC_DEFINE(NO_EXECUTE_PERMISSION)
-    ;;
- sparc-*-netbsd*)
-    machdep="sparc_netbsd_mach_dep.lo"
-    ;;
- sparc-sun-solaris2.3)
-    machdep="sparc_mach_dep.lo"
-    AC_DEFINE(SUNOS53_SHARED_LIB)
-    ;;
- sparc*-sun-solaris2.*)
-    machdep="sparc_mach_dep.lo"
-    ;;
- ia64-*-*)
-     machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
-       target_ia64=true
-    ;;
- *-*-nacl*)
-    AC_DEFINE(NO_EXECUTE_PERMISSION)
-    ;;
-esac
-if test x"$machdep" = x; then
-AC_MSG_RESULT($machdep)
-   machdep="mach_dep.lo"
-fi
-addobjs="$addobjs $machdep"
-#
-# Adding object files directly to _LIBADD breaks -j builds, so we need to add the sources
-# instead, but _SOURCES can't contain autoconf substitutions, so add them using automake
-# conditionals.
-#
-#AC_SUBST(addobjs)
-AC_SUBST(addincludes)
-AC_SUBST(addlibs)
-AC_SUBST(addtests)
-
-AM_CONDITIONAL(TARGET_IA64,test x$target_ia64 = xtrue)
-
-AC_PROG_LIBTOOL
-# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
-DOLT
-
-#
-# Check for AViiON Machines running DGUX
-#
-ac_is_dgux=no
-AC_CHECK_HEADER(sys/dg_sys_info.h,
-[ac_is_dgux=yes;])
-
-    ## :GOTCHA: we do not check anything but sys/dg_sys_info.h
-if test $ac_is_dgux = yes; then
-    if test "$enable_full_debug" = "yes"; then
-      CFLAGS="-g -mstandard -DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
-      CXXFLAGS="-g -mstandard -DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
-    else
-      CFLAGS="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
-      CXXFLAGS="-DDGUX -D_DGUX_SOURCE -Di386 -mno-legend -O2"
-    fi
-    AC_SUBST(CFLAGS)
-    AC_SUBST(CXXFLAGS)
-fi
-
-dnl We use these options to decide which functions to include.
-AC_ARG_WITH(target-subdir,
-[  --with-target-subdir=SUBDIR
-                          configuring with a cross compiler])
-AC_ARG_WITH(cross-host,
-[  --with-cross-host=HOST  configuring with a cross compiler])
-
-# automake wants to see AC_EXEEXT.  But we don't need it.  And having
-# it is actually a problem, because the compiler we're passed can't
-# necessarily do a full link.  So we fool automake here.
-if false; then
-  # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
-  # to nothing, so nothing would remain between `then' and `fi' if it
-  # were not for the `:' below.
-  :
-  AC_EXEEXT
-fi
-
-AC_MSG_CHECKING([for threads package to use])
-AC_MSG_RESULT($THREADS)
-
-dnl As of 4.13a2, the collector will not properly work on Solaris when
-dnl built with gcc and -O.  So we remove -O in the appropriate case.
-dnl Not needed anymore on Solaris.
-AC_MSG_CHECKING(whether Solaris gcc optimization fix is necessary)
-case "$host" in
- *aix*)
-    if test "$GCC" = yes; then
-       AC_MSG_RESULT(yes)
-       new_CFLAGS=
-       for i in $CFLAGS; do
-         case "$i" in
-          -O*)
-             ;;
-          *)
-             new_CFLAGS="$new_CFLAGS $i"
-             ;;
-         esac
-       done
-       CFLAGS="$new_CFLAGS"
-    else
-       AC_MSG_RESULT(no)
-    fi
-    ;;
- *) AC_MSG_RESULT(no) ;;
-esac
-
-dnl We need to override the top-level CFLAGS.  This is how we do it.
-MY_CFLAGS="$CFLAGS"
-AC_SUBST(MY_CFLAGS)
-
-dnl Include defines that have become de facto standard.
-dnl ALL_INTERIOR_POINTERS can be overridden in startup code.
-AC_DEFINE(SILENT)
-AC_DEFINE(NO_SIGNALS)
-AC_DEFINE(NO_EXECUTE_PERMISSION)
-dnl AC_DEFINE(ALL_INTERIOR_POINTERS)
-
-dnl By default, make the library as general as possible.
-AC_DEFINE(JAVA_FINALIZATION)
-AC_DEFINE(GC_GCJ_SUPPORT)
-AC_DEFINE(ATOMIC_UNCOLLECTABLE)
-
-dnl This is something of a hack.  When cross-compiling we turn off
-dnl some functionality.  We also enable the "small" configuration.
-dnl These is only correct when targetting an embedded system.  FIXME.
-if test -n "${with_cross_host}"; then
-   AC_DEFINE(NO_SIGSET)
-   AC_DEFINE(NO_CLOCK)
-   AC_DEFINE(SMALL_CONFIG)
-   AC_DEFINE(NO_DEBUGGING)
-fi
-
-UNWINDLIBS=
-AC_ARG_ENABLE(full-debug,
-[  --enable-full-debug include full support for pointer backtracing etc.],
-[ if test "$enable_full_debug" = "yes"; then
-    AC_MSG_WARN("Should define GC_DEBUG and use debug alloc. in clients.")
-    AC_DEFINE(KEEP_BACK_PTRS)
-    AC_DEFINE(DBG_HDRS_ALL)
-    case $host in
-      ia64-*-linux* )
-       AC_DEFINE(MAKE_BACK_GRAPH)
-       AC_DEFINE(SAVE_CALL_COUNT, 8)
-        AC_CHECK_LIB(unwind, backtrace, [
-         AC_DEFINE(GC_HAVE_BUILTIN_BACKTRACE)
-         UNWINDLIBS=-lunwind
-         AC_MSG_WARN("Client code may need to link against libunwind.")
-       ])
-      ;;
-      x86-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* )
-       AC_DEFINE(MAKE_BACK_GRAPH)
-       AC_MSG_WARN("Client must not use -fomit-frame-pointer.")
-       AC_DEFINE(SAVE_CALL_COUNT, 8)
-      ;;
-      i[3456]86-*-dgux*)
-       AC_DEFINE(MAKE_BACK_GRAPH)
-      ;;
-    esac ]
-  fi)
-
-AC_SUBST(UNWINDLIBS)
-
-AC_ARG_ENABLE(redirect-malloc,
-[  --enable-redirect-malloc  redirect malloc and friends to GC routines])
-
-if test "${enable_redirect_malloc}" = yes; then
-    if test "${enable_full_debug}" = yes; then
-       AC_DEFINE(REDIRECT_MALLOC, GC_debug_malloc_replacement)
-       AC_DEFINE(REDIRECT_REALLOC, GC_debug_realloc_replacement)
-       AC_DEFINE(REDIRECT_FREE, GC_debug_free)
-    else
-       AC_DEFINE(REDIRECT_MALLOC, GC_malloc)
-    fi
-fi
-
-AC_DEFINE(_IN_LIBGC)
-
-AC_ARG_ENABLE(gc-assertions,
-[  --enable-gc-assertions  collector-internal assertion checking])
-if test "${enable_gc_assertions}" = yes; then
-    AC_DEFINE(GC_ASSERTIONS)
-fi
-
-AC_ARG_ENABLE(quiet-build, [  --enable-quiet-build  Enable quiet libgc build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
-AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
-
-if test "${multilib}" = "yes"; then
-  multilib_arg="--enable-multilib"
-else
-  multilib_arg=
-fi
-
-AC_OUTPUT(Makefile
-m4/Makefile
-include/Makefile
-include/private/Makefile
-doc/Makefile,,
-srcdir=${srcdir}
-host=${host}
-CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-CC="${CC}"
-DEFS="$DEFS"
-)
index a19cb3021b0aa9568f3ec265e4aca5a2961606ce..eaba6e509d36612d6258fbd20f6f56f8b2fff744 100644 (file)
@@ -6,7 +6,7 @@ Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
 The file linux_threads.c is also
 Copyright (c) 1998 by Fergus Henderson.  All rights reserved.
 
-The files Makefile.am, and configure.in are
+The files Makefile.am, and configure.ac are
 Copyright (c) 2001 by Red Hat Inc. All rights reserved.
 
 Several files supporting GNU-style builds are copyrighted by the Free
index 97b0b684dde5b556750993056e3240d3bee1c2f5..fa6f279f518a5fac4b4778e9e869e4d82bb0539c 100644 (file)
@@ -1269,7 +1269,7 @@ Since 6.0alpha6:
    many places.  (Thanks to Benjamin Lerman.)
  - Made win32_threads.c more tolerant of detaching a thread that it didn't
    know about.  (Thanks to Paul Nash.)
- - Added Makefile.am and configure.in from gcc to the distribution, with
+ - Added Makefile.am and configure.ac from gcc to the distribution, with
    minimal changes.  For the moment, those are just placeholders.  In the
    future, we're planning to switch to a GNU-style build environment for
    Un*x-like systems, though the old Makefile will remain as a backup.
@@ -1491,7 +1491,7 @@ Since 6.1alpha3:
  - Fixed a formatting error in dbg_mlc.c.  Added prototype to GC_abort()
    declaration.   (Thanks to Michael Smith.)
  - Removed "source" argument to GC_find_start().  Eliminate GC_FIND_START().
- - Added win32 recognition code in configure.in.  Changed some of the
+ - Added win32 recognition code in configure.ac.  Changed some of the
    dllimport/export defines in gc.h.  (Thanks to Adam Megacz.)
  - GC_malloc_many didn't set hb_last_reclaimed when it called 
    GC_reclaim_generic.  (I'm not sure this matters much, but ...)
@@ -1629,7 +1629,7 @@ Since 6.1alpha4:
 
 Since 6.1alpha5:
  - Added GC_MAXIMUM_HEAP_SIZE environment variable.
- - Fix configure.in for MIPS/LINUX. (Thanks to H.J. Lu.)
+ - Fix configure.ac for MIPS/LINUX. (Thanks to H.J. Lu.)
  - Double page hash table size for -DLARGE_CONFIG.
  - Integrated Bo Thorsen's X86-64 support.
  - STACKBOTTOM definition for LINUX/MIPS was partially changed back.
@@ -1942,7 +1942,7 @@ Since 6.3alpha1:
    There is also still some code duplication with pthread_support.c.
    (Thread descriptors did become much smaller, since Ben Hutchings
    removed the thread context from them.)
- - Integrated a Solaris configure.in patch from Rainer Orth.
+ - Integrated a Solaris configure.ac patch from Rainer Orth.
  - Added GC_IGNORE_FB and associated warning to very partially address
    the issue of the collector treating a mapped frame buffer as part
    of the root set.  (Thanks to David Peroutka for providing some
@@ -2151,7 +2151,7 @@ Since 6.3:
    it seems to be incorrect if the preceding memory op is a load.
  - Fixed print_block_list to print the correct kind number for
    STUBBORN.  (Thanks to Rutger Ovidus.)
- - Have configure.in generate an error if it is asked to support
+ - Have configure.ac generate an error if it is asked to support
    pthreads, but doesn't know how to.
  - Added Kazuhiro Inaoka's patch for Renesas M32R support.
  - Have the GNU build mechanism link with -ldl.  Rename THREADLIBS
index 91f6970180cd26352a864464a0ac44184d2a07ce..5626e8721370071bbefdbfb1710911b86a17bb50 100644 (file)
@@ -366,6 +366,15 @@ GC_process_togglerefs (void)
        GC_toggleref_array_size = w;
 }
 
+/* Finalizer proc support */
+static void (*GC_object_finalized_proc) (GC_PTR obj);
+
+void
+GC_set_finalizer_notify_proc (void (*proc) (GC_PTR obj))
+{
+       GC_object_finalized_proc = proc;
+}
+
 
 static void push_and_mark_object (GC_PTR p)
 {
@@ -877,6 +886,10 @@ void GC_finalize()
                 fo_set_next(prev_fo, next_fo);
               }
               GC_fo_entries--;
+
+                         if (GC_object_finalized_proc)
+                                 GC_object_finalized_proc (real_ptr);
+
             /* Add to list of objects awaiting finalization.   */
               fo_set_next(curr_fo, GC_finalize_now);
               GC_finalize_now = curr_fo;
index a3eb3c2dc06e35ff79ed87bf223c85131c8b412a..4693a3d9a5416248700084c6acbb32d2ba3028d4 100644 (file)
@@ -778,6 +778,10 @@ GC_API int GC_unregister_long_link GC_PROTO((GC_PTR * /* link */));
 GC_API void GC_toggleref_register_callback GC_PROTO((int (*proccess_toggleref) (GC_PTR obj)));
 GC_API void GC_toggleref_add (GC_PTR object, int strong_ref);
 
+/* finalizer callback support */
+GC_API void GC_set_finalizer_notify_proc GC_PROTO((void (*object_finalized) (GC_PTR obj)));
+
+
 /* Returns !=0  if GC_invoke_finalizers has something to do.           */
 GC_API int GC_should_invoke_finalizers GC_PROTO((void));
 
index e1fe24bd0abe84e8b3f15b950721c724ec612f20..9fcbb7b651fb0e5be116c17ecbf954b19c90c8d6 100644 (file)
@@ -1,4 +1,4 @@
-/* The version here should match that in configure/configure.in        */
+/* The version here should match that in configure/configure.ac        */
 /* Eventually this one may become unnecessary.  For now we need        */
 /* it to keep the old-style build process working.             */
 #define GC_TMP_VERSION_MAJOR 6
@@ -14,7 +14,7 @@
      GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \
      defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \
      defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION
-#   error Inconsistent version info.  Check README, version.h, and configure.in.
+#   error Inconsistent version info.  Check README, version.h, and configure.ac.
 # endif
 #else
 # define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR
index 1d2a512447d401388f5a48aa7585e86384bb7f36..a576ba602dbff7e642312899cdcacb52ee3a3d13 100644 (file)
@@ -11,7 +11,7 @@
 tests_CLEAN_FILES := 
 
 ifndef TEST_COMPILE
-TEST_COMPILE = $(CSCOMPILE)
+TEST_COMPILE = $(subst $(test_remove),,$(CSCOMPILE))
 endif
 
 TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
index 46ab1607ccb3595678a8bddb3d4a7624ffb817b3..28d5043dcd403d9e039ee2a51db20a3fc15e61fe 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
@@ -73,7 +74,7 @@
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1e11dffd26006e303e1714e2b2ea50b52f3c2169..c390f2dbcffc31536c45c4ea8ee8a887b4482f86 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index d249b5528d58cf023f599b670515e976b5a8e4fd..a2783d9b1d54bc5e0a44487ce3a28f44995d51a3 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index d53213ae9151e5638263e1c4b9e5809b8c68b72f..b655375597406c6fb5cf1adf0a625770b4d12abf 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index a529f198e095830dcb7a6739ed10759f1d5819a8..5477c74d8242ad4001b1a8556c0841654d36daa6 100644 (file)
     <AssemblyName>EntityFramework.SqlServer</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../ecma.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../EntityFramework/EntityFramework-net_4_5.csproj">\r
       <Project>{CEE31F03-087E-4164-BBD4-990759B40C3E}</Project>\r
-      <Name>EntityFramework\EntityFramework-net_4_5</Name>\r
+      <Name>EntityFramework-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 7c81911b07f2c99fcbc7a82731ae8510b09d6493..c99f52bcf5bab108783c0a9d83c97ea9d02a2f9e 100644 (file)
     <AssemblyName>EntityFramework</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../ecma.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
       <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
+      <Name>System.Transactions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
       <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
+      <Name>System.Xml.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
       <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
+      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj">\r
       <Project>{D554618C-5D38-413A-82BA-7A70B6FC61A3}</Project>\r
-      <Name>Microsoft.CSharp\Microsoft.CSharp-net_4_5</Name>\r
+      <Name>Microsoft.CSharp-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 8f6854869c6129af981e846ac42138031667b882..ff69d5deabb525aa6413d1c6cf3ddec4deb5b0bc 100644 (file)
@@ -8,7 +8,7 @@ monotouch_SUBDIRS = System.Collections.Concurrent System.Collections System.Comp
        System.Reflection.Extensions System.Reflection.Primitives System.Reflection System.Resources.ResourceManager System.Runtime.Extensions \
        System.Runtime.InteropServices System.Runtime.InteropServices.WindowsRuntime System.Runtime.Numerics System.Runtime.Serialization.Json \
        System.Runtime.Serialization.Primitives System.Runtime.Serialization.Xml System.Runtime System.Security.Principal System.ServiceModel.Http \
-       System.ServiceModel.Primitives System.Text.Encoding.Extensions System.Text.Encoding System.Text.RegularExpressions System.Threading.Tasks.Parallel \
+       System.ServiceModel.Primitives System.ServiceModel.Security System.Text.Encoding.Extensions System.Text.Encoding System.Text.RegularExpressions System.Threading.Tasks.Parallel \
        System.Threading.Tasks System.Threading.Timer System.Threading System.Xml.ReaderWriter System.Xml.XDocument System.Xml.XmlSerializer
 
 mobile_static_SUBDIRS = $(monotouch_SUBDIRS)
index fe9af8668366e9a24453a45afa03f0b37611e34b..785ae325924d4b70d7956a7b8d0c88c5b8993249 100644 (file)
     <AssemblyName>System.Collections.Concurrent</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 07f594f6fab697456b7755fdae34b91744740ea8..7739de83730b105dafb0dcef34d606e1c24009b3 100644 (file)
     <AssemblyName>System.Collections</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 79124c6c016ee4cbf8aa0011b0813d24e7a07cbc..11fd690cf1aa51e2b5a9c766034bf69f8c33dc9d 100644 (file)
     <AssemblyName>System.ComponentModel.Annotations</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
       <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
+      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index f400ebc980e6563b7f6f5eae8f9eeba4cdc1df87..e524ac8f8f3508c378b79457b9c1d73d70207d2b 100644 (file)
     <AssemblyName>System.ComponentModel.EventBasedAsync</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 524b35472f36b82492f5937ec530a86a6abef389..0ad13cf5122b9658e5cd1af1a94f4441f40cfebc 100644 (file)
     <AssemblyName>System.ComponentModel</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index bff7c5e0ca2ee4a3fd3ba75106b73affc7944754..115c3e065c25b5c5faa45f8b3493b5b770966c8b 100644 (file)
     <AssemblyName>System.Diagnostics.Contracts</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 5a9d868f231384a1e7c50132c1e40489a2152bd1..7b44d0996db8b851a3b0bb92251a5d33bd8ab236 100644 (file)
     <AssemblyName>System.Diagnostics.Debug</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 4aa4baa76da94f6f2e9c86f04155baddff2ed6cc..cf5c5e745e2b30f3f3eb0a9d422fa0b934eeaf0b 100644 (file)
     <AssemblyName>System.Diagnostics.Tools</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 71078ed61e1a0c24f061e47489c9d4851e723ee3..8182d201d8c47fb8cb7f53a922d7391647b80cf7 100644 (file)
     <AssemblyName>System.Diagnostics.Tracing</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index dc0b78b8814a87c373ede1caa2d844ea455b4a0c..529847be7b5f47e433e105ecadd9e36d0d1637bc 100644 (file)
     <AssemblyName>System.Dynamic.Runtime</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c13d0b502ae20f642adc461b96fb8855cae0d5c5..67df5249ef75d11c0ad3151060870cbee8c80052 100644 (file)
     <AssemblyName>System.Globalization</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 7a70db9f819a4e3d9be830945ba50f9cc40d6610..596ecf7afb0480cd51a285f9b1412682d821e1ae 100644 (file)
     <AssemblyName>System.IO</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 870d659ad1d8646edbaf4a8472cf0358b3ed5aaf..5467fc471c58a459939843e6dc1b7fee421f2610 100644 (file)
     <AssemblyName>System.Linq.Expressions</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 069b01b11714f3ff3bd82023c56c8b39c391f574..dea40f73f627c9f380b70346b93950d8b21147d7 100644 (file)
     <AssemblyName>System.Linq.Parallel</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 775bafd6e70f3f7cfd3f43492d206ce03459f339..be8d341330749a99aa38551e621c5d2fbf8a371d 100644 (file)
     <AssemblyName>System.Linq.Queryable</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c1f86a6f12e81756f676cd4a3043ac99e579637e..a674a868fede1e847ef4407cef6f8476866160ca 100644 (file)
     <AssemblyName>System.Linq</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index a4b3d4beca232394bf9f81097b889abf5dd85cd2..214fb1cd476332146e886696408af0515c999059 100644 (file)
     <AssemblyName>System.Net.NetworkInformation</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index bb9e054295b0d47026b98c679f8fcb1bc6215dc1..adaab1def69cb88c3b57c968a5aae23b75ffd9c4 100644 (file)
     <AssemblyName>System.Net.Primitives</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index d3afb5203e4da6b733fd11299a313ec1d6177bea..09b309af64ae5941381b1f59608332ee209e3e2a 100644 (file)
     <AssemblyName>System.Net.Requests</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c720b82c313276001329866961e1bd52ca59268b..3c290c07e38ed32d4d48dbb3b23f4729e22fe6b7 100644 (file)
     <AssemblyName>System.ObjectModel</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index f3a01fa4e8b8f5b30e6575df7be5c70103d9e15b..18738869be0fc150cd257d39b62d63654d10f034 100644 (file)
     <AssemblyName>System.Reflection.Emit.ILGeneration</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 5e37de37c886dca92545729b7d064921948a1d38..62ea08f2ffa67090ed5885522ab77f7efb87aa87 100644 (file)
     <AssemblyName>System.Reflection.Emit.Lightweight</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 185c48c77e486c42280560221d6ad4809b747376..1a1743fbd9b05c7a9f9406a1ddd19ca9af3c3d1d 100644 (file)
     <AssemblyName>System.Reflection.Emit</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index e60886ccf444eadf99cc6c7100d7cb6c1e034678..6b5fa509b447bcaf3ff152628d87afcfde3d158d 100644 (file)
     <AssemblyName>System.Reflection.Extensions</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1ba5bdedbc3390f2bf71895836af8ebfe75be377..3d4df95f0f93d5dd3857285d789b6fc2a4441b10 100644 (file)
     <AssemblyName>System.Reflection.Primitives</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index eb4cd6e075b5a6fd74b14fa81f86962a0bfd5cdd..82b4dbdd6c63c327c2a0833c035d6874418857b3 100644 (file)
     <AssemblyName>System.Reflection</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0fc45e22ee46f3fc2ca964eac9a06a2d95d2ca60..9625feac8b7ddbf91f0078dab59d8af7d2fd0611 100644 (file)
     <AssemblyName>System.Resources.ResourceManager</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 2c7de2ddcde5f8ff4f2eabecbb50d49a87b4a2ff..cb8249005dd9b664fb72eaf184f73891b96bab09 100644 (file)
     <AssemblyName>System.Runtime.Extensions</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 05c287dd3a95d10d1284c9e931594c319bf8db28..35c6e825d291c8f9fe43ad75a409d8f140239e7f 100644 (file)
     <AssemblyName>System.Runtime.InteropServices.WindowsRuntime</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 00fa6b3eb601c2ca6a86fa114b83b5553627c6b9..f28fddd49b11d5a2e3b04ae559a35cc89ba65030 100644 (file)
     <AssemblyName>System.Runtime.InteropServices</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index cd4e31882ffc0a3551b14e5d77748ec027dfc451..650e2d7ff296b1393860746049b01a2fbc32c8a3 100644 (file)
     <AssemblyName>System.Runtime.Numerics</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Numerics/System.Numerics-net_4_5.csproj">\r
       <Project>{14631AC9-FDC6-4561-A04C-6913947C939E}</Project>\r
-      <Name>System.Numerics\System.Numerics-net_4_5</Name>\r
+      <Name>System.Numerics-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index a880c8b76d5a14b9a0475bab1edc3866b569c864..1208c6450e4c681b2e33015418a1330bf49f93e3 100644 (file)
     <AssemblyName>System.Runtime.Serialization.Json</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 83f042e51e43b9429eb6cbef67ab496e0b3ff70f..1e4d995779924e41db9354f773ec2f418e6690dd 100644 (file)
     <AssemblyName>System.Runtime.Serialization.Primitives</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 3ce07ff9374ec85a9672823f45dbdd0df6e92986..8b6f6eb33839c3f01074117caaf0b0d3393eb9e1 100644 (file)
     <AssemblyName>System.Runtime.Serialization.Xml</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1ff2f7c3e6037f470677b01f39a249651eb01fd1..d8192f88f4f33a273f0a446b360388b79d89fd94 100644 (file)
     <AssemblyName>System.Runtime</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.ComponentModel.Composition/System.ComponentModel.Composition-net_4_5.csproj">\r
       <Project>{51392CAD-5DCF-443F-8ECF-C9113DF3B91A}</Project>\r
-      <Name>System.ComponentModel.Composition\System.ComponentModel.Composition-net_4_5</Name>\r
+      <Name>System.ComponentModel.Composition-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index aa6669d68c9a84adfcd5a78c213f6bf591b33f27..a4cbb6299c9d8165be8b78055cfdb3fb73277cde 100644 (file)
     <AssemblyName>System.Security.Principal</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0a2b1b579c51c158ece6c7f3564f3aeb5201eb54..d66906dce8ab5b8b2fd0e29c92e82e489a48c152 100644 (file)
     <AssemblyName>System.ServiceModel.Http</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 9fc9038ac51a762841646e974b5c26d0c760538e..d0cb63b3eae1d0cf6f767f635ae4118b6c8ad215 100644 (file)
     <AssemblyName>System.ServiceModel.Primitives</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
diff --git a/mcs/class/Facades/System.ServiceModel.Security/AssemblyInfo.cs b/mcs/class/Facades/System.ServiceModel.Security/AssemblyInfo.cs
new file mode 100644 (file)
index 0000000..f222e8b
--- /dev/null
@@ -0,0 +1,41 @@
+// 
+// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// 
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle ("System.ServiceModel.Security.dll")]
+[assembly: AssemblyDescription ("System.ServiceModel.Security.dll")]
+[assembly: AssemblyDefaultAlias ("System.ServiceModel.Security.dll")]
+[assembly: AssemblyCompany ("Xamarin, Inc.")]
+[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
+[assembly: AssemblyCopyright ("Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)")]
+[assembly: AssemblyVersion ("4.0.0.0")]
+[assembly: AssemblyInformationalVersion ("4.0.0.0")]
+[assembly: AssemblyFileVersion ("4.0.0.0")]
+[assembly: AssemblyDelaySign (true)]
+[assembly: AssemblyKeyFile ("../../msfinal.pub")]
+
+[assembly: ReferenceAssembly]
+
+
diff --git a/mcs/class/Facades/System.ServiceModel.Security/Makefile b/mcs/class/Facades/System.ServiceModel.Security/Makefile
new file mode 100644 (file)
index 0000000..b021eff
--- /dev/null
@@ -0,0 +1,22 @@
+MCS_BUILD_DIR = ../../../build
+
+thisdir = class/Facades/System.ServiceModel.Security
+SUBDIRS = 
+include $(MCS_BUILD_DIR)/rules.make
+
+LIBRARY_SUBDIR = Facades
+LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
+
+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
+
+PLATFORM_DEBUG_FLAGS =
+
+NO_TEST = yes
+
+include $(MCS_BUILD_DIR)/library.make
+
+
diff --git a/mcs/class/Facades/System.ServiceModel.Security/System.ServiceModel.Security.dll.sources b/mcs/class/Facades/System.ServiceModel.Security/System.ServiceModel.Security.dll.sources
new file mode 100644 (file)
index 0000000..8e33d4d
--- /dev/null
@@ -0,0 +1,3 @@
+TypeForwarders.cs
+AssemblyInfo.cs
+
diff --git a/mcs/class/Facades/System.ServiceModel.Security/TypeForwarders.cs b/mcs/class/Facades/System.ServiceModel.Security/TypeForwarders.cs
new file mode 100644 (file)
index 0000000..e0cc880
--- /dev/null
@@ -0,0 +1,39 @@
+// 
+// Copyright (c) 2013 Xamarin Inc. (http://www.xamarin.com)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// 
+
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.LocalClientSecuritySettings))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.SecurityBindingElement))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.SecurityHeaderLayout))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.TransportSecurityBindingElement))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.DnsEndpointIdentity))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageSecurityVersion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.BasicSecurityProfileVersion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.SecureConversationVersion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.SecurityPolicyVersion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.SecurityVersion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.Tokens.SecureConversationSecurityTokenParameters))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.Tokens.SecurityTokenParameters))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.Tokens.SupportingTokenParameters))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.TrustVersion))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.SpnEndpointIdentity))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.UpnEndpointIdentity))]
index 3a55e57e568dd0b1f34ddf354a111bf5a7b95b5a..4a6b140ae32401796d1c29d0c02a1cd250c51d43 100644 (file)
     <AssemblyName>System.Text.Encoding.Extensions</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 209c0590891fd9744a06be5abbf68c54bdd4c544..6c03c541652a66d707854ccd97f194625f017058 100644 (file)
     <AssemblyName>System.Text.Encoding</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index b22e1ed1714927c7e0973d3f0bc3b9951ea24b66..8603aca5d46eb79f9bb189fa9d397a0234e1a599 100644 (file)
     <AssemblyName>System.Text.RegularExpressions</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 109f1b88022809f2599ba30f2ccad3a892a7b115..e7a569031790a84c4f12a55962ea8a2ea4ed10f6 100644 (file)
     <AssemblyName>System.Threading.Tasks.Parallel</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 269a6fe3e744ccdc8d634c130abbada665ea2dcd..6cbf5f5fe641f0f535042a9ae01768aff577db36 100644 (file)
     <AssemblyName>System.Threading.Tasks</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index e3d5a299d7d7feba2df10af625caf007c75540c0..35f690a0c96d5b1272e3200bd27f56a006d49e17 100644 (file)
     <AssemblyName>System.Threading.Timer</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0c2c715a4929c5ead4fd919b575e7b2e0e27bad7..855dcde2a23f7328e8a32f93b7f5720c6dbe0ca0 100644 (file)
     <AssemblyName>System.Threading</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1d31710672530f299aabf6c9be47fc6e5f219160..c5f31c82bbc94f4837262c9783c48c155cca4e3c 100644 (file)
     <AssemblyName>System.Xml.ReaderWriter</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 962af3458f3101ccdec31a8664f8ea674c0dd4cb..030fbbb7c18b9c11ff69484ce4bfd21381233aad 100644 (file)
     <AssemblyName>System.Xml.XDocument</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
       <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
+      <Name>System.Xml.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index aa436dcd8825df35523930b4e11f75ddb6b30c0f..7ef501521c3404b24646b3e296cd8cffc391a16f 100644 (file)
     <AssemblyName>System.Xml.XmlSerializer</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 5a517b6f6d6bf7941fb7c7493ab68a4d28835b47..dec298ea7f2d0afea4c5986620e56e73949b7c05 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
       <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>Common\I18N-net_4_5</Name>\r
+      <Name>I18N-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 76baf716f31252028108548c73b4591804963b04..d982706eeda65001d8856ea53ce3403805e1191a 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
@@ -78,7 +79,7 @@
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 66fbe53d000938885ab924902d5de6166a492c65..ea241e7de1bc8cc7930ab05fef681f96b8ea3e0e 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
       <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>Common\I18N-net_4_5</Name>\r
+      <Name>I18N-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0e6cbf1e160dcaff1976b26bb7c28f3f1fce6774..a0f092aee99f85c956aab7159b34b18082a26f6d 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
       <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>Common\I18N-net_4_5</Name>\r
+      <Name>I18N-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 08f7769891d48a118254f30512913acf06890842..bc4392d65dac4ac162177ae189400a9090c7882a 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
       <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>Common\I18N-net_4_5</Name>\r
+      <Name>I18N-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 12daa0d7364fe9a82ce159c3f605974e3154e60b..b2487de8957b574c100c89ad26893c8c72f617d9 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Common/I18N-net_4_5.csproj">\r
       <Project>{C337A9A4-3797-4339-AD23-493DF062CD76}</Project>\r
-      <Name>Common\I18N-net_4_5</Name>\r
+      <Name>I18N-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 9a0a126b3c1aab692897822fda83e7bb2426fec8..f9d1cdda39ced46b0850c38f17860afa1b29e06d 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index f6f3e38121aff1192e46c9b5d59120dc6ee771b3..0cc37dc7f4549ec9974154982ad5def3ae590beb 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 4c79552f4af690db2fedbbfee7a3ab08cf6083b6..48bf07b6720fb4e5f911b59eea92284e03802004 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Accessibility/Accessibility-net_4_5.csproj">\r
       <Project>{FACE8136-C95A-4788-90B2-DB0ECF7A020A}</Project>\r
-      <Name>Accessibility\Accessibility-net_4_5</Name>\r
+      <Name>Accessibility-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_5.csproj">\r
       <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_5</Name>\r
+      <Name>Mono.Posix-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.WebBrowser/Mono.WebBrowser-net_4_5.csproj">\r
       <Project>{1D660912-8164-4499-A2D7-A3B2FE742E17}</Project>\r
-      <Name>Mono.WebBrowser\Mono.WebBrowser-net_4_5</Name>\r
+      <Name>Mono.WebBrowser-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
       <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 708d5b1c55bc96d336de414a2f74e3acd38b8436..df6603cfa8569c53f1ea348724911660b08ee8d4 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
       <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
+      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_5.csproj">\r
       <Project>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5</Name>\r
+      <Name>Microsoft.Build.Utilities-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index e11230333de0b57a9eaec3b1b61aa008388f44ed..64b5a4134b70d3d34011aadd4a6af19e74900a7d 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 134fdb51ff93a47a3ceca48df45a7adfb48e1241..a811de97c38850fab72db3b2ac1bad0d5a68fa8a 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Build.Utilities/Microsoft.Build.Utilities-net_4_5.csproj">\r
       <Project>{6E1C7BDE-7B9E-47B0-A7B2-1561822FE922}</Project>\r
-      <Name>Microsoft.Build.Utilities\Microsoft.Build.Utilities-net_4_5</Name>\r
+      <Name>Microsoft.Build.Utilities-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
       <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
+      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj">\r
       <Project>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5</Name>\r
+      <Name>Microsoft.Build.Engine-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.XBuild.Tasks/Mono.XBuild.Tasks-net_4_5.csproj">\r
       <Project>{73FB1B7E-09F9-4E7F-A63A-C407A93BCA59}</Project>\r
-      <Name>Mono.XBuild.Tasks\Mono.XBuild.Tasks-net_4_5</Name>\r
+      <Name>Mono.XBuild.Tasks-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1fc961b72dc1f56a4865b6a55bb1c583ef706087..2833e27fda1227ab3a49ddbc0f21c82908c3410e 100644 (file)
@@ -57,9 +57,15 @@ namespace Microsoft.Build.Tasks {
                                else
                                        commandLine.AppendSwitch ("/delaysign-");
                        commandLine.AppendSwitchIfNotNull ("/description:", Description);
-                       if (EmbedResources != null)
-                               foreach (ITaskItem item in EmbedResources)
-                                       commandLine.AppendSwitchIfNotNull ("/embed:", item.ItemSpec);
+                       if (EmbedResources != null) {
+                               foreach (ITaskItem item in EmbedResources) {
+                                       string logical_name = item.GetMetadata ("LogicalName");
+                                       if (!string.IsNullOrEmpty (logical_name))
+                                               commandLine.AppendSwitchIfNotNull ("/embed:", string.Format ("{0},{1}", item.ItemSpec, logical_name));
+                                       else
+                                               commandLine.AppendSwitchIfNotNull ("/embed:", item.ItemSpec);
+                               }
+                       }
                        commandLine.AppendSwitchIfNotNull ("/evidence:", EvidenceFile);
                        commandLine.AppendSwitchIfNotNull ("/fileversion:", FileVersion);
                        commandLine.AppendSwitchIfNotNull ("/flags:", Flags);
index 7b92594d0b894ec9851372f3899ce0a710fc00e3..56f9ea36813e00b7d3b6b822eaa39372f026b613 100644 (file)
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using Microsoft.Build.BuildEngine;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Tasks;
@@ -287,6 +288,20 @@ namespace MonoTests.Microsoft.Build.Tasks {
                        Assert.AreEqual ("/embed:a /embed:b", clbe.ToString (), "A1");
                }
 
+               [Test]
+               public void TestEmbedResourcesWithLogicalName ()
+               {
+                       ALExtended ale = new ALExtended ();
+                       CommandLineBuilderExtension clbe = new CommandLineBuilderExtension ();
+                       var dict = new Dictionary<string, string> ();
+                       dict ["LogicalName"] = "value";
+
+                       ale.EmbedResources = new ITaskItem [2] { new TaskItem ("a", dict), new TaskItem ("b", dict) };
+                       ale.ARFC (clbe);
+
+                       Assert.AreEqual ("/embed:a,value /embed:b,value", clbe.ToString (), "A1");
+               }
+
                [Test]
                public void TestEvidenceFile ()
                {
index b4c72efa977eb388f111593db3c3fc8a9e0d52f6..f68c6db23ea1b6e0e298fd5610d8da793a23ca3f 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
       <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
+      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index bd043e993e328fc008818e9d3ca2ed94046f49b3..b35509f52474b274a9d00c566849dac6080f40f3 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Build.Engine/Microsoft.Build.Engine-net_4_5.csproj">\r
       <Project>{54DFC5A7-7C1D-4BA5-A0F7-F0B312E1E076}</Project>\r
-      <Name>Microsoft.Build.Engine\Microsoft.Build.Engine-net_4_5</Name>\r
+      <Name>Microsoft.Build.Engine-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Build.Framework/Microsoft.Build.Framework-net_4_5.csproj">\r
       <Project>{DA3B9FEE-8FBD-4587-B760-65420765256A}</Project>\r
-      <Name>Microsoft.Build.Framework\Microsoft.Build.Framework-net_4_5</Name>\r
+      <Name>Microsoft.Build.Framework-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 38006848872ca74d049901d12780664f93b254c4..36f0ad6dbba0c061ce9f8a1b25dff847e5b88456 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.CSharp/Mono.CSharp-net_4_5.csproj">\r
       <Project>{811AC316-9CC2-497D-A45E-7B6B1E0E481B}</Project>\r
-      <Name>Mono.CSharp\Mono.CSharp-net_4_5</Name>\r
+      <Name>Mono.CSharp-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 6014172763413aa97180bca1f3c89857bda826a4..fdc3b194187581f48189bd1261a50b8e3aebf1bd 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index a840d891af82fb1bd2ff70bd2d804ea7d8c3618a..2077c59c4ff0d1cc2fa54ad5706d30ab95dc4150 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 270d7a4b83b2fdc7412f02d006df0c91c4b319d5..a4783febcaa27f38f02f6b992816b1af7597e3aa 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 9fb2df1c2c8cb6ea9e69eb243833f082d43cc272..c3cdc5974a0fd5d11fb9edb5c3a773f150ff4db2 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index bd0167efbf026ec84cb9d7125973fc78d5f0f85b..970aa33443d459a23509d782e18ede555c9b8ab1 100644 (file)
@@ -98,5 +98,13 @@ namespace MonoTests.EvaluatorTest
                        Evaluator.Run ("struct B { public string foo; public int bar; }");
                        Evaluator.Run ("B aStruct = new B { foo = \"foo\", bar = 1 };");
                }
+
+               [Test]
+               public void NestedType ()
+               {
+                       Evaluator.Run ("class A { class B { } }");
+                       Evaluator.Run ("var x = new A ();");
+
+               }
        }
 }
\ No newline at end of file
index 116f8fed010852b28272d33552e15b2488eb51f2..7781cfdbf7593dc0a2e5fdc4e02c2dcc8b426bb8 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 558d6dcd1cef2e4d40a2df4cf9843ff368592ae2..8c1b0c48e5ab10cd6b7b335d65335ecdff5ce600 100644 (file)
     <AssemblyName>Mono.Cecil.Mdb</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../mono.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Cecil/Mono.Cecil-net_4_5.csproj">\r
       <Project>{F6DD456E-ADE4-419D-997F-41ECA0CE79F7}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_4_5</Name>\r
+      <Name>Mono.Cecil-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 69e43221eb5ff99617c9c8fbdf89b47dcd69389c..5810015d5b98ccb2c3a4c737a29229c58bd9fd30 100644 (file)
     <AssemblyName>Mono.Cecil</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../mono.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 3bbef32483608446191ad697fefc815de83c555d..7f50fed785f370836a6b43a407d5609122f88bf8 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Cecil/Mono.Cecil-net_4_5.csproj">\r
       <Project>{F6DD456E-ADE4-419D-997F-41ECA0CE79F7}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_4_5</Name>\r
+      <Name>Mono.Cecil-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Cecil.Mdb/Mono.Cecil.Mdb-net_4_5.csproj">\r
       <Project>{9ABB7BB9-5EA1-4081-B205-5658A602C1F5}</Project>\r
-      <Name>Mono.Cecil.Mdb\Mono.Cecil.Mdb-net_4_5</Name>\r
+      <Name>Mono.Cecil.Mdb-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 3155074eb5b879140773043c43f8659cdc4f7b3c..5c2bd0b31361e1dfedc61b4c62d35dabfa4b477f 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 8dca41b2659885eb98a620d241ad29067b7f22fa..226f6e668101fdadb2fb681f5a3c34e342a1e8db 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
       <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
+      <Name>System.Transactions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 4d8ab1edf1f34fb3a8c84c7a9ea3973e85343659..d54e8b0c829f2ef9e3a779e24947efc0d08afa3e 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 083c66e6e9a5dbc812acb5272855b5241731061d..c61490cd1a5afd0bfa47b4474a3cdb823a812802 100644 (file)
     <AssemblyName>Mono.Debugger.Soft</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../mono.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Cecil/Mono.Cecil-net_4_5.csproj">\r
       <Project>{F6DD456E-ADE4-419D-997F-41ECA0CE79F7}</Project>\r
-      <Name>Mono.Cecil\Mono.Cecil-net_4_5</Name>\r
+      <Name>Mono.Cecil-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 6d196aabbab374ff4ff9f70ce974cd3e7c9210eb..03d2d3af13a6ef5279ff0d0d3ea057c0105e6397 100644 (file)
@@ -1432,12 +1432,12 @@ namespace Mono.Debugger.Soft
                //
                public void StartBuffering () {
                        buffer_packets = true;
-                       if (Version.AtLeast (3, 34))
+                       if (Version.AtLeast (2, 34))
                                VM_StartBuffering ();
                }
 
                public void StopBuffering () {
-                       if (Version.AtLeast (3, 34))
+                       if (Version.AtLeast (2, 34))
                                VM_StopBuffering ();
                        buffer_packets = false;
 
@@ -1983,21 +1983,20 @@ namespace Mono.Debugger.Soft
                        return SendReceive (CommandSet.THREAD, (int)CmdThread.GET_NAME, new PacketWriter ().WriteId (id)).ReadString ();
                }
 
-               internal FrameInfo[] Thread_GetFrameInfo (long id, int start_frame, int length) {
-                       var res = SendReceive (CommandSet.THREAD, (int)CmdThread.GET_FRAME_INFO, new PacketWriter ().WriteId (id).WriteInt (start_frame).WriteInt (length));
-                       int count = res.ReadInt ();
-
-                       var frames = new FrameInfo [count];
-                       for (int i = 0; i < count; ++i) {
-                               var f = new FrameInfo ();
-                               f.id = res.ReadInt ();
-                               f.method = res.ReadId ();
-                               f.il_offset = res.ReadInt ();
-                               f.flags = (StackFrameFlags)res.ReadByte ();
-                               frames [i] = f;
-                       }
-
-                       return frames;
+               internal void Thread_GetFrameInfo (long id, int start_frame, int length, Action<FrameInfo[]> resultCallaback) {
+                       Send (CommandSet.THREAD, (int)CmdThread.GET_FRAME_INFO, new PacketWriter ().WriteId (id).WriteInt (start_frame).WriteInt (length), (res) => {
+                               int count = res.ReadInt ();
+                               var frames = new FrameInfo[count];
+                               for (int i = 0; i < count; ++i) {
+                                       var f = new FrameInfo ();
+                                       f.id = res.ReadInt ();
+                                       f.method = res.ReadId ();
+                                       f.il_offset = res.ReadInt ();
+                                       f.flags = (StackFrameFlags)res.ReadByte ();
+                                       frames [i] = f;
+                               }
+                               resultCallaback (frames);
+                       }, 1);
                }
 
                internal int Thread_GetState (long id) {
index f3eedccaf5b24592ce35e5b1cc1c0af05df033ac..030fa3e3e4ad431ec00f50e1b45a96451e2d56b2 100644 (file)
@@ -262,7 +262,7 @@ namespace Mono.Debugger.Soft
                                f |= InvokeFlags.SINGLE_THREADED;
 
                        InvokeAsyncResult r = new InvokeAsyncResult { AsyncState = state, AsyncWaitHandle = new ManualResetEvent (false), VM = vm, Thread = thread, Callback = callback };
-
+                       thread.InvalidateFrames ();
                        r.ID = vm.conn.VM_BeginInvokeMethod (thread.Id, method.Id, this_obj != null ? vm.EncodeValue (this_obj) : vm.EncodeValue (vm.CreateValue (null)), vm.EncodeValues (arguments), f, InvokeCB, r);
 
                        return r;
@@ -301,15 +301,15 @@ namespace Mono.Debugger.Soft
                                } catch (CommandException ex) {
                                        if (ex.ErrorCode == ErrorCode.INVALID_ARGUMENT)
                                                throw new ArgumentException ("Incorrect number or types of arguments", "arguments");
-                                       else
-                                               throw;
+
+                                       throw;
                                }
                                throw new NotImplementedException ();
                        } else {
                                if (r.Exception != null)
                                        throw new InvocationException ((ObjectMirror)r.VM.DecodeValue (r.Exception));
-                               else
-                                       return r.VM.DecodeValue (r.Value);
+
+                               return r.VM.DecodeValue (r.Value);
                        }
                }
 
@@ -370,6 +370,7 @@ namespace Mono.Debugger.Soft
                        var args = new List<ValueImpl[]> ();
                        for (int i = 0; i < methods.Length; ++i)
                                args.Add (vm.EncodeValues (arguments [i]));
+                       thread.InvalidateFrames ();
                        r.ID = vm.conn.VM_BeginInvokeMethods (thread.Id, mids, this_obj != null ? vm.EncodeValue (this_obj) : vm.EncodeValue (vm.CreateValue (null)), args, f, InvokeMultipleCB, r);
 
                        return r;
index 38c733ccaf5e07e60681abcd77cf7c58be440608..541118d66d6cc1ad4b6c4f0f8bdc681891d68b58 100644 (file)
@@ -7,7 +7,12 @@ namespace Mono.Debugger.Soft
        public class ThreadMirror : ObjectMirror
        {
                string name;
+               bool cacheInvalid = true;
+               bool fetching;
+               object fetchingLocker = new object ();
+               ManualResetEvent fetchingEvent = new ManualResetEvent (false);
                ThreadInfo info;
+               StackFrame[] frames;
 
                internal ThreadMirror (VirtualMachine vm, long id) : base (vm, id) {
                }
@@ -15,22 +20,58 @@ namespace Mono.Debugger.Soft
                internal ThreadMirror (VirtualMachine vm, long id, TypeMirror type, AppDomainMirror domain) : base (vm, id, type, domain) {
                }
 
-               // FIXME: Cache, invalidate when the thread/runtime is resumed
                public StackFrame[] GetFrames () {
-                       FrameInfo[] frame_info = vm.conn.Thread_GetFrameInfo (id, 0, -1);
+                       FetchFrames (true);
+                       fetchingEvent.WaitOne ();
+                       return frames;
+               }
 
-                       var frames = new List<StackFrame> ();
+               internal void InvalidateFrames () {
+                       cacheInvalid = true;
+               }
 
-                       for (int i = 0; i < frame_info.Length; ++i) {
-                               FrameInfo info = (FrameInfo)frame_info [i];
-                               MethodMirror method = vm.GetMethod (info.method);
-                               var f = new StackFrame (vm, info.id, this, method, info.il_offset, info.flags);
-                               if (!(f.IsNativeTransition && !NativeTransitions))
-                                       frames.Add (f);
+               internal void FetchFrames (bool mustFetch = false) {
+                       lock (fetchingLocker) {
+                               if (fetching || !cacheInvalid)
+                                       return;
+                               cacheInvalid = false;
+                               fetching = true;
+                               fetchingEvent.Reset ();
                        }
+                       vm.conn.Thread_GetFrameInfo (id, 0, -1, (frame_info) => {
+                               var framesList = new List<StackFrame> ();
+                               for (int i = 0; i < frame_info.Length; ++i) {
+                                       var frameInfo = (FrameInfo)frame_info [i];
+                                       var method = vm.GetMethod (frameInfo.method);
+                                       var f = new StackFrame (vm, frameInfo.id, this, method, frameInfo.il_offset, frameInfo.flags);
+                                       if (!(f.IsNativeTransition && !NativeTransitions))
+                                               framesList.Add (f);
+                               }
+                               lock (fetchingLocker) {
+                                       vm.AddThreadToInvalidateList (this);
+                                       fetching = false;
+                                       //In case it was invalidated during waiting for response from
+                                       //runtime and mustFetch was set refetch
+                                       if (cacheInvalid && mustFetch) {
+                                               FetchFrames (mustFetch);
+                                               return;
+                                       }
+                                       frames = framesList.ToArray ();
+                                       fetchingEvent.Set ();
+                               }
+                       });
+               }
 
-                       return frames.ToArray ();
-           }
+               public static void FetchFrames(IList<ThreadMirror> threads)
+               {
+                       if (threads.Count == 0)
+                               return;
+                       threads [0].vm.conn.StartBuffering ();
+                       foreach (var thread in threads) {
+                               thread.FetchFrames ();
+                       }
+                       threads [0].vm.conn.StopBuffering ();
+               }
 
                public string Name {
                        get {
@@ -38,7 +79,7 @@ namespace Mono.Debugger.Soft
                                        name = vm.conn.Thread_GetName (id);
                                return name;
                        }
-           }
+               }
 
                public new long Id {
                        get {
@@ -111,8 +152,8 @@ namespace Mono.Debugger.Soft
                        } catch (CommandException ex) {
                                if (ex.ErrorCode == ErrorCode.INVALID_ARGUMENT)
                                        throw new ArgumentException ("loc doesn't refer to a location in the current method of this thread.", "loc");
-                               else
-                                       throw;
+
+                               throw;
                        }
                }
     }
index 61ee11c18314fb401424ade351529c4fa6e29d81..ee5806d4722a6cce409547d9e0095f0a8764c63e 100644 (file)
@@ -121,12 +121,13 @@ namespace Mono.Debugger.Soft
 
                public void Resume () {
                        try {
+                               InvalidateThreadAndFrameCaches ();
                                conn.VM_Resume ();
                        } catch (CommandException ex) {
                                if (ex.ErrorCode == ErrorCode.NOT_SUSPENDED)
                                        throw new VMNotSuspendedException ();
-                               else
-                                       throw;
+
+                               throw;
                        }
            }
 
@@ -151,12 +152,44 @@ namespace Mono.Debugger.Soft
                        conn.ForceDisconnect ();
                }
 
+               HashSet<ThreadMirror> threadsToInvalidate = new HashSet<ThreadMirror> ();
+               ThreadMirror[] threadCache;
+               object threadCacheLocker = new object ();
+
+               void InvalidateThreadAndFrameCaches () {
+                       lock (threadsToInvalidate) {
+                               foreach (var thread in threadsToInvalidate)
+                                       thread.InvalidateFrames ();
+                               threadsToInvalidate.Clear ();
+                       }
+                       lock (threadCacheLocker) {
+                               threadCache = null;
+                       }
+               }
+
+               internal void InvalidateThreadCache () {
+                       lock (threadCacheLocker) {
+                               threadCache = null;
+                       }
+               }
+
+               internal void AddThreadToInvalidateList (ThreadMirror threadMirror)
+               {
+                       lock (threadsToInvalidate) {
+                               threadsToInvalidate.Add (threadMirror);
+                       }
+               }
+
                public IList<ThreadMirror> GetThreads () {
-                       long[] ids = vm.conn.VM_GetThreads ();
-                       ThreadMirror[] res = new ThreadMirror [ids.Length];
-                       for (int i = 0; i < ids.Length; ++i)
-                               res [i] = GetThread (ids [i]);
-                       return res;
+                       lock (threadCacheLocker) {
+                               if (threadCache == null) {
+                                       long[] ids = vm.conn.VM_GetThreads ();
+                                       threadCache = new ThreadMirror [ids.Length];
+                                       for (int i = 0; i < ids.Length; ++i)
+                                               threadCache [i] = GetThread (ids [i]);
+                               }
+                               return threadCache;
+                       }
                }
 
                // Same as the mirrorOf methods in JDI
@@ -675,9 +708,11 @@ namespace Mono.Debugger.Soft
                                        vm.notify_vm_event (EventType.VMDeath, suspend_policy, req_id, thread_id, null, ei.ExitCode);
                                        break;
                                case EventType.ThreadStart:
+                                       vm.InvalidateThreadCache ();
                                        l.Add (new ThreadStartEvent (vm, req_id, id));
                                        break;
                                case EventType.ThreadDeath:
+                                       vm.InvalidateThreadCache ();
                                        l.Add (new ThreadDeathEvent (vm, req_id, id));
                                        break;
                                case EventType.AssemblyLoad:
@@ -718,8 +753,6 @@ namespace Mono.Debugger.Soft
                                case EventType.UserLog:
                                        l.Add (new UserLogEvent (vm, req_id, thread_id, ei.Level, ei.Category, ei.Message));
                                        break;
-                               default:
-                                       break;
                                }
                        }
                        
index da0eaa1a1a70b3f1955e3e6d8760ee71e85a624f..6083b3d0ebc54324eae817eff2196d81598409c0 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_5.csproj">\r
       <Project>{0B587DBA-BA92-4B92-821A-AA200C612A7E}</Project>\r
-      <Name>ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib-net_4_5</Name>\r
+      <Name>ICSharpCode.SharpZipLib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 91984c92bf22e5a7b40c5a0a437d0898c5147ddf..0e98d81156edb84ef5db1b16b034c768699c3046 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_5.csproj">\r
       <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_5</Name>\r
+      <Name>Mono.Posix-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 5747dcd2ba9564f61a7bc9614d295ef8a6779a6c..9870cab073c851d5ffd6b1eafb01f0e3e8831b06 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Messaging/System.Messaging-net_4_5.csproj">\r
       <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_5</Name>\r
+      <Name>System.Messaging-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Messaging/Mono.Messaging-net_4_5.csproj">\r
       <Project>{DDCC93B5-9425-4E9A-95DC-3400D0028508}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_5</Name>\r
+      <Name>Mono.Messaging-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../RabbitMQ.Client/src/client/RabbitMQ.Client-net_4_5.csproj">\r
       <Project>{55AA0C89-63D9-438E-A139-3ED9F72AE295}</Project>\r
-      <Name>client\RabbitMQ.Client-net_4_5</Name>\r
+      <Name>RabbitMQ.Client-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 38b4bc70bdaab846a142ec658d1af79a8aa6d423..1288172ab1d5c84ef511405364962d01ebcde8b5 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index f3d1d0fe30bbe2ff9f7254d10b4e68b119858639..bc2f7b6a2f3e1d52c83af9310f9c540e408c7a69 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 47b2dd4eb311dae54dcf5b631e2d20d93a2dfeb5..89a4d5fddf61a5986ee1e36ba759e55fc829d3bc 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1161ee4ce8b05f89cc4904ed54595d4911dfda2f..b0a8c4cb312c9739a21d38a6df02988bf874d664 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index fa7a6d50843cbabd92e2d10803829b7de7fa54f2..1b8525bd30d0cdda14fed059ceb337657c11a9b8 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
@@ -83,7 +84,7 @@
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0c0f4a628139d8d0ce73a35f629bae913a73556c..1de32f0bb99eefaa164040a8c31f92b9be5bae84 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-bare-net_4_5.csproj">\r
       <Project>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</Project>\r
-      <Name>System\System-bare-net_4_5</Name>\r
+      <Name>System-bare-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index a00ab1b55a33083eacf78a41b8539ce2a691e653..3da8463338b3f21468e6b54c4b8acd309676e3b2 100644 (file)
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type1MessageTest.cs" />\r
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type2MessageTest.cs" />\r
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type3MessageTest.cs" />\r
+    <Compile Include="Test\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\BasicConstraintsExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\ExtendedKeyUsageExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\KeyUsageExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\SubjectAltNameExtensionTest.cs" />\r
+    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509\PKCS12Test.cs" />\r
     <Compile Include="Test\Mono.Security.X509\X501NameTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509\X509CertificateTest.cs" />\r
index 4b1f0c56c9a71a7ca7d84694aa39021a8d6b4123..fa6828bdb8a461df196e64bf44774c8fcb7be391 100644 (file)
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type1MessageTest.cs" />\r
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type2MessageTest.cs" />\r
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type3MessageTest.cs" />\r
+    <Compile Include="Test\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\BasicConstraintsExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\ExtendedKeyUsageExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\KeyUsageExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\SubjectAltNameExtensionTest.cs" />\r
+    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509\PKCS12Test.cs" />\r
     <Compile Include="Test\Mono.Security.X509\X501NameTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509\X509CertificateTest.cs" />\r
index 27e8ad50ba5804add70d49516384b6627646c093..9f6dd3aab9c7f7bc086348d1e5edae69ef4a990c 100644 (file)
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type1MessageTest.cs" />\r
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type2MessageTest.cs" />\r
     <Compile Include="Test\Mono.Security.Protocol.Ntlm\Type3MessageTest.cs" />\r
+    <Compile Include="Test\Mono.Security.X509.Extensions\AuthorityKeyIdentifierExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\BasicConstraintsExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\ExtendedKeyUsageExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\KeyUsageExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509.Extensions\SubjectAltNameExtensionTest.cs" />\r
+    <Compile Include="Test\Mono.Security.X509.Extensions\SubjectKeyIdentifierExtensionTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509\PKCS12Test.cs" />\r
     <Compile Include="Test\Mono.Security.X509\X501NameTest.cs" />\r
     <Compile Include="Test\Mono.Security.X509\X509CertificateTest.cs" />\r
index fb6f940a1ecbc9f4355bf11602c330229ed75bda..858ee1e7e59895c7cbe55cee79deb47da343127c 100644 (file)
@@ -87,6 +87,18 @@ namespace Mono.Security.X509.Extensions {
                        }
                }
 
+               protected override void Encode ()
+               {
+                       ASN1 seq = new ASN1 (0x30);
+                       if (aki == null) {
+                               throw new InvalidOperationException ("Invalid AuthorityKeyIdentifier extension");
+                       }
+
+                       seq.Add (new ASN1 (0x80, aki));
+                       extnValue = new ASN1 (0x04);
+                       extnValue.Add (seq);
+               }
+
                public override string Name {
                        get { return "Authority Key Identifier"; }
                }
@@ -97,6 +109,7 @@ namespace Mono.Security.X509.Extensions {
                                        return null;
                                return (byte[]) aki.Clone (); 
                        }
+                       set { aki = value; }
                }
 
                public override string ToString () 
index 945111675e3b95e3169422f01a56d1c099bba9a7..8f15c28e34a13d7595f53f073b46fcec1cd19743 100644 (file)
@@ -75,6 +75,17 @@ namespace Mono.Security.X509.Extensions {
                        ski = sequence.Value;
                }
 
+               protected override void Encode ()
+               {
+                       if (ski == null) {
+                               throw new InvalidOperationException ("Invalid SubjectKeyIdentifier extension");
+                       }
+
+                       var seq = new ASN1 (0x04, ski);
+                       extnValue = new ASN1 (0x04);
+                       extnValue.Add (seq);
+               }
+
                public override string Name {
                        get { return "Subject Key Identifier"; }
                }
@@ -85,6 +96,7 @@ namespace Mono.Security.X509.Extensions {
                                        return null;
                                return (byte[]) ski.Clone (); 
                        }
+                       set { ski = value; }
                }
 
                public override string ToString () 
index 16777e98972ecb045e113c3c24db2d312980a8ae..9d5ac35f66a98d80bdbb38d92bb63566bca9a5a1 100644 (file)
@@ -37,7 +37,9 @@ Mono.Security.X509/X501NameTest.cs
 Mono.Security.X509/X509CertificateTest.cs
 Mono.Security.X509/X509CrlTest.cs
 Mono.Security.X509/X520AttributesTest.cs
+Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtensionTest.cs
 Mono.Security.X509.Extensions/KeyUsageExtensionTest.cs
 Mono.Security.X509.Extensions/ExtendedKeyUsageExtensionTest.cs
 Mono.Security.X509.Extensions/BasicConstraintsExtensionTest.cs
 Mono.Security.X509.Extensions/SubjectAltNameExtensionTest.cs
+Mono.Security.X509.Extensions/SubjectKeyIdentifierExtensionTest.cs
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtensionTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.X509.Extensions/AuthorityKeyIdentifierExtensionTest.cs
new file mode 100644 (file)
index 0000000..e095df4
--- /dev/null
@@ -0,0 +1,122 @@
+//
+// AuthorityKeyIdentifierExtensionTest.cs - NUnit Test Cases for 
+//     Mono.Security.X509.Extensions.AuthorityKeyIdentifierExtension
+//
+// Authors:
+//     Lex Li  <support@lextm.com>
+//
+// Copyright (C) 2014 Lex Li
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using Mono.Security.X509.Extensions;
+using NUnit.Framework;
+
+namespace MonoTests.Mono.Security.X509.Extensions
+{
+       [TestFixture]
+       public class AuthorityKeyIdentifierExtensionTest
+       {
+               private void Empty (AuthorityKeyIdentifierExtension aki)
+               {
+                       Assert.IsFalse (aki.Critical, "Critical");
+                       Assert.AreEqual ("2.5.29.35", aki.Oid, "Oid");
+                       Assert.IsNotNull (aki.Name, "Name");
+                       Assert.IsFalse (aki.Name == aki.Oid, "Name!=Oid");
+                       Assert.AreEqual (new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       }, aki.Identifier, "Identifier");
+               }
+
+               [Test]
+               public void Constructor_Empty ()
+               {
+                       AuthorityKeyIdentifierExtension aki = new AuthorityKeyIdentifierExtension ();
+                       aki.Identifier = new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       };
+                       Empty (aki);
+               }
+
+               [Test]
+               public void Constructor_Extension ()
+               {
+                       AuthorityKeyIdentifierExtension ext = new AuthorityKeyIdentifierExtension ();
+                       ext.Identifier = new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       };
+                       AuthorityKeyIdentifierExtension aki = new AuthorityKeyIdentifierExtension (ext);
+                       Empty (aki);
+               }
+
+               [Test]
+               public void Constructor_ASN1 ()
+               {
+                       AuthorityKeyIdentifierExtension ext = new AuthorityKeyIdentifierExtension ();
+                       ext.Identifier = new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       };
+                       AuthorityKeyIdentifierExtension aki = new AuthorityKeyIdentifierExtension (ext.ASN1);
+                       Empty (aki);
+               }
+
+               [Test]
+               public void AuthorityKeyIdentifier_Critical ()
+               {
+                       AuthorityKeyIdentifierExtension aki = new AuthorityKeyIdentifierExtension ();
+                       aki.Critical = true;
+                       aki.Identifier = new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       };
+                       Assert.AreEqual ("30-22-06-03-55-1D-23-01-01-FF-04-18-30-16-80-14-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00", BitConverter.ToString (aki.GetBytes ()), "GetBytes");
+
+                       AuthorityKeyIdentifierExtension aki2 = new AuthorityKeyIdentifierExtension (aki.ASN1);
+                       Assert.IsTrue (aki2.Critical, "Critical");
+                       Assert.AreEqual (new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       }, aki2.Identifier, "Identifier");
+               }
+
+               [Test]
+               [ExpectedException (typeof(InvalidOperationException))]
+               public void EmptyIdentifier ()
+               {
+                       AuthorityKeyIdentifierExtension ext = new AuthorityKeyIdentifierExtension ();
+                       AuthorityKeyIdentifierExtension aki = new AuthorityKeyIdentifierExtension (ext);
+                       Empty (aki);
+               }
+       }
+}
diff --git a/mcs/class/Mono.Security/Test/Mono.Security.X509.Extensions/SubjectKeyIdentifierExtensionTest.cs b/mcs/class/Mono.Security/Test/Mono.Security.X509.Extensions/SubjectKeyIdentifierExtensionTest.cs
new file mode 100644 (file)
index 0000000..5acdd73
--- /dev/null
@@ -0,0 +1,122 @@
+//
+// SubjectKeyIdentifierExtensionTest.cs - NUnit Test Cases for 
+//     Mono.Security.X509.Extensions.SubjectKeyIdentifierExtension
+//
+// Authors:
+//     Lex Li  <support@lextm.com>
+//
+// Copyright (C) 2014 Lex Li
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using Mono.Security.X509.Extensions;
+using NUnit.Framework;
+
+namespace MonoTests.Mono.Security.X509.Extensions
+{
+       [TestFixture]
+       public class SubjectKeyIdentifierExtensionTest
+       {
+               private void Empty (SubjectKeyIdentifierExtension ski)
+               {
+                       Assert.IsFalse (ski.Critical, "Critical");
+                       Assert.AreEqual ("2.5.29.14", ski.Oid, "Oid");
+                       Assert.IsNotNull (ski.Name, "Name");
+                       Assert.IsFalse (ski.Name == ski.Oid, "Name!=Oid");
+                       Assert.AreEqual (new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       }, ski.Identifier, "Identifier");
+               }
+
+               [Test]
+               public void Constructor_Empty ()
+               {
+                       SubjectKeyIdentifierExtension ski = new SubjectKeyIdentifierExtension ();
+                       ski.Identifier = new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       };
+                       Empty (ski);
+               }
+
+               [Test]
+               public void Constructor_Extension ()
+               {
+                       SubjectKeyIdentifierExtension ext = new SubjectKeyIdentifierExtension ();
+                       ext.Identifier = new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       };
+                       SubjectKeyIdentifierExtension ski = new SubjectKeyIdentifierExtension (ext);
+                       Empty (ski);
+               }
+
+               [Test]
+               public void Constructor_ASN1 ()
+               {
+                       SubjectKeyIdentifierExtension ext = new SubjectKeyIdentifierExtension ();
+                       ext.Identifier = new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       };
+                       SubjectKeyIdentifierExtension ski = new SubjectKeyIdentifierExtension (ext.ASN1);
+                       Empty (ski);
+               }
+
+               [Test]
+               public void AuthorityKeyIdentifier_Critical ()
+               {
+                       SubjectKeyIdentifierExtension ski = new SubjectKeyIdentifierExtension ();
+                       ski.Critical = true;
+                       ski.Identifier = new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       };
+                       Assert.AreEqual ("30-20-06-03-55-1D-0E-01-01-FF-04-16-04-14-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00", BitConverter.ToString (ski.GetBytes ()), "GetBytes");
+
+                       SubjectKeyIdentifierExtension ski2 = new SubjectKeyIdentifierExtension (ski.ASN1);
+                       Assert.IsTrue (ski2.Critical, "Critical");
+                       Assert.AreEqual (new byte[] {
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00
+                       }, ski2.Identifier, "Identifier");
+               }
+
+               [Test]
+               [ExpectedException (typeof(InvalidOperationException))]
+               public void EmptyIdentifier ()
+               {
+                       SubjectKeyIdentifierExtension ext = new SubjectKeyIdentifierExtension ();
+                       SubjectKeyIdentifierExtension ski = new SubjectKeyIdentifierExtension (ext);
+                       Empty (ski);
+               }
+       }
+}
index 1c5d3c8655f444c6ed917c6dde41c71deba610cf..14595b380787265c3e41be215b2c0f28105392c0 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index f7b41bb32cdbfb49a031611272f45103e9d18d05..f74e4b7e54dfa770d3512cc13c6028eeb36e48ac 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
@@ -73,7 +74,7 @@
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 318b19b20b56fc51ae0f10acb67f2b867eafec55..998b16d4bbd397b8053f0690d66ff342c5b8811f 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 7bb9cb88199c806700af7d51a7d70b6412233d77..965e4b4975233fe5428bbdbdc43bf8ee204bf3c5 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1fb94134719e825f959b014e0571d8411529b8dd..2de21cef819d122122c6c14794bb98594dec6630 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index a388fd751bead4a85b42beff026adedad5ddeba4..f2d7caef871ec1d0cd13caa5d12c62582d521be3 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index ce84b0fd4c8d042abcdb1928ab0e55f586899942..13b2303bdad90ab1bd30c400016459bfcd3734bb 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 903039d5b80d7b098741a8beebe548926cffce4f..222ab037c1ea297db5ca01057826ed8a3002d597 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 9ae7d6af649831b57db4af3b7edab6cb59c5ad3e..8d3bca2afa34a4fd78d2b4adca923e034bd83c14 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../../../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../../../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 491ad795085e50a1ae44d8337e36ad94967dc3fb..9b6a7217eb1d210a862e1c3d269954a02f39d45e 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 34e4a621000703295655ce71bfab22bfd9c80ade..c0b799cf8b2245eeff47d91ad3235112b7dbe2c9 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 9cd827887cfbd802586976907fddc8330ba99525..ec4da6c37ab628498a0d3b54529edc228ba06c3d 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index b52020dc0be4f5892ac95a00315cb89ab85f7885..a4c37a0fd4530e8ab6d6839095dfb5ecbf3fb42a 100644 (file)
@@ -1,12 +1,14 @@
 thisdir = class/System.Configuration
 SUBDIRS =
+
 include ../../build/rules.make
 
 LIBRARY = System.Configuration.dll
 
 LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir)
+test_remove = $(LOCAL_MCS_FLAGS)
 LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Security.dll -nowarn:618 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) 
 
 include ../../build/library.make
 
index ab5314c23ae018c46111b14691d965699c907b51..c4858d21b4113605309728db0e5805c61e581c58 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-secxml-net_4_5.csproj">\r
       <Project>{46F151F2-A422-4A1B-9D29-2E148CE73629}</Project>\r
-      <Name>System\System-secxml-net_4_5</Name>\r
+      <Name>System-secxml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-bare-net_4_5.csproj">\r
       <Project>{21FB091E-0F84-479E-AB16-6503D36852F9}</Project>\r
-      <Name>System.XML\System.Xml-bare-net_4_5</Name>\r
+      <Name>System.Xml-bare-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
       <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
+      <Name>System.Security-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 3808b8457ab5cd2c8cc46454eb461e0366ecce72..d749c862b5d95e60f5b8a03379aec66cd6c6a985 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_5.csproj">\r
       <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_5</Name>\r
+      <Name>Mono.Posix-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index fa259cd1e078314c300ae08a6f392f6bd362457e..2d1945f82ce041891c5d10035d6dcb7705647d62 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Posix/Mono.Posix-net_4_5.csproj">\r
       <Project>{85A9B29B-58FF-4FBE-8998-B0A89AC22880}</Project>\r
-      <Name>Mono.Posix\Mono.Posix-net_4_5</Name>\r
+      <Name>Mono.Posix-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1ee118c3084ad33a43340de872e0cbf7d2eb63ca..a8c627360dab6b08e5b73c6bfed6f83cbfc0c5e5 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1d6b5f7d052eab5b46e5bd1f13b9b55dc8faead9..adae7bd5664bd96aa5281df9e056ddb00bad7b14 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index b2f14dc0d5d072cfc33a80bcbf5ef1c33ca59a3c..a045f9fbc5fdb19fe1cfc9cf47eff62bebf5ccd1 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
       <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
+      <Name>System.EnterpriseServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 25ca6f3fe68bcc05c8141a7a2a2b915af8a6c515..82ad0c24860d92e8317c2a4befa3510f9400845b 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
       <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
+      <Name>System.Xml.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../WindowsBase/WindowsBase-net_4_5.csproj">\r
       <Project>{8E6ED7D5-3B08-4A83-905E-8FB4CF0C160D}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_4_5</Name>\r
+      <Name>WindowsBase-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index fcd40b1d6f989fd78553ca5cb7d5320567d45dfe..d0b2c9d8aa5bb63996debb474a2173e5beed2a46 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel.Web/System.ServiceModel.Web-net_4_5.csproj">\r
       <Project>{BD4DF654-42EE-40E8-A3F4-8A80959E7879}</Project>\r
-      <Name>System.ServiceModel.Web\System.ServiceModel.Web-net_4_5</Name>\r
+      <Name>System.ServiceModel.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data.Services.Client/System.Data.Services.Client-net_4_5.csproj">\r
       <Project>{E9B87AE3-9A05-4146-83CC-082BE32D8EB2}</Project>\r
-      <Name>System.Data.Services.Client\System.Data.Services.Client-net_4_5</Name>\r
+      <Name>System.Data.Services.Client-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj">\r
       <Project>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_5</Name>\r
+      <Name>System.ServiceModel.Activation-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0497bb8647807fd3e20bccae0701be4b5c69c3fd..95dead37499f066bc460e7be0cb115b2c6bea82f 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
       <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
+      <Name>System.EnterpriseServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Data.Tds/Mono.Data.Tds-net_4_5.csproj">\r
       <Project>{CB7949AC-5FA7-4FAB-893A-8FAF436BF514}</Project>\r
-      <Name>Mono.Data.Tds\Mono.Data.Tds-net_4_5</Name>\r
+      <Name>Mono.Data.Tds-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
       <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
+      <Name>System.Transactions-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index b8c4ad723029560e38590d8db53a0cea32410551..dcc8c7392f0a4a5ec9069f40f522eee9e2e7c358 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Accessibility/Accessibility-net_4_5.csproj">\r
       <Project>{FACE8136-C95A-4788-90B2-DB0ECF7A020A}</Project>\r
-      <Name>Accessibility\Accessibility-net_4_5</Name>\r
+      <Name>Accessibility-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0c7d629b8cfffed9a5236039a5fef7a829c9f3d9..566b6a2222b74c0577403745e9ee557fbc063303 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.DirectoryServices/System.DirectoryServices-net_4_5.csproj">\r
       <Project>{EC4E43E7-63C0-4D64-8B7A-E00C097872A5}</Project>\r
-      <Name>System.DirectoryServices\System.DirectoryServices-net_4_5</Name>\r
+      <Name>System.DirectoryServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1544be525e6b51fc4ed0b0ea7e5cde67def76af7..5c6cebd8b824f4cf6558df8ddfcbb0a69b3fd3ad 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Novell.Directory.Ldap/Novell.Directory.Ldap-net_4_5.csproj">\r
       <Project>{E6070FFA-2CBA-4C24-99C1-63A4F5052821}</Project>\r
-      <Name>Novell.Directory.Ldap\Novell.Directory.Ldap-net_4_5</Name>\r
+      <Name>Novell.Directory.Ldap-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0fda4a534e1714fa7e72103d50f30e857bd14fe9..d67485ff8c28652775732e919d44ab1d284c16c5 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 445b593b05c7a84648811a5dc4d332ba7ec0f7eb..4d0789ccd4dff5ce1002fd0e62f41f53953f2fb5 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 71a1033dd425f9add0841b445a6281c8b229f1a8..3f2cec0d706099e094f39316e7f57bacd8e45b89 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 5bb647f3bc950746d9b06d843b757e23e1b72555..c0d00ac30bdc7f7c350176bfa11c2bbc9a364eec 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
       <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
+      <Name>System.Transactions-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index eae409618af20b25f83753a17c4678f04834a27d..3825d4cb606c2a41caf1202d1dda6b1889061260 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.IO.Compression/System.IO.Compression-net_4_5.csproj">\r
       <Project>{BDF04E30-60D9-4279-A1DF-3291328A5AFD}</Project>\r
-      <Name>System.IO.Compression\System.IO.Compression-net_4_5</Name>\r
+      <Name>System.IO.Compression-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c19d32943e7314a5e1800a72a6fe62b1d7d63490..22c83d5bb2e4d03ebeddb47f348755765068212b 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index dd82f0b0e78cce59ff4d1737fcd381d09fb5db45..afb8ae891aed83e8729913495a87727fc25410fc 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
       <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
+      <Name>System.Security-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
       <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_5</Name>\r
+      <Name>System.IdentityModel-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 38fd187fdd5b799fcb561d800f753564ad85b7f3..17888b5d370f7f50c64a4024c6ca87bea6f6f668 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
       <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
+      <Name>System.Security-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
       <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
+      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index f978549ad5d2d9bb0eafe75b490efbb54bec5ff8..dd2198f4914af0d25408244d7c9b666e0f150851 100644 (file)
     <AssemblyName>System.Json.Microsoft</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj">\r
       <Project>{D554618C-5D38-413A-82BA-7A70B6FC61A3}</Project>\r
-      <Name>Microsoft.CSharp\Microsoft.CSharp-net_4_5</Name>\r
+      <Name>Microsoft.CSharp-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 3fda9997b13caea5a91869bbe58f0d03c4b12434..ad056809095a25cabab06bbc1a0224d9a5daeed5 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index ec51f9f7ba8492ea65edb31c60398267ba19e3ec..4204826702f98f5a8229583ac9d31ee165efc08e 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration.Install/System.Configuration.Install-net_4_5.csproj">\r
       <Project>{E6E1740E-37DD-487C-8947-F1C0612D4738}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_5</Name>\r
+      <Name>System.Configuration.Install-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 081f4191aa5f02157e49d7ce06c83eaa022942d5..2754b9d6738924410b1fb942699bc2623fd91259 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration.Install/System.Configuration.Install-net_4_5.csproj">\r
       <Project>{E6E1740E-37DD-487C-8947-F1C0612D4738}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_5</Name>\r
+      <Name>System.Configuration.Install-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Messaging/Mono.Messaging-net_4_5.csproj">\r
       <Project>{DDCC93B5-9425-4E9A-95DC-3400D0028508}</Project>\r
-      <Name>Mono.Messaging\Mono.Messaging-net_4_5</Name>\r
+      <Name>Mono.Messaging-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index b738a48bc640b7895fc9da587c41d228a06d471e..1241af63ff618173deffb7c6e7fbce03e62aff8f 100644 (file)
     <AssemblyName>System.Net.Http.Formatting</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
       <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http\System.Net.Http-net_4_5</Name>\r
+      <Name>System.Net.Http-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
       <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
+      <Name>System.Xml.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 612cafa47423b53c2c2ca628b1074c918edfff98..238097aeb249bf8bfc5c629fe2386f830c908ff7 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
       <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http\System.Net.Http-net_4_5</Name>\r
+      <Name>System.Net.Http-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 6ff2417947c49bd549450e1e9c951ed5b9fd1f82..06d2ae9c4e40a3333a1e2f6a644c71b99efdaeca 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 5a61b0f57ed29b9a09988a086ae4287c32dacc3d..5aebaa0add7f7c1fafff803a91eb2d89de085a08 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index aa973986ecc94e174047909718c8f96252a1e254..58b950df3a6766957f3fb871b5629714d954a56a 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 48eef1e1fb7609af6245cda48a53ca4ee4bd8e29..c3d05c0943ed5799e308c99a393398196fe04b9e 100644 (file)
     <AssemblyName>System.Reactive.Core</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 8f52a18a013c92c904adf61d1f0ac79d54cf2c56..6e9d230ecf6fde88caaccda5acc05f4df0fe93fc 100644 (file)
     <AssemblyName>System.Reactive.Debugger</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
       <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>\r
+      <Name>System.Reactive.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 6392053ad62a2bf7beeb5319bf7faf1a8437c506..ecd5ef66c38bb5669ca94d2b58e4e8d672809adf 100644 (file)
     <AssemblyName>System.Reactive.Experimental</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
       <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>\r
+      <Name>System.Reactive.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 5173cf1de09d2d2fc49e18635ed907e09c37e36c..c7590b4de86e4a47edcc7a31ea38744e29b20fa1 100644 (file)
     <AssemblyName>System.Reactive.Interfaces</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1fb3317c962ee330e6982c3a4a7c88649ae8b2ce..48c5cb1f74049a69b9a6f1b8f630f6fdf2403cc1 100644 (file)
     <AssemblyName>System.Reactive.Linq</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 0ec36c38e1188fb5b83780fa79d5b3103ae4cd57..55671c8cbf9ce459125a2953e412476155c47edc 100644 (file)
     <AssemblyName>System.Reactive.Observable.Aliases</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
       <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>\r
+      <Name>System.Reactive.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj">\r
       <Project>{8D27108A-3DD4-46D7-917E-7833A3C4D479}</Project>\r
-      <Name>System.Reactive.Providers\System.Reactive.Providers-net_4_5</Name>\r
+      <Name>System.Reactive.Providers-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c00a435d988c51c04eccdb020452c23ca0a60277..2fc9e385a4506bf4fce8534158aac707c73b0c08 100644 (file)
     <AssemblyName>System.Reactive.PlatformServices</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
       <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>\r
+      <Name>System.Reactive.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 841b297835087ed007a3fa2e527b30eb4a227964..f39a6e823bceb7ad3f6cd85fd22addf9e7f157bb 100644 (file)
     <AssemblyName>System.Reactive.Providers</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
       <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>\r
+      <Name>System.Reactive.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 62a25babdfce4ce18361cf11512aaa9ca9beb9c4..a9647c3b7371f29e514992b057f13b498df4ad4e 100644 (file)
     <AssemblyName>System.Reactive.Runtime.Remoting</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
       <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>\r
+      <Name>System.Reactive.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1a495e4ae0622368b10fb8925cd7804aa2b03d41..639e9d73a77c469cb9f6d4025b50b61a950f45c8 100644 (file)
     <AssemblyName>System.Reactive.Windows.Forms</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
       <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>\r
+      <Name>System.Reactive.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 2141b412e481137d3a2a66700d607184b0170cea..85c8cddba105435a3270e687ead50240b77fca6c 100644 (file)
     <AssemblyName>System.Reactive.Windows.Threading</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj">\r
       <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>\r
-      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>\r
+      <Name>System.Reactive.Interfaces-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Core/System.Reactive.Core-net_4_5.csproj">\r
       <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>\r
-      <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>\r
+      <Name>System.Reactive.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Reactive.Linq/System.Reactive.Linq-net_4_5.csproj">\r
       <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>\r
-      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>\r
+      <Name>System.Reactive.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../WindowsBase/WindowsBase-net_4_5.csproj">\r
       <Project>{8E6ED7D5-3B08-4A83-905E-8FB4CF0C160D}</Project>\r
-      <Name>WindowsBase\WindowsBase-net_4_5</Name>\r
+      <Name>WindowsBase-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index aaca2b059f5ec410b6ba8af5d3e5ca2d3164a09b..40003195c3e8384ebc1a0fd12e056b6d3987a725 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index cbeccdbf9801ca7b9edbd9c8f6d2b5debd41c3df..e8cfc440b4699a6a99e38cc4daa5d3a699d13024 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
       <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
+      <Name>System.Xml.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 244d5504fffb741ca2785e5673f88a1443e604e4..82d13338a769e3a2ebcce0b46f1dfc876dd3b174 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
       <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 83f5eeff79a1e4d45f3ba82f9369c265bc525826..9ca8bba321d6f5aa872a886f0b2232079b2906fd 100644 (file)
@@ -218,7 +218,7 @@ namespace System.Runtime.Remoting.Channels.Tcp
                                        try {
                                                if (!threadPool.RunThread (new ThreadStart (reader.ProcessMessages)))
                                                        socket.Close ();
-                                       } catch (Exception) 
+                                       } catch (Exception e
                                        {
 #if DEBUG
                                                Console.WriteLine("Exception caught in TcpServerChannel.WaitForConnections during start process message: {0} {1}", e.GetType(), e.Message);
@@ -226,7 +226,7 @@ namespace System.Runtime.Remoting.Channels.Tcp
                                        }
                                }
                        }
-                       catch (Exception)
+                       catch (Exception e)
                        {
 #if DEBUG
                                Console.WriteLine("Exception caught in TcpServerChannel.WaitForConnections, stop channel's thread : {0} {1}", e.GetType(), e.Message);
index 52954456e5cb5675db267145c203b48f65860007..aa99a6554872244ad712418160a8fe74aa1ab473 100644 (file)
@@ -169,7 +169,7 @@ namespace System.Runtime.Remoting.Channels
                                try {
                                        work ();
                                }
-                               catch (Exception)
+                               catch (Exception ex)
                                {
 #if DEBUG
                                        Console.WriteLine("The exception was caught during RemotingThreadPool.PoolThread - work: {0}, {1}", ex.GetType(), ex.Message);
index 27813db136caac4be7d986d68bd7a477b71e9de0..b9862693a57901d29bd93629f141a4dd4b4db59f 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index fe1c9a98ead526ec887a211fb53160fc247b47bc..ef8b730315a13a09c119f1971a28e1965ccd1406 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 5808c10c4c56d94a9b2ede0e2a3d65c29227ac67..95e35b0a09fad0355a6b1e267c8f632213ba1c14 100755 (executable)
@@ -566,9 +566,14 @@ namespace System.Runtime.Serialization
                }
 #endif
 
-               private bool IsAny() {
+               private bool IsAny ()
+               {
                        var xpa = type.GetCustomAttribute<XmlSchemaProviderAttribute> (true);
-                       return xpa.IsAny;
+
+                       if (xpa != null)
+                               return xpa.IsAny;
+
+                       return false;
                }
        }
 }
index 3ba1539f43aab3b924268ea102de27efd318348f..d97385f225c49bf9293297830374beebb9192ea9 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-secxml-net_4_5.csproj">\r
       <Project>{46F151F2-A422-4A1B-9D29-2E148CE73629}</Project>\r
-      <Name>System\System-secxml-net_4_5</Name>\r
+      <Name>System-secxml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-bare-net_4_5.csproj">\r
       <Project>{21FB091E-0F84-479E-AB16-6503D36852F9}</Project>\r
-      <Name>System.XML\System.Xml-bare-net_4_5</Name>\r
+      <Name>System.Xml-bare-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 22073a2cfb2a423684909f05725a722b2f80e93a..7f34560859a042dc4b6ebec7092160230e223a1c 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-plainservice-net_4_5.csproj">\r
       <Project>{0E3CFD7E-2F93-4B5B-B7FA-2AEBE0F850C0}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-plainservice-net_4_5</Name>\r
+      <Name>System.ServiceModel-plainservice-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c0971d9e4aa9dc5b9e86a3f683dab831d688a23d..e97737daecdb24e5c3db445c11eee0e8d767a9cc 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
       <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
+      <Name>System.Xml.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index ef0e827376e270087a9bcce88ae395403a02f248..318ef05c74bfc1a020d825eb592392e8a6058e8f 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 9ccf447e5bf927c49f9d28a133f3208254b409e6..9ea5bf907d66c683dec2965e5ddf5fe930b370aa 100644 (file)
@@ -121,21 +121,21 @@ namespace System.Runtime.Serialization.Json
                                        writer.WriteString (qn.Namespace);
                                } else if (TypeMap.IsDictionary (type)) {
                                        writer.WriteAttributeString ("type", "array");
-                                       var itemGetter = type.GetProperty ("Item");
-                                       var keysGetter = type.GetProperty ("Keys");
-                                       var argarr = new object [1];
-                                       foreach (object o in (IEnumerable) keysGetter.GetValue (graph, null)) {
-                                               writer.WriteStartElement ("item");
-                                               writer.WriteAttributeString ("type", "object");
-                                               // outputting a KeyValuePair as <Key .. /><Value ... />
-                                               writer.WriteStartElement ("Key");
-                                               WriteObjectContent (o, false, !(graph is Array && type.GetElementType () != typeof (object)));
-                                               writer.WriteEndElement ();
-                                               writer.WriteStartElement ("Value");
-                                               argarr [0] = o;
-                                               WriteObjectContent (itemGetter.GetValue (graph, argarr), false, !(graph is Array && type.GetElementType () != typeof (object)));
-                                               writer.WriteEndElement ();
-                                               writer.WriteEndElement ();
+                                       bool otn = !(graph is Array && type.GetElementType () != typeof (object));
+                                       var d = graph as IDictionary;
+                                       if (d != null) {
+                                               // Optimize the IDictionary case to avoid reflection
+                                               foreach (object k in d.Keys)
+                                                       WriteItem (k, d [k], otn);
+                                       } else {
+                                               // we can't typecast to IDictionary<,> and can't use dynamic for iOS support
+                                               var itemGetter = GetDictionaryProperty (type, "Item");
+                                               var keysGetter = GetDictionaryProperty (type, "Keys");
+                                               var argarr = new object [1];
+                                               foreach (object o in (IEnumerable) keysGetter.GetValue (graph, null)) {
+                                                       argarr [0] = o;
+                                                       WriteItem (o, itemGetter.GetValue (graph, argarr), otn);
+                                               }
                                        }
                                } else if (graph is Array || TypeMap.IsEnumerable (type)) {
                                        writer.WriteAttributeString ("type", "array");
@@ -162,6 +162,36 @@ throw new InvalidDataContractException (String.Format ("Type {0} cannot be seria
                        }
                }
 
+               void WriteItem (object key, object value, bool outputTypeName)
+               {
+                       writer.WriteStartElement ("item");
+                       writer.WriteAttributeString ("type", "object");
+                       // outputting a KeyValuePair as <Key .. /><Value ... />
+                       writer.WriteStartElement ("Key");
+                       WriteObjectContent (key, false, outputTypeName);
+                       writer.WriteEndElement ();
+                       writer.WriteStartElement ("Value");
+                       WriteObjectContent (value, false, outputTypeName);
+                       writer.WriteEndElement ();
+                       writer.WriteEndElement ();
+               }
+
+               PropertyInfo GetDictionaryProperty (Type type, string propertyName)
+               {
+                       var p = type.GetProperty (propertyName);
+                       if (p != null)
+                               return p;
+                       // check explicit - but the generic names might differ, e.g. TKey,TValue vs T,V
+                       var ap = type.GetProperties (BindingFlags.Instance | BindingFlags.NonPublic);
+                       foreach (var cp in ap) {
+                               if (!cp.Name.EndsWith (propertyName, StringComparison.Ordinal))
+                                       continue;
+                               if (cp.Name.StartsWith ("System.Collections.Generic.IDictionary<", StringComparison.Ordinal))
+                                       return cp;
+                       }
+                       return null;
+               }
+
                string FormatTypeName (Type type)
                {
                        return String.Format ("{0}:#{1}", type.Name, type.Namespace);
index b74e00fa02ce27174a47a389cfca81ae629ab33e..9bbf869afb323a9b6ed92eb6d0c49dd6a07242a7 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Extensions/System.Web.Extensions-net_4_5.csproj">\r
       <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_5</Name>\r
+      <Name>System.Web.Extensions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj">\r
       <Project>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_5</Name>\r
+      <Name>System.ServiceModel.Activation-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 7bcb40ccf8f8774cd82ff7effe091a1d0e5fab39..68d9fb6a083ce21a6a60b36523769bf4afbd47ba 100644 (file)
@@ -1453,7 +1453,24 @@ namespace MonoTests.System.Runtime.Serialization.Json
                        Assert.AreEqual (1, dict.Count, "#2");
                        Assert.AreEqual ("value", dict ["key"], "#3");
                }
-               
+
+               [Test]
+               public void ExplicitCustomDictionarySerialization ()
+               {
+                       var dict = new MyExplicitDictionary<string,string> ();
+                       dict.Add ("key", "value");
+                       var serializer = new DataContractJsonSerializer (dict.GetType ());
+                       var stream = new MemoryStream ();
+                       serializer.WriteObject (stream, dict);
+                       stream.Position = 0;
+
+                       Assert.AreEqual ("[{\"Key\":\"key\",\"Value\":\"value\"}]", new StreamReader (stream).ReadToEnd (), "#1");
+                       stream.Position = 0;
+                       dict = (MyExplicitDictionary<string,string>) serializer.ReadObject (stream);
+                       Assert.AreEqual (1, dict.Count, "#2");
+                       Assert.AreEqual ("value", dict ["key"], "#3");
+               }
+
                [Test]
                public void Bug13485 ()
                {
@@ -2113,6 +2130,91 @@ public class MyDictionary<K, V> : System.Collections.Generic.IDictionary<K, V>
        }
 }
 
+public class MyExplicitDictionary<K, V> : IDictionary<K, V> {
+
+       Dictionary<K,V> dic = new Dictionary<K,V> ();
+
+       public void Add (K key, V value)
+       {
+               dic.Add (key,  value);
+       }
+
+       public bool ContainsKey (K key)
+       {
+               return dic.ContainsKey (key);
+       }
+
+       ICollection<K> IDictionary<K, V>.Keys {
+               get { return dic.Keys; }
+       }
+
+       public bool Remove (K key)
+       {
+               return dic.Remove (key);
+       }
+
+       public bool TryGetValue (K key, out V value)
+       {
+               return dic.TryGetValue (key, out value);
+       }
+
+       ICollection<V> IDictionary<K, V>.Values {
+               get { return dic.Values; }
+       }
+
+       public V this [K key] {
+               get { return dic [key]; }
+               set { dic [key] = value; }
+       }
+
+       IEnumerator IEnumerable.GetEnumerator ()
+       {
+               return dic.GetEnumerator ();
+       }
+
+       ICollection<KeyValuePair<K,V>> Coll {
+               get { return (ICollection<KeyValuePair<K,V>>) dic; }
+       }
+
+       public void Add (KeyValuePair<K, V> item)
+       {
+               Coll.Add (item);
+       }
+
+       public void Clear ()
+       {
+               dic.Clear ();
+       }
+
+       public bool Contains (KeyValuePair<K, V> item)
+       {
+               return Coll.Contains (item);
+       }
+
+       public void CopyTo (KeyValuePair<K, V> [] array, int arrayIndex)
+       {
+               Coll.CopyTo (array, arrayIndex);
+       }
+
+       public int Count {
+               get { return dic.Count; }
+       }
+
+       public bool IsReadOnly {
+               get { return Coll.IsReadOnly; }
+       }
+
+       public bool Remove (KeyValuePair<K, V> item)
+       {
+               return Coll.Remove (item);
+       }
+
+       public IEnumerator<KeyValuePair<K, V>> GetEnumerator ()
+       {
+               return Coll.GetEnumerator ();
+       }
+}
+
 [DataContract]
 public class Bug13485Type
 {
index 02d12751dc38961d4e9bc8c843c87d820be5b009..033b2cdb0c58a08e89653d2bf3c34d00b4c1e20b 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
       <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
+      <Name>System.Security-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
       <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_5</Name>\r
+      <Name>System.IdentityModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_5.csproj">\r
       <Project>{AB4F77BB-4340-4A79-9B66-EF5B4221E1F2}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_5</Name>\r
+      <Name>System.IdentityModel.Selectors-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
       <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
+      <Name>System.Transactions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Messaging/System.Messaging-net_4_5.csproj">\r
       <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_5</Name>\r
+      <Name>System.Messaging-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_5.csproj">\r
       <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
+      <Name>System.Web.Services-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
       <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
+      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel.Activation/System.ServiceModel.Activation-net_4_5.csproj">\r
       <Project>{E537F31B-BCB7-4935-ABF3-DF2FAC48DCB3}</Project>\r
-      <Name>System.ServiceModel.Activation\System.ServiceModel.Activation-net_4_5</Name>\r
+      <Name>System.ServiceModel.Activation-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 4dda1162f5c7c7091bdd63f1fcd3c0e6219cc185..56c41fea352a5f9d411c503e900168990d7ac707 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Security/System.Security-net_4_5.csproj">\r
       <Project>{B55E59B2-31CA-438B-ADB8-4B9A9A547830}</Project>\r
-      <Name>System.Security\System.Security-net_4_5</Name>\r
+      <Name>System.Security-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
       <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_5</Name>\r
+      <Name>System.IdentityModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.IdentityModel.Selectors/System.IdentityModel.Selectors-net_4_5.csproj">\r
       <Project>{AB4F77BB-4340-4A79-9B66-EF5B4221E1F2}</Project>\r
-      <Name>System.IdentityModel.Selectors\System.IdentityModel.Selectors-net_4_5</Name>\r
+      <Name>System.IdentityModel.Selectors-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Transactions/System.Transactions-net_4_5.csproj">\r
       <Project>{AF2BBF50-AB57-4CA1-8EF5-2B54C7418434}</Project>\r
-      <Name>System.Transactions\System.Transactions-net_4_5</Name>\r
+      <Name>System.Transactions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Messaging/System.Messaging-net_4_5.csproj">\r
       <Project>{1CBEC0FC-5926-42FA-A0CF-A19617FABB78}</Project>\r
-      <Name>System.Messaging\System.Messaging-net_4_5</Name>\r
+      <Name>System.Messaging-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_5.csproj">\r
       <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
+      <Name>System.Web.Services-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
       <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
+      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index f2da407498226a3bb8841918d9b92655a3e3adf7..c5e60dafff8dd1d49785ca70539e356f59b576b8 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration.Install/System.Configuration.Install-net_4_5.csproj">\r
       <Project>{E6E1740E-37DD-487C-8947-F1C0612D4738}</Project>\r
-      <Name>System.Configuration.Install\System.Configuration.Install-net_4_5</Name>\r
+      <Name>System.Configuration.Install-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index dfc446c783d965fe966cfd16896837d18609deda..6587d3f69e3cb098a4974be68720cad764755a44 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 264b9bf89a0d8365acabc4e121fa0b861e943c52..923da35dfdd69cf5f9fca832bbbd9f48c3cc0934 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 95b6c8ce5366fd73e293bfba2c016b839a290d90..6c1c6451c8facb7048ee859a6dc8720624ae753c 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 58e77cdc12287302b26198566441dcec03868a9e..1fb3e263dcc5a061733bc91c6349bd5b2cf4394f 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 1a3158d1d9166468cf8c20c7925e9888a894eaf6..282b542e457271aab48c2a21c8a43db724163601 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
       <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
+      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
       <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
+      <Name>System.Data.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Extensions/System.Web.Extensions-net_4_5.csproj">\r
       <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_5</Name>\r
+      <Name>System.Web.Extensions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj">\r
       <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_5</Name>\r
+      <Name>System.Web.Abstractions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Routing/System.Web.Routing-net_4_5.csproj">\r
       <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_5</Name>\r
+      <Name>System.Web.Routing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
       <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
+      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 86d96d5ea3a8b656a92ff2f8d6402fe3c6a5085e..a2c55b0b2d9b7c6e1a0bbc2fc4c7200e893bd4e0 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Design/System.Design-net_4_5.csproj">\r
       <Project>{D4E6A482-761B-4B41-8B63-C930CA84D268}</Project>\r
-      <Name>System.Design\System.Design-net_4_5</Name>\r
+      <Name>System.Design-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c70a18fb35279a7e1170a02759e864d3b1e0f37a..2aaa88beb04088706b0779295521c3e588dee337 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
       <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
+      <Name>System.Data.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_5.csproj">\r
       <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
+      <Name>System.Web.Services-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
       <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
+      <Name>System.EnterpriseServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
       <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
+      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c606cfe80344bb41e19820bd51286b2b13c7c89a..59f0bb25a35fd0da3ec991e706a2d95e909df64e 100644 (file)
     <AssemblyName>System.Web.Http.SelfHost</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
       <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http\System.Net.Http-net_4_5</Name>\r
+      <Name>System.Net.Http-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
       <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_5</Name>\r
+      <Name>System.IdentityModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Http/System.Web.Http-net_4_5.csproj">\r
       <Project>{2EFF8684-99DB-4DD6-B3BC-7E7AA42A15FC}</Project>\r
-      <Name>System.Web.Http\System.Web.Http-net_4_5</Name>\r
+      <Name>System.Web.Http-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj">\r
       <Project>{BFBE5444-4F21-45CF-929E-C8FBEF302F5E}</Project>\r
-      <Name>System.Net.Http.Formatting\System.Net.Http.Formatting-net_4_5</Name>\r
+      <Name>System.Net.Http.Formatting-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 76ad7746a321b3ae43460c23737b526ff0cb2d33..2bbb825c2c065c7f658464088ea7c1bd13936ba6 100644 (file)
     <AssemblyName>System.Web.Http.WebHost</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
       <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http\System.Net.Http-net_4_5</Name>\r
+      <Name>System.Net.Http-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.IdentityModel/System.IdentityModel-net_4_5.csproj">\r
       <Project>{F056C062-E467-4989-9366-440E8CD23C0C}</Project>\r
-      <Name>System.IdentityModel\System.IdentityModel-net_4_5</Name>\r
+      <Name>System.IdentityModel-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Http/System.Web.Http-net_4_5.csproj">\r
       <Project>{2EFF8684-99DB-4DD6-B3BC-7E7AA42A15FC}</Project>\r
-      <Name>System.Web.Http\System.Web.Http-net_4_5</Name>\r
+      <Name>System.Web.Http-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj">\r
       <Project>{BFBE5444-4F21-45CF-929E-C8FBEF302F5E}</Project>\r
-      <Name>System.Net.Http.Formatting\System.Net.Http.Formatting-net_4_5</Name>\r
+      <Name>System.Net.Http.Formatting-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Routing/System.Web.Routing-net_4_5.csproj">\r
       <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_5</Name>\r
+      <Name>System.Web.Routing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj">\r
       <Project>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</Project>\r
-      <Name>Microsoft.Web.Infrastructure\Microsoft.Web.Infrastructure-net_4_5</Name>\r
+      <Name>Microsoft.Web.Infrastructure-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c4fd0979fb8ef1c8788f67991e17ac586fa8079e..eea2585d2a000a1bbcdd473fb5141992f3760274 100644 (file)
     <AssemblyName>System.Web.Http</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Net.Http/System.Net.Http-net_4_5.csproj">\r
       <Project>{E36C154B-A0AC-4721-B06A-AFE31D357CE5}</Project>\r
-      <Name>System.Net.Http\System.Net.Http-net_4_5</Name>\r
+      <Name>System.Net.Http-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
       <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
+      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Net.Http.Formatting/System.Net.Http.Formatting-net_4_5.csproj">\r
       <Project>{BFBE5444-4F21-45CF-929E-C8FBEF302F5E}</Project>\r
-      <Name>System.Net.Http.Formatting\System.Net.Http.Formatting-net_4_5</Name>\r
+      <Name>System.Net.Http.Formatting-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Caching/System.Runtime.Caching-net_4_5.csproj">\r
       <Project>{CB3E9225-3DFF-4930-BFED-1E8AE5319C32}</Project>\r
-      <Name>System.Runtime.Caching\System.Runtime.Caching-net_4_5</Name>\r
+      <Name>System.Runtime.Caching-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization/System.Runtime.Serialization-net_4_5.csproj">\r
       <Project>{08FF4C26-9C12-433D-AE90-43370046387A}</Project>\r
-      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
       <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
+      <Name>System.Data.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index a29e32126a38a952d3bfe5a11eb878ddb954ad47..81adf78d9ef02f217945c2dfd982f1b7399eea02 100644 (file)
     <AssemblyName>dummy-System.Web.Mvc</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj">\r
       <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_5</Name>\r
+      <Name>System.Web.Abstractions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Routing/System.Web.Routing-net_4_5.csproj">\r
       <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_5</Name>\r
+      <Name>System.Web.Routing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Extensions/System.Web.Extensions-net_4_5.csproj">\r
       <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_5</Name>\r
+      <Name>System.Web.Extensions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
       <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
+      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
       <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
+      <Name>System.Data.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 02938c10901781def230c8126e667e7976f25374..8c4cef06e96fa8c9f3d18f535d970fcb0e067eec 100644 (file)
     <AssemblyName>System.Web.Mvc</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj">\r
       <Project>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</Project>\r
-      <Name>Microsoft.Web.Infrastructure\Microsoft.Web.Infrastructure-net_4_5</Name>\r
+      <Name>Microsoft.Web.Infrastructure-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj">\r
       <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_5</Name>\r
+      <Name>System.Web.Abstractions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Routing/System.Web.Routing-net_4_5.csproj">\r
       <Project>{A28F2A14-901C-452C-82B6-75ECE5C7E714}</Project>\r
-      <Name>System.Web.Routing\System.Web.Routing-net_4_5</Name>\r
+      <Name>System.Web.Routing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Extensions/System.Web.Extensions-net_4_5.csproj">\r
       <Project>{74D281D8-F725-4D79-B218-2DFCCFD44FA2}</Project>\r
-      <Name>System.Web.Extensions\System.Web.Extensions-net_4_5</Name>\r
+      <Name>System.Web.Extensions-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
       <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
+      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
       <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
+      <Name>System.Data.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Caching/System.Runtime.Caching-net_4_5.csproj">\r
       <Project>{CB3E9225-3DFF-4930-BFED-1E8AE5319C32}</Project>\r
-      <Name>System.Runtime.Caching\System.Runtime.Caching-net_4_5</Name>\r
+      <Name>System.Runtime.Caching-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Razor/System.Web.Razor-net_4_5.csproj">\r
       <Project>{FF61AB24-4492-47FA-B4D3-8D961113DD08}</Project>\r
-      <Name>System.Web.Razor\System.Web.Razor-net_4_5</Name>\r
+      <Name>System.Web.Razor-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.WebPages.Razor/System.Web.WebPages.Razor-net_4_5.csproj">\r
       <Project>{4E601800-644F-49B2-B1C9-60D3489AAC38}</Project>\r
-      <Name>System.Web.WebPages.Razor\System.Web.WebPages.Razor-net_4_5</Name>\r
+      <Name>System.Web.WebPages.Razor-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.WebPages/System.Web.WebPages-net_4_5.csproj">\r
       <Project>{FFDF7B0A-BD62-4E39-8A80-A42B560149C5}</Project>\r
-      <Name>System.Web.WebPages\System.Web.WebPages-net_4_5</Name>\r
+      <Name>System.Web.WebPages-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 9a1e71f3c97febdd8fd02b1aa56de2f274919d48..a3e10f1629b9a200bfbada9ff1f10211958fd9c3 100644 (file)
     <AssemblyName>System.Web.Razor</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 244f90cc4e9bac50c765b4b9f47ecc16e234bb0a..e145f1dcacb046657a4275c5a73014d4e4242c97 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Abstractions/System.Web.Abstractions-net_4_5.csproj">\r
       <Project>{94BD3939-6937-47AA-86CF-5C3E4C59E272}</Project>\r
-      <Name>System.Web.Abstractions\System.Web.Abstractions-net_4_5</Name>\r
+      <Name>System.Web.Abstractions-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 23e0b0cc31486eceb8e7a3690c4db1360c3bd174..d52fbb6bd6db215e81c770f1996bc9eccca52e9e 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
       <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
+      <Name>System.EnterpriseServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-plainweb-net_4_5.csproj">\r
       <Project>{21892B00-1C9F-44F3-AE4C-A6A9A210CEC7}</Project>\r
-      <Name>System.Web\System.Web-plainweb-net_4_5</Name>\r
+      <Name>System.Web-plainweb-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 077c0420f7c1c642361491c20dc79e74ccea6a51..2f7b47b18e3ebf155ed8ca827576443304cb6753 100644 (file)
     <AssemblyName>System.Web.WebPages.Deployment</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj">\r
       <Project>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</Project>\r
-      <Name>Microsoft.Web.Infrastructure\Microsoft.Web.Infrastructure-net_4_5</Name>\r
+      <Name>Microsoft.Web.Infrastructure-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c346b1f19a62506f19fac6de147f8df532127727..185ea68b67a1e72caa6153d19e926152aeeb2475 100644 (file)
     <AssemblyName>System.Web.WebPages.Razor</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.WebPages/System.Web.WebPages-net_4_5.csproj">\r
       <Project>{FFDF7B0A-BD62-4E39-8A80-A42B560149C5}</Project>\r
-      <Name>System.Web.WebPages\System.Web.WebPages-net_4_5</Name>\r
+      <Name>System.Web.WebPages-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Razor/System.Web.Razor-net_4_5.csproj">\r
       <Project>{FF61AB24-4492-47FA-B4D3-8D961113DD08}</Project>\r
-      <Name>System.Web.Razor\System.Web.Razor-net_4_5</Name>\r
+      <Name>System.Web.Razor-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index d9a6840eb0173995dc438d12187c2ec8289d4751..b4bb9b73a6ef446837eed5fc1d30b8f74b24587a 100644 (file)
     <AssemblyName>System.Web.WebPages</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../winfx.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.CSharp/Microsoft.CSharp-net_4_5.csproj">\r
       <Project>{D554618C-5D38-413A-82BA-7A70B6FC61A3}</Project>\r
-      <Name>Microsoft.CSharp\Microsoft.CSharp-net_4_5</Name>\r
+      <Name>Microsoft.CSharp-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure-net_4_5.csproj">\r
       <Project>{50DC9191-2D18-4EDB-A929-4ECAB7981A1C}</Project>\r
-      <Name>Microsoft.Web.Infrastructure\Microsoft.Web.Infrastructure-net_4_5</Name>\r
+      <Name>Microsoft.Web.Infrastructure-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations-net_4_5.csproj">\r
       <Project>{63EC4158-FFAC-4867-8003-CF6054C8DF0B}</Project>\r
-      <Name>System.ComponentModel.DataAnnotations\System.ComponentModel.DataAnnotations-net_4_5</Name>\r
+      <Name>System.ComponentModel.DataAnnotations-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data.Linq/System.Data.Linq-net_4_5.csproj">\r
       <Project>{8AC5471F-9515-4D01-87B9-7974F2CBD6F1}</Project>\r
-      <Name>System.Data.Linq\System.Data.Linq-net_4_5</Name>\r
+      <Name>System.Data.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.WebPages.Deployment/System.Web.WebPages.Deployment-net_4_5.csproj">\r
       <Project>{CFBE1EF0-4B98-4752-9F6A-4D61CF9DA0EF}</Project>\r
-      <Name>System.Web.WebPages.Deployment\System.Web.WebPages.Deployment-net_4_5</Name>\r
+      <Name>System.Web.WebPages.Deployment-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Razor/System.Web.Razor-net_4_5.csproj">\r
       <Project>{FF61AB24-4492-47FA-B4D3-8D961113DD08}</Project>\r
-      <Name>System.Web.Razor\System.Web.Razor-net_4_5</Name>\r
+      <Name>System.Web.Razor-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
       <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
+      <Name>System.Xml.Linq-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c55b89a4a21602bb7f4a04d966be97db10d24711..787662b4184549c387b62070dcba435b725de71f 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
       <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
+      <Name>System.EnterpriseServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
       <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_5.csproj">\r
       <Project>{41476FBD-C1CB-4B3C-8078-3281EB1E0EAB}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_5</Name>\r
+      <Name>Mono.Data.Sqlite-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
       <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
+      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.Services/System.Web.Services-net_4_5.csproj">\r
       <Project>{251DB111-FEE1-4080-8411-0AD1CC9BA94B}</Project>\r
-      <Name>System.Web.Services\System.Web.Services-net_4_5</Name>\r
+      <Name>System.Web.Services-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index c0740c7185b39c7be69c24e80578460a28367ad2..5f49197e3f6a3919a03a6464f6544bf0a93af6e6 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
       <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
+      <Name>System.EnterpriseServices-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap-net_4_5.csproj">\r
       <Project>{B12AABBC-30D1-4885-BF3F-A53B970F68FB}</Project>\r
-      <Name>System.Runtime.Serialization.Formatters.Soap\System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
+      <Name>System.Runtime.Serialization.Formatters.Soap-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Mono.Data.Sqlite/Mono.Data.Sqlite-net_4_5.csproj">\r
       <Project>{41476FBD-C1CB-4B3C-8078-3281EB1E0EAB}</Project>\r
-      <Name>Mono.Data.Sqlite\Mono.Data.Sqlite-net_4_5</Name>\r
+      <Name>Mono.Data.Sqlite-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web.ApplicationServices/System.Web.ApplicationServices-net_4_5.csproj">\r
       <Project>{B4E6806D-1B38-4CEE-8ADB-2D0A4D1AF25F}</Project>\r
-      <Name>System.Web.ApplicationServices\System.Web.ApplicationServices-net_4_5</Name>\r
+      <Name>System.Web.ApplicationServices-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 6af625e39451d5cab86f31139be5d33d62bc66db..462d298f6bd3e26e9611f5be6919169f8d174e5c 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 134d7ffb49a75839094fe3b978a4a2fde7c6d6f9..e480fac38b741a68362a7d1b3ddf14938a678ef7 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 2160578776c31fc576d2664c0e0f05dcf94b9946..c52a56468ffe7eace41f8bd470fb029c2ec83a35 100644 (file)
@@ -65,8 +65,8 @@ EXTRA_DISTFILES = \
        $(xmlfiles_files:%=Test/XmlFiles/%) \
        $(nist_dom_files:%=Test/System.Xml/nist_dom/%)
 
-System.Xml.XPath/Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
-       (cd System.Xml.XPath; $(topdir)/../jay/jay -ct < $(topdir)/../jay/skeleton.cs Parser.jay >> Parser.cs)
+System.Xml.XPath/$(PROFILE)_Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
+       (cd System.Xml.XPath; $(topdir)/../jay/jay -ct < $(topdir)/../jay/skeleton.cs Parser.jay >> $(PROFILE)_Parser.cs)
 
 Mono.Xml.Xsl/$(PROFILE)_PatternParser.jay: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
        sed "s/\%start Expr/\%start Pattern/" $< >$@
@@ -80,12 +80,12 @@ Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs: System.Xml.XPath/Tokenizer.cs
        cat $< >>$@
 
 ifneq (moonlight_raw, $(PROFILE))
-BUILT_SOURCES = System.Xml.XPath/Parser.cs \
+BUILT_SOURCES = System.Xml.XPath/$(PROFILE)_Parser.cs \
        Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs \
        Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs
 
 CLEAN_FILES = Test/XmlFiles/xsl/result.xml \
-       System.Xml.XPath/Parser.cs \
+       System.Xml.XPath/$(PROFILE)_Parser.cs \
        Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs \
        Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs
 endif
index bce17f5f00b7679272a9e4f0c343c5529ec96a02..d253b4ea411b9017e6c657af3a1b2a91863a8dce 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
@@ -472,11 +473,11 @@ type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\P
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-bare-net_4_5.csproj">\r
       <Project>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</Project>\r
-      <Name>System\System-bare-net_4_5</Name>\r
+      <Name>System-bare-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index e39b9a75b43aead3c0480d6a9e41e19364030189..ea6fcbeb89d213eeeed4cbd19b35de53428ac1b9 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
@@ -472,15 +473,15 @@ type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\P
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-bare-net_4_5.csproj">\r
       <Project>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</Project>\r
-      <Name>System\System-bare-net_4_5</Name>\r
+      <Name>System-bare-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index ac16218ced330daca06dd545e6c5eb5f140adf8d..9affbc6415d3ba82f58bd0669a9c303ee0e9505e 100644 (file)
@@ -1 +1 @@
-/Parser.cs
+/*_Parser.cs
index efe48c7846119cc6a95390b23b62ae7303ae79a4..7e4b8875fcf5f275b36157f24f7943a7b43bf720 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index ea39aaa2447547753c089afac61ab68949e5f353..ee628c2c5fbe8ab65c38694afff240991c219a94 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index df66098df76fe8b50ea71e69a79d6f19429fdd93..0fe3b0dd4428a9cb1ff6e7c0114700ba952c3eee 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.ServiceModel/System.ServiceModel-net_4_5.csproj">\r
       <Project>{F2156C09-C377-4945-A690-39CFBF3319B3}</Project>\r
-      <Name>System.ServiceModel\System.ServiceModel-net_4_5</Name>\r
+      <Name>System.ServiceModel-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 31b70df4c5256b47edee9b82c579452ab9eaa99f..26714d1f7bb7aa7ddf712111488f575d7e427147 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index e28d9a90cdadf4b9a00f427bc68c41e0248b00a2..8367ee9e16b6491a7e06acc4cc6c55f98b0de58a 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="System-secxml-net_4_5.csproj">\r
       <Project>{46F151F2-A422-4A1B-9D29-2E148CE73629}</Project>\r
-      <Name>System\System-secxml-net_4_5</Name>\r
+      <Name>System-secxml-net_4_5</Name>\r
       <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
       <Aliases>MonoSecurity</Aliases>    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index e531d22607cec03e602cef34a300738424dec6de..2e69308ad30648fa52b784f6600e590a5557874e 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-bare-net_4_5.csproj">\r
       <Project>{21FB091E-0F84-479E-AB16-6503D36852F9}</Project>\r
-      <Name>System.XML\System.Xml-bare-net_4_5</Name>\r
+      <Name>System.Xml-bare-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="System-bare-net_4_5.csproj">\r
       <Project>{91CDF14E-F60F-4AB7-BC9D-5CBD7E669076}</Project>\r
-      <Name>System\System-bare-net_4_5</Name>\r
+      <Name>System-bare-net_4_5</Name>\r
       <Aliases>PrebuiltSystem</Aliases>    </ProjectReference>\r
     <ProjectReference Include="../Mono.Security/Mono.Security-net_4_5.csproj">\r
       <Project>{D68D4FED-CA32-4800-A628-58BAE485562C}</Project>\r
-      <Name>Mono.Security\Mono.Security-net_4_5</Name>\r
+      <Name>Mono.Security-net_4_5</Name>\r
       <Aliases>MonoSecurity</Aliases>    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 9dbf4857ab9f986353530ccc74739d0a27e7bbb5..c86790164a3159eadb5ea451cbe26f53ca70248d 100644 (file)
@@ -1328,9 +1328,9 @@ namespace System.Net
                        });
                }
 
-               SimpleAsyncResult SetWriteStreamInner (SimpleAsyncCallback callback)
+               void SetWriteStreamInner (SimpleAsyncCallback callback)
                {
-                       return SimpleAsyncResult.Run (result => {
+                       SimpleAsyncResult.Run (result => {
                                if (bodyBuffer != null) {
                                        // The body has been written and buffered. The request "user"
                                        // won't write it again, so we must do it.
index 1a5e89ec0a36e8571f3750c8f7091ff635d8b5b1..45740306db54d46b6c7ebb44c3b1ed35a169c786 100644 (file)
@@ -3,7 +3,7 @@
 //  
 // Author: Jeffrey Stedfast <jeff@xamarin.com>
 // 
-// Copyright (c) 2012 Xamarin Inc.
+// Copyright (c) 2012-2014 Xamarin Inc.
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -83,7 +83,7 @@ namespace System.Net
                }
 
                [DllImport (CoreFoundationLibrary)]
-               extern static IntPtr CFRelease (IntPtr handle);
+               extern static void CFRelease (IntPtr handle);
 
                void Release ()
                {
@@ -110,7 +110,7 @@ namespace System.Net
                public CFArray (IntPtr handle, bool own) : base (handle, own) { }
 
                [DllImport (CoreFoundationLibrary)]
-               extern static IntPtr CFArrayCreate (IntPtr allocator, IntPtr values, int numValues, IntPtr callbacks);
+               extern static IntPtr CFArrayCreate (IntPtr allocator, IntPtr values, /* CFIndex */ IntPtr numValues, IntPtr callbacks);
                static readonly IntPtr kCFTypeArrayCallbacks;
 
                static CFArray ()
@@ -132,7 +132,7 @@ namespace System.Net
                                throw new ArgumentNullException ("values");
 
                        fixed (IntPtr *pv = values) {
-                               IntPtr handle = CFArrayCreate (IntPtr.Zero, (IntPtr) pv, values.Length, kCFTypeArrayCallbacks);
+                               IntPtr handle = CFArrayCreate (IntPtr.Zero, (IntPtr) pv, (IntPtr) values.Length, kCFTypeArrayCallbacks);
 
                                return new CFArray (handle, false);
                        }
@@ -151,18 +151,18 @@ namespace System.Net
                }
 
                [DllImport (CoreFoundationLibrary)]
-               extern static int CFArrayGetCount (IntPtr handle);
+               extern static /* CFIndex */ IntPtr CFArrayGetCount (IntPtr handle);
 
                public int Count {
-                       get { return CFArrayGetCount (Handle); }
+                       get { return (int) CFArrayGetCount (Handle); }
                }
 
                [DllImport (CoreFoundationLibrary)]
-               extern static IntPtr CFArrayGetValueAtIndex (IntPtr handle, int index);
+               extern static IntPtr CFArrayGetValueAtIndex (IntPtr handle, /* CFIndex */ IntPtr index);
 
                public IntPtr this[int index] {
                        get {
-                               return CFArrayGetValueAtIndex (Handle, index);
+                               return CFArrayGetValueAtIndex (Handle, (IntPtr) index);
                        }
                }
        }
@@ -172,7 +172,8 @@ namespace System.Net
                public CFNumber (IntPtr handle, bool own) : base (handle, own) { }
 
                [DllImport (CoreFoundationLibrary)]
-               extern static bool CFNumberGetValue (IntPtr handle, int type, out bool value);
+               [return: MarshalAs (UnmanagedType.I1)]
+               extern static bool CFNumberGetValue (IntPtr handle, /* CFNumberType */ IntPtr type, [MarshalAs (UnmanagedType.I1)] out bool value);
 
                public static bool AsBool (IntPtr handle)
                {
@@ -181,7 +182,7 @@ namespace System.Net
                        if (handle == IntPtr.Zero)
                                return false;
 
-                       CFNumberGetValue (handle, 1, out value);
+                       CFNumberGetValue (handle, (IntPtr) 1, out value);
 
                        return value;
                }
@@ -192,7 +193,8 @@ namespace System.Net
                }
 
                [DllImport (CoreFoundationLibrary)]
-               extern static bool CFNumberGetValue (IntPtr handle, int type, out int value);
+               [return: MarshalAs (UnmanagedType.I1)]
+               extern static bool CFNumberGetValue (IntPtr handle, /* CFNumberType */ IntPtr type, out int value);
 
                public static int AsInt32 (IntPtr handle)
                {
@@ -201,7 +203,8 @@ namespace System.Net
                        if (handle == IntPtr.Zero)
                                return 0;
 
-                       CFNumberGetValue (handle, 9, out value);
+                       // 9 == kCFNumberIntType == C int
+                       CFNumberGetValue (handle, (IntPtr) 9, out value);
 
                        return value;
                }
@@ -213,12 +216,12 @@ namespace System.Net
        }
 
        internal struct CFRange {
-               public int Location, Length;
+               public IntPtr Location, Length;
                
                public CFRange (int loc, int len)
                {
-                       Location = loc;
-                       Length = len;
+                       Location = (IntPtr) loc;
+                       Length = (IntPtr) len;
                }
        }
 
@@ -229,7 +232,7 @@ namespace System.Net
                public CFString (IntPtr handle, bool own) : base (handle, own) { }
 
                [DllImport (CoreFoundationLibrary)]
-               extern static IntPtr CFStringCreateWithCharacters (IntPtr alloc, IntPtr chars, int length);
+               extern static IntPtr CFStringCreateWithCharacters (IntPtr alloc, IntPtr chars, /* CFIndex */ IntPtr length);
 
                public static CFString Create (string value)
                {
@@ -237,7 +240,7 @@ namespace System.Net
 
                        unsafe {
                                fixed (char *ptr = value) {
-                                       handle = CFStringCreateWithCharacters (IntPtr.Zero, (IntPtr) ptr, value.Length);
+                                       handle = CFStringCreateWithCharacters (IntPtr.Zero, (IntPtr) ptr, (IntPtr) value.Length);
                                }
                        }
 
@@ -248,14 +251,14 @@ namespace System.Net
                }
 
                [DllImport (CoreFoundationLibrary)]
-               extern static int CFStringGetLength (IntPtr handle);
+               extern static /* CFIndex */ IntPtr CFStringGetLength (IntPtr handle);
 
                public int Length {
                        get {
                                if (str != null)
                                        return str.Length;
 
-                               return CFStringGetLength (Handle);
+                               return (int) CFStringGetLength (Handle);
                        }
                }
 
@@ -270,7 +273,7 @@ namespace System.Net
                        if (handle == IntPtr.Zero)
                                return null;
                        
-                       int len = CFStringGetLength (handle);
+                       int len = (int) CFStringGetLength (handle);
                        
                        if (len == 0)
                                return string.Empty;
index 42c94e0c14dd138e669f6ec0508b929e5d92590b..4d143153ddf9b2c6b336e90000dd2fcda8f3fbf5 100644 (file)
@@ -1,5 +1,5 @@
 //
-// System.Net.WebAsyncResult
+// SimpleAsyncResult.cs
 //
 // Authors:
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
@@ -63,7 +63,7 @@ namespace System.Net
                        };
                }
 
-               public static SimpleAsyncResult Run (SimpleAsyncFunc func, SimpleAsyncCallback callback)
+               public static void Run (SimpleAsyncFunc func, SimpleAsyncCallback callback)
                {
                        var result = new SimpleAsyncResult (callback);
                        try {
@@ -72,12 +72,11 @@ namespace System.Net
                        } catch (Exception ex) {
                                result.SetCompleted (true, ex);
                        }
-                       return result;
                }
 
-               public static SimpleAsyncResult RunWithLock (object locker, SimpleAsyncFunc func, SimpleAsyncCallback callback)
+               public static void RunWithLock (object locker, SimpleAsyncFunc func, SimpleAsyncCallback callback)
                {
-                       return Run (inner => {
+                       Run (inner => {
                                bool running = func (inner);
                                if (running)
                                        Monitor.Exit (locker);
@@ -105,7 +104,6 @@ namespace System.Net
                {
                        callbackDone = false;
                        exc = null;
-                       exc = null;
                        lock (locker) {
                                isCompleted = false;
                                if (handle != null)
index 25c101a7d01153c4df971951aaea1f800f2a019f..b946654f329dfbf3bb9e78bfce8161dde8730c83 100644 (file)
@@ -633,9 +633,9 @@ namespace System.Net
                {
                }
 
-               internal SimpleAsyncResult SetHeadersAsync (bool setInternalLength, SimpleAsyncCallback callback)
+               internal void SetHeadersAsync (bool setInternalLength, SimpleAsyncCallback callback)
                {
-                       return SimpleAsyncResult.Run (r => SetHeadersAsync (r, setInternalLength), callback);
+                       SimpleAsyncResult.Run (r => SetHeadersAsync (r, setInternalLength), callback);
                }
 
                bool SetHeadersAsync (SimpleAsyncResult result, bool setInternalLength)
@@ -715,7 +715,7 @@ namespace System.Net
                                        WebExceptionStatus.ServerProtocolViolation, null);
                        }
 
-                       var ret = SetHeadersAsync (true, inner => {
+                       SetHeadersAsync (true, inner => {
                                if (inner.GotException) {
                                        result.SetCompleted (inner.CompletedSynchronously, inner.Exception);
                                        return;
index efd394ef5e851dffbc0c05d85b6b7228d954e750..4dc4e0a1560032964690910ab9ac72473df08d26 100644 (file)
@@ -1,5 +1,5 @@
 // Copyright (C) 2010 Novell, Inc (http://www.novell.com)
-// Copyright 2012 Xamarin Inc.
+// Copyright 2012-2014 Xamarin Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -42,26 +42,27 @@ namespace System.Security.Cryptography.X509Certificates {
                extern static IntPtr SecCertificateCreateWithData (IntPtr allocator, IntPtr nsdataRef);
                
                [DllImport (SecurityLibrary)]
-               extern static int SecTrustCreateWithCertificates (IntPtr certOrCertArray, IntPtr policies, out IntPtr sectrustref);
+               extern static /* OSStatus */ int SecTrustCreateWithCertificates (IntPtr certOrCertArray, IntPtr policies, out IntPtr sectrustref);
                
                [DllImport (SecurityLibrary)]
-               extern static IntPtr SecPolicyCreateSSL (bool server, IntPtr cfStringHostname);
+               extern static IntPtr SecPolicyCreateSSL ([MarshalAs (UnmanagedType.I1)] bool server, IntPtr cfStringHostname);
                
                [DllImport (SecurityLibrary)]
-               extern static int SecTrustEvaluate (IntPtr secTrustRef, out SecTrustResult secTrustResultTime);
+               extern static /* OSStatus */ int SecTrustEvaluate (IntPtr secTrustRef, out SecTrustResult secTrustResultTime);
 
                [DllImport (CoreFoundationLibrary, CharSet=CharSet.Unicode)]
-               extern static IntPtr CFStringCreateWithCharacters (IntPtr allocator, string str, int count);
+               extern static IntPtr CFStringCreateWithCharacters (IntPtr allocator, string str, /* CFIndex */ IntPtr count);
 
                [DllImport (CoreFoundationLibrary)]
-               unsafe extern static IntPtr CFDataCreate (IntPtr allocator, byte *bytes, IntPtr length);
+               unsafe extern static IntPtr CFDataCreate (IntPtr allocator, byte *bytes, /* CFIndex */ IntPtr length);
 
                [DllImport (CoreFoundationLibrary)]
-               unsafe extern static void CFRelease (IntPtr handle);
+               extern static void CFRelease (IntPtr handle);
 
                [DllImport (CoreFoundationLibrary)]
-               extern static IntPtr CFArrayCreate (IntPtr allocator, IntPtr values, IntPtr numValues, IntPtr callbacks);
-               
+               extern static IntPtr CFArrayCreate (IntPtr allocator, IntPtr values, /* CFIndex */ IntPtr numValues, IntPtr callbacks);
+
+               // uint32_t
                public enum SecTrustResult {
                        Invalid,
                        Proceed,
@@ -125,7 +126,7 @@ namespace System.Security.Cryptography.X509Certificates {
                                                return SecTrustResult.Deny;
                                }
                                certArray = FromIntPtrs (secCerts);
-                               host = CFStringCreateWithCharacters (IntPtr.Zero, hostName, hostName.Length);
+                               host = CFStringCreateWithCharacters (IntPtr.Zero, hostName, (IntPtr) hostName.Length);
                                sslsecpolicy = SecPolicyCreateSSL (true, host);
 
                                int code = SecTrustCreateWithCertificates (certArray, sslsecpolicy, out sectrust);
index dad8c60651c7440f725e5357bd8ee66e1d7e28ee..4757d762f807ab9f1127c9d895dc4317f1e40a9d 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
       <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
-      <Name>System.Web\System.Web-net_4_5</Name>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 8c652ad6245b924feafecb9be8ade582b8e593ea..211e9cd6824475b600515683d8a9c433e68f009c 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index fb0244d6eb9502f5d648fecf2009df1664502c30..59f1f11e325efd8837a54305a66a712e73b8b217 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Xaml/System.Xaml-net_4_5.csproj">\r
       <Project>{F574F9BD-1838-4C13-8722-7D6D33DE1781}</Project>\r
-      <Name>System.Xaml\System.Xaml-net_4_5</Name>\r
+      <Name>System.Xaml-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index e5a26ce28d3577b53d240dec40c7b0e96d189f9e..8098cdbc5828bfd6e7cd188e3bab68dd4127b619 100644 (file)
@@ -262,7 +262,11 @@ namespace System.Collections.Concurrent
 
                bool ICollection<KeyValuePair<TKey,TValue>>.Contains (KeyValuePair<TKey, TValue> pair)
                {
-                       return ContainsKey (pair.Key);
+                       TValue value;
+                       if (!TryGetValue (pair.Key, out value))
+                               return false;
+
+                       return EqualityComparer<TValue>.Default.Equals (value, pair.Value);
                }
 
                public KeyValuePair<TKey,TValue>[] ToArray ()
index 0911f8152c4827f7fdafb5f2dd993d302a651da0..cad54a4d553f71ff2141c8227c880d16332a2add 100644 (file)
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Security;
 
-#if !NET_2_1
+#if !MOBILE
 using System.Security.AccessControl;
 #endif
 
@@ -93,7 +93,6 @@ namespace System.IO {
                        }
                }
 
-#if !NET_2_1
                public bool IsReadOnly {
                        get {
                                if (!Exists)
@@ -138,7 +137,6 @@ namespace System.IO {
                        // handling this exception to work properly.
                        throw new NotSupportedException (Locale.GetText ("File encryption isn't supported on any file system."));
                }
-#endif
 
                public long Length {
                        get {
@@ -265,15 +263,10 @@ namespace System.IO {
 
                public override string ToString ()
                {
-#if NET_2_1
-                       // for Moonlight we *never* return paths, since ToString is not [SecurityCritical] we simply return the Name
-                       return Name;
-#else
                        return OriginalPath;
-#endif
                }
 
-#if !NET_2_1
+#if !MOBILE
                public FileSecurity GetAccessControl ()
                {
                        return File.GetAccessControl (FullPath); 
index 76dc9da4e4c95461aedc9812fc74dd4bf81476fe..852e4f40085e2d6e3fa8e02577b540d503bb7ab0 100644 (file)
@@ -43,6 +43,7 @@ namespace System.Security.Claims {
                
                List<Claim> claims;
                ClaimsIdentity actor;
+               string auth_type;
 
                public ClaimsIdentity ()
                        : this (claims: null, authenticationType: null, nameType: null, roleType: null)
@@ -69,12 +70,12 @@ namespace System.Security.Claims {
                {
                        claims = claims == null ? new List<Claim> (): new List<Claim> (claims);
                        
-                       AuthenticationType = authenticationType;
-
                        // Special case: if empty, set to null.
                        if (authenticationType == "")
-                               AuthenticationType = null;
-                       
+                               auth_type = null;
+                       else
+                               auth_type = authenticationType;
+
                        NameClaimType = nameType == null ? DefaultNameClaimType : nameType;
                        RoleClaimType = roleType == null ? DefaultRoleClaimType : roleType;
                }
@@ -101,7 +102,7 @@ namespace System.Security.Claims {
                                Label = ci.Label;
                                NameClaimType = ci.NameClaimType;
                                RoleClaimType = ci.RoleClaimType;
-                               AuthenticationType = ci.AuthenticationType;
+                               auth_type = ci.AuthenticationType;
                        }
                }
 
@@ -130,7 +131,11 @@ namespace System.Security.Claims {
                        }
                }
 
-               public virtual string AuthenticationType { get; private set; }
+               public virtual string AuthenticationType {
+                       get {
+                               return auth_type;
+                       }
+               }
                public object BootstrapContext { get; set; }
                public string Label { get; set; }
                public virtual string Name {
index 6a5f71471288ad27e8c3a262b4c84637f5af6dae..d14271c623a0965ce9f5c9e75411b05e2f2fe293 100644 (file)
@@ -4,7 +4,7 @@
 // Authors:
 //     Sebastien Pouliot  <sebastien@xamarin.com>
 //
-// Copyright 2012-2013 Xamarin Inc. All rights reserved.
+// Copyright 2012-2014 Xamarin Inc. All rights reserved.
 //
 
 #if FULL_AOT_RUNTIME
@@ -23,7 +23,7 @@ namespace System {
                        extern static void monotouch_log (string s);
 
                        [DllImport ("/usr/lib/libSystem.dylib")]
-                       extern static int write (int fd, byte [] buffer, int n);
+                       extern static /* ssize_t */ IntPtr write (int fd, byte [] buffer, /* size_t */ IntPtr n);
                        
                        StringBuilder sb;
                        
@@ -39,7 +39,8 @@ namespace System {
                        static void direct_write_to_stdout (string s)
                        {
                                byte [] b = Encoding.Default.GetBytes (s);
-                               while (write (1, b, b.Length) == -1 && Marshal.GetLastWin32Error () == /* EINTR*/ 4)
+                               var len = (IntPtr) b.Length;
+                               while ((int) write (1, b, len) == -1 && Marshal.GetLastWin32Error () == /* EINTR*/ 4)
                                        ;
                        }
                        
index 13d63ccc129d66740dc1148e997d36aa5b2b7d46..122606212391a547dfc5f8b65547016ab8c02fe1 100644 (file)
@@ -715,7 +715,7 @@ namespace System {
                        return GetLogicalDrivesInternal ();
                }
 
-#if !NET_2_1
+#if !MOBILE
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                private static extern void internalBroadcastSettingChange ();
 
@@ -826,10 +826,24 @@ namespace System {
                                throw new ArgumentException ("target");
                        }
                }
+#else
+               public static void SetEnvironmentVariable (string variable, string value)
+               {
+                       if (variable == null)
+                               throw new ArgumentNullException ("variable");
+                       if (variable == String.Empty)
+                               throw new ArgumentException ("String cannot be of zero length.", "variable");
+                       if (variable.IndexOf ('=') != -1)
+                               throw new ArgumentException ("Environment variable name cannot contain an equal character.", "variable");
+                       if (variable[0] == '\0')
+                               throw new ArgumentException ("The first char in the string is the null character.", "variable");
 
+                       InternalSetEnvironmentVariable (variable, value);
+               }
+#endif
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                internal static extern void InternalSetEnvironmentVariable (string variable, string value);
-#endif
+
                [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode=true)]
                public static void FailFast (string message)
                {
index 698a25588f63abdaca2e1f7553533ca6fc5e512a..e38c904590094c4d205afd198fea736b31ea4bdd 100644 (file)
@@ -353,6 +353,19 @@ namespace MonoTests.System.Collections.Concurrent
                        } catch (ArgumentNullException ex) {
                        }
                }
+               
+               [Test]
+               public void ContainsKeyPairTest ()
+               {
+                       var validKeyPair = new KeyValuePair<string, string> ("key", "validValue");
+                       var wrongKeyPair = new KeyValuePair<string, string> ("key", "wrongValue");
+
+                       IDictionary<string, string> dict = new ConcurrentDictionary<string, string> ();
+                       dict.Add (validKeyPair);
+
+                       Assert.IsTrue (dict.Contains (validKeyPair));
+                       Assert.IsFalse (dict.Contains (wrongKeyPair));
+               }
        }
 }
 #endif
index 1f6be893342298d64c730dd186ce4a6a56b5a378..9aa0d46510b588c911e90fca0a5aaea14e6a1388 100644 (file)
@@ -1928,6 +1928,7 @@ namespace MonoTests.System.Threading.Tasks
                }
 
                [Test]
+               [Category("MobileNotWorking")]
                public void TaskContinuationChainLeak()
                {
                        // Start cranking out tasks, starting each new task upon completion of and from inside the prior task.
index 20fc57d86ca0b62202d7bb5995864715ea27fd65..43e03fbfa33674b15669ac0e96e7cdbe64ccd6ae 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
index 7b709f70f53b195636691fad0cfc8764e11622bc..d412797a8ff57e7317ecd776acdb014113c4fea9 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
   <ItemGroup>\r
     <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib-net_4_5.csproj">\r
       <Project>{0B587DBA-BA92-4B92-821A-AA200C612A7E}</Project>\r
-      <Name>ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib-net_4_5</Name>\r
+      <Name>ICSharpCode.SharpZipLib-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System/System-net_4_5.csproj">\r
       <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
-      <Name>System\System-net_4_5</Name>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
       <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
       <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5</Name>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Xml.Linq/System.Xml.Linq-net_4_5.csproj">\r
       <Project>{8328796E-8A15-4972-8F1E-2F15E7D57C42}</Project>\r
-      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>\r
+      <Name>System.Xml.Linq-net_4_5</Name>\r
     </ProjectReference>\r
     <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
diff --git a/mcs/errors/cs0545-2.cs b/mcs/errors/cs0545-2.cs
new file mode 100644 (file)
index 0000000..61d3887
--- /dev/null
@@ -0,0 +1,16 @@
+// CS0545: `B.Prop': cannot override because `A.Prop' does not have accessible get accessor
+// Line: 13
+
+public class A
+{
+       public virtual string Prop {
+               set; private get;
+       }  
+}
+public class B : A
+{
+       sealed override public string Prop {
+               set { }
+       }   
+}
\ No newline at end of file
diff --git a/mcs/errors/cs0546-2.cs b/mcs/errors/cs0546-2.cs
new file mode 100644 (file)
index 0000000..4cec448
--- /dev/null
@@ -0,0 +1,16 @@
+// CS0546: `B.Prop': cannot override because `A.Prop' does not have accessible set accessor
+// Line: 13
+
+public class A
+{
+       public virtual string Prop {
+               get; private set;
+       }
+}
+public class B : A
+{
+       sealed override public string Prop {
+               get { return ""; }
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs1501-16.cs b/mcs/errors/cs1501-16.cs
new file mode 100644 (file)
index 0000000..4dcbe3e
--- /dev/null
@@ -0,0 +1,14 @@
+// CS1501: No overload for method `Block' takes `2' arguments
+// Line: 12
+
+class X
+{
+       public static void Block (object type, object variables, params object[] expressions)
+       {
+       }
+
+       public static void Main ()
+       {
+               Block (variables: null, expressions: null);
+       }
+}
\ No newline at end of file
diff --git a/mcs/errors/cs1593-5.cs b/mcs/errors/cs1593-5.cs
new file mode 100644 (file)
index 0000000..6055fee
--- /dev/null
@@ -0,0 +1,27 @@
+// CS1593: Delegate `System.Action<System.Threading.Tasks.Task>' does not take `0' arguments
+// Line: 17
+
+using System;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+
+namespace CrashRepro.Core
+{
+       public class X
+       {               
+               async void Foo ()
+               {
+                       var pushes = await Run ().ContinueWith (l =>
+                       {
+                               for (int i = 0; i < 1; ++i)
+                                       Run ().ContinueWith(() => { });
+                       });
+               }
+
+               Task Run ()
+               {
+                       return null;
+               }
+       }
+}
+
index 6feb97925c79bb29e9e52577c2058724f8df774d..88f9c12deca51b8d214bd2e87c42b18b4efa6746 100644 (file)
@@ -1,3 +1,3 @@
-// CS1617: Invalid -langversion option `ISO'. It must be `ISO-1', `ISO-2', `3', `4', `5', `Default' or `Future'
+// CS1617: Invalid -langversion option `ISO'. It must be `ISO-1', `ISO-2', Default or value in range 1 to 6
 // Line: 0
 // Compiler options: -langversion:ISO
diff --git a/mcs/errors/cs1644-35.cs b/mcs/errors/cs1644-35.cs
new file mode 100644 (file)
index 0000000..c97b37d
--- /dev/null
@@ -0,0 +1,17 @@
+// CS1644: Feature `exception filter' cannot be used because it is not part of the C# 5.0 language specification
+// Line: 14
+// Compiler options: -langversion:5
+
+using System;
+
+class X
+{
+       public static void Main ()
+       {
+               int x = 4;
+               try {
+                       throw null;
+               } catch (Exception) if (x > 0) {
+               }
+       }
+}
index 6c99245480b93f6766af3adb8b86f5beddb78c0c..cd77ac26226ed4126df7bae3c357f013891bbb99 100644 (file)
@@ -357,6 +357,11 @@ namespace Mono.CSharp
                                                vi_product_version, a.Name);
                                        return;
                                }
+
+                               // File version info decoding from blob is not supported
+                               var cab = new CustomAttributeBuilder ((ConstructorInfo) ctor.GetMetaInfo (), new object[] { vi_product_version });
+                               Builder.SetCustomAttribute (cab);
+                               return;
                        } else if (a.Type == pa.AssemblyProduct) {
                                vi_product = a.GetString ();
                        } else if (a.Type == pa.AssemblyCompany) {
index 84394c99eddcfa7ca87737d0b21d71b9df39c9e1..ff77e33340ab620d7331ab0fd3ff1ff36c5001a1 100644 (file)
@@ -1036,7 +1036,7 @@ namespace Mono.CSharp
                                }
                        }
 
-                       if (call_op == OpCodes.Callvirt && (InstanceExpression.Type.IsGenericParameter || InstanceExpression.Type.IsStruct)) {
+                       if (call_op == OpCodes.Callvirt && (InstanceExpression.Type.IsGenericParameter || InstanceExpression.Type.IsStructOrEnum)) {
                                ec.Emit (OpCodes.Constrained, InstanceExpression.Type);
                        }
 
@@ -1076,7 +1076,7 @@ namespace Mono.CSharp
                        //
                        // Push the instance expression
                        //
-                       if ((instance_type.IsStruct && (callOpcode == OpCodes.Callvirt || (callOpcode == OpCodes.Call && declaringType.IsStruct))) ||
+                       if ((instance_type.IsStructOrEnum && (callOpcode == OpCodes.Callvirt || (callOpcode == OpCodes.Call && declaringType.IsStruct))) ||
                                instance_type.IsGenericParameter || declaringType.IsNullableType) {
                                //
                                // If the expression implements IMemoryLocation, then
@@ -1098,7 +1098,7 @@ namespace Mono.CSharp
                                return ReferenceContainer.MakeType (ec.Module, instance_type);
                        }
 
-                       if (instance_type.IsEnum || instance_type.IsStruct) {
+                       if (instance_type.IsStructOrEnum) {
                                instance.Emit (ec);
                                ec.Emit (OpCodes.Box, instance_type);
                                return ec.BuiltinTypes.Object;
index 7736532e07c5c149bb4d2f8be881edfd0a0be6eb..f93324f30602ca2f956eff102b7674a76df37471 100644 (file)
@@ -6892,7 +6892,7 @@ doc_cref
          }       
        | OPERATOR overloadable_operator opt_doc_method_sig
          {
-               var p = (List<DocumentationParameter>)$3 ?? new List<DocumentationParameter> (1);
+               var p = (List<DocumentationParameter>)$3;
                module.DocumentationBuilder.ParsedParameters = p;
                module.DocumentationBuilder.ParsedOperator = (Operator.OpType) $2;
                $$ = null;
index f0386177bd4ffa2e879a8deee57f99f1ee725c80..86c7931f13abbb6cc31055bdc6eb2339ccbce2c2 100644 (file)
@@ -4485,11 +4485,11 @@ namespace Mono.CSharp {
                                        //
                                        // LAMESPEC:
                                        //
-                                       // void Foo (params int[]) is better than void Foo (int i = 0) for Foo ()
+                                       // void Foo (int i = 0) is better than void Foo (params int[]) for Foo ()
                                        // void Foo (string[] s, string value = null) is better than Foo (string s, params string[]) for Foo (null) or Foo ()
                                        //
                                        if (cand_param.HasDefaultValue != best_param.HasDefaultValue)
-                                               return !candidate_params;
+                                               return cand_param.HasDefaultValue;
 
                                        if (cand_param.HasDefaultValue) {
                                                ++j;
@@ -4692,7 +4692,10 @@ namespace Mono.CSharp {
                                                                ++arg_count;
                                                                temp = null;
                                                        } else {
-                                                               temp = arguments[index];
+                                                               if (index == arg_count) 
+                                                                       return (i + 1) * 3;
+
+                                                               temp = arguments [index];
 
                                                                // The slot has been taken by positional argument
                                                                if (temp != null && !(temp is NamedArgument))
@@ -5442,8 +5445,7 @@ namespace Mono.CSharp {
                        // For candidates which match on parameters count report more details about incorrect arguments
                        //
                        if (pm != null) {
-                               int unexpanded_count = ((IParametersMember) best_candidate).Parameters.HasParams ? pm.Parameters.Count - 1 : pm.Parameters.Count;
-                               if (pm.Parameters.Count == arg_count || params_expanded || unexpanded_count == arg_count) {
+                               if (pm.Parameters.Count == arg_count || params_expanded || HasUnfilledParams (best_candidate, pm, args)) {
                                        // Reject any inaccessible member
                                        if (!best_candidate.IsAccessible (rc) || !best_candidate.DeclaringType.IsAccessible (rc)) {
                                                rc.Report.SymbolRelatedToPreviousError (best_candidate);
@@ -5497,6 +5499,39 @@ namespace Mono.CSharp {
                        }
                }
 
+               static bool HasUnfilledParams (MemberSpec best_candidate, IParametersMember pm, Arguments args)
+               {
+                       var p = ((IParametersMember)best_candidate).Parameters;
+                       if (!p.HasParams)
+                               return false;
+
+                       string name = null;
+                       for (int i = p.Count - 1; i != 0; --i) {
+                               var fp = p.FixedParameters [i];
+                               if ((fp.ModFlags & Parameter.Modifier.PARAMS) == 0)
+                                       continue;
+
+                               name = fp.Name;
+                               break;
+                       }
+
+                       foreach (var arg in args) {
+                               var na = arg as NamedArgument;
+                               if (na == null)
+                                       continue;
+
+                               if (na.Name == name) {
+                                       name = null;
+                                       break;
+                               }
+                       }
+
+                       if (name == null)
+                               return false;
+
+                       return args.Count + 1 == pm.Parameters.Count;
+               }
+
                bool VerifyArguments (ResolveContext ec, ref Arguments args, MemberSpec member, IParametersMember pm, bool chose_params_expanded)
                {
                        var pd = pm.Parameters;
@@ -6259,7 +6294,6 @@ namespace Mono.CSharp {
                                var temp = ec.GetTemporaryLocal (type);
                                ec.Emit (OpCodes.Stloc, temp);
                                ec.Emit (OpCodes.Ldloca, temp);
-                               ec.FreeTemporaryLocal (temp, type);
                                return;
                        }
 
index 766bb05696b6f9e815d0b80ee621c3e1c54194f7..5bda997062587af84c2d227d0cf5e371c5dea3ef 100644 (file)
@@ -1233,10 +1233,13 @@ namespace Mono.CSharp
                        if (undo_actions == null)
                                undo_actions = new List<Action> ();
 
-                       var existing = current_container.Containers.FirstOrDefault (l => l.Basename == tc.Basename);
-                       if (existing != null) {
-                               current_container.RemoveContainer (existing);
-                               undo_actions.Add (() => current_container.AddTypeContainer (existing));
+                       if (current_container.Containers != null)
+                       {
+                               var existing = current_container.Containers.FirstOrDefault (l => l.Basename == tc.Basename);
+                               if (existing != null) {
+                                       current_container.RemoveContainer (existing);
+                                       undo_actions.Add (() => current_container.AddTypeContainer (existing));
+                               }
                        }
 
                        undo_actions.Add (() => current_container.RemoveContainer (tc));
index 28c2a117e15336a6c1e05d12560968f92c4bf84a..01bbbafcf92d970069c5fc842632dc77349256d9 100644 (file)
@@ -2610,8 +2610,14 @@ namespace Mono.CSharp
                public override void FlowAnalysis (FlowAnalysisContext fc)
                {
                        if ((oper & Operator.LogicalMask) == 0) {
+                               var fc_ontrue = fc.DefiniteAssignmentOnTrue;
+                               var fc_onfalse = fc.DefiniteAssignmentOnFalse;
+                               fc.DefiniteAssignmentOnTrue = fc.DefiniteAssignmentOnFalse = fc.DefiniteAssignment;
                                left.FlowAnalysis (fc);
+                               fc.DefiniteAssignmentOnTrue = fc.DefiniteAssignmentOnFalse = fc.DefiniteAssignment;
                                right.FlowAnalysis (fc);
+                               fc.DefiniteAssignmentOnTrue = fc_ontrue;
+                               fc.DefiniteAssignmentOnFalse = fc_onfalse;
                                return;
                        }
 
@@ -2962,8 +2968,8 @@ namespace Mono.CSharp
                                                        }
                                                }
 
-                                               left = ConvertEnumOperandToUnderlyingType (rc, left);
-                                               right = ConvertEnumOperandToUnderlyingType (rc, right);
+                                               left = ConvertEnumOperandToUnderlyingType (rc, left, r.IsNullableType);
+                                               right = ConvertEnumOperandToUnderlyingType (rc, right, l.IsNullableType);
                                                return expr;
                                        }
                                } else if ((oper == Operator.Addition || oper == Operator.Subtraction)) {
@@ -2978,8 +2984,8 @@ namespace Mono.CSharp
                                                // which is not ambiguous with predefined enum operators
                                                //
                                                if (expr != null) {
-                                                       left = ConvertEnumOperandToUnderlyingType (rc, left);
-                                                       right = ConvertEnumOperandToUnderlyingType (rc, right);
+                                                       left = ConvertEnumOperandToUnderlyingType (rc, left, false);
+                                                       right = ConvertEnumOperandToUnderlyingType (rc, right, false);
 
                                                        return expr;
                                                }
@@ -3782,7 +3788,7 @@ namespace Mono.CSharp
                        return null;
                }
 
-               static Expression ConvertEnumOperandToUnderlyingType (ResolveContext rc, Expression expr)
+               static Expression ConvertEnumOperandToUnderlyingType (ResolveContext rc, Expression expr, bool liftType)
                {
                        TypeSpec underlying_type;
                        if (expr.Type.IsNullableType) {
@@ -3806,7 +3812,7 @@ namespace Mono.CSharp
                                break;
                        }
 
-                       if (expr.Type.IsNullableType)
+                       if (expr.Type.IsNullableType || liftType)
                                underlying_type = rc.Module.PredefinedTypes.Nullable.TypeSpec.MakeGenericType (rc.Module, new[] { underlying_type });
 
                        if (expr.Type == underlying_type)
index 4b0b21685993678e3891b45c005db46cbadaf61d..278f71e0f1830471ef1bda269a3856f7efafaaf2 100644 (file)
@@ -223,7 +223,9 @@ namespace Mono.CSharp
                        if (MemberType.IsStatic)
                                Error_VariableOfStaticClass (Location, GetSignatureForError (), MemberType, Report);
 
-                       CheckBase ();
+                       if (!IsCompilerGenerated)
+                               CheckBase ();
+
                        IsTypePermitted ();
                }
 
index a440d0ca66f6a0634d83863b766e5676d11286d6..daa7628756501f0f99ea11300281965550d7a19c 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
@@ -136,7 +137,7 @@ $(ProjectDir)\..\jay\jay.exe -ct &lt; $(ProjectDir)\..\jay\skeleton.cs $(Project
   <ItemGroup>\r
     <ProjectReference Include="../class/corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
index 339d42d8f6753c1fad8a13f00ee0a4f5f1935a5d..e8b3879f05afb10598cf8d54e3f1d093015910c2 100644 (file)
@@ -512,7 +512,16 @@ namespace Mono.CSharp
                        // Check base property accessors conflict
                        //
                        var base_prop = (PropertySpec) base_member;
-                       if (Get != null) {
+                       if (Get == null) {
+                               if ((ModFlags & Modifiers.SEALED) != 0 && base_prop.HasGet && !base_prop.Get.IsAccessible (this)) {
+                                       // TODO: Should be different error code but csc uses for some reason same
+                                       Report.SymbolRelatedToPreviousError (base_prop);
+                                       Report.Error (545, Location,
+                                               "`{0}': cannot override because `{1}' does not have accessible get accessor",
+                                               GetSignatureForError (), base_prop.GetSignatureForError ());
+                                       ok = false;
+                               }
+                       } else {
                                if (!base_prop.HasGet) {
                                        if (ok) {
                                                Report.SymbolRelatedToPreviousError (base_prop);
@@ -529,7 +538,16 @@ namespace Mono.CSharp
                                }
                        }
 
-                       if (Set != null) {
+                       if (Set == null) {
+                               if ((ModFlags & Modifiers.SEALED) != 0 && base_prop.HasSet && !base_prop.Set.IsAccessible (this)) {
+                                       // TODO: Should be different error code but csc uses for some reason same
+                                       Report.SymbolRelatedToPreviousError (base_prop);
+                                       Report.Error (546, Location,
+                                               "`{0}': cannot override because `{1}' does not have accessible set accessor",
+                                               GetSignatureForError (), base_prop.GetSignatureForError ());
+                                       ok = false;
+                               }
+                       } else {
                                if (!base_prop.HasSet) {
                                        if (ok) {
                                                Report.SymbolRelatedToPreviousError (base_prop);
index 5e56f614f232f985a567d6ec9d7d3f2029cee2a1..3c7f13bdb13b4b3922fc19d5f57593c2334418e1 100644 (file)
@@ -28,6 +28,7 @@ namespace Mono.CSharp {
                V_3 = 3,
                V_4 = 4,
                V_5 = 5,
+               V_6 = 6,
                Future = 100,
 
                Default = LanguageVersion.Future,
@@ -1136,11 +1137,13 @@ namespace Mono.CSharp {
 
                                switch (value.ToLowerInvariant ()) {
                                case "iso-1":
+                               case "1":
                                        settings.Version = LanguageVersion.ISO_1;
                                        return ParseResult.Success;
                                case "default":
                                        settings.Version = LanguageVersion.Default;
                                        return ParseResult.Success;
+                               case "2":
                                case "iso-2":
                                        settings.Version = LanguageVersion.ISO_2;
                                        return ParseResult.Success;
@@ -1153,12 +1156,15 @@ namespace Mono.CSharp {
                                case "5":
                                        settings.Version = LanguageVersion.V_5;
                                        return ParseResult.Success;
+                               case "6":
+                                       settings.Version = LanguageVersion.V_6;
+                                       return ParseResult.Success;
                                case "future":
                                        settings.Version = LanguageVersion.Future;
                                        return ParseResult.Success;
                                }
 
-                               report.Error (1617, "Invalid -langversion option `{0}'. It must be `ISO-1', `ISO-2', `3', `4', `5', `Default' or `Future'", value);
+                               report.Error (1617, "Invalid -langversion option `{0}'. It must be `ISO-1', `ISO-2', Default or value in range 1 to 6", value);
                                return ParseResult.Error;
 
                        case "/codepage":
index cbce03f2bc5506facff0ca588a77ec51cef52df0..cfcf334197132489b4a1ff7637f4022f46182267 100644 (file)
@@ -688,11 +688,7 @@ namespace Mono.CSharp {
                                infinite = true;
                        }
 
-                       base.Resolve (bc);
-
-                       Iterator.Resolve (bc);
-
-                       return true;
+                       return base.Resolve (bc) && Iterator.Resolve (bc);
                }
 
                protected override bool DoFlowAnalysis (FlowAnalysisContext fc)
@@ -859,11 +855,11 @@ namespace Mono.CSharp {
                        var prev_loop = bc.EnclosingLoop;
                        var prev_los = bc.EnclosingLoopOrSwitch;
                        bc.EnclosingLoopOrSwitch = bc.EnclosingLoop = this;
-                       Statement.Resolve (bc);
+                       var ok = Statement.Resolve (bc);
                        bc.EnclosingLoopOrSwitch = prev_los;
                        bc.EnclosingLoop = prev_loop;
 
-                       return true;
+                       return ok;
                }
 
                //
@@ -3726,16 +3722,14 @@ namespace Mono.CSharp {
                        var label = value as LabeledStatement;
                        Block b = block;
                        if (label != null) {
-                               do {
-                                       if (label.Block == b)
-                                               return label;
-                                       b = b.Parent;
-                               } while (b != null);
+                               if (IsLabelVisible (label, b))
+                                       return label;
+
                        } else {
                                List<LabeledStatement> list = (List<LabeledStatement>) value;
                                for (int i = 0; i < list.Count; ++i) {
                                        label = list[i];
-                                       if (label.Block == b)
+                                       if (IsLabelVisible (label, b))
                                                return label;
                                }
                        }
@@ -3743,6 +3737,17 @@ namespace Mono.CSharp {
                        return null;
                }
 
+               static bool IsLabelVisible (LabeledStatement label, Block b)
+               {
+                       do {
+                               if (label.Block == b)
+                                       return true;
+                               b = b.Parent;
+                       } while (b != null);
+
+                       return false;
+               }
+
                public ParameterInfo GetParameterInfo (Parameter p)
                {
                        for (int i = 0; i < parameters.Count; ++i) {
@@ -7024,12 +7029,12 @@ namespace Mono.CSharp {
                                }
                        }
 
-                       base.Resolve (ec);
+                       var ok = base.Resolve (ec);
 
                        if (vr != null)
                                vr.IsLockedByStatement = vr_locked;
 
-                       return true;
+                       return ok;
                }
 
                protected override void CloneTo (CloneContext clonectx, Statement t)
@@ -7590,8 +7595,7 @@ namespace Mono.CSharp {
                                Statement = new CollectionForeach (this, variable, expr);
                        }
 
-                       base.Resolve (ec);
-                       return true;
+                       return base.Resolve (ec);
                }
 
                protected override void DoEmit (EmitContext ec)
index 73d82b086f97752c46a2af57bdc684a48d80b0ab..339addfd15e11ff1e6859856bbb29449b2b30ed4 100644 (file)
@@ -295,6 +295,12 @@ namespace Mono.CSharp
                        }
                }
 
+               public bool IsStructOrEnum {
+                       get {
+                               return (Kind & (MemberKind.Struct | MemberKind.Enum)) != 0;
+                       }
+               }
+
                public bool IsTypeBuilder {
                        get {
 #if STATIC
index 248d1452d2bb949b8639d8fa3ddee3f21cf09b80..e538021cd0aff253f68ddc97dfe97a30991ec39a 100644 (file)
@@ -254,6 +254,12 @@ enum MyEnumUlong : ulong
        Value_1 = 1
 }
 
+enum EnumInt
+{
+       A,
+       B,
+       C
+}
 
 class NewTest<T>
 {
@@ -1205,6 +1211,14 @@ class Tester
                Assert (true, e.Compile ().Invoke (4, 4));
        }
 
+       void EqualTest_16 ()
+       {
+               Expression<Func<EnumInt?, EnumInt, bool?>> e = (x, y) => x == y;
+               AssertNodeType (e, ExpressionType.Convert);
+               Assert (false, e.Compile () (null, 0));
+               Assert (true, e.Compile () (EnumInt.B, EnumInt.B));
+       }
+
        void EqualTestDelegate ()
        {
                Expression<Func<Delegate, Delegate, bool>> e1 = (a, b) => a == b;
diff --git a/mcs/tests/gtest-optional-31.cs b/mcs/tests/gtest-optional-31.cs
new file mode 100644 (file)
index 0000000..9e7158a
--- /dev/null
@@ -0,0 +1,21 @@
+using System;
+
+class Test
+{
+       public static int M (bool b = false)
+       {
+               Console.WriteLine ("PASS");
+               return 0;
+       }
+
+       public static int M (params string[] args)
+       {
+               Console.WriteLine ("FAIL");
+               return 1;
+       }
+       
+       public static int Main ()
+       {
+               return M ();
+       }
+}
index 3b2fa888a96ac26f051f86bd68a244eb300b2b17..e0e263d435927787e29d8e475998b317d7457cb2 100644 (file)
@@ -4,7 +4,7 @@ class MainClass
 {
        public struct DC
        {
-               private readonly Guid m_Id;
+               public readonly Guid m_Id;
 
                public DC (Guid Id)
                {
@@ -27,6 +27,10 @@ class MainClass
                if (dc.Id.Equals (default (Guid)))
                        return 1;
 
+               if (dc.m_Id.Equals (default (Guid)))
+                       return 2;
+
+Console.WriteLine ("ok");
                return 0;
        }
 }
diff --git a/mcs/tests/test-859.cs b/mcs/tests/test-859.cs
new file mode 100644 (file)
index 0000000..b866263
--- /dev/null
@@ -0,0 +1,20 @@
+class X
+{
+       public static void Main ()
+       {
+               int i = 0;
+               if (i == 1) {
+                       a:
+                       switch (i) {
+                       default:
+                               goto a;
+                       }
+               } else if (i == 2) {
+                       a:
+                       switch (i) {
+                       default:
+                               goto a;
+                       }
+               }
+       }
+}
diff --git a/mcs/tests/test-892.cs b/mcs/tests/test-892.cs
new file mode 100644 (file)
index 0000000..b649279
--- /dev/null
@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Diagnostics;
+using System;
+
+[assembly: AssemblyVersion ("2011.04.0.0")]
+[assembly: AssemblyFileVersion ("2011.02.0.0")]
+
+class X
+{
+       public static int Main ()
+       {
+               Assembly executingAssembly = Assembly.GetAssembly (typeof(X));
+               FileVersionInfo fvi = FileVersionInfo.GetVersionInfo (executingAssembly.Location);
+               if (fvi.FileVersion != "2011.02.0.0")
+                       return 1;
+
+               return 0;
+       }
+}
\ No newline at end of file
diff --git a/mcs/tests/test-893.cs b/mcs/tests/test-893.cs
new file mode 100644 (file)
index 0000000..97cfc0a
--- /dev/null
@@ -0,0 +1,15 @@
+public class A
+{
+       public static bool TryAssign (out int x)
+       {
+               x = 0;
+               return true;
+       }
+
+       public static void Main ()
+       {
+               int x, y;
+               if ((!TryAssign (out x) || x == 0) & (!TryAssign (out y) || y == 0)) {
+               }
+       }
+}
index 5b4e0e1edcd25d63a464cd742b93a18ffa7db9fa..2db20c17d24a3ffcdc70f89ed18c659e970328ca 100644 (file)
@@ -1,37 +1,40 @@
-<?xml version="1.0"?>\r
-<doc>\r
-    <assembly>\r
-        <name>test-xml-063</name>\r
-    </assembly>\r
-    <members>\r
-        <member name="T:A">\r
-            Test A\r
-        </member>\r
-        <member name="T:Test">\r
-            <seealso cref="M:Test.op_Explicit(Test)~System.Int64"/>\r
-            <seealso cref="M:Test.op_Explicit(Test)~A"/>\r
-            <seealso cref="M:Test.op_Implicit(System.Int32)~Test"/>\r
-            <seealso cref="M:Test.op_Implicit(System.Boolean)~Test"/>\r
-            <seealso cref="M:Test.op_LogicalNot(Test)"/>\r
-            <seealso cref="M:Test.#ctor"/>\r
-        </member>\r
-        <member name="M:Test.#ctor">\r
-            Start\r
-        </member>\r
-        <member name="M:Test.op_Explicit(Test)~A">\r
-            Comment\r
-        </member>\r
-        <member name="M:Test.op_Explicit(Test)~System.Int64">\r
-            Comment 2\r
-        </member>\r
-        <member name="M:Test.op_Implicit(System.Int32)~Test">\r
-            Comment 3\r
-        </member>\r
-        <member name="M:Test.op_Implicit(System.Boolean)~Test">\r
-            Comment 4\r
-        </member>\r
-        <member name="M:Test.op_LogicalNot(Test)">\r
-            Comment 5\r
-        </member>\r
-    </members>\r
-</doc>\r
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>test-xml-063</name>
+    </assembly>
+    <members>
+        <member name="T:A">
+            Test A</member>
+        <member name="T:Test">
+            <seealso cref="M:Test.op_Explicit(Test)~System.Int64" />
+            <seealso cref="M:Test.op_Explicit(Test)~A" />
+            <seealso cref="M:Test.op_Implicit(System.Int32)~Test" />
+            <seealso cref="M:Test.op_Implicit(System.Boolean)~Test" />
+            <seealso cref="M:Test.op_LogicalNot(Test)" />
+            <seealso cref="M:Test.op_Equality(Test,System.Int32)" />
+            <seealso cref="M:Test.op_Inequality(Test,System.Int32)" />
+            <seealso cref="M:Test.#ctor" />
+        </member>
+        <member name="M:Test.#ctor">
+            Start</member>
+        <member name="M:Test.op_Explicit(Test)~A">
+            Comment</member>
+        <member name="M:Test.op_Explicit(Test)~System.Int64">
+            Comment 2</member>
+        <member name="M:Test.op_Implicit(System.Int32)~Test">
+            Comment 3</member>
+        <member name="M:Test.op_Implicit(System.Boolean)~Test">
+            Comment 4</member>
+        <member name="M:Test.op_LogicalNot(Test)">
+            Comment 5</member>
+        <member name="M:Test.op_Equality(Test,System.Int32)">
+            Comment 6</member>
+        <member name="M:Test.op_Inequality(Test,System.Int32)">
+            Comment 7</member>
+        <member name="M:Test.op_Equality(Test,System.Int64)">
+            Comment 61</member>
+        <member name="M:Test.op_Inequality(Test,System.Int64)">
+            Comment 72</member>
+    </members>
+</doc>
index 7a63f013ad7e5940aba86d25f863bba8a769a009..f9964180120d0661b98c95100c953e95ff3b5266 100644 (file)
@@ -10,6 +10,8 @@ public class A
 /// <seealso cref="implicit operator Test"/>
 /// <seealso cref="implicit operator Test(bool)"/>
 /// <seealso cref="operator !(Test)"/>
+/// <seealso cref="operator =="/>
+/// <seealso cref="operator !="/>
 /// <seealso cref="Test()"/>
 public class Test
 {
@@ -17,37 +19,61 @@ public class Test
        Test ()
        {
        }
-       
+
        /// Comment
-       public static explicit operator A(Test test)
+       public static explicit operator A (Test test)
        {
                return new A ();
        }
-       
+
        /// Comment 2
-       public static explicit operator long(Test test)
+       public static explicit operator long (Test test)
        {
                return 2;
        }
-       
+
        /// Comment 3
-       public static implicit operator Test(int test)
+       public static implicit operator Test (int test)
        {
                return new Test ();
        }
-       
+
        /// Comment 4
-       public static implicit operator Test(bool test)
+       public static implicit operator Test (bool test)
        {
                return new Test ();
        }
-       
+
        /// Comment 5
        public static bool operator !(Test test)
        {
                return false;
        }
-       
+
+       /// Comment 6
+       public static bool operator == (Test a, int b)
+       {
+               return true;
+       }
+
+       /// Comment 7
+       public static bool operator != (Test a, int b)
+       {
+               return false;
+       }
+
+       /// Comment 61
+       public static bool operator == (Test a, long b)
+       {
+               return true;
+       }
+
+       /// Comment 72
+       public static bool operator != (Test a, long b)
+       {
+               return false;
+       }
+
        static void Main ()
        {
        }
index 19d9696f82c022aed828f8fb4e98ad92b6a9ab45..e6ca47f73d763c3078d2279e31225edaff6bc50c 100644 (file)
   <test name="gtest-433.cs">\r
     <type name="M">\r
       <method name="Void Main()" attrs="150">\r
-        <size>38</size>\r
+        <size>42</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
         <size>28</size>\r
       </method>\r
       <method name="Void ThisWorksFine()" attrs="150">\r
-        <size>39</size>\r
+        <size>41</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
         <size>0</size>\r
       </method>\r
     </type>\r
+    <type name="Tester">\r
+      <method name="Void EqualTest_16()" attrs="129">\r
+        <size>185</size>\r
+      </method>\r
+    </type>\r
   </test>\r
   <test name="gtest-etree-02.cs">\r
     <type name="M">\r
         <size>33</size>\r
       </method>\r
       <method name="T Value[T]()" attrs="145">\r
-        <size>84</size>\r
+        <size>86</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="gtest-optional-31.cs">\r
+    <type name="Test">\r
+      <method name="Int32 M(Boolean)" attrs="150">\r
+        <size>20</size>\r
+      </method>\r
+      <method name="Int32 M(System.String[])" attrs="150">\r
+        <size>20</size>\r
+      </method>\r
+      <method name="Int32 Main()" attrs="150">\r
+        <size>15</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="gtest-partial-01.cs">\r
     <type name="B`1[U]">\r
       <method name="Void .ctor()" attrs="6278">\r
   <test name="test-279.cs">\r
     <type name="FlagsAttributeDemo">\r
       <method name="Int32 Main()" attrs="150">\r
-        <size>51</size>\r
+        <size>55</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
   <test name="test-376.cs">\r
     <type name="C">\r
       <method name="Int32 Main()" attrs="150">\r
-        <size>90</size>\r
+        <size>99</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
     </type>\r
     <type name="Test">\r
       <method name="Void Main()" attrs="150">\r
-        <size>72</size>\r
+        <size>76</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
   <test name="test-453.cs">\r
     <type name="C">\r
       <method name="Void Main()" attrs="150">\r
-        <size>34</size>\r
+        <size>38</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
     </type>\r
     <type name="X">\r
       <method name="Int32 Main()" attrs="150">\r
-        <size>197</size>\r
+        <size>204</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
   <test name="test-833.cs">\r
     <type name="MainClass">\r
       <method name="Int32 Main()" attrs="150">\r
-        <size>93</size>\r
+        <size>141</size>\r
       </method>\r
       <method name="Void .ctor()" attrs="6278">\r
         <size>7</size>\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="test-859.cs">\r
+    <type name="X">\r
+      <method name="Void Main()" attrs="150">\r
+        <size>40</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="test-86.cs">\r
     <type name="T.T">\r
       <method name="Int32 method1(System.Type, Int32)" attrs="145">\r
       </method>\r
     </type>\r
   </test>\r
+  <test name="test-892.cs">\r
+    <type name="X">\r
+      <method name="Int32 Main()" attrs="150">\r
+        <size>66</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
+  <test name="test-893.cs">\r
+    <type name="A">\r
+      <method name="Boolean TryAssign(Int32 ByRef)" attrs="150">\r
+        <size>13</size>\r
+      </method>\r
+      <method name="Void Main()" attrs="150">\r
+        <size>48</size>\r
+      </method>\r
+      <method name="Void .ctor()" attrs="6278">\r
+        <size>7</size>\r
+      </method>\r
+    </type>\r
+  </test>\r
   <test name="test-9.cs">\r
     <type name="X">\r
       <method name="Int32 Main(System.String[])" attrs="150">\r
     </type>\r
     <type name="Tester+&lt;CallTest_4&gt;c__async15">\r
       <method name="Void MoveNext()" attrs="486">\r
-        <size>234</size>\r
+        <size>240</size>\r
       </method>\r
     </type>\r
     <type name="Tester+&lt;CallTest_5&gt;c__async16">\r
index 3f9965eeb41d52c2a9dc56fc9d25f0e41432b74d..2d20ebfc974c53b10eb53bfc7c2e69483c28346f 100644 (file)
@@ -159,7 +159,7 @@ namespace Mono.XBuild.CommandLine {
                                var projectInstances = new List<ProjectInstance> ();
                                if (string.Equals (Path.GetExtension (projectFile), ".sln", StringComparison.OrdinalIgnoreCase)) {
                                        var parser = new SolutionParser ();
-                                       var root = ProjectRootElement.Create ();
+                                       var root = ProjectRootElement.Create (project_collection);
                                        parser.ParseSolution (projectFile, project_collection, root, LogWarning);
                                        foreach (var p in project_collection.LoadedProjects)
                                                projectInstances.Add (p.CreateProjectInstance ());
index 069a78eed6b4015b5bb5e70d1aeaa1f12ee30c54..61339b1a5cc54c0208bfdce507a971cbec418648 100644 (file)
@@ -7,6 +7,8 @@ BUILD_FRAMEWORK = Microsoft.Build.Framework.dll
 BUILD_NEW_ENGINE = Microsoft.Build.dll
 INSTALL_FRAMEWORK_VERSION = $(FRAMEWORK_VERSION)
 
+include ../xbuild/xbuild.make
+
 ifeq (3.5, $(FRAMEWORK_VERSION))
 NAME_SUFFIX = .v3.5
 ASSEMBLY_VERSION = 3.5.0.0
@@ -30,3 +32,13 @@ XBUILD_FRAMEWORKS_DIR=$(mono_libdir)/mono/xbuild-frameworks/.NETFramework/
 REDISTLIST_DIR=$(XBUILD_FRAMEWORKS_DIR)/v$(FRAMEWORK_VERSION)/RedistList
 #include $(XBUILD_DIR)/xbuild_targets.make
 
+install-local: install-extras
+
+install-extras: install-bin-data
+
+install-bin-data:
+       $(INSTALL_DATA) data/msbuild.rsp $(DESTDIR)$(XBUILD_BIN_DIR)
+
+EXTRA_DISTFILES = \
+       data/msbuild.rsp
+
index effba4bb8b682cd77853358cb10232713f28cbe7..7420a73f69a121b0e0c2aa0ac80cb8feea843694 100644 (file)
@@ -123,7 +123,11 @@ namespace Mono.XBuild.CommandLine {
                        StreamReader reader = new StreamReader (file);
                        string slnVersion = GetSlnFileVersion (reader);
                        if (slnVersion == "12.00")
+#if XBUILD_12
                                projects.DefaultToolsVersion = "12.0";
+#else
+                               projects.DefaultToolsVersion = "4.0";
+#endif
                        else if (slnVersion == "11.00")
                                projects.DefaultToolsVersion = "4.0";
                        else if (slnVersion == "10.00")
@@ -206,7 +210,7 @@ namespace Mono.XBuild.CommandLine {
 
                                if (!File.Exists (filename)) {
                                        RaiseWarning (0, String.Format ("Project file {0} referenced in the solution file, " +
-                                                               "not found. Ignoring.", filename));
+                                                               " not found. Ignoring.", filename));
                                        continue;
                                }
 
diff --git a/mcs/tools/msbuild/data/msbuild.rsp b/mcs/tools/msbuild/data/msbuild.rsp
new file mode 100644 (file)
index 0000000..9b9ce70
--- /dev/null
@@ -0,0 +1,3 @@
+# xbuild command line options specified here will be used
+# by xbuild on every build, unless /noautoresponse is passed
+# on the command line.
index 40c9591a8972cd4bfae302bf34f684ff40ba6c99..9e2fb959697245a7cab2e78ef642f118e752bc8e 100755 (executable)
@@ -705,7 +705,7 @@ static gboolean file_setendoffile(gpointer handle)
        }
        
 #ifdef FTRUNCATE_DOESNT_EXTEND
-       /* I haven't bothered to write the configure.in stuff for this
+       /* I haven't bothered to write the configure.ac stuff for this
         * because I don't know if any platform needs it.  I'm leaving
         * this code just in case though
         */
index e4867a8a81a5dbb069d520cdbdd4983235a7e1c1..fa6228326346f1b492131ccfa1c1752958f4ba94 100644 (file)
@@ -75,7 +75,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLA
 #  mono-config.c uses MONO_CFG_DIR
 #
 # This won't result in many more false positives than AC_DEFINEing them
-# in configure.in.
+# in configure.ac.
 #
 assembly.lo mono-config.lo: Makefile
 
index 82bc43bace4ac21cd09bdb1748df53816b41a4c2..a27a004f7c612fdab81257b3d53f250c4166499b 100644 (file)
@@ -59,6 +59,9 @@ boehm_thread_unregister (MonoThreadInfo *p);
 static void
 register_test_toggleref_callback (void);
 
+#define BOEHM_GC_BIT_FINALIZER_AWARE 1
+static MonoGCFinalizerCallbacks fin_callbacks;
+
 static void
 mono_gc_warning (char *msg, GC_word arg)
 {
@@ -1259,6 +1262,10 @@ BOOL APIENTRY mono_gc_dllmain (HMODULE module_handle, DWORD reason, LPVOID reser
 guint
 mono_gc_get_vtable_bits (MonoClass *class)
 {
+       if (fin_callbacks.is_class_finalization_aware) {
+               if (fin_callbacks.is_class_finalization_aware (class))
+                       return BOEHM_GC_BIT_FINALIZER_AWARE;
+       }
        return 0;
 }
 
@@ -1338,4 +1345,29 @@ register_test_toggleref_callback (void)
        mono_gc_toggleref_register_callback (test_toggleref_callback);
 }
 
+static gboolean
+is_finalization_aware (MonoObject *obj)
+{
+       MonoVTable *vt = obj->vtable;
+       return (vt->gc_bits & BOEHM_GC_BIT_FINALIZER_AWARE) == BOEHM_GC_BIT_FINALIZER_AWARE;
+}
+
+static void
+fin_notifier (MonoObject *obj)
+{
+       if (is_finalization_aware (obj))
+               fin_callbacks.object_queued_for_finalization (obj);
+}
+
+void
+mono_gc_register_finalizer_callbacks (MonoGCFinalizerCallbacks *callbacks)
+{
+       if (callbacks->version != MONO_GC_FINALIZER_EXTENSION_VERSION)
+               g_error ("Invalid finalizer callback version. Expected %d but got %d\n", MONO_GC_FINALIZER_EXTENSION_VERSION, callbacks->version);
+
+       fin_callbacks = *callbacks;
+
+       GC_set_finalizer_notify_proc ((void (*) (GC_PTR))fin_notifier);
+}
+
 #endif /* no Boehm GC */
index 01f843526964499d4de395a2f9118b5111b5dbbe..be2d0eecfddfd638f6fa8678086ce3952d25b779 100644 (file)
@@ -356,6 +356,19 @@ struct _MonoReferenceQueue {
        gboolean should_be_deleted;
 };
 
+enum {
+       MONO_GC_FINALIZER_EXTENSION_VERSION = 1,
+};
+
+typedef struct {
+       int version;
+       gboolean (*is_class_finalization_aware) (MonoClass *class);
+       void (*object_queued_for_finalization) (MonoObject *object);
+} MonoGCFinalizerCallbacks;
+
+void mono_gc_register_finalizer_callbacks (MonoGCFinalizerCallbacks *callbacks);
+
+
 #ifdef HOST_WIN32
 BOOL APIENTRY mono_gc_dllmain (HMODULE module_handle, DWORD reason, LPVOID reserved) MONO_INTERNAL;
 #endif
index ee0e5cd8a36f388b444feb86168f2afa71d2e5f9..f861ff581f9dc7562af81ef30610770946a67d97 100644 (file)
@@ -1265,6 +1265,8 @@ get_caller_no_reflection (MonoMethod *m, gint32 no, gint32 ilo, gboolean managed
 static MonoReflectionType *
 type_from_name (const char *str, MonoBoolean ignoreCase)
 {
+       MonoMethod *m, *dest;
+
        MonoType *type = NULL;
        MonoAssembly *assembly = NULL;
        MonoTypeNameParse info;
@@ -1280,32 +1282,38 @@ type_from_name (const char *str, MonoBoolean ignoreCase)
                return NULL;
        }
 
-       if (info.assembly.name) {
-               assembly = mono_assembly_load (&info.assembly, NULL, NULL);
-       } else {
-               MonoMethod *m = mono_method_get_last_managed ();
-               MonoMethod *dest = m;
 
-               mono_stack_walk_no_il (get_caller_no_reflection, &dest);
-               if (!dest)
-                       dest = m;
+       /*
+        * We must compute the calling assembly as type loading must happen under a metadata context.
+        * For example. The main assembly is a.exe and Type.GetType is called from dir/b.dll. Without
+        * the metadata context (basedir currently) set to dir/b.dll we won't be able to load a dir/c.dll.
+        */
+       m = mono_method_get_last_managed ();
+       dest = m;
 
-               /*
-                * FIXME: mono_method_get_last_managed() sometimes returns NULL, thus
-                *        causing ves_icall_System_Reflection_Assembly_GetCallingAssembly()
-                *        to crash.  This only seems to happen in some strange remoting
-                *        scenarios and I was unable to figure out what's happening there.
-                *        Dec 10, 2005 - Martin.
-                */
+       mono_stack_walk_no_il (get_caller_no_reflection, &dest);
+       if (!dest)
+               dest = m;
 
-               if (dest) {
-                       assembly = dest->klass->image->assembly;
-                       type_resolve = TRUE;
-               } else {
-                       g_warning (G_STRLOC);
-               }
+       /*
+        * FIXME: mono_method_get_last_managed() sometimes returns NULL, thus
+        *        causing ves_icall_System_Reflection_Assembly_GetCallingAssembly()
+        *        to crash.  This only seems to happen in some strange remoting
+        *        scenarios and I was unable to figure out what's happening there.
+        *        Dec 10, 2005 - Martin.
+        */
+
+       if (dest) {
+               assembly = dest->klass->image->assembly;
+               type_resolve = TRUE;
+       } else {
+               g_warning (G_STRLOC);
        }
 
+       if (info.assembly.name)
+               assembly = mono_assembly_load (&info.assembly, assembly ? assembly->basedir : NULL, NULL);
+
+
        if (assembly) {
                /* When loading from the current assembly, AppDomain.TypeResolve will not be called yet */
                type = mono_reflection_get_type (assembly->image, &info, ignoreCase, &type_resolve);
index 9cb2b18f5efb6dcc5d0897f421c056ea97deeb45..089867768b97f2b0c88d2b48fe63c8ba327f74ec 100644 (file)
@@ -7458,7 +7458,7 @@ _mono_reflection_get_type_from_info (MonoTypeNameParse *info, MonoImage *image,
                        assembly = image->assembly;
                if (!assembly) {
                        /* then we must load the assembly ourselve - see #60439 */
-                       assembly = mono_assembly_load (&info->assembly, NULL, NULL);
+                       assembly = mono_assembly_load (&info->assembly, image->assembly->basedir, NULL);
                        if (!assembly)
                                return NULL;
                }
index 6f2909769abb92dfe9aba4a1f5ed2f1433743b94..6eb71c13c34e2007bdaf3bbca5fac1baaee5d68e 100644 (file)
@@ -454,12 +454,12 @@ void*
 mono_gc_alloc_obj (MonoVTable *vtable, size_t size)
 {
        void *res;
+       TLAB_ACCESS_INIT;
 
        if (!SGEN_CAN_ALIGN_UP (size))
                return NULL;
 
 #ifndef DISABLE_CRITICAL_REGION
-       TLAB_ACCESS_INIT;
 
        if (G_UNLIKELY (has_per_allocation_action)) {
                static int alloc_count;
@@ -498,12 +498,12 @@ void*
 mono_gc_alloc_vector (MonoVTable *vtable, size_t size, uintptr_t max_length)
 {
        MonoArray *arr;
+       TLAB_ACCESS_INIT;
 
        if (!SGEN_CAN_ALIGN_UP (size))
                return NULL;
 
 #ifndef DISABLE_CRITICAL_REGION
-       TLAB_ACCESS_INIT;
        ENTER_CRITICAL_REGION;
        arr = mono_gc_try_alloc_obj_nolock (vtable, size);
        if (arr) {
@@ -535,12 +535,12 @@ mono_gc_alloc_array (MonoVTable *vtable, size_t size, uintptr_t max_length, uint
 {
        MonoArray *arr;
        MonoArrayBounds *bounds;
+       TLAB_ACCESS_INIT;
 
        if (!SGEN_CAN_ALIGN_UP (size))
                return NULL;
 
 #ifndef DISABLE_CRITICAL_REGION
-       TLAB_ACCESS_INIT;
        ENTER_CRITICAL_REGION;
        arr = mono_gc_try_alloc_obj_nolock (vtable, size);
        if (arr) {
@@ -577,12 +577,12 @@ void*
 mono_gc_alloc_string (MonoVTable *vtable, size_t size, gint32 len)
 {
        MonoString *str;
+       TLAB_ACCESS_INIT;
 
        if (!SGEN_CAN_ALIGN_UP (size))
                return NULL;
 
 #ifndef DISABLE_CRITICAL_REGION
-       TLAB_ACCESS_INIT;
        ENTER_CRITICAL_REGION;
        str = mono_gc_try_alloc_obj_nolock (vtable, size);
        if (str) {
index 5900dc731a37aea1c46daa43875e27c817437440..359ce01471d52b663486b596124c5e16b69f4a47 100644 (file)
@@ -353,6 +353,8 @@ static long long time_major_fragment_creation = 0;
 int gc_debug_level = 0;
 FILE* gc_debug_file;
 
+static MonoGCFinalizerCallbacks fin_callbacks;
+
 /*
 void
 mono_gc_flush_info (void)
@@ -3352,6 +3354,13 @@ has_critical_finalizer (MonoObject *obj)
        return mono_class_has_parent_fast (class, mono_defaults.critical_finalizer_object);
 }
 
+static gboolean
+is_finalization_aware (MonoObject *obj)
+{
+       MonoVTable *vt = ((MonoVTable*)LOAD_VTABLE (obj));
+       return (vt->gc_bits & SGEN_GC_BIT_FINALIZER_AWARE) == SGEN_GC_BIT_FINALIZER_AWARE;
+}
+
 void
 sgen_queue_finalization_entry (MonoObject *obj)
 {
@@ -3366,6 +3375,9 @@ sgen_queue_finalization_entry (MonoObject *obj)
                fin_ready_list = entry;
        }
 
+       if (fin_callbacks.object_queued_for_finalization && is_finalization_aware (obj))
+               fin_callbacks.object_queued_for_finalization (obj);
+
 #ifdef ENABLE_DTRACE
        if (G_UNLIKELY (MONO_GC_FINALIZE_ENQUEUE_ENABLED ())) {
                int gen = sgen_ptr_in_nursery (obj) ? GENERATION_NURSERY : GENERATION_OLD;
@@ -4750,7 +4762,7 @@ mono_gc_base_init (void)
 
                                        if (val < SGEN_MAX_NURSERY_WASTE) {
                                                sgen_env_var_error (MONO_GC_PARAMS_NAME, "Using default value.",
-                                                               "`nursery-size` must be at least %d bytes.\n", SGEN_MAX_NURSERY_WASTE);
+                                                               "`nursery-size` must be at least %d bytes.", SGEN_MAX_NURSERY_WASTE);
                                                continue;
                                        }
 
@@ -5320,17 +5332,24 @@ sgen_get_remset (void)
 guint
 mono_gc_get_vtable_bits (MonoClass *class)
 {
+       guint res = 0;
        /* FIXME move this to the bridge code */
-       if (!sgen_need_bridge_processing ())
-               return 0;
-       switch (sgen_bridge_class_kind (class)) {
-       case GC_BRIDGE_TRANSPARENT_BRIDGE_CLASS:
-       case GC_BRIDGE_OPAQUE_BRIDGE_CLASS:
-               return SGEN_GC_BIT_BRIDGE_OBJECT;
-       case GC_BRIDGE_OPAQUE_CLASS:
-               return SGEN_GC_BIT_BRIDGE_OPAQUE_OBJECT;
+       if (sgen_need_bridge_processing ()) {
+               switch (sgen_bridge_class_kind (class)) {
+               case GC_BRIDGE_TRANSPARENT_BRIDGE_CLASS:
+               case GC_BRIDGE_OPAQUE_BRIDGE_CLASS:
+                       res = SGEN_GC_BIT_BRIDGE_OBJECT;
+                       break;
+               case GC_BRIDGE_OPAQUE_CLASS:
+                       res = SGEN_GC_BIT_BRIDGE_OPAQUE_OBJECT;
+                       break;
+               }
        }
-       return 0;
+       if (fin_callbacks.is_class_finalization_aware) {
+               if (fin_callbacks.is_class_finalization_aware (class))
+                       res |= SGEN_GC_BIT_FINALIZER_AWARE;
+       }
+       return res;
 }
 
 void
@@ -5366,4 +5385,13 @@ sgen_timestamp (void)
        return SGEN_TV_ELAPSED (sgen_init_timestamp, timestamp);
 }
 
+void
+mono_gc_register_finalizer_callbacks (MonoGCFinalizerCallbacks *callbacks)
+{
+       if (callbacks->version != MONO_GC_FINALIZER_EXTENSION_VERSION)
+               g_error ("Invalid finalizer callback version. Expected %d but got %d\n", MONO_GC_FINALIZER_EXTENSION_VERSION, callbacks->version);
+
+       fin_callbacks = *callbacks;
+}
+
 #endif /* HAVE_SGEN_GC */
index 7008cec2f7475c84ba284b327249a739a113d631..0e37c90f43007697ec9e77eb72bac35696d3cb4b 100644 (file)
@@ -367,6 +367,7 @@ List of what each bit on of the vtable gc bits means.
 enum {
        SGEN_GC_BIT_BRIDGE_OBJECT = 1,
        SGEN_GC_BIT_BRIDGE_OPAQUE_OBJECT = 2,
+       SGEN_GC_BIT_FINALIZER_AWARE = 4,
 };
 
 /* the runtime can register areas of memory as roots: we keep two lists of roots,
index 437f61a4d084a343d2c854ee2b4a2a8058fa9829..c322e649b75daa3e90f3c12046bf261d1b216f3e 100644 (file)
@@ -441,8 +441,9 @@ dyn_array_int_contains (DynIntArray *da, int x)
 static void
 enable_accounting (void)
 {
+       SgenHashTable table = SGEN_HASH_TABLE_INIT (INTERNAL_MEM_BRIDGE_HASH_TABLE, INTERNAL_MEM_BRIDGE_HASH_TABLE_ENTRY, sizeof (HashEntryWithAccounting), mono_aligned_addr_hash, NULL);
        bridge_accounting_enabled = TRUE;
-       hash_table = (SgenHashTable)SGEN_HASH_TABLE_INIT (INTERNAL_MEM_BRIDGE_HASH_TABLE, INTERNAL_MEM_BRIDGE_HASH_TABLE_ENTRY, sizeof (HashEntryWithAccounting), mono_aligned_addr_hash, NULL);
+       hash_table = table;
 }
 
 static MonoGCBridgeObjectKind
@@ -881,7 +882,7 @@ dump_graph (void)
        MonoObject *obj;
        HashEntry *entry;
        int prefix_len = strlen (dump_prefix);
-       char filename [prefix_len + 64];
+       char *filename = alloca(prefix_len + 64);
        FILE *file;
        int edge_id = 0;
 
index 51b5bc6f8f5bdcf777210cf2f19882ff7b525d02..189a60b5297d7e8ce5765bb6a3e058ea783e0aa4 100644 (file)
@@ -938,7 +938,12 @@ sgen_nursery_allocator_set_nursery_bounds (char *start, char *end)
        sgen_nursery_start = start;
        sgen_nursery_end = end;
 
-       sgen_space_bitmap_size = (end - start) / (SGEN_TO_SPACE_GRANULE_IN_BYTES * 8);
+       /*
+        * This will not divide evenly for tiny nurseries (<4kb), so we make sure to be on
+        * the right side of things and round up.  We could just do a MIN(1,x) instead,
+        * since the nursery size must be a power of 2.
+        */
+       sgen_space_bitmap_size = (end - start + SGEN_TO_SPACE_GRANULE_IN_BYTES * 8 - 1) / (SGEN_TO_SPACE_GRANULE_IN_BYTES * 8);
        sgen_space_bitmap = g_malloc0 (sgen_space_bitmap_size);
 
        /* Setup the single first large fragment */
index de2933f77957379a3b7ee6a64ea4d100737218ca..42a588164df379f3827988052145f1590e7ceee2 100644 (file)
@@ -396,8 +396,9 @@ dyn_array_int_merge_one (DynIntArray *array, int value)
 static void
 enable_accounting (void)
 {
+       SgenHashTable table = SGEN_HASH_TABLE_INIT (INTERNAL_MEM_BRIDGE_HASH_TABLE, INTERNAL_MEM_BRIDGE_HASH_TABLE_ENTRY, sizeof (HashEntryWithAccounting), mono_aligned_addr_hash, NULL);
        bridge_accounting_enabled = TRUE;
-       hash_table = (SgenHashTable)SGEN_HASH_TABLE_INIT (INTERNAL_MEM_BRIDGE_HASH_TABLE, INTERNAL_MEM_BRIDGE_HASH_TABLE_ENTRY, sizeof (HashEntryWithAccounting), mono_aligned_addr_hash, NULL);
+       hash_table = table;
 }
 
 static MonoGCBridgeObjectKind
index fec1d697ca27c4e3eaf92fef781b2356351a0bae..1abcda6b2e14ec8e80f90bb7bb23d53405136dc9 100644 (file)
@@ -390,10 +390,10 @@ retry:
 static void
 free_color_buckets (void)
 {
-       color_data_count = 0;
-
        ColorBucket *cur, *tmp;
 
+       color_data_count = 0;
+
        for (cur = root_color_bucket; cur; cur = tmp) {
                ColorData *cd;
                for (cd = &cur->data [0]; cd < cur->next_data; ++cd) {
index 9eb952f18ced93bb79222b391f007d62676ccf45..689e4e294880af8ac185598acc0bdf1b329facc9 100755 (executable)
@@ -721,6 +721,12 @@ create_thread (MonoThread *thread, MonoInternalThread *internal, StartInfo *star
        MonoNativeThreadId tid;
        guint32 create_flags;
 
+       /*
+        * Join joinable threads to prevent running out of threads since the finalizer
+        * thread might be blocked/backlogged.
+        */
+       mono_threads_join_threads ();
+
        mono_threads_lock ();
        if (shutting_down) {
                g_free (start_info);
index 3c29b116e4c5522eb4a9176455a8c10ee2d8a9c2..aa4435c8e85705289d4097cad7b300f4f68bfe86 100644 (file)
@@ -3219,9 +3219,10 @@ do_invoke_method (VerifyContext *ctx, int method_token, gboolean virtual)
                if (constrained && virtual) {
                        if (!stack_slot_is_managed_pointer (value))
                                CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Object is not a managed pointer for a constrained call at 0x%04x", ctx->ip_offset));
-                       if (!mono_metadata_type_equal_full (mono_type_get_type_byval (value->type), ctx->constrained_type, TRUE))
+                       if (!mono_metadata_type_equal_full (mono_type_get_type_byval (value->type), mono_type_get_underlying_type (ctx->constrained_type), TRUE))
                                CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Object not compatible with constrained type at 0x%04x", ctx->ip_offset));
                        copy.stype |= BOXED_MASK;
+                       copy.type = ctx->constrained_type;
                } else {
                        if (stack_slot_is_managed_pointer (value) && !mono_class_from_mono_type (value->type)->valuetype)
                                CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Cannot call a reference type using a managed pointer to the this arg at 0x%04x", ctx->ip_offset));
index 0c809062b867bb0d739c3a2c329f70bc6a7e53a8..d7a903adbeda21cbbb73300054996c178fe17857 100644 (file)
@@ -356,7 +356,8 @@ typedef enum {
        MOD_KIND_STEP = 10,
        MOD_KIND_ASSEMBLY_ONLY = 11,
        MOD_KIND_SOURCE_FILE_ONLY = 12,
-       MOD_KIND_TYPE_NAME_ONLY = 13
+       MOD_KIND_TYPE_NAME_ONLY = 13,
+       MOD_KIND_NONE = 14
 } ModifierKind;
 
 typedef enum {
@@ -4326,7 +4327,7 @@ insert_breakpoint (MonoSeqPointInfo *seq_points, MonoDomain *domain, MonoJitInfo
 #endif
        }
 
-       DEBUG(1, fprintf (log_file, "[dbg] Inserted breakpoint at %s:0x%x.\n", mono_method_full_name (jinfo_get_method (ji), TRUE), (int)sp->il_offset));       
+       DEBUG(1, fprintf (log_file, "[dbg] Inserted breakpoint at %s:0x%x [%p](%d).\n", mono_method_full_name (jinfo_get_method (ji), TRUE), (int)sp->il_offset, inst->ip, count));
 }
 
 static void
@@ -4346,6 +4347,7 @@ remove_breakpoint (BreakpointInstance *inst)
 
        if (count == 1 && inst->native_offset != SEQ_POINT_NATIVE_OFFSET_DEAD_CODE) {
                mono_arch_clear_breakpoint (ji, ip);
+               DEBUG(1, fprintf (log_file, "[dbg] Clear breakpoint at %s [%p].\n", mono_method_full_name (jinfo_get_method (ji), TRUE), ip));
        }
 #else
        NOT_IMPLEMENTED;
@@ -5412,6 +5414,25 @@ ss_destroy (SingleStepReq *req)
        ss_req = NULL;
 }
 
+static void
+ss_clear_for_assembly (SingleStepReq *req, MonoAssembly *assembly)
+{
+       GSList *l;
+       gboolean found = TRUE;
+
+       while (found) {
+               found = FALSE;
+               for (l = ss_req->bps; l; l = l->next) {
+                       if (breakpoint_matches_assembly (l->data, assembly)) {
+                               clear_breakpoint (l->data);
+                               ss_req->bps = g_slist_delete_link (ss_req->bps, l);
+                               found = TRUE;
+                               break;
+                       }
+               }
+       }
+}
+
 /*
  * Called from metadata by the icall for System.Diagnostics.Debugger:Log ().
  */
@@ -6311,28 +6332,47 @@ clear_event_request (int req_id, int etype)
        mono_loader_unlock ();
 }
 
-static gboolean
-event_req_matches_assembly (EventRequest *req, MonoAssembly *assembly)
+static void
+clear_assembly_from_modifier (EventRequest *req, Modifier *m, MonoAssembly *assembly)
 {
-       if (req->event_kind == EVENT_KIND_BREAKPOINT)
-               return breakpoint_matches_assembly (req->info, assembly);
-       else {
-               int i, j;
+       int i;
 
-               for (i = 0; i < req->nmodifiers; ++i) {
-                       Modifier *m = &req->modifiers [i];
+       if (m->kind == MOD_KIND_EXCEPTION_ONLY && m->data.exc_class && m->data.exc_class->image->assembly == assembly)
+               m->kind = MOD_KIND_NONE;
+       if (m->kind == MOD_KIND_ASSEMBLY_ONLY && m->data.assemblies) {
+               int count = 0, match_count = 0, pos;
+               MonoAssembly **newassemblies;
 
-                       if (m->kind == MOD_KIND_EXCEPTION_ONLY && m->data.exc_class && m->data.exc_class->image->assembly == assembly)
-                               return TRUE;
-                       if (m->kind == MOD_KIND_ASSEMBLY_ONLY && m->data.assemblies) {
-                               for (j = 0; m->data.assemblies [j]; ++j)
-                                       if (m->data.assemblies [j] == assembly)
-                                               return TRUE;
-                       }
+               for (i = 0; m->data.assemblies [i]; ++i) {
+                       count ++;
+                       if (m->data.assemblies [i] == assembly)
+                               match_count ++;
+               }
+
+               if (match_count) {
+                       newassemblies = g_new0 (MonoAssembly*, count - match_count);
+
+                       pos = 0;
+                       for (i = 0; i < count; ++i)
+                               if (m->data.assemblies [i] != assembly)
+                                       newassemblies [pos ++] = m->data.assemblies [i];
+                       g_assert (pos == count - match_count);
+                       g_free (m->data.assemblies);
+                       m->data.assemblies = newassemblies;
                }
        }
+}
 
-       return FALSE;
+static void
+clear_assembly_from_modifiers (EventRequest *req, MonoAssembly *assembly)
+{
+       int i;
+
+       for (i = 0; i < req->nmodifiers; ++i) {
+               Modifier *m = &req->modifiers [i];
+
+               clear_assembly_from_modifier (req, m, assembly);
+       }
 }
 
 /*
@@ -6353,11 +6393,16 @@ clear_event_requests_for_assembly (MonoAssembly *assembly)
                for (i = 0; i < event_requests->len; ++i) {
                        EventRequest *req = g_ptr_array_index (event_requests, i);
 
-                       if (event_req_matches_assembly (req, assembly)) {
+                       clear_assembly_from_modifiers (req, assembly);
+
+                       if (req->event_kind == EVENT_KIND_BREAKPOINT && breakpoint_matches_assembly (req->info, assembly)) {
                                clear_event_request (req->id, req->event_kind);
                                found = TRUE;
                                break;
                        }
+
+                       if (req->event_kind == EVENT_KIND_STEP)
+                               ss_clear_for_assembly (req->info, assembly);
                }
        }
        mono_loader_unlock ();
index b81a7dca3a3fa8eced768d1e8f6c1e7b5504d004..bd9847c4172f923b42056dd68a6e4b6914378674 100644 (file)
@@ -19,6 +19,7 @@
 #include <glib.h>
 #include <signal.h>
 #include <string.h>
+
 #ifdef HAVE_UCONTEXT_H
 #include <ucontext.h>
 #endif
@@ -876,11 +877,11 @@ prepare_for_guard_pages (MonoContext *mctx)
 }
 
 static void
-altstack_handle_and_restore (void *sigctx, gpointer obj, gboolean stack_ovf)
+altstack_handle_and_restore (MonoContext *ctx, gpointer obj, gboolean stack_ovf)
 {
        MonoContext mctx;
 
-       mono_arch_sigctx_to_monoctx (sigctx, &mctx);
+       mctx = *ctx;
 
        mono_handle_exception (&mctx, obj);
        if (stack_ovf)
@@ -893,11 +894,10 @@ mono_arch_handle_altstack_exception (void *sigctx, gpointer fault_addr, gboolean
 {
 #if defined(MONO_ARCH_USE_SIGACTION)
        MonoException *exc = NULL;
-       ucontext_t *ctx = (ucontext_t*)sigctx;
        MonoJitInfo *ji = mini_jit_info_table_find (mono_domain_get (), (gpointer)UCONTEXT_REG_RIP (sigctx), NULL);
        gpointer *sp;
        int frame_size;
-       ucontext_t *copied_ctx;
+       MonoContext *copied_ctx;
 
        if (stack_ovf)
                exc = mono_domain_get ()->stack_overflow_ex;
@@ -912,27 +912,15 @@ mono_arch_handle_altstack_exception (void *sigctx, gpointer fault_addr, gboolean
         *   return ip
         * 128 is the size of the red zone
         */
-       frame_size = sizeof (ucontext_t) + sizeof (gpointer) * 4 + 128;
-#ifdef __APPLE__
-       frame_size += sizeof (*ctx->uc_mcontext);
-#endif
+       frame_size = sizeof (MonoContext) + sizeof (gpointer) * 4 + 128;
        frame_size += 15;
        frame_size &= ~15;
        sp = (gpointer)(UCONTEXT_REG_RSP (sigctx) & ~15);
        sp = (gpointer)((char*)sp - frame_size);
-       copied_ctx = (ucontext_t*)(sp + 4);
+       copied_ctx = (MonoContext*)(sp + 4);
        /* the arguments must be aligned */
        sp [-1] = (gpointer)UCONTEXT_REG_RIP (sigctx);
-       /* may need to adjust pointers in the new struct copy, depending on the OS */
-       memcpy (copied_ctx, ctx, sizeof (ucontext_t));
-#ifdef __APPLE__
-       {
-               guint8 * copied_mcontext = (guint8*)copied_ctx + sizeof (ucontext_t);
-               /* uc_mcontext is a pointer, so make a copy which is stored after the ctx */
-               memcpy (copied_mcontext, ctx->uc_mcontext, sizeof (*ctx->uc_mcontext));
-               copied_ctx->uc_mcontext = (void*)copied_mcontext;
-       }
-#endif
+       mono_sigctx_to_monoctx (sigctx, copied_ctx);
        /* at the return form the signal handler execution starts in altstack_handle_and_restore() */
        UCONTEXT_REG_RIP (sigctx) = (unsigned long)altstack_handle_and_restore;
        UCONTEXT_REG_RSP (sigctx) = (unsigned long)(sp - 1);
index 6e5bf2f8586b331670c76f02325d0cb7585f3d95..66eb8fcdcf2f0c78f58f12ca2fd5bfeae4091fd7 100644 (file)
@@ -1452,6 +1452,8 @@ mono_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
                                                if (k != j)
                                                        sreg_masks [k] &= ~ (regmask (dest_sreg));
                                        }
+                                       /* See below */
+                                       dreg_mask &= ~ (regmask (dest_sreg));
                                } else {
                                        val = rs->vassign [sreg];
                                        if (val == -1) {
@@ -1471,7 +1473,7 @@ mono_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)
                                                                sreg_masks [k] &= ~ (regmask (dest_sreg));
                                                }
                                                /* 
-                                                * Prevent the dreg from being allocate to dest_sreg 
+                                                * Prevent the dreg from being allocated to dest_sreg
                                                 * too, since it could force sreg1 to be allocated to 
                                                 * the same reg on x86.
                                                 */
index 9da527eaf357d7af1eb77a526a6c215151a72e23..d09863f709b43646dfa5df388408e604d40d7f7a 100644 (file)
@@ -313,6 +313,8 @@ type_to_simd_type (int type)
 static LLVMTypeRef
 type_to_llvm_type (EmitContext *ctx, MonoType *t)
 {
+       t = mini_replace_type (t);
+
        if (t->byref)
                return LLVMPointerType (LLVMInt8Type (), 0);
        switch (t->type) {
index 702daa6b813a5e0485b984bc780da12894b300d4..ff3d5537ad28b22cb4718acd8357fe1f20a0effe 100644 (file)
@@ -2656,7 +2656,7 @@ void mono_generic_sharing_cleanup (void) MONO_INTERNAL;
 MonoClass* mini_class_get_container_class (MonoClass *class) MONO_INTERNAL;
 MonoGenericContext* mini_class_get_context (MonoClass *class) MONO_INTERNAL;
 
-MonoType* mini_replace_type (MonoType *type) MONO_INTERNAL;
+MonoType* mini_replace_type (MonoType *type) MONO_LLVM_INTERNAL;
 MonoType* mini_get_basic_type_from_generic (MonoGenericSharingContext *gsctx, MonoType *type) MONO_INTERNAL;
 MonoType* mini_type_get_underlying_type (MonoGenericSharingContext *gsctx, MonoType *type) MONO_INTERNAL;
 MonoMethod* mini_get_shared_method (MonoMethod *method) MONO_INTERNAL;
index 96c79ef2712546a66db9b65f7ed299baafc56c09..eea1dbf5db5e27987c35b915dcc515999cdf9921 100644 (file)
@@ -2403,13 +2403,14 @@ decode_buffer (ProfContext *ctx)
                        } else if (subtype == TYPE_SAMPLE_COUNTERS_DESC) {
                                uint64_t i, len = decode_uleb128 (p + 1, &p);
                                for (i = 0; i < len; i++) {
+                                       uint64_t type, unit, variance, index;
                                        uint64_t section = decode_uleb128 (p, &p);
                                        char *name = pstrdup ((char*)p);
                                        while (*p++);
-                                       uint64_t type = decode_uleb128 (p, &p);
-                                       uint64_t unit = decode_uleb128 (p, &p);
-                                       uint64_t variance = decode_uleb128 (p, &p);
-                                       uint64_t index = decode_uleb128 (p, &p);
+                                       type = decode_uleb128 (p, &p);
+                                       unit = decode_uleb128 (p, &p);
+                                       variance = decode_uleb128 (p, &p);
+                                       index = decode_uleb128 (p, &p);
                                        add_counter ((int)section, name, (int)type, (int)unit, (int)variance, (int)index);
                                }
                        } else if (subtype == TYPE_SAMPLE_COUNTERS) {
@@ -2419,7 +2420,7 @@ decode_buffer (ProfContext *ctx)
                                uint64_t timestamp = decode_uleb128 (p + 1, &p);
                                uint64_t time_between = timestamp / 1000 * 1000 * 1000 * 1000 + startup_time;
                                while (1) {
-                                       uint64_t index = decode_uleb128 (p, &p);
+                                       uint64_t type, index = decode_uleb128 (p, &p);
                                        if (index == 0)
                                                break;
 
@@ -2430,7 +2431,7 @@ decode_buffer (ProfContext *ctx)
                                                }
                                        }
 
-                                       uint64_t type = decode_uleb128 (p, &p);
+                                       type = decode_uleb128 (p, &p);
 
                                        value = calloc (1, sizeof (CounterValue));
                                        value->timestamp = timestamp;
index 16b9b781ae5d4ba56c9a52fe02fc1c8625733dcd..438c0ec38033cd6e64d1ff47a5ed14844b34d028 100644 (file)
@@ -1937,12 +1937,12 @@ counters_init_add_counter (MonoCounter *counter, gpointer data)
 static void
 counters_init (MonoProfiler *profiler)
 {
-       mono_counters_foreach (counters_init_add_counter, NULL);
-
        MonoCounterAgent *agent;
        LogBuffer *logbuffer;
        int size = 1 + 5, len = 0;
 
+       mono_counters_foreach (counters_init_add_counter, NULL);
+
        for (agent = counters; agent; agent = agent->next) {
                size += strlen (mono_counter_get_name (agent->counter)) + 1 + 5 * 5;
                len += 1;
@@ -1994,9 +1994,11 @@ counters_sample (MonoProfiler *profiler, uint64_t timestamp)
        emit_byte (logbuffer, TYPE_SAMPLE_COUNTERS | TYPE_SAMPLE);
        emit_uvalue (logbuffer, timestamp);
        for (agent = counters; agent; agent = agent->next) {
+               size_t size;
+
                counter = agent->counter;
 
-               size_t size = mono_counter_get_size (counter);
+               size = mono_counter_get_size (counter);
                if (size < 0) {
                        continue; // FIXME error
                } else if (size > buffer_size) {
index 79c6f9193240873966208cd91bf95f04661d2572..ab18c9bdf0808ad974774a8f85b22b5a75422042 100644 (file)
@@ -1,6 +1,6 @@
 SUBDIRS = cas assemblyresolve gc-descriptors
 
-check-local: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test-cattr-type-load test_platform test-process-exit test-messages rm-empty-logs
+check-local: assemblyresolve/test/asm.dll testjit test-generic-sharing test-type-load test-cattr-type-load test-reflection-load-with-context test_platform test-process-exit test-messages rm-empty-logs
 check-full: test-sgen check-local
 check-parallel: compile-tests check-full
 
@@ -892,6 +892,16 @@ test-cattr-type-load: TestDriver.dll custom-attr-errors.cs custom-attr-errors-li
        @echo "Testing custom-attribute-load-exceptions.exe..."
        @$(RUNTIME) custom-attr-errors.exe > custom-attr-errors.exe.stdout 2> custom-attr-errors.exe.stderr
 
+EXTRA_DIST += reflection-load-with-context-lib.cs reflection-load-with-context-second-lib.cs reflection-load-with-context.cs
+test-reflection-load-with-context: TestDriver.dll reflection-load-with-context-lib.cs reflection-load-with-context-second-lib.cs reflection-load-with-context.cs
+       rm -rf reflection-load-dir
+       mkdir reflection-load-dir
+       $(MCS) /t:library $(srcdir)/reflection-load-with-context-second-lib.cs -out:reflection-load-dir/reflection-load-with-context-second-lib.dll
+       $(MCS) /t:library -r:reflection-load-dir/reflection-load-with-context-second-lib.dll $(srcdir)/reflection-load-with-context-lib.cs -out:reflection-load-dir/reflection-load-with-context-lib.dll
+       $(MCS) reflection-load-with-context.cs
+       @echo "Testing reflection-load-with-context.cs.exe..."
+       @$(RUNTIME) reflection-load-with-context.exe > reflection-load-with-context.exe.stdout 2> reflection-load-with-context.exe.stderr
+
 
 EXTRA_DIST += debug-casts.cs
 # This depends on TLS, so its not ran by default
diff --git a/mono/tests/reflection-load-with-context-lib.cs b/mono/tests/reflection-load-with-context-lib.cs
new file mode 100644 (file)
index 0000000..9aca41f
--- /dev/null
@@ -0,0 +1,29 @@
+using System;
+
+namespace B
+{
+       public class MyAttribute : Attribute {
+               public Type Type { get; set; }
+               public MyAttribute (Type t) {
+                       Type = t;
+               }
+               public override string ToString () {
+                       return "My " + Type;
+               }
+       }
+
+       [My (typeof (A.ClassA))]
+       public class ClassB { // A.AnotherClassA
+
+               public ClassB () {
+                       Console.WriteLine ("IN B");
+                       Console.WriteLine (typeof (ClassB).AssemblyQualifiedName);
+                       var t = Type.GetType ("B.ClassB, reflection-load-with-context-lib, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null");
+                       Console.WriteLine (t);
+                       t = Type.GetType ("A.ClassA, reflection-load-with-context-second-lib, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null");
+                       Console.WriteLine ("class a: {0}", t);
+                       if (t == null)
+                               throw new Exception ("FAIL");
+               }
+       }
+}
\ No newline at end of file
diff --git a/mono/tests/reflection-load-with-context-second-lib.cs b/mono/tests/reflection-load-with-context-second-lib.cs
new file mode 100644 (file)
index 0000000..4458aad
--- /dev/null
@@ -0,0 +1,7 @@
+using System;
+
+namespace A
+{
+       public class ClassA {}
+       public class AnotherClassA {}
+}
\ No newline at end of file
diff --git a/mono/tests/reflection-load-with-context.cs b/mono/tests/reflection-load-with-context.cs
new file mode 100644 (file)
index 0000000..4c791e7
--- /dev/null
@@ -0,0 +1,26 @@
+using System;
+using System.Reflection;
+using System.IO;
+
+class Driver {
+       static int Main () {
+               var src = Path.Combine (Path.GetDirectoryName (typeof (Driver).Assembly.Location), "reflection-load-dir");
+               var dep_asm = Assembly.UnsafeLoadFrom (Path.Combine (src, "reflection-load-with-context-lib.dll"));
+               var type = dep_asm.GetType ("B.ClassB");
+               var attr_type = dep_asm.GetType ("B.MyAttribute");
+
+               try {
+                       Activator.CreateInstance (type);
+               } catch (Exception) {
+                       return 1;
+               }
+
+               try {
+                       type.GetCustomAttributes (attr_type, false);
+               } catch (Exception) {
+                       return 2;
+               }
+               return 0;
+       }
+}
+
index c8c70007bc751d0a55d612c230a28450c79e968f..c1a1a94b47597e5e288ba306348925bf391c06a2 100755 (executable)
@@ -167,7 +167,7 @@ static inline void InterlockedWrite16(volatile gint16 *dst, gint16 val)
        mono_memory_barrier ();
 }
 
-/* Prefer GCC atomic ops if the target supports it (see configure.in). */
+/* Prefer GCC atomic ops if the target supports it (see configure.ac). */
 #elif defined(USE_GCC_ATOMIC_OPS)
 
 static inline gint32 InterlockedCompareExchange(volatile gint32 *dest,
index b4ea3770ad2af85b15e3a08af7de2fc77da7a5da..6da0fb2fc8d9c7a98fafaf697b2fc0e9b8e4d501 100644 (file)
        
 #      if defined(HAVE_KW_THREAD) && defined(USE_INCLUDED_LIBGC) && !defined(__powerpc__)
         /* The local alloc stuff is in pthread_support.c, but solaris uses solaris_threads.c */
-        /* It is also disabled on solaris/x86 by libgc/configure.in */
+        /* It is also disabled on solaris/x86 by libgc/configure.ac */
         /* 
                 * ARM has no definition for some atomic functions in gc_locks.h and
-                * support is also disabled in libgc/configure.in.
+                * support is also disabled in libgc/configure.ac.
                 */
 #       if !defined(__sparc__) && !defined(__sun) && !defined(__arm__) && !defined(__mips__)
 #                  define GC_REDIRECT_TO_LOCAL
index 8c813453f6ee4f83c2467219903504b3dc30e4df..258199018b366ce57ad70f4d181548c2ac6fb483 100755 (executable)
@@ -118,7 +118,8 @@ typedef struct {
         __asm mov [eax+0x14], esp                                                                                      \
         __asm mov [eax+0x18], esi                                                                                      \
         __asm mov [eax+0x1c], edi                                                                                      \
-        __asm call $+5                                                                                                         \
+        __asm call __mono_context_get_ip                                                                       \
+        __asm __mono_context_get_ip:                                                                           \
         __asm pop dword ptr [eax+0x20]                                                                         \
                 }                                                                                                                              \
        } while (0)
index 9d72ba2dcd30e7cc5ed82c5330f7a0be3ce5b336..2f642bb3ec19473a604993426ee1146202cce6d1 100644 (file)
@@ -273,43 +273,43 @@ dump_counter (MonoCounter *counter, FILE *outfile) {
 }
 
 static gint64
-user_time ()
+user_time (void)
 {
        return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_USER_TIME);
 }
 
 static gint64
-system_time ()
+system_time (void)
 {
        return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_SYSTEM_TIME);
 }
 
 static gint64
-total_time ()
+total_time (void)
 {
        return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_TOTAL_TIME);
 }
 
 static gint64
-working_set ()
+working_set (void)
 {
        return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_WORKING_SET);
 }
 
 static gint64
-private_bytes ()
+private_bytes (void)
 {
        return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_PRIVATE_BYTES);
 }
 
 static gint64
-virtual_bytes ()
+virtual_bytes (void)
 {
        return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_VIRTUAL_BYTES);
 }
 
 static gint64
-page_faults ()
+page_faults (void)
 {
        return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_FAULTS);
 }
@@ -349,19 +349,19 @@ cpu_load (int kind)
 }
 
 static double
-cpu_load_1min ()
+cpu_load_1min (void)
 {
        return cpu_load (0);
 }
 
 static double
-cpu_load_5min ()
+cpu_load_5min (void)
 {
        return cpu_load (1);
 }
 
 static double
-cpu_load_15min ()
+cpu_load_15min (void)
 {
        return cpu_load (2);
 }
@@ -374,7 +374,7 @@ static gboolean system_counters_initialized = FALSE;
 #define SYSCOUNTER_LOAD (MONO_COUNTER_SYSTEM | MONO_COUNTER_DOUBLE | MONO_COUNTER_PERCENTAGE | MONO_COUNTER_VARIABLE | MONO_COUNTER_CALLBACK)
 
 static void
-initialize_system_counters ()
+initialize_system_counters (void)
 {
        mono_counters_register ("User Time", SYSCOUNTER_TIME, &user_time);
        mono_counters_register ("System Time", SYSCOUNTER_TIME, &system_time);
@@ -417,8 +417,7 @@ mono_counters_foreach (CountersEnumCallback cb, gpointer user_data)
                size = sizeof (type);   \
                if (buffer_size < size) \
                        return -1;      \
-               type __var = cb ? ((functype)counter->addr) () : *(type*)counter->addr; \
-               memcpy (buffer, &__var, size);  \
+               *(type*)buffer = cb ? ((functype)counter->addr) () : *(type*)counter->addr; \
        } while (0);
 
 int
index 74be0028245c4a5cf4f3180349f83bca1f949568..4ac92196e07c5cdae57975616aa4c7f54c1e2ba0 100644 (file)
@@ -25,9 +25,6 @@
 #  elif defined(__native_client__) && defined(USE_NEWLIB)
 #    define TIMESPEC struct timespec
 #    define WAIT_BLOCK(a, b) sem_trywait(a)
-#  elif defined(__OpenBSD__)
-#    define TIMESPEC struct timespec
-#    define WAIT_BLOCK(a) sem_trywait(a)
 #  else
 #    define TIMESPEC struct timespec
 #    define WAIT_BLOCK(a,b) sem_timedwait (a, b)
@@ -43,9 +40,6 @@ mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable)
        TIMESPEC ts, copy;
        struct timeval t;
        int res = 0;
-#if defined(__OpenBSD__)
-       int timeout;
-#endif
 
 #ifndef USE_MACH_SEMA
        if (timeout_ms == 0)
@@ -65,19 +59,7 @@ mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable)
                ts.tv_nsec -= NSEC_PER_SEC;
                ts.tv_sec++;
        }
-#if defined(__OpenBSD__)
-       timeout = ts.tv_sec;
-       while (timeout) {
-               if ((res = WAIT_BLOCK (sem)) == 0)
-                       return res;
-
-               if (alertable)
-                       return -1;
 
-               usleep (ts.tv_nsec / 1000);
-               timeout--;
-       }
-#else
        copy = ts;
        while ((res = WAIT_BLOCK (sem, &ts)) == -1 && errno == EINTR) {
                struct timeval current;
@@ -104,7 +86,7 @@ mono_sem_timedwait (MonoSemType *sem, guint32 timeout_ms, gboolean alertable)
                        ts.tv_nsec = 0;
                }
        }
-#endif
+
        /* OSX might return > 0 for error */
        if (res != 0)
                res = -1;
index 0e95d4e878e6eb1c7f3789dc8c13b92fdd456731..cafb3fe96d03a7ddc35d3e72216ccdb8258be080 100644 (file)
@@ -66,25 +66,24 @@ mono_threads_install_dead_letter (void)
 {
        id cur, dict;
 
+       /*
+        * See the 'Dispatch Objective-C Messages Using the Method Function’s Prototype' section in
+        * the '64-Bit Transition Guide for Cocoa Touch' as to why this is required.
+        *
+        * It doesn't hurt on other architectures either, so no need to #ifdef it only for ARM64.
+        */
+
+       id (*id_objc_msgSend_id)(id, SEL, id) = (id (*)(id, SEL, id)) objc_msgSend;
+       void (*objc_msgSend_id_id)(id, SEL, id, id) = (void (*)(id, SEL, id, id)) objc_msgSend;
+
        cur = objc_msgSend ((id)nsthread, currentThread);
        if (!cur)
                return;
        dict = objc_msgSend (cur, threadDictionary);
-       if (dict && objc_msgSend (dict, objectForKey, mono_dead_letter_key) == nil) {
+       if (dict && id_objc_msgSend_id (dict, objectForKey, mono_dead_letter_key) == nil) {
                id value = objc_msgSend (objc_msgSend ((id)mono_dead_letter_class, alloc), init);
 
-#ifdef TARGET_ARM64
-               /*
-                * See the 'Dispatch Objective-C Messages Using the Method Function’s Prototype' section in
-                * the '64-Bit Transition Guide for Cocoa Touch' as to why this is required.
-                */
-               {
-                       void (*action)(id, SEL, id, id) = (void (*)(id, SEL, id, id)) objc_msgSend;
-                       action (dict, setObjectForKey, value, mono_dead_letter_key);
-               }
-#else
-               objc_msgSend (dict, setObjectForKey, value, mono_dead_letter_key);
-#endif
+               objc_msgSend_id_id (dict, setObjectForKey, value, mono_dead_letter_key);
 
                objc_msgSend (value, release);
        }
@@ -93,8 +92,8 @@ mono_threads_install_dead_letter (void)
 void
 mono_threads_init_dead_letter (void)
 {
-       id nsstring = objc_getClass ("NSString");
-       id nsautoreleasepool = objc_getClass ("NSAutoreleasePool");
+       id nsstring = (id) objc_getClass ("NSString");
+       id nsautoreleasepool = (id) objc_getClass ("NSAutoreleasePool");
        SEL stringWithUTF8String = sel_registerName ("stringWithUTF8String:");
        SEL retain = sel_registerName ("retain");
        id pool;
@@ -121,14 +120,8 @@ mono_threads_init_dead_letter (void)
        // create the dict key
        pool = objc_msgSend (objc_msgSend (nsautoreleasepool, alloc), init);
 
-#ifdef TARGET_ARM64
-       {
-               id (*action)(id, SEL, char*) = (id (*)(id, SEL, char*)) objc_msgSend;
-               mono_dead_letter_key = action(nsstring, stringWithUTF8String, "mono-dead-letter");
-       }
-#else
-       mono_dead_letter_key = objc_msgSend (nsstring, stringWithUTF8String, "mono-dead-letter");
-#endif
+       id (*objc_msgSend_char)(id, SEL, const char*) = (id (*)(id, SEL, const char*)) objc_msgSend;
+       mono_dead_letter_key = objc_msgSend_char (nsstring, stringWithUTF8String, "mono-dead-letter");
 
        objc_msgSend (mono_dead_letter_key, retain);
        objc_msgSend (pool, release);
index d7b993409991182021565d76457cd7f4dc16ddf6..f20acdc2498bb31a49f9d81cc5257c381c118ef2 100644 (file)
  * #define NO_ERRNO if strtod should not assign errno = ERANGE when
  *     the result overflows to +-Infinity or underflows to 0.
  */
-#if defined(TARGET_X86) || defined(mips) && defined(MIPSEL) || defined (__arm__)
+#if defined(TARGET_X86) || defined(mips) && defined(MIPSEL) || defined (__arm__) || defined(__aarch64__)
 
 #   define IEEE_8087
 
index 4e0e44e59153b693460c6fae0e119016dc8f7e1b..872748e7f476b3e8b1fcd378b222d1a95d5828aa 100644 (file)
@@ -19,6 +19,7 @@
     <TargetFrameworkVersion>v@FX_VERSION</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  @SIGNATURE@\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
index 5fa1a75ec78e2938b5a0ae5f385845e4f02d7cfe..b3e6b0d6715ef51ec68663f1ddd3e3815b064f24 100644 (file)
@@ -861,7 +861,19 @@ class MsbuildGenerator {
                // Replace the template values
                //
 
+               string strongNameSection = "";
+               if (StrongNameKeyFile != null){
+                       strongNameSection = String.Format (
+                               "  <PropertyGroup>\n" +
+                               "    <SignAssembly>true</SignAssembly>\n" +
+                               "{1}" +
+                               "  </PropertyGroup>\n" + 
+                               "  <PropertyGroup>\n" + 
+                               "    <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>\n" +
+                               "  </PropertyGroup>", StrongNameKeyFile, StrongNameDelaySign ? "    <DelaySign>true</DelaySign>\n" : "");
+               }
                Csproj.output = template.
+                       Replace ("@SIGNATURE@", strongNameSection).
                        Replace ("@PROJECTGUID@", Csproj.projectGuid).
                        Replace ("@DEFINES@", defines.ToString ()).
                        Replace ("@DISABLEDWARNINGS@", string.Join (",", (from i in ignore_warning select i.ToString ()).ToArray ())).
index 78c900e9d9b2afeb460a3d24d7d0614d7bf7a027..e5b54da47b909f222d3664480c522d34d40ca1f8 100644 (file)
@@ -26,7 +26,7 @@ Mono_Posix_Syscall_L_ctermid (void)
 gint32
 Mono_Posix_Syscall_L_cuserid (void)
 {
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined (__OpenBSD__)
        return -1;
 #else
        return L_cuserid;
index 1084339a44f2172c1cb4b8758d216c541bf72168..427e21f35a88bd246c81c8002f86f50d5d079253 100644 (file)
@@ -1,5 +1,5 @@
 /* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* The architecture this is running on */
 #if defined(_M_IA64)