From e0fc576f9e2c7bc39953ce09de6dc051c69f03c4 Mon Sep 17 00:00:00 2001 From: mvarblow Date: Thu, 3 Sep 2015 16:07:06 -0400 Subject: [PATCH] Suppressed warning CS0436 in Orchard.Framework Daniel changed the Orchaard.Framework project to ignore the JetBrains.Annotations conflicts for debug builds several months back. See http://orchard.codeplex.com/workitem/21056 and 78901ba . However, the problem still exists for release builds. This pull request applies the same fix (ignoring the warning) to release builds. --- src/Orchard/Orchard.Framework.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index ee62487ba..4135b0375 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -55,6 +55,7 @@ 4 AllRules.ruleset false + 0436 @@ -1028,4 +1029,4 @@ --> - \ No newline at end of file +