Removing security attributes conflicting with dynamic compilation.

BuildManager.GetCompiledAssembly will generate an AssemblyInfo.cs file which will get compiled with the project, but create a conflict as two SecurityRules attributes can't be defined at the same time. For VS 11 Beta compatibility. --HG-- branch : 1.x
2025-10-14 19:04:51 +08:00 · 2012-04-23 12:30:01 -07:00
parent 17b07cb4a1
commit 326c8df745
42 changed files with 48 additions and 49 deletions
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,8 +1,8 @@
-44f230efa46f774c59881718ed8ee7e44641ae15 src/Orchard.Web/Modules/Orchard.Autoroute
-9565e6af918d5bb7be71cbbfa46fcc4494442d67 src/Orchard.Web/Modules/Orchard.Forms
-abfb103a4f86804f006ac411fe8f023588107e2e src/Orchard.Web/Modules/Orchard.Rules
-6f30f54fdf5620a9478eec9ba1babedac5e8b61a src/Orchard.Web/Modules/Orchard.TaskLease
-6d2893b6fd51427610342a554db926f0d833b451 src/Orchard.Web/Modules/Orchard.Tokens
-baf304a1c36cec8f1b01a092ff7c9e527006c452 src/orchard.web/Modules/Orchard.Alias
-a8f1ae170deff7160d485493113236b224acf666 src/orchard.web/Modules/Orchard.Projections
-4626639b355ec343cade66c9535a915284de8b52 src/orchard.web/modules/Orchard.Fields
+68e639da9c5c78a3bd89cef4bba177ee1a0c4aa9 src/Orchard.Web/Modules/Orchard.Autoroute
+3ac4633527ad504aab9d0dcb5f7815105a368751 src/Orchard.Web/Modules/Orchard.Forms
+205d4503d65d58e29be78ebfce2dbcdb69b1e1f3 src/Orchard.Web/Modules/Orchard.Rules
+c549fb967b45b1353bf50f0ba1dc9e52ecc7ffc9 src/Orchard.Web/Modules/Orchard.TaskLease
+c0265a0ed1f6ce8ca733062bb562222e12720270 src/Orchard.Web/Modules/Orchard.Tokens
+dbaf5cd5482c513dd095d66ed39e73a8e168d1b7 src/orchard.web/Modules/Orchard.Alias
+372a56ef39cad104696b22b94ac9c0bb24636392 src/orchard.web/Modules/Orchard.Projections
+9ebb8a1676fba9a965fed74d578c2eb917646318 src/orchard.web/modules/Orchard.Fields
--- a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Core/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs
@@ -29,4 +29,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssemblyInfo.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssemblyInfo.txt
@@ -33,4 +33,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
@@ -33,4 +33,3 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
--- a/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Localization/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Localization/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Security;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Media/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Messaging/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Security;
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Recipes/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Scripting/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Warmup/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Warmup/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.jQuery/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/TinyMce/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Modules/UpgradeTo14/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/UpgradeTo14/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@ using System.Security;
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Properties/AssemblyInfo.cs
@@ -36,4 +36,4 @@ using System.Security;

 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Themes/Properties/AssemblyInfo.cs
@@ -36,4 +36,4 @@ using System.Security;

 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+
--- a/src/Orchard/Properties/AssemblyInfo.cs
+++ b/src/Orchard/Properties/AssemblyInfo.cs
@@ -37,4 +37,4 @@ using System.Security;

 [assembly: AssemblyVersion("1.4.0")]
 [assembly: AssemblyFileVersion("1.4.0")]
-[assembly: SecurityRules(SecurityRuleSet.Level2)]
+