Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -135,14 +135,12 @@ namespace System.CodeDom.Compiler {
CompilerInfo ci = GetCompilerInfo (language);
return (ci == null) ? null : ci.CreateProvider ();
}
#if NET_4_0
[ComVisible (false)]
public static CodeDomProvider CreateProvider (string language, IDictionary<string, string> providerOptions)
{
CompilerInfo ci = GetCompilerInfo (language);
return ci == null ? null : ci.CreateProvider (providerOptions);
}
#endif
#endif
public virtual string CreateValidIdentifier (string value)

View File

@@ -39,11 +39,7 @@ namespace System.CodeDom.Compiler
[ConfigurationCollection (typeof (Compiler), AddItemName = "compiler", CollectionType = ConfigurationElementCollectionType.BasicMap)]
internal sealed class CompilerCollection : ConfigurationElementCollection
{
#if NET_4_0
static readonly string defaultCompilerVersion = "3.5";
#else
static readonly string defaultCompilerVersion = "2.0";
#endif
static ConfigurationPropertyCollection properties;
static List <CompilerInfo> compiler_infos;
static Dictionary <string, CompilerInfo> compiler_languages;

View File

@@ -34,9 +34,6 @@ using System.Security.Permissions;
namespace System.CodeDom.Compiler {
[Serializable]
#if ONLY_1_1
[PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)]
#endif
public class CompilerErrorCollection : CollectionBase
{
public CompilerErrorCollection ()

View File

@@ -103,9 +103,7 @@ namespace System.CodeDom.Compiler {
return CreateProvider (ProviderOptions);
}
#if NET_4_0
public
#endif
CodeDomProvider CreateProvider (IDictionary<string, string> providerOptions)
{
Type providerType = CodeDomProviderType;

View File

@@ -96,9 +96,7 @@ namespace System.CodeDom.Compiler {
}
}
#if NET_4_0
[Obsolete]
#endif
public Evidence Evidence {
get { return evidence; }
[SecurityPermission (SecurityAction.Demand, ControlEvidence = true)]

View File

@@ -68,4 +68,4 @@ namespace System.CodeDom.Compiler
}
}
}
#endif
#endif

View File

@@ -128,4 +128,4 @@ namespace System.CodeDom.Compiler
}
}
}
#endif
#endif

View File

@@ -78,9 +78,7 @@ namespace System.CodeDom.Compiler {
}
}
#if NET_4_0
[Obsolete]
#endif
public Evidence Evidence {
get { return evidence; }
[SecurityPermission (SecurityAction.Demand, ControlEvidence = true)]