Remove Obsolete attribute when type is deprecated

dnnsoftware · Jul 21, 2023 · fd95188 · fd95188
1 parent 697b878
commit fd95188
Show file tree

Hide file tree

Showing 25 changed files with 9 additions and 190 deletions.
diff --git a/DNN Platform/DotNetNuke.Web.Razor/DotNetNukeWebPage.cs b/DNN Platform/DotNetNuke.Web.Razor/DotNetNukeWebPage.cs
@@ -14,20 +14,16 @@ public abstract partial class DotNetNukeWebPage : WebPageBase
     {
         private dynamic model;
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public dynamic Model
         {
             get { return this.model ?? (this.model = this.PageContext.Model); }
             set { this.model = value; }
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected internal DnnHelper Dnn { get; internal set; }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected internal HtmlHelper Html { get; internal set; }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected internal UrlHelper Url { get; internal set; }
 
         /// <inheritdoc/>

diff --git a/DNN Platform/DotNetNuke.Web.Razor/DotNetNukeWebPage{TModel}.cs b/DNN Platform/DotNetNuke.Web.Razor/DotNetNukeWebPage{TModel}.cs
@@ -23,7 +23,6 @@ public DotNetNukeWebPage()
             this.Model = model ?? Activator.CreateInstance<TModel>();
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public new TModel Model
         {
             get { return this.PageContext?.Model as TModel ?? this.model; }

diff --git a/DNN Platform/DotNetNuke.Web.Razor/Helpers/DnnHelper.cs b/DNN Platform/DotNetNuke.Web.Razor/Helpers/DnnHelper.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information
 namespace DotNetNuke.Web.Razor.Helpers
 {
-    using System;
-
     using DotNetNuke.Entities.Modules;
     using DotNetNuke.Entities.Portals;
     using DotNetNuke.Entities.Tabs;
@@ -17,13 +15,11 @@ public partial class DnnHelper
     {
         private readonly ModuleInstanceContext context;
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public DnnHelper(ModuleInstanceContext context)
         {
             this.context = context;
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public ModuleInfo Module
         {
             get
@@ -32,7 +28,6 @@ public ModuleInfo Module
             }
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public TabInfo Tab
         {
             get
@@ -41,7 +36,6 @@ public TabInfo Tab
             }
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public PortalSettings Portal
         {
             get
@@ -50,7 +44,6 @@ public PortalSettings Portal
             }
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public UserInfo User
         {
             get

diff --git a/DNN Platform/DotNetNuke.Web.Razor/Helpers/HtmlHelper.cs b/DNN Platform/DotNetNuke.Web.Razor/Helpers/HtmlHelper.cs
@@ -16,7 +16,6 @@ public partial class HtmlHelper
         private readonly string resourceFile;
         private ModuleInstanceContext context;
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public HtmlHelper(ModuleInstanceContext context, string resourcefile)
         {
             this.context = context;

diff --git a/DNN Platform/DotNetNuke.Web.Razor/Helpers/UrlHelper.cs b/DNN Platform/DotNetNuke.Web.Razor/Helpers/UrlHelper.cs
@@ -18,7 +18,6 @@ public partial class UrlHelper
 
         /// <summary>Initializes a new instance of the <see cref="UrlHelper"/> class.</summary>
         /// <param name="context">The module context.</param>
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public UrlHelper(ModuleInstanceContext context)
         {
             this.context = context;

diff --git a/DNN Platform/DotNetNuke.Web.Razor/RazorEngine.cs b/DNN Platform/DotNetNuke.Web.Razor/RazorEngine.cs
@@ -20,7 +20,6 @@ namespace DotNetNuke.Web.Razor
     [DnnDeprecated(9, 3, 2, "Use Razor Pages instead")]
     public partial class RazorEngine
     {
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public RazorEngine(string razorScriptFile, ModuleInstanceContext moduleContext, string localResourceFile)
         {
             this.RazorScriptFile = razorScriptFile;
@@ -45,22 +44,17 @@ public RazorEngine(string razorScriptFile, ModuleInstanceContext moduleContext,
             }
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public DotNetNukeWebPage Webpage { get; set; }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected HttpContextBase HttpContext
         {
             get { return new HttpContextWrapper(System.Web.HttpContext.Current); }
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected string RazorScriptFile { get; set; }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected ModuleInstanceContext ModuleContext { get; set; }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected string LocalResourceFile { get; set; }
 
         [DnnDeprecated(9, 3, 2, "Use Razor Pages instead")]

diff --git a/DNN Platform/DotNetNuke.Web.Razor/RazorHostControl.cs b/DNN Platform/DotNetNuke.Web.Razor/RazorHostControl.cs
@@ -22,14 +22,12 @@ public partial class RazorHostControl : ModuleControlBase, IActionable
 
         /// <summary>Initializes a new instance of the <see cref="RazorHostControl"/> class.</summary>
         /// <param name="scriptFile">The path to the Razor script file.</param>
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public RazorHostControl(string scriptFile)
         {
             this.razorScriptFile = scriptFile;
         }
 
         /// <inheritdoc/>
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         public ModuleActionCollection ModuleActions
         {
             get
@@ -43,7 +41,6 @@ public ModuleActionCollection ModuleActions
             }
         }
 
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected virtual string RazorScriptFile
         {
             get { return this.razorScriptFile; }

diff --git a/DNN Platform/DotNetNuke.Web.Razor/RazorModuleBase.cs b/DNN Platform/DotNetNuke.Web.Razor/RazorModuleBase.cs
@@ -14,7 +14,6 @@ namespace DotNetNuke.Web.Razor
     [DnnDeprecated(9, 3, 2, "Use Razor Pages instead")]
     public partial class RazorModuleBase : ModuleUserControlBase
     {
-        [Obsolete("Deprecated in 9.3.2, will be removed in 11.0.0, use Razor Pages instead")]
         protected virtual string RazorScriptFile
         {
             get

diff --git a/DNN Platform/HttpModules/Users Online/UsersOnlineModule.cs b/DNN Platform/HttpModules/Users Online/UsersOnlineModule.cs
@@ -13,7 +13,6 @@ namespace DotNetNuke.HttpModules.UsersOnline
     [DnnDeprecated(8, 0, 0, "Other solutions exist outside of the DNN Platform", RemovalVersion = 11)]
     public partial class UsersOnlineModule : IHttpModule
     {
-        [Obsolete("Support for users online was removed in 8.x, other solutions exist outside of the DNN Platform.  Scheduled removal in v11.0.0.")]
         public string ModuleName
         {
             get
@@ -33,8 +32,7 @@ public void Dispose()
         {
         }
 
-        [DnnDeprecated(8, 0, 0, "Other solutions exist outside of the DNN Platform", RemovalVersion = 11)]
-        public partial void OnAuthorizeRequest(object s, EventArgs e)
+        public void OnAuthorizeRequest(object s, EventArgs e)
         {
             // First check if we are upgrading/installing
             var app = (HttpApplication)s;